kwin/effect: reload config on change

#4
taj-ny · Jan 25, 2025 · 1527751 · 1527751
1 parent c3f69eb
commit 1527751
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/src/kwin/effect.cpp b/src/kwin/effect.cpp
@@ -21,6 +21,15 @@ Effect::Effect()
 #endif
 
     reconfigure(ReconfigureAll);
+
+    if (!QFile::exists(configFile)) {
+        QFile(configFile).open(QIODevice::WriteOnly);
+    }
+
+    m_configFileWatcher.addPath(configFile);
+    m_configFileWatcher.addPath(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation));
+    connect(&m_configFileWatcher, &QFileSystemWatcher::directoryChanged, this, &Effect::slotConfigDirectoryChanged);
+    connect(&m_configFileWatcher, &QFileSystemWatcher::fileChanged, this, &Effect::slotConfigFileChanged);
 }
 
 Effect::~Effect()
@@ -30,13 +39,26 @@ Effect::~Effect()
     }
 }
 
-void Effect::reconfigure(ReconfigureFlags flags)
+void Effect::slotConfigFileChanged()
 {
-    Q_UNUSED(flags)
+    if (!m_configFileWatcher.files().contains(configFile)) {
+        m_configFileWatcher.addPath(configFile);
+    }
 
-    if (!QFile::exists(configFile)) {
-        QFile(configFile).open(QIODevice::WriteOnly);
+    reconfigure(ReconfigureAll);
+}
+
+void Effect::slotConfigDirectoryChanged()
+{
+    if (!m_configFileWatcher.files().contains(configFile) && QFile::exists(configFile)) {
+        m_configFileWatcher.addPath(configFile);
+        reconfigure(ReconfigureAll);
     }
+}
+
+void Effect::reconfigure(ReconfigureFlags flags)
+{
+    Q_UNUSED(flags)
 
     try {
         auto gestureRecognizer = YAML::LoadFile(configFile.toStdString())["touchpad"].as<std::shared_ptr<libgestures::GestureRecognizer>>();

diff --git a/src/kwin/effect.h b/src/kwin/effect.h
@@ -5,6 +5,8 @@
 #include "impl/kwinwindowinfoprovider.h"
 #include "inputfilter.h"
 
+#include <QFileSystemWatcher>
+
 class Effect : public KWin::Effect
 {
 public:
@@ -16,6 +18,11 @@ class Effect : public KWin::Effect
 
     void reconfigure(ReconfigureFlags flags) override;
 
+private slots:
+    void slotConfigFileChanged();
+    void slotConfigDirectoryChanged();
+
 private:
     std::unique_ptr<GestureInputEventFilter> m_inputEventFilter = std::make_unique<GestureInputEventFilter>();
+    QFileSystemWatcher m_configFileWatcher;
 };