From ec8ddefecbb3ccb0f64ef311e4456d7660d82dc8 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Tue, 8 Mar 2022 21:46:00 +0100 Subject: [PATCH] fix: remove path as it's included upstream already --- ...sterious-s_cursorUpdateBlocking-bool.patch | 59 ------------------- kwin.spec | 2 - 2 files changed, 61 deletions(-) delete mode 100644 0001-Revert-Remove-mysterious-s_cursorUpdateBlocking-bool.patch diff --git a/0001-Revert-Remove-mysterious-s_cursorUpdateBlocking-bool.patch b/0001-Revert-Remove-mysterious-s_cursorUpdateBlocking-bool.patch deleted file mode 100644 index 19de122..0000000 --- a/0001-Revert-Remove-mysterious-s_cursorUpdateBlocking-bool.patch +++ /dev/null @@ -1,59 +0,0 @@ -From bac4f4ed62017bb4aeb81078f5ec2cd915af5de4 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii -Date: Wed, 23 Feb 2022 20:17:28 +0200 -Subject: [PATCH] Revert "Remove mysterious s_cursorUpdateBlocking boolean flag - in pointer_input.cpp" - -This reverts commit 3d0bdc56a48fe0d5cc0889ab098f6c6c922d20c7. - -seat->setFocusedPointerSurface() before notifyPointerMotion() is needed -to prevent sending a motion event that's outside the previously focused -surface. - -BUG: 449273 - - -(cherry picked from commit aaa07f0605d605ae2472b1a8f7f4bd07f2138cb2) ---- - src/pointer_input.cpp | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/pointer_input.cpp b/src/pointer_input.cpp -index 88091e88b..a608b50e6 100644 ---- a/src/pointer_input.cpp -+++ b/src/pointer_input.cpp -@@ -548,6 +548,8 @@ void PointerInputRedirection::cleanupDecoration(Decoration::DecoratedClientImpl - m_decorationDestroyedConnection = connect(now, &QObject::destroyed, this, &PointerInputRedirection::update, Qt::QueuedConnection); - } - -+static bool s_cursorUpdateBlocking = false; -+ - void PointerInputRedirection::focusUpdate(Toplevel *focusOld, Toplevel *focusNow) - { - if (AbstractClient *ac = qobject_cast(focusOld)) { -@@ -568,6 +570,11 @@ void PointerInputRedirection::focusUpdate(Toplevel *focusOld, Toplevel *focusNow - return; - } - -+ // prevent updating cursor and sending motion event outside the previously focused surface -+ s_cursorUpdateBlocking = true; -+ seat->setFocusedPointerSurface(nullptr); -+ s_cursorUpdateBlocking = false; -+ - seat->notifyPointerMotion(m_pos.toPoint()); - seat->setFocusedPointerSurface(focusNow->surface(), focusNow->inputTransformation()); - -@@ -1014,6 +1021,10 @@ void CursorImage::handlePointerChanged() - - void CursorImage::handleFocusedSurfaceChanged() - { -+ if (s_cursorUpdateBlocking) { -+ return; -+ } -+ - KWaylandServer::PointerInterface *pointer = waylandServer()->seat()->pointer(); - disconnect(m_serverCursor.connection); - --- -2.35.1 - diff --git a/kwin.spec b/kwin.spec index be8a2da..1288d33 100644 --- a/kwin.spec +++ b/kwin.spec @@ -37,8 +37,6 @@ URL: https://userbase.kde.org/KWin Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz ## upstream patches -# https://bugs.kde.org/show_bug.cgi?id=449273 -Patch1: 0001-Revert-Remove-mysterious-s_cursorUpdateBlocking-bool.patch ## proposed patches