From 0d6f29c18de66515ef7e696ac82a55a4e1ab2016 Mon Sep 17 00:00:00 2001
From: Lucas Murray <lmurray@undefinedfire.com>
Date: Sun, 15 Feb 2009 16:37:42 +0000
Subject: [PATCH] Ignore struts half-way up the screen when calculating the
 available work area. Fixes placement and resizing of windows on the larger
 monitor of a xinerama setup where each monitor has a different resolution.
 BUG: 184348

svn path=/trunk/KDE/kdebase/workspace/; revision=926545
---
 client.h     |  5 +++++
 geometry.cpp | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/client.h b/client.h
index ade93a1e1e..6c99cfc47a 100644
--- a/client.h
+++ b/client.h
@@ -281,6 +281,11 @@ class Client
         void cancelAutoRaise();
         void checkActiveModal();
         bool hasStrut() const;
+        /**
+         * Whether or not the window has a strut that expands through the invisible area of
+         * an xinerama setup where the monitors are not the same resolution.
+         */
+        bool hasOffscreenXineramaStrut() const;
 
         bool isMove() const 
             {
diff --git a/geometry.cpp b/geometry.cpp
index 2ffd45ac16..c48e5f0928 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -110,13 +110,23 @@ void Workspace::updateClientArea( bool force )
         if( !(*it)->hasStrut())
             continue;
         QRect r = (*it)->adjustedClientArea( desktopArea, desktopArea );
+
+        // Ignore offscreen xinerama struts. These interfere with the larger monitors on the setup
+        // and should be ignored so that applications that use the work area to work out where
+        // windows can go can use the entire visible area of the larger monitors.
+        // This goes against the EWMH description of the work area but it is a toss up between
+        // having unusable sections of the screen (Which can be quite large with newer monitors)
+        // or having some content appear offscreen (Relatively rare compared to other).
+        bool hasOffscreenXineramaStrut = (*it)->hasOffscreenXineramaStrut();
+
         if( (*it)->isOnAllDesktops())
             {
             for( int i = 1;
                  i <= numberOfDesktops();
                  ++i )
                 {
-                new_wareas[ i ] = new_wareas[ i ].intersected( r );
+                if( !hasOffscreenXineramaStrut )
+                    new_wareas[ i ] = new_wareas[ i ].intersected( r );
                 for( int iS = 0;
                      iS < nscreens;
                      iS ++ )
@@ -128,7 +138,8 @@ void Workspace::updateClientArea( bool force )
             }
         else
             {
-            new_wareas[ (*it)->desktop() ] = new_wareas[ (*it)->desktop() ].intersected( r );
+            if( !hasOffscreenXineramaStrut )
+                new_wareas[ (*it)->desktop() ] = new_wareas[ (*it)->desktop() ].intersected( r );
             for( int iS = 0;
                  iS < nscreens;
                  iS ++ )
@@ -961,6 +972,40 @@ bool Client::hasStrut() const
     return true;
     }
 
+bool Client::hasOffscreenXineramaStrut() const
+    {
+    // Convert strut to a QRegion
+    NETExtendedStrut strutArea = strut();
+    QRegion strutRegion;
+    if( strutArea.left_width != 0 )
+        strutRegion += QRect(
+            0, strutArea.left_start,
+            strutArea.left_width, strutArea.left_end - strutArea.left_start
+            );
+    if( strutArea.right_width != 0 )
+        strutRegion += QRect(
+            displayWidth() - strutArea.right_width, strutArea.right_start,
+            strutArea.right_width, strutArea.right_end - strutArea.right_start
+            );
+    if( strutArea.top_width != 0 )
+        strutRegion += QRect(
+            strutArea.top_start, 0,
+            strutArea.top_end - strutArea.top_start, strutArea.top_width
+            );
+    if( strutArea.bottom_width != 0 )
+        strutRegion += QRect(
+            strutArea.bottom_start, displayHeight() - strutArea.bottom_width,
+            strutArea.bottom_end - strutArea.bottom_start, strutArea.bottom_width
+            );
+
+    // Remove all visible areas so that only the invisible remain
+    int numScreens = Kephal::ScreenUtils::numScreens();
+    for( int i = 0; i < numScreens; i ++ )
+        strutRegion -= Kephal::ScreenUtils::screenGeometry( i );
+
+    // If there's anything left then we have an offscreen strut
+    return !strutRegion.isEmpty();
+    }
 
 // updates differences to workarea edges for all directions
 void Client::updateWorkareaDiffs()