Merge lp:~azzar1/unity/fix-dodge-active-window into lp:unity

[Andrea Azzarone]

[Alex Launi (alexlauni)]

I don't like this as a general solution, I think it's very ugly to have stuff like
...
int type_dialogs = CompWindowTypeDialogMask | CompWindowTypeModalDialogMask
                     | CompWindowTypeUtilMask;

if (window && (window->type () & type_dialogs))
...

all over the place, but this is a general compiz slop problem, and is fine for now. I'm going to add a //FIXME to add api to compiz and eventually replace this with some kind of window->IsModalDialog () call. This will get into the SRU but I'd like to see this fixed properly for O.

review: Approve

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-05-17 04:06:05 +0000
+++ src/Launcher.cpp	2011-05-23 06:02:30 +0000
@@ -1893,6 +1893,9 @@
   CompWindowList window_list = _screen->windows ();
   CompWindowList::iterator it;
   CompWindow *window = NULL;
+  CompWindow *parent = NULL;
+  int type_dialogs = CompWindowTypeDialogMask | CompWindowTypeModalDialogMask 
+                     | CompWindowTypeUtilMask;
 
   bool any = false;
   bool active = false;
@@ -1902,7 +1905,11 @@
     return;
 
   window = _screen->findWindow (_screen->activeWindow ());
-  if (CheckIntersectWindow (window))
+
+  if (window && (window->type () & type_dialogs))
+    parent = _screen->findWindow (window->transientFor ());
+
+  if (CheckIntersectWindow (window) || CheckIntersectWindow (parent))
   {
     any = true;
     active = true;