From 903988ff7133a5f123f80a2ca80b8058b16bc4e2 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sat, 23 Feb 2019 22:50:23 +0200
Subject: [PATCH] identify correctly touching flags with kwin effects

-- KWin Effects such as ShowDesktop have no way to be identified and as such
create issues with identifying properly touching and maximized windows. BUT when
they are enabled then NO ACTIVE window is found. This is a way to identify these
effects trigerring and disable the touch flags.

BUG: 404483
---
 app/view/windowstracker.cpp | 55 ++++++++++++++++++++++++++-----------
 app/view/windowstracker.h   |  1 +
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/app/view/windowstracker.cpp b/app/view/windowstracker.cpp
index f9a296aa3..87d73b3b5 100644
--- a/app/view/windowstracker.cpp
+++ b/app/view/windowstracker.cpp
@@ -228,9 +228,10 @@ void WindowsTracker::updateAvailableScreenGeometry()
 void WindowsTracker::updateFlags()
 {
     bool foundActive{false};
-    bool foundActiveTouch{false};
-    bool foundTouch{false};
-    bool foundMaximized{false};
+    bool foundActiveInCurScreen{false};
+    bool foundActiveTouchInCurScreen{false};
+    bool foundTouchInCurScreen{false};
+    bool foundMaximizedInCurScreen{false};
 
     //! the notification window is not sending a remove signal and creates windows of geometry (0x0 0,0),
     //! maybe a garbage collector here is a good idea!!!
@@ -242,22 +243,26 @@ void WindowsTracker::updateFlags()
     WindowId activeTouchWinId;
 
     for (const auto &winfo : m_windows) {
-        if (isActiveInCurrentScreen(winfo)) {
+        if (isActive(winfo)) {
             foundActive = true;
+        }
+
+        if (isActiveInCurrentScreen(winfo)) {
+            foundActiveInCurScreen = true;
             activeWinId = winfo.wid();
         }
 
         if (isMaximizedInCurrentScreen(winfo)) {
-            foundMaximized = true;
+            foundMaximizedInCurScreen = true;
             maxWinId = winfo.wid();
         }
 
         if (isTouchingViewEdge(winfo) || isTouchingView(winfo)) {
             if (winfo.isActive()) {
-                foundActiveTouch = true;
+                foundActiveTouchInCurScreen = true;
                 activeTouchWinId = winfo.wid();
             } else {
-                foundTouch = true;
+                foundTouchInCurScreen = true;
                 touchWinId = winfo.wid();
             }
         }
@@ -273,26 +278,44 @@ void WindowsTracker::updateFlags()
         cleanupFaultyWindows();
     }
 
-    setExistsWindowActive(foundActive);
-    setActiveWindowTouching(foundActiveTouch);
-    setExistsWindowMaximized(foundMaximized);
-    setExistsWindowTouching(foundTouch || foundActiveTouch);
+    //! HACK: KWin Effects such as ShowDesktop have no way to be identified and as such
+    //! create issues with identifying properly touching and maximized windows. BUT when
+    //! they are enabled then NO ACTIVE window is found. This is a way to identify these
+    //! effects trigerring and disable the touch flags.
+    //! BUG: 404483
+    foundMaximizedInCurScreen = foundMaximizedInCurScreen && foundActive;
+    foundTouchInCurScreen = foundTouchInCurScreen && foundActive;
 
-    //! update color schemes for active and touching windows
+    //! assign flags
+    setExistsWindowActive(foundActiveInCurScreen);
+    setActiveWindowTouching(foundActiveTouchInCurScreen);
+    setExistsWindowMaximized(foundMaximizedInCurScreen);
+    setExistsWindowTouching(foundTouchInCurScreen || foundActiveTouchInCurScreen);
 
-    setActiveWindowScheme(foundActive ? m_wm->schemeForWindow(activeWinId) : nullptr);
+    //! update color schemes for active and touching windows
+    setActiveWindowScheme(foundActiveInCurScreen ? m_wm->schemeForWindow(activeWinId) : nullptr);
 
-    if (foundActiveTouch) {
+    if (foundActiveTouchInCurScreen) {
         setTouchingWindowScheme(m_wm->schemeForWindow(activeTouchWinId));
-    } else if (foundMaximized) {
+    } else if (foundMaximizedInCurScreen) {
         setTouchingWindowScheme(m_wm->schemeForWindow(maxWinId));
-    } else if (foundTouch) {
+    } else if (foundTouchInCurScreen) {
         setTouchingWindowScheme(m_wm->schemeForWindow(touchWinId));
     } else {
         setTouchingWindowScheme(nullptr);
     }
 }
 
+bool WindowsTracker::isActive(const WindowInfoWrap &winfo)
+{
+    if (winfo.isValid() && winfo.isActive() && !winfo.isMinimized()
+            && m_wm->isOnCurrentDesktop(winfo.wid()) && m_wm->isOnCurrentActivity(winfo.wid())) {
+        return true;
+    }
+
+    return false;
+}
+
 bool WindowsTracker::isActiveInCurrentScreen(const WindowInfoWrap &winfo)
 {
     if (winfo.isValid() && winfo.isActive() && !winfo.isMinimized()
diff --git a/app/view/windowstracker.h b/app/view/windowstracker.h
index e8806ccae..7221a6fc6 100644
--- a/app/view/windowstracker.h
+++ b/app/view/windowstracker.h
@@ -92,6 +92,7 @@ private:
     //! this is a garbage collector to collect such windows in order to not break the windows array validity.
     void cleanupFaultyWindows();
 
+    bool isActive(const WindowInfoWrap &winfo);
     bool isActiveInCurrentScreen(const WindowInfoWrap &winfo);
     bool isMaximizedInCurrentScreen(const WindowInfoWrap &winfo);
     bool isTouchingViewEdge(const WindowInfoWrap &winfo);