diff options
Diffstat (limited to 'kde-plasma/kwin/files')
3 files changed, 219 insertions, 162 deletions
diff --git a/kde-plasma/kwin/files/kwin-5.19.5-safe-removal-of-X11-event-filters.patch b/kde-plasma/kwin/files/kwin-5.19.5-safe-removal-of-X11-event-filters.patch deleted file mode 100644 index 7eeccf6e8c5f..000000000000 --- a/kde-plasma/kwin/files/kwin-5.19.5-safe-removal-of-X11-event-filters.patch +++ /dev/null @@ -1,162 +0,0 @@ -From c5880833d94330d022c4b6fc84c175aadeaf9632 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> -Date: Tue, 22 Sep 2020 08:53:17 +0000 -Subject: [PATCH] x11: Make removal of X11 event filters safe - -If an X11 event filter has been activated and it unregisters another X11 -event filter, then the window manager may crash because the foreach macro -in Workspace::workspaceEvent() makes a copy of m_genericEventFilters or -m_eventFilters and we can call the event() method for an already defunct -filter. - -With this change, X11 event filters can be safely removed and installed -at any particular moment. - -BUG: 423319 - - -(cherry picked from commit a433fb08a3a9255802405a17dd4c8270c68fcb25) ---- - events.cpp | 52 +++++++++++++++++++++++++++++++++++++++++---------- - workspace.cpp | 10 ++++++++++ - workspace.h | 17 +++++++++++++++-- - 3 files changed, 67 insertions(+), 12 deletions(-) - -diff --git a/events.cpp b/events.cpp -index eb3572d13..2e8885d76 100644 ---- a/events.cpp -+++ b/events.cpp -@@ -165,18 +165,34 @@ QVector<QByteArray> s_xcbEerrors({ - - void Workspace::registerEventFilter(X11EventFilter *filter) - { -- if (filter->isGenericEvent()) -- m_genericEventFilters.append(filter); -- else -- m_eventFilters.append(filter); -+ if (filter->isGenericEvent()) { -+ m_genericEventFilters.append(new X11EventFilterContainer(filter)); -+ } else { -+ m_eventFilters.append(new X11EventFilterContainer(filter)); -+ } -+} -+ -+static X11EventFilterContainer *takeEventFilter(X11EventFilter *eventFilter, -+ QList<QPointer<X11EventFilterContainer>> &list) -+{ -+ for (int i = 0; i < list.count(); ++i) { -+ X11EventFilterContainer *container = list.at(i); -+ if (container->filter() == eventFilter) { -+ return list.takeAt(i); -+ } -+ } -+ return nullptr; - } - - void Workspace::unregisterEventFilter(X11EventFilter *filter) - { -- if (filter->isGenericEvent()) -- m_genericEventFilters.removeOne(filter); -- else -- m_eventFilters.removeOne(filter); -+ X11EventFilterContainer *container = nullptr; -+ if (filter->isGenericEvent()) { -+ container = takeEventFilter(filter, m_genericEventFilters); -+ } else { -+ container = takeEventFilter(filter, m_eventFilters); -+ } -+ delete container; - } - - -@@ -219,13 +235,29 @@ bool Workspace::workspaceEvent(xcb_generic_event_t *e) - if (eventType == XCB_GE_GENERIC) { - xcb_ge_generic_event_t *ge = reinterpret_cast<xcb_ge_generic_event_t *>(e); - -- foreach (X11EventFilter *filter, m_genericEventFilters) { -+ // We need to make a shadow copy of the event filter list because an activated event -+ // filter may mutate it by removing or installing another event filter. -+ const auto eventFilters = m_genericEventFilters; -+ -+ for (X11EventFilterContainer *container : eventFilters) { -+ if (!container) { -+ continue; -+ } -+ X11EventFilter *filter = container->filter(); - if (filter->extension() == ge->extension && filter->genericEventTypes().contains(ge->event_type) && filter->event(e)) { - return true; - } - } - } else { -- foreach (X11EventFilter *filter, m_eventFilters) { -+ // We need to make a shadow copy of the event filter list because an activated event -+ // filter may mutate it by removing or installing another event filter. -+ const auto eventFilters = m_eventFilters; -+ -+ for (X11EventFilterContainer *container : eventFilters) { -+ if (!container) { -+ continue; -+ } -+ X11EventFilter *filter = container->filter(); - if (filter->eventTypes().contains(eventType) && filter->event(e)) { - return true; - } -diff --git a/workspace.cpp b/workspace.cpp -index a87a622e9..fd3634b16 100644 ---- a/workspace.cpp -+++ b/workspace.cpp -@@ -66,6 +66,16 @@ namespace KWin - extern int screen_number; - extern bool is_multihead; - -+X11EventFilterContainer::X11EventFilterContainer(X11EventFilter *filter) -+ : m_filter(filter) -+{ -+} -+ -+X11EventFilter *X11EventFilterContainer::filter() const -+{ -+ return m_filter; -+} -+ - ColorMapper::ColorMapper(QObject *parent) - : QObject(parent) - , m_default(kwinApp()->x11DefaultScreen()->default_colormap) -diff --git a/workspace.h b/workspace.h -index 489d7bae4..61fb215a8 100644 ---- a/workspace.h -+++ b/workspace.h -@@ -55,6 +55,19 @@ class X11Client; - class X11EventFilter; - enum class Predicate; - -+class X11EventFilterContainer : public QObject -+{ -+ Q_OBJECT -+ -+public: -+ explicit X11EventFilterContainer(X11EventFilter *filter); -+ -+ X11EventFilter *filter() const; -+ -+private: -+ X11EventFilter *m_filter; -+}; -+ - class KWIN_EXPORT Workspace : public QObject - { - Q_OBJECT -@@ -654,8 +667,8 @@ private: - - QScopedPointer<KillWindow> m_windowKiller; - -- QList<X11EventFilter *> m_eventFilters; -- QList<X11EventFilter *> m_genericEventFilters; -+ QList<QPointer<X11EventFilterContainer>> m_eventFilters; -+ QList<QPointer<X11EventFilterContainer>> m_genericEventFilters; - QScopedPointer<X11EventFilter> m_movingClientFilter; - QScopedPointer<X11EventFilter> m_syncAlarmFilter; - --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch b/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch new file mode 100644 index 000000000000..9677fc76488e --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch @@ -0,0 +1,154 @@ +From b3e9c819537cf292d9b1c4d19c5ce7adde00158e Mon Sep 17 00:00:00 2001 +From: Nate Graham <nate@kde.org> +Date: Tue, 20 Oct 2020 14:15:46 -0600 +Subject: [PATCH] [focuschain/task switcher] Add hidden option to govern + repositioning minimized windows + +Since some people apparently liked the old behavior of moving minimized +windows to the end of the focus chain, let's let them have it if they +set a hidden config option: + +`MoveMinimizedWindowsToEndOfTabBoxFocusChain=true` in the `[TabBox]` group +of the kwinrc file. + +We can add a UI for it later if needed. + +BUG: 427840 +FIXED-IN: 5.21 +--- + abstract_client.cpp | 6 +++++- + focuschain.cpp | 16 ++++++++++------ + kwin.kcfg | 3 +++ + options.cpp | 11 +++++++++++ + options.h | 6 ++++++ + 5 files changed, 35 insertions(+), 7 deletions(-) + +diff --git a/abstract_client.cpp b/abstract_client.cpp +index e44da4725..01f3081f8 100644 +--- a/abstract_client.cpp ++++ b/abstract_client.cpp +@@ -703,7 +703,11 @@ void AbstractClient::minimize(bool avoid_animation) + doMinimize(); + + updateWindowRules(Rules::Minimize); +- FocusChain::self()->update(this, FocusChain::MakeFirstMinimized); ++ ++ if (options->moveMinimizedWindowsToEndOfTabBoxFocusChain()) { ++ FocusChain::self()->update(this, FocusChain::MakeFirstMinimized); ++ } ++ + // TODO: merge signal with s_minimized + addWorkspaceRepaint(visibleRect()); + emit clientMinimized(this, !avoid_animation); +diff --git a/focuschain.cpp b/focuschain.cpp +index a68e6d3c6..347df3066 100644 +--- a/focuschain.cpp ++++ b/focuschain.cpp +@@ -227,14 +227,18 @@ AbstractClient *FocusChain::nextForDesktop(AbstractClient *reference, uint deskt + void FocusChain::makeFirstInChain(AbstractClient *client, Chain &chain) + { + chain.removeAll(client); +- if (client->isMinimized()) { // add it before the first minimized ... +- for (int i = chain.count()-1; i >= 0; --i) { +- if (chain.at(i)->isMinimized()) { +- chain.insert(i+1, client); +- return; ++ if (options->moveMinimizedWindowsToEndOfTabBoxFocusChain()) { ++ if (client->isMinimized()) { // add it before the first minimized ... ++ for (int i = chain.count()-1; i >= 0; --i) { ++ if (chain.at(i)->isMinimized()) { ++ chain.insert(i+1, client); ++ return; ++ } + } ++ chain.prepend(client); // ... or at end of chain ++ } else { ++ chain.append(client); + } +- chain.prepend(client); // ... or at end of chain + } else { + chain.append(client); + } +diff --git a/kwin.kcfg b/kwin.kcfg +index 0b59606e3..2b06efe52 100644 +--- a/kwin.kcfg ++++ b/kwin.kcfg +@@ -295,6 +295,9 @@ + <entry name="LayoutName" type="String"> + <default>thumbnails</default> + </entry> ++ <entry name="MoveMinimizedWindowsToEndOfTabBoxFocusChain" type="Bool"> ++ <default>false</default> ++ </entry> + </group> + <group name="KDE"> + <entry name="AnimationDurationFactor" type="Double"> +diff --git a/options.cpp b/options.cpp +index 4bce7ee39..8014f8b78 100644 +--- a/options.cpp ++++ b/options.cpp +@@ -111,6 +111,7 @@ Options::Options(QObject *parent) + , m_glPreferBufferSwap(Options::defaultGlPreferBufferSwap()) + , m_glPlatformInterface(Options::defaultGlPlatformInterface()) + , m_windowsBlockCompositing(true) ++ , m_MoveMinimizedWindowsToEndOfTabBoxFocusChain(false) + , OpTitlebarDblClick(Options::defaultOperationTitlebarDblClick()) + , CmdActiveTitlebar1(Options::defaultCommandActiveTitlebar1()) + , CmdActiveTitlebar2(Options::defaultCommandActiveTitlebar2()) +@@ -679,6 +680,15 @@ void Options::setWindowsBlockCompositing(bool value) + emit windowsBlockCompositingChanged(); + } + ++void Options::setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool value) ++{ ++ if (m_MoveMinimizedWindowsToEndOfTabBoxFocusChain == value) { ++ return; ++ } ++ m_MoveMinimizedWindowsToEndOfTabBoxFocusChain = value; ++ ++} ++ + void Options::setGlPreferBufferSwap(char glPreferBufferSwap) + { + if (glPreferBufferSwap == 'a') { +@@ -849,6 +859,7 @@ void Options::syncFromKcfgc() + setElectricBorderTiling(m_settings->electricBorderTiling()); + setElectricBorderCornerRatio(m_settings->electricBorderCornerRatio()); + setWindowsBlockCompositing(m_settings->windowsBlockCompositing()); ++ setMoveMinimizedWindowsToEndOfTabBoxFocusChain(m_settings->moveMinimizedWindowsToEndOfTabBoxFocusChain()); + + } + +diff --git a/options.h b/options.h +index 6d72017d3..0834f314e 100644 +--- a/options.h ++++ b/options.h +@@ -590,6 +590,10 @@ public: + return m_windowsBlockCompositing; + } + ++ bool moveMinimizedWindowsToEndOfTabBoxFocusChain() const { ++ return m_MoveMinimizedWindowsToEndOfTabBoxFocusChain; ++ } ++ + QStringList modifierOnlyDBusShortcut(Qt::KeyboardModifier mod) const; + + // setters +@@ -651,6 +655,7 @@ public: + void setGlPreferBufferSwap(char glPreferBufferSwap); + void setGlPlatformInterface(OpenGLPlatformInterface interface); + void setWindowsBlockCompositing(bool set); ++ void setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool set); + + // default values + static WindowOperation defaultOperationTitlebarDblClick() { +@@ -881,6 +886,7 @@ private: + GlSwapStrategy m_glPreferBufferSwap; + OpenGLPlatformInterface m_glPlatformInterface; + bool m_windowsBlockCompositing; ++ bool m_MoveMinimizedWindowsToEndOfTabBoxFocusChain; + + WindowOperation OpTitlebarDblClick; + WindowOperation opMaxButtonRightClick = defaultOperationMaxButtonRightClick(); +-- +GitLab diff --git a/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch b/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch new file mode 100644 index 000000000000..7de71bf959c0 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch @@ -0,0 +1,65 @@ +From 75fded6f11ed645b0e25bf42b05fa57b8a675197 Mon Sep 17 00:00:00 2001 +From: Nate Graham <nate@kde.org> +Date: Tue, 20 Oct 2020 14:05:33 -0600 +Subject: [PATCH] Revert "[focuschain/task switcher] Remove special handling + for minimized windows" + +This reverts commit cc862fa674d3407f516a89b8543acea04aa8b37d. + +It turns out that some people like this behavior and we've received +various user complaints about it. +--- + abstract_client.cpp | 1 + + focuschain.cpp | 12 +++++++++++- + focuschain.h | 3 ++- + 3 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/abstract_client.cpp b/abstract_client.cpp +index 35b7fcb61..e44da4725 100644 +--- a/abstract_client.cpp ++++ b/abstract_client.cpp +@@ -703,6 +703,7 @@ void AbstractClient::minimize(bool avoid_animation) + doMinimize(); + + updateWindowRules(Rules::Minimize); ++ FocusChain::self()->update(this, FocusChain::MakeFirstMinimized); + // TODO: merge signal with s_minimized + addWorkspaceRepaint(visibleRect()); + emit clientMinimized(this, !avoid_animation); +diff --git a/focuschain.cpp b/focuschain.cpp +index 66d209709..a68e6d3c6 100644 +--- a/focuschain.cpp ++++ b/focuschain.cpp +@@ -227,7 +227,17 @@ AbstractClient *FocusChain::nextForDesktop(AbstractClient *reference, uint deskt + void FocusChain::makeFirstInChain(AbstractClient *client, Chain &chain) + { + chain.removeAll(client); +- chain.append(client); ++ if (client->isMinimized()) { // add it before the first minimized ... ++ for (int i = chain.count()-1; i >= 0; --i) { ++ if (chain.at(i)->isMinimized()) { ++ chain.insert(i+1, client); ++ return; ++ } ++ } ++ chain.prepend(client); // ... or at end of chain ++ } else { ++ chain.append(client); ++ } + } + + void FocusChain::makeLastInChain(AbstractClient *client, Chain &chain) +diff --git a/focuschain.h b/focuschain.h +index 8baf3ea32..9a7c7e25d 100644 +--- a/focuschain.h ++++ b/focuschain.h +@@ -41,7 +41,8 @@ class FocusChain : public QObject + enum Change { + MakeFirst, + MakeLast, +- Update ++ Update, ++ MakeFirstMinimized = MakeFirst + }; + ~FocusChain() override; + /** |