Merge lp:~muktupavels/compiz/lp1574866 into lp:compiz/0.9.12

[Alberts Muktupāvels]

OpenGL: use the number of Opaque windows around to decide whether paint the bg or not

- count only opaque windows, ignore if window has alpha and/or 32 depth.

[lp:~muktupavels/compiz/lp1574866]

4011. By Alberts Muktupāvels on 2016-04-26

LP: #1574866

[Andrea Azzarone (azzar1)]

Please take a look to diff comments.

[Andrea Azzarone (azzar1)]

+1. Thanks!

review: Approve

=== modified file 'include/core/screen.h'
--- include/core/screen.h	2015-10-20 22:43:42 +0000
+++ include/core/screen.h	2016-04-26 12:43:18 +0000
@@ -169,8 +169,11 @@
 {
 public:
     virtual void incrementDesktopWindowCount() = 0;
+    virtual void incrementOpaqueDesktopWindowCount() = 0;
     virtual void decrementDesktopWindowCount() = 0;
+    virtual void decrementOpaqueDesktopWindowCount() = 0;
     virtual int desktopWindowCount() = 0;
+    virtual int opaqueDesktopWindowCount() = 0;
 protected:
     ~DesktopWindowCount() {}
 };

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2015-04-07 14:20:32 +0000
+++ plugins/opengl/src/paint.cpp	2016-04-26 12:43:18 +0000
@@ -86,7 +86,7 @@
     if (!nBox)
 	return;
 
-    if (screen->desktopWindowCount ())
+    if (screen->opaqueDesktopWindowCount ())
     {
 	if (!backgroundTextures.empty ())
 	{

=== modified file 'src/event.cpp'
--- src/event.cpp	2015-10-13 11:33:31 +0000
+++ src/event.cpp	2016-04-26 12:43:18 +0000
@@ -1679,9 +1679,17 @@
 		    if (w->isViewable ())
 		    {
 			if (w->type () == CompWindowTypeDesktopMask)
-			    decrementDesktopWindowCount();
+			{
+			    decrementDesktopWindowCount ();
+			    if (!w->alpha ())
+			        decrementOpaqueDesktopWindowCount ();
+			}
 			else if (type == CompWindowTypeDesktopMask)
-			    incrementDesktopWindowCount();
+			{
+			    incrementDesktopWindowCount ();
+			    if (!w->alpha ())
+			        incrementOpaqueDesktopWindowCount ();
+			}
 		    }
 
 		    w->wmType () = type;

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2015-10-26 17:15:50 +0000
+++ src/privatescreen.h	2016-04-26 12:43:18 +0000
@@ -542,10 +542,14 @@
     DesktopWindowCount();
     virtual ~DesktopWindowCount() {}
     virtual void incrementDesktopWindowCount();
+    virtual void incrementOpaqueDesktopWindowCount();
     virtual void decrementDesktopWindowCount();
+    virtual void decrementOpaqueDesktopWindowCount();
     virtual int desktopWindowCount();
+    virtual int opaqueDesktopWindowCount();
 private:
-    int       count;
+    int       countAll;
+    int       countOpaque;
 };
 
 class MapNum :

=== modified file 'src/privatescreen/tests/test-privatescreen.cpp'
--- src/privatescreen/tests/test-privatescreen.cpp	2015-10-26 17:15:50 +0000
+++ src/privatescreen/tests/test-privatescreen.cpp	2016-04-26 12:43:18 +0000
@@ -145,6 +145,7 @@
 				CompSize   &size,
 				void       *&data));
     MOCK_METHOD0(desktopWindowCount, int ());
+    MOCK_METHOD0(opaqueDesktopWindowCount, int ());
     MOCK_METHOD0(attrib, XWindowAttributes ());
     MOCK_CONST_METHOD0(defaultIcon, CompIcon *());
     virtual bool otherGrabExist (const char *, ...) { return false; }  // TODO How to mock?
@@ -183,7 +184,9 @@
     MOCK_METHOD0(snDisplay, SnDisplay * ());
     MOCK_CONST_METHOD0(createFailed, bool ());
     MOCK_METHOD0(incrementDesktopWindowCount, void ());
+    MOCK_METHOD0(incrementOpaqueDesktopWindowCount, void ());
     MOCK_METHOD0(decrementDesktopWindowCount, void ());
+    MOCK_METHOD0(decrementOpaqueDesktopWindowCount, void ());
     MOCK_METHOD0(nextMapNum, unsigned int ());
     MOCK_CONST_METHOD0(updatePassiveKeyGrabs, void ());
     MOCK_METHOD1(updatePassiveButtonGrabs, void (Window serverFrame));

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2015-10-26 17:15:50 +0000
+++ src/screen.cpp	2016-04-26 12:43:18 +0000
@@ -4565,7 +4565,13 @@
 int
 cps::DesktopWindowCount::desktopWindowCount ()
 {
-    return count;
+    return countAll;
+}
+
+int
+cps::DesktopWindowCount::opaqueDesktopWindowCount ()
+{
+    return countOpaque;
 }
 
 unsigned int
@@ -4879,19 +4885,32 @@
 }
 
 cps::DesktopWindowCount::DesktopWindowCount() :
-count(0)
+countAll(0), countOpaque(0)
 {
 }
 
 void
 cps::DesktopWindowCount::incrementDesktopWindowCount()
 {
-    count++;
-}
+    countAll++;
+}
+
+void
+cps::DesktopWindowCount::incrementOpaqueDesktopWindowCount()
+{
+    countOpaque++;
+}
+
 void
 cps::DesktopWindowCount::decrementDesktopWindowCount()
 {
-    count--;
+    countAll--;
+}
+
+void
+cps::DesktopWindowCount::decrementOpaqueDesktopWindowCount()
+{
+    countOpaque--;
 }
 
 cps::MapNum::MapNum() :

=== modified file 'src/window.cpp'
--- src/window.cpp	2015-08-05 11:26:30 +0000
+++ src/window.cpp	2016-04-26 12:43:18 +0000
@@ -1372,7 +1372,11 @@
 	screen->updateClientList ();
 
 	if (priv->type & CompWindowTypeDesktopMask)
-	    screen->incrementDesktopWindowCount();
+	{
+	    screen->incrementDesktopWindowCount ();
+	    if (!alpha ())
+	        screen->incrementOpaqueDesktopWindowCount ();
+	}
 
 	if (priv->protocols & CompWindowProtocolSyncRequestMask)
 	{
@@ -1456,7 +1460,11 @@
 	return;
 
     if (priv->type == CompWindowTypeDesktopMask)
-	screen->decrementDesktopWindowCount();
+    {
+	screen->decrementDesktopWindowCount ();
+	if (!alpha ())
+	    screen->decrementOpaqueDesktopWindowCount ();
+    }
 
     priv->attrib.map_state = IsUnmapped;
     priv->invisible        = true;
@@ -6333,7 +6341,11 @@
     if (priv->attrib.map_state == IsViewable)
     {
 	if (priv->type == CompWindowTypeDesktopMask)
+	{
 	    screen->decrementDesktopWindowCount ();
+	    if (!alpha ())
+	        screen->decrementOpaqueDesktopWindowCount ();
+	}
 
 	if (priv->destroyed && priv->struts)
 	    screen->updateWorkarea ();