From 37ecb879ddc0d598bbbd2939271b8f8d6e3efd6f Mon Sep 17 00:00:00 2001 From: wheaney <42350981+wheaney@users.noreply.github.com> Date: Thu, 21 Aug 2025 13:50:53 -0700 Subject: [PATCH] Revert "Update logging" This reverts commit e4dbcdaee79424e5569e21e1923bc1774fe60e66. --- kwin/src/breezydesktopeffect.cpp | 14 ++++++++++---- kwin/src/kcm/CMakeLists.txt | 4 ++++ kwin/src/kcm/breezydesktopeffectkcm.h | 6 ++++++ kwin/src/kcm/breezydesktopeffectkcm.ui | 5 +++++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/kwin/src/breezydesktopeffect.cpp b/kwin/src/breezydesktopeffect.cpp index f84b1b4..5de06fb 100644 --- a/kwin/src/breezydesktopeffect.cpp +++ b/kwin/src/breezydesktopeffect.cpp @@ -68,6 +68,7 @@ namespace KWin BreezyDesktopEffect::BreezyDesktopEffect() : m_shutdownTimer(new QTimer(this)) { + qCCritical(KWIN_XR) << "\t\t\tBreezy - constructor"; qmlRegisterUncreatableType("org.kde.kwin.effect.breezy_desktop_effect", 1, 0, "BreezyDesktopEffect", QStringLiteral("BreezyDesktop cannot be created in QML")); m_shutdownTimer->setSingleShot(true); @@ -157,16 +158,18 @@ int BreezyDesktopEffect::requestedEffectChainPosition() const void BreezyDesktopEffect::toggle() { if (isRunning()) { - qCInfo(KWIN_XR) << "\t\t\tBreezy - toggle - deactivating"; + qCCritical(KWIN_XR) << "\t\t\tBreezy - toggle - deactivating"; deactivate(); } else { - qCInfo(KWIN_XR) << "\t\t\tBreezy - toggle - activating"; + qCCritical(KWIN_XR) << "\t\t\tBreezy - toggle - activating"; activate(); } } void BreezyDesktopEffect::activate() { + qCCritical(KWIN_XR) << "\t\t\tBreezy - activate"; + if (!isRunning()) setRunning(true); connect(effects, &EffectsHandler::cursorShapeChanged, this, &BreezyDesktopEffect::updateCursorImage); @@ -174,6 +177,7 @@ void BreezyDesktopEffect::activate() // QuickSceneEffect grabs the keyboard and mouse input, which pulls focus away from the active window // and doesn't allow for interaction with anything on the desktop. These two calls fix that. + // TODO - move away from QuickSceneEffect effects->ungrabKeyboard(); effects->stopMouseInterception(this); @@ -186,6 +190,7 @@ void BreezyDesktopEffect::deactivate() return; } + qCCritical(KWIN_XR) << "\t\t\tBreezy - deactivate"; disconnect(effects, &EffectsHandler::cursorShapeChanged, this, &BreezyDesktopEffect::updateCursorImage); m_cursorUpdateTimer->stop(); showCursor(); @@ -202,6 +207,7 @@ void BreezyDesktopEffect::deactivate() void BreezyDesktopEffect::realDeactivate() { + qCCritical(KWIN_XR) << "\t\t\tBreezy - realDeactivate"; setRunning(false); } @@ -399,7 +405,7 @@ void BreezyDesktopEffect::updateImuRotation() { if (!enabled) { // give a grace period after enabling the effect if (wasEnabled && (currentTimeMs - activatedAt > 1000)) { - qCInfo(KWIN_XR) << "\t\t\tBreezy - disabling effect; currentTimeMs:" << currentTimeMs + qCCritical(KWIN_XR) << "\t\t\tBreezy - disabling effect; currentTimeMs:" << currentTimeMs << "imuDateMs:" << imuDateMs << "enabledFlag:" << enabledFlag << "version:" << version @@ -410,7 +416,7 @@ void BreezyDesktopEffect::updateImuRotation() { return; } } else if (!wasEnabled) { - qCInfo(KWIN_XR) << "\t\t\tBreezy - enabling effect; currentTimeMs:" << currentTimeMs + qCCritical(KWIN_XR) << "\t\t\tBreezy - enabling effect; currentTimeMs:" << currentTimeMs << "imuDateMs:" << imuDateMs << "enabledFlag:" << enabledFlag << "version:" << version diff --git a/kwin/src/kcm/CMakeLists.txt b/kwin/src/kcm/CMakeLists.txt index 4190c90..5a0913b 100644 --- a/kwin/src/kcm/CMakeLists.txt +++ b/kwin/src/kcm/CMakeLists.txt @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2022 Vlad Zahorodnii +# +# SPDX-License-Identifier: BSD-3-Clause + set(breezy_desktop_config_SOURCES breezydesktopeffectkcm.cpp) ki18n_wrap_ui(breezy_desktop_config_SOURCES breezydesktopeffectkcm.ui) qt_add_dbus_interface(breezy_desktop_config_SOURCES ${KWIN_EFFECTS_INTERFACE} kwineffects_interface) diff --git a/kwin/src/kcm/breezydesktopeffectkcm.h b/kwin/src/kcm/breezydesktopeffectkcm.h index 940be5d..f795942 100644 --- a/kwin/src/kcm/breezydesktopeffectkcm.h +++ b/kwin/src/kcm/breezydesktopeffectkcm.h @@ -1,3 +1,9 @@ +/* + SPDX-FileCopyrightText: 2022 Vlad Zahorodnii + + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ + #pragma once #include diff --git a/kwin/src/kcm/breezydesktopeffectkcm.ui b/kwin/src/kcm/breezydesktopeffectkcm.ui index 3f1036b..f9ad626 100644 --- a/kwin/src/kcm/breezydesktopeffectkcm.ui +++ b/kwin/src/kcm/breezydesktopeffectkcm.ui @@ -1,4 +1,9 @@ + BreezyDesktopEffectConfig