From 96af98609e1e3d62b96c5baed90305a035ef6691 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Mon, 20 Nov 2023 14:44:58 +0200
Subject: [PATCH] Don't pass ownership of InputEventFilter and InputEventSpy to
 InputRedirection

This is not compatible with plugins that install their own filters. The
approach in this patch is not elegant, but it should work. Another option
would be to convert these filters and spies to QObjects and use QObject
ownership model, but this would be also too excessive just to save a few
lines of code.
---
 src/input.cpp | 80 ++++++++++++++++++++++++++++++++++++---------------
 src/input.h   | 23 ++++++++++++++-
 2 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index 7ef54e2452..b6f328f07a 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -2669,8 +2669,6 @@ InputRedirection::~InputRedirection()
     m_inputDevices.clear();
 
     s_self = nullptr;
-    qDeleteAll(m_filters);
-    qDeleteAll(m_spies);
 }
 
 void InputRedirection::installInputEventFilter(InputEventFilter *filter)
@@ -2911,36 +2909,72 @@ void InputRedirection::setupInputFilters()
 {
     const bool hasGlobalShortcutSupport = waylandServer()->hasGlobalShortcutSupport();
     if (kwinApp()->session()->capabilities() & Session::Capability::SwitchTerminal) {
-        installInputEventFilter(new VirtualTerminalFilter);
+        m_virtualTerminalFilter = std::make_unique<VirtualTerminalFilter>();
+        installInputEventFilter(m_virtualTerminalFilter.get());
     }
-    installInputEventSpy(new HideCursorSpy);
-    installInputEventSpy(new UserActivitySpy);
-    installInputEventSpy(new WindowInteractedSpy);
+
+    m_hideCursorSpy = std::make_unique<HideCursorSpy>();
+    installInputEventSpy(m_hideCursorSpy.get());
+
+    m_userActivitySpy = std::make_unique<UserActivitySpy>();
+    installInputEventSpy(m_userActivitySpy.get());
+
+    m_windowInteractedSpy = std::make_unique<WindowInteractedSpy>();
+    installInputEventSpy(m_windowInteractedSpy.get());
+
     if (hasGlobalShortcutSupport) {
-        installInputEventFilter(new TerminateServerFilter);
+        m_terminateServerFilter = std::make_unique<TerminateServerFilter>();
+        installInputEventFilter(m_terminateServerFilter.get());
     }
-    installInputEventFilter(new DragAndDropInputFilter);
-    installInputEventFilter(new LockScreenFilter);
-    m_windowSelector = new WindowSelectorFilter;
-    installInputEventFilter(m_windowSelector);
+
+    m_dragAndDropFilter = std::make_unique<DragAndDropInputFilter>();
+    installInputEventFilter(m_dragAndDropFilter.get());
+
+    m_lockscreenFilter = std::make_unique<LockScreenFilter>();
+    installInputEventFilter(m_lockscreenFilter.get());
+
+    m_windowSelector = std::make_unique<WindowSelectorFilter>();
+    installInputEventFilter(m_windowSelector.get());
+
     if (hasGlobalShortcutSupport) {
-        installInputEventFilter(new ScreenEdgeInputFilter);
+        m_screenEdgeFilter = std::make_unique<ScreenEdgeInputFilter>();
+        installInputEventFilter(m_screenEdgeFilter.get());
     }
 #if KWIN_BUILD_TABBOX
-    installInputEventFilter(new TabBoxInputFilter);
+    m_tabboxFilter = std::make_unique<TabBoxInputFilter>();
+    installInputEventFilter(m_tabboxFilter.get());
 #endif
     if (hasGlobalShortcutSupport) {
-        installInputEventFilter(new GlobalShortcutFilter);
+        m_globalShortcutFilter = std::make_unique<GlobalShortcutFilter>();
+        installInputEventFilter(m_globalShortcutFilter.get());
     }
-    installInputEventFilter(new EffectsFilter);
-    installInputEventFilter(new MoveResizeFilter);
-    installInputEventFilter(new PopupInputFilter);
-    installInputEventFilter(new DecorationEventFilter);
-    installInputEventFilter(new WindowActionInputFilter);
-    installInputEventFilter(new InternalWindowEventFilter);
-    installInputEventFilter(new InputKeyboardFilter);
-    installInputEventFilter(new ForwardInputFilter);
-    installInputEventFilter(new TabletInputFilter);
+
+    m_effectsFilter = std::make_unique<EffectsFilter>();
+    installInputEventFilter(m_effectsFilter.get());
+
+    m_interactiveMoveResizeFilter = std::make_unique<MoveResizeFilter>();
+    installInputEventFilter(m_interactiveMoveResizeFilter.get());
+
+    m_popupFilter = std::make_unique<PopupInputFilter>();
+    installInputEventFilter(m_popupFilter.get());
+
+    m_decorationFilter = std::make_unique<DecorationEventFilter>();
+    installInputEventFilter(m_decorationFilter.get());
+
+    m_windowActionFilter = std::make_unique<WindowActionInputFilter>();
+    installInputEventFilter(m_windowActionFilter.get());
+
+    m_internalWindowFilter = std::make_unique<InternalWindowEventFilter>();
+    installInputEventFilter(m_internalWindowFilter.get());
+
+    m_inputKeyboardFilter = std::make_unique<InputKeyboardFilter>();
+    installInputEventFilter(m_inputKeyboardFilter.get());
+
+    m_forwardFilter = std::make_unique<ForwardInputFilter>();
+    installInputEventFilter(m_forwardFilter.get());
+
+    m_tabletFilter = std::make_unique<TabletInputFilter>();
+    installInputEventFilter(m_tabletFilter.get());
 }
 
 void InputRedirection::handleInputConfigChanged(const KConfigGroup &group)
diff --git a/src/input.h b/src/input.h
index dd0e5534d9..b4fa56014f 100644
--- a/src/input.h
+++ b/src/input.h
@@ -325,12 +325,33 @@ private:
 
     QList<IdleDetector *> m_idleDetectors;
     QList<Window *> m_idleInhibitors;
-    WindowSelectorFilter *m_windowSelector = nullptr;
+    std::unique_ptr<WindowSelectorFilter> m_windowSelector;
 
     QList<InputEventFilter *> m_filters;
     QList<InputEventSpy *> m_spies;
     KConfigWatcher::Ptr m_inputConfigWatcher;
 
+    std::unique_ptr<InputEventFilter> m_virtualTerminalFilter;
+    std::unique_ptr<InputEventFilter> m_terminateServerFilter;
+    std::unique_ptr<InputEventFilter> m_dragAndDropFilter;
+    std::unique_ptr<InputEventFilter> m_lockscreenFilter;
+    std::unique_ptr<InputEventFilter> m_screenEdgeFilter;
+    std::unique_ptr<InputEventFilter> m_tabboxFilter;
+    std::unique_ptr<InputEventFilter> m_globalShortcutFilter;
+    std::unique_ptr<InputEventFilter> m_effectsFilter;
+    std::unique_ptr<InputEventFilter> m_interactiveMoveResizeFilter;
+    std::unique_ptr<InputEventFilter> m_popupFilter;
+    std::unique_ptr<InputEventFilter> m_decorationFilter;
+    std::unique_ptr<InputEventFilter> m_windowActionFilter;
+    std::unique_ptr<InputEventFilter> m_internalWindowFilter;
+    std::unique_ptr<InputEventFilter> m_inputKeyboardFilter;
+    std::unique_ptr<InputEventFilter> m_forwardFilter;
+    std::unique_ptr<InputEventFilter> m_tabletFilter;
+
+    std::unique_ptr<InputEventSpy> m_hideCursorSpy;
+    std::unique_ptr<InputEventSpy> m_userActivitySpy;
+    std::unique_ptr<InputEventSpy> m_windowInteractedSpy;
+
     LEDs m_leds;
     bool m_hasKeyboard = false;
     bool m_hasAlphaNumericKeyboard = false;