winft · romangg · Jun 19, 2024 · May 23, 2024 · Jan 10, 2024 · Jan 11, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -77,8 +77,8 @@ ecm_setup_version(PROJECT
 # required frameworks by Core
 find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
     Auth
+    ColorScheme
     Config
-    ConfigWidgets
     CoreAddons
     Crash
     GlobalAccel

diff --git a/como-config.cmake.in b/como-config.cmake.in
@@ -13,8 +13,8 @@ find_dependency(wlroots @WLROOTS_MIN_VERSION@)
 find_dependency(Qt6Gui @QT_MIN_VERSION@)
 find_dependency(KF6 @KF6_MIN_VERSION@ COMPONENTS
   Auth
+  ColorScheme
   Config
-  ConfigWidgets
   CoreAddons
   GlobalAccel
   I18n

diff --git a/como/input/CMakeLists.txt b/como/input/CMakeLists.txt
@@ -32,7 +32,6 @@ target_sources(input
       filters/popup.h
       filters/screen_edge.h
       filters/tabbox.h
-      filters/terminate_server.h
       filters/virtual_terminal.h
       filters/window_action.h
       filters/window_selector.h

diff --git a/como/input/event_filter.h b/como/input/event_filter.h
@@ -31,7 +31,7 @@ namespace como::input
 template<typename Filters, typename UnaryPredicate>
 void process_filters(Filters const& filters, UnaryPredicate function)
 {
-    std::any_of(filters.cbegin(), filters.cend(), function);
+    static_cast<void>(std::any_of(filters.cbegin(), filters.cend(), function));
 }
 
 /**

diff --git a/como/input/filters/terminate_server.h b/como/input/filters/terminate_server.h
diff --git a/como/input/wayland/redirect.h b/como/input/wayland/redirect.h
@@ -30,7 +30,6 @@
 #include <como/input/filters/move_resize.h>
 #include <como/input/filters/popup.h>
 #include <como/input/filters/screen_edge.h>
-#include <como/input/filters/terminate_server.h>
 #include <como/input/filters/virtual_terminal.h>
 #include <como/input/filters/window_action.h>
 #include <como/input/filters/window_selector.h>
@@ -357,9 +356,6 @@ class redirect
 
         m_spies.push_back(new activity_spy(*this));
         m_spies.push_back(new touch_hide_cursor_spy(*this));
-        if (has_global_shortcuts) {
-            m_filters.emplace_back(new terminate_server_filter<type>(*this));
-        }
         m_filters.emplace_back(new drag_and_drop_filter<type>(*this));
         m_filters.emplace_back(new lock_screen_filter<type>(*this));
         m_filters.emplace_back(new popup_filter<type>(*this));

diff --git a/como/render/effect/interface/quick_scene.cpp b/como/render/effect/interface/quick_scene.cpp
@@ -69,7 +69,7 @@ class QuickSceneEffectPrivate : QObject
         return effect->d.get();
     }
 
-    std::unique_ptr<QQmlComponent> delegate;
+    QPointer<QQmlComponent> delegate;
     QUrl source;
     std::map<EffectScreen const*, std::unique_ptr<QQmlContext>> contexts;
     std::map<EffectScreen const*, std::unique_ptr<QQmlIncubator>> incubators;
@@ -270,7 +270,7 @@ void QuickSceneEffect::setSource(const QUrl& url)
     }
     if (d->source != url) {
         d->source = url;
-        d->delegate.reset();
+        d->delegate.clear();
     }
 }
 
@@ -287,7 +287,7 @@ void QuickSceneEffect::setDelegate(QQmlComponent* delegate)
     }
     if (d->delegate.get() != delegate) {
         d->source = QUrl();
-        d->delegate.reset(delegate);
+        d->delegate = delegate;
         Q_EMIT delegateChanged();
     }
 }
@@ -516,11 +516,12 @@ void QuickSceneEffect::startInternal()
             return;
         }
 
-        d->delegate = std::make_unique<QQmlComponent>(effects->qmlEngine());
+        d->delegate = new QQmlComponent(effects->qmlEngine(), this);
         d->delegate->loadUrl(d->source);
+
         if (d->delegate->isError()) {
             qWarning().nospace() << "Failed to load " << d->source << ": " << d->delegate->errors();
-            d->delegate.reset();
+            d->delegate.clear();
             return;
         }
         Q_EMIT delegateChanged();

diff --git a/como/render/post/night_color_manager.h b/como/render/post/night_color_manager.h
@@ -44,8 +44,9 @@ inline void night_color_display_inhibit_message(bool inhibit, bool show_day_stat
         : show_day_status     ? QStringLiteral("redshift-status-day")
                               : QStringLiteral("redshift-status-on");
 
-    auto const text = inhibit ? i18nc("Night Light was disabled", "Night Light Off")
-                              : i18nc("Night Light was enabled", "Night Light On");
+    auto const text = inhibit
+        ? i18nc("Night Light was temporarily disabled", "Night Light Suspended")
+        : i18nc("Night Light was reenabled from temporary suspension", "Night Light Resumed");
 
     auto message = QDBusMessage::createMethodCall(QStringLiteral("org.kde.plasmashell"),
                                                   QStringLiteral("/org/kde/osdService"),

diff --git a/como/render/post/night_color_setup.h b/como/render/post/night_color_setup.h
@@ -19,7 +19,8 @@ void init_night_color_shortcuts(Input& input, NightColor& manager)
     auto toggleAction = new QAction(manager.qobject.get());
     toggleAction->setProperty("componentName", "kwin");
     toggleAction->setObjectName(QStringLiteral("Toggle Night Color"));
-    toggleAction->setText(i18n("Toggle Night Light"));
+    toggleAction->setText(
+        i18nc("Temporarily disable/reenable Night Light", "Suspend/Resume Night Light"));
 
     input.shortcuts->register_keyboard_default_shortcut(toggleAction, {});
     input.shortcuts->register_keyboard_shortcut(toggleAction, {});

diff --git a/como/render/qml/frames/plasma/frame_unstyled.qml b/como/render/qml/frames/plasma/frame_unstyled.qml
@@ -9,7 +9,7 @@ import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls as QQC2
 
-import org.kde.kirigami 2.12 as Kirigami
+import org.kde.kirigami as Kirigami
 
 Rectangle {
     id: root
@@ -20,7 +20,7 @@ Rectangle {
     implicitHeight: layout.implicitHeight + 2 * layout.anchors.margins
 
     color: Qt.rgba(0, 0, 0, effectFrame.frameOpacity)
-    radius: layout.anchors.margins
+    radius: Kirigami.Units.cornerRadius
 
     RowLayout {
         id: layout

diff --git a/como/win/CMakeLists.txt b/como/win/CMakeLists.txt
@@ -9,7 +9,9 @@ target_link_libraries(win
   PUBLIC
     KDecoration2::KDecoration
     KDecoration2::KDecoration2Private
-    KF6::ConfigWidgets
+    KF6::ColorScheme
+    KF6::ConfigCore
+    KF6::ConfigGui
     KF6::CoreAddons
     KF6::I18n
     KF6::Package

diff --git a/como/win/deco/bridge.h b/como/win/deco/bridge.h
@@ -99,7 +99,7 @@ class bridge : public KDecoration2::DecorationBridge
         if (!m_theme.isEmpty()) {
             args.insert(QStringLiteral("theme"), m_theme);
         }
-        auto deco = m_factory->create<KDecoration2::Decoration>(window, QVariantList({args}));
+        auto deco = m_factory->create<KDecoration2::Decoration>(window, QVariantList{args});
         deco->setSettings(m_settings);
         deco->init();
         return deco;

diff --git a/como/win/deco/settings.h b/como/win/deco/settings.h
@@ -110,6 +110,7 @@ class settings : public QObject, public KDecoration2::DecorationSettingsPrivate
         s_buttonNames[KDecoration2::DecorationButtonType::KeepAbove] = QChar('F');
         s_buttonNames[KDecoration2::DecorationButtonType::KeepBelow] = QChar('B');
         s_buttonNames[KDecoration2::DecorationButtonType::Shade] = QChar('L');
+        s_buttonNames[KDecoration2::DecorationButtonType::Spacer] = QChar('_');
     }
 
     QString buttonsToString(QVector<KDecoration2::DecorationButtonType> const& buttons) const

diff --git a/como/win/meta.h b/como/win/meta.h
@@ -91,39 +91,6 @@ bool is_special_window(Win const* win)
         || is_notification(win) || is_critical_notification(win) || is_on_screen_display(win);
 }
 
-/**
- * Looks for another window with same captionNormal and captionSuffix.
- * If no such window exists @c nullptr is returned.
- */
-template<typename Win>
-std::optional<typename Win::space_t::window_t> find_client_with_same_caption(Win const* win)
-{
-    for (auto candidate : win->space.windows) {
-        if (std::visit(overload{[&](auto&& candidate) {
-                           if constexpr (std::is_same_v<std::decay_t<decltype(candidate)>, Win*>) {
-                               if (candidate == win) {
-                                   return false;
-                               }
-                           }
-                           if (!candidate->control) {
-                               return false;
-                           }
-                           if (is_special_window(candidate) && !is_toolbar(candidate)) {
-                               return false;
-                           }
-                           if (candidate->meta.caption.normal != win->meta.caption.normal
-                               || candidate->meta.caption.suffix != win->meta.caption.suffix) {
-                               return false;
-                           }
-                           return true;
-                       }},
-                       candidate)) {
-            return candidate;
-        }
-    }
-    return {};
-}
-
 template<typename Win>
 void set_wm_class(Win& win, QByteArray const& res_name, QByteArray const& res_class)
 {

diff --git a/como/win/rules/book.cpp b/como/win/rules/book.cpp
@@ -9,7 +9,6 @@
 #include <como/base/logging.h>
 #include <como/win/control.h>
 
-#include "book_settings.h"
 #include "rules_settings.h"
 
 #include <KConfig>
@@ -46,34 +45,25 @@ void book::load()
 {
     deleteAll();
 
-    if (!config) {
-        config = KSharedConfig::openConfig(QStringLiteral("kwinrulesrc"), KConfig::NoGlobals);
+    if (!settings) {
+        settings = std::make_unique<book_settings>();
     } else {
-        config->reparseConfiguration();
+        settings->sharedConfig()->reparseConfiguration();
     }
 
-    book_settings book(config);
-    book.load();
-    m_rules = book.rules();
+    settings->load();
+    m_rules = settings->rules();
 }
 
 void book::save()
 {
     m_updateTimer->stop();
 
-    if (!config) {
+    if (!settings) {
         qCWarning(KWIN_CORE) << "book::save invoked without prior invocation of book::load";
         return;
     }
-
-    std::vector<ruling*> filteredRules;
-    for (const auto& rule : std::as_const(m_rules)) {
-        filteredRules.push_back(rule);
-    }
-
-    book_settings settings(config);
-    settings.setRules(filteredRules);
-    settings.save();
+    settings->save();
 }
 
 void book::requestDiskStorage()

diff --git a/como/win/rules/book.h b/como/win/rules/book.h
@@ -6,14 +6,16 @@
 */
 #pragma once
 
-#include "window.h"
+#include <como/win/rules/book_settings.h>
+#include <como/win/rules/window.h>
 
 #include <QTimer>
 #include <deque>
 
 namespace como::win::rules
 {
 
+class book_settings;
 class ruling;
 
 class COMO_EXPORT book_qobject : public QObject
@@ -38,7 +40,7 @@ class COMO_EXPORT book
     void requestDiskStorage();
 
     std::unique_ptr<book_qobject> qobject;
-    KSharedConfig::Ptr config;
+    std::unique_ptr<book_settings> settings;
     std::deque<ruling*> m_rules;
 
 private:

diff --git a/como/win/rules/book_edit.h b/como/win/rules/book_edit.h
@@ -17,25 +17,31 @@ namespace como::win::rules
 template<typename Book, typename RefWin>
 void discard_used_rules(Book& book, RefWin& ref_win, bool withdrawn)
 {
-    auto updated = false;
-
     for (auto it = book.m_rules.begin(); it != book.m_rules.end();) {
         if (ref_win.control->rules.contains(*it)) {
+            auto const index = book.settings->indexForId((*it)->id);
+
             if ((*it)->discardUsed(withdrawn)) {
-                updated = true;
+                if (index) {
+                    auto settings = book.settings->ruleSettingsAt(index.value());
+                    (*it)->write(settings);
+                }
             }
             if ((*it)->isEmpty()) {
                 ref_win.control->remove_rule(*it);
                 auto r = *it;
                 it = book.m_rules.erase(it);
                 delete r;
+                if (index) {
+                    book.settings->removeRuleSettingsAt(index.value());
+                }
                 continue;
             }
         }
         ++it;
     }
 
-    if (updated) {
+    if (book.settings->usrIsSaveNeeded()) {
         book.requestDiskStorage();
     }
 }