Merge lp:~compiz-team/compiz-core/compiz-core.notify_occlusion_detection into lp:compiz-core/0.9.5

[Sam Spilsbury]

[Tim Penhey (thumper)]

Hi Sam,

This screams for a private function. If that isn't possible for ABI break
reasons, please add a note to refactor ASAP.

"o" is a terrible name for a variable. Also, using the correct constructor
for the vector means avoiding a call to resize.

void WHATEVER::ComputeShadowsForScreen(Screen* screen)
{
  CompOption::Vector options(1);
  CompOption& option = options.back ();
  option = CompOption ("active", CompOption::TypeBool);
  option.value ().set (true);

  screen->handleCompizEvent ("decor", "occlusion_detection", options);
  foreach (CompWindow *cw,
           DecorScreen::get (screen)->cScreen->getWindowPaintList ())
  {
    DecorWindow::get (cw)->computeShadowRegion ();
  }
  option.value ().set (false);
  screen->handleCompizEvent ("decor", "occlusion_detection", options);
}

review: Needs Fixing

[Mikkel Kamstrup Erlandsen (kamstrup)]

> This screams for a private function. If that isn't possible for ABI break
> reasons, please add a note to refactor ASAP.

Or keeping it ABI stable just a simple C-style static function that takes the object and the needed pointers to private members. That will make the post-Oneiric refactoring a 2-liner. In my experience it's better to get the structure right while you have your hands and mind in it anyway.

[Tim Penhey (thumper)]

Good call Mikkel. I thought about that, but didn't say it.

Unmerged revisions

2798. By Sam Spilsbury on 2011-08-29

Notify that we're doing occlusion detection

2797. By Sam Spilsbury on 2011-08-23

Merge lp:~compiz-team/compiz-core/compiz-core.fix_831987

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2011-08-19 14:25:11 +0000
+++ plugins/decor/src/decor.cpp	2011-08-29 13:26:23 +0000
@@ -2161,10 +2161,21 @@
 	    update (true);
 	    if (dScreen->cmActive)
 	    {
-		foreach (CompWindow *cw, DecorScreen::get (screen)->cScreen->getWindowPaintList ())
+		CompOption::Vector o;
+
+		o.resize (1);
+		o.back () = CompOption ("active", CompOption::TypeBool);
+		o.back ().value ().set (true);
+
+		screen->handleCompizEvent ("decor", "occlusion_detection", o);
+		foreach (CompWindow *cw,
+			 DecorScreen::get (screen)->cScreen->getWindowPaintList ())
 		{
 		    DecorWindow::get (cw)->computeShadowRegion ();
 		}
+
+		o.back ().value ().set (false);
+		screen->handleCompizEvent ("decor", "occlusion_detection", o);
 	    }
 	    break;
 	case CompWindowNotifyUnreparent:
@@ -2370,10 +2381,21 @@
 	    {
 		if (cmActive)
 		{
-		    foreach (CompWindow *cw, cScreen->getWindowPaintList ())
+		    CompOption::Vector o;
+
+		    o.resize (1);
+		    o.back () = CompOption ("active", CompOption::TypeBool);
+		    o.back ().value ().set (true);
+
+		    screen->handleCompizEvent ("decor", "occlusion_detection", o);
+		    foreach (CompWindow *cw,
+			     DecorScreen::get (screen)->cScreen->getWindowPaintList ())
 		    {
 			DecorWindow::get (cw)->computeShadowRegion ();
 		    }
+
+		    o.back ().value ().set (false);
+		    screen->handleCompizEvent ("decor", "occlusion_detection", o);
 		}
 	    }
 	    else
@@ -2690,11 +2712,21 @@
 
     if (dScreen->cmActive)
     {
+	CompOption::Vector o;
+
+	o.resize (1);
+	o.back () = CompOption ("active", CompOption::TypeBool);
+	o.back ().value ().set (true);
+
+	screen->handleCompizEvent ("decor", "occlusion_detection", o);
 	foreach (CompWindow *cw,
 		 DecorScreen::get (screen)->cScreen->getWindowPaintList ())
 	{
 	    DecorWindow::get (cw)->computeShadowRegion ();
 	}
+
+	o.back ().value ().set (false);
+	screen->handleCompizEvent ("decor", "occlusion_detection", o);
     }
 
     window->moveNotify (dx, dy, immediate);
@@ -2750,11 +2782,21 @@
 
     if (dScreen->cmActive)
     {
+	CompOption::Vector o;
+
+	o.resize (1);
+	o.back () = CompOption ("active", CompOption::TypeBool);
+	o.back ().value ().set (true);
+
+	screen->handleCompizEvent ("decor", "occlusion_detection", o);
 	foreach (CompWindow *cw,
 		 DecorScreen::get (screen)->cScreen->getWindowPaintList ())
 	{
 	    DecorWindow::get (cw)->computeShadowRegion ();
 	}
+
+	o.back ().value ().set (false);
+	screen->handleCompizEvent ("decor", "occlusion_detection", o);
     }
 
     window->resizeNotify (dx, dy, dwidth, dheight);