Merge lp:~unity-team/unity/meta-fullscreen-detection into lp:unity

[Jason Smith]

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks good. But I have to comments:

 1) Perhaps remove the PointX warnings, unless its crucial for some debugging... Or at least elaborate the messages a bit if they should stay there

 2) The section

+ if (!(launcher is Launcher.Launcher) || !(panel is Clutter.Actor))
+ return;

could maybe use a comment in the code

review: Approve

=== modified file 'targets/mutter/plugin.vala'
--- targets/mutter/plugin.vala	2010-06-10 00:17:10 +0000
+++ targets/mutter/plugin.vala	2010-06-10 20:14:22 +0000
@@ -128,6 +128,8 @@
     private Panel.View         panel;
     private ActorBlur          actor_blur;
     private Clutter.Rectangle  dark_box;
+    private unowned Mutter.MetaWindow?  focus_window = null;
+    private unowned Mutter.MetaDisplay? display = null;
 
     private bool     places_enabled = false;
 
@@ -153,8 +155,6 @@
     private DBus.Connection screensaver_conn;
     private dynamic DBus.Object screensaver;
 
-    private unowned Mutter.Window? active_window = null;
-
     construct
     {
       Unity.global_shell = this;
@@ -293,6 +293,25 @@
       this.ensure_input_region ();
       return false;
     }
+    
+    private void on_focus_window_changed ()
+    {
+      check_fullscreen_obstruction ();
+      
+      if (focus_window != null)
+        {
+          focus_window.notify["fullscreen"].disconnect (on_focus_window_fullscreen_changed);
+        }
+      
+      display.get ("focus-window", ref focus_window);
+      focus_window.notify["fullscreen"].connect (on_focus_window_fullscreen_changed);
+    }
+    
+    private void on_focus_window_fullscreen_changed ()
+    {
+      warning ("FOCUS WINDOW FULLSCREEN CHANGED");
+      check_fullscreen_obstruction ();
+    }
 
     private void got_screensaver_changed (dynamic DBus.Object screensaver, bool changed)
     {
@@ -315,19 +334,32 @@
 
     void check_fullscreen_obstruction ()
     {
+      warning ("Point0");
       Mutter.Window focus = null;
       bool fullscreen = false;
+      
+      if (!(launcher is Launcher.Launcher) || !(panel is Clutter.Actor))
+        return;
+      
+      warning ("Point1");
 
       unowned GLib.List<Mutter.Window> mutter_windows = plugin.get_windows ();
       foreach (Mutter.Window w in mutter_windows)
         {
-          if (Mutter.MetaWindow.has_focus (w.get_meta_window ()))
-            focus = w;
+          unowned Mutter.MetaWindow meta = w.get_meta_window ();
+          
+          if (meta != null && Mutter.MetaWindow.has_focus (w.get_meta_window ()))
+            {  
+              focus = w;
+              break;
+            }
         }
       
       if (focus == null)
         return;
       
+      warning ("Point2");
+      
       (focus.get_meta_window () as GLib.Object).get ("fullscreen", ref fullscreen);
       if (fullscreen)
         {
@@ -675,6 +707,12 @@
     {
       this.maximus.process_window (window);
       this.window_mapped (this, window);
+      
+      if (display == null)
+        {
+          display = Mutter.MetaWindow.get_display (window.get_meta_window ());
+          display.notify["focus-window"].connect (on_focus_window_changed);
+        }
     }
 
     public void destroy (Mutter.Window window)
 
=== modified file 'vapi/mutter-2.28.vapi'
--- vapi/mutter-2.28.vapi	2010-03-01 19:57:23 +0000
+++ vapi/mutter-2.28.vapi	2010-06-10 20:14:22 +0000
@@ -85,7 +85,7 @@
 	}
 	[Compact]
 	[CCode (cheader_filename = "mutter-plugins.h", cname = "MetaDisplay")]
-	public class MetaDisplay {
+	public class MetaDisplay : GLib.Object {
 		[CCode (cname = "meta_display_begin_grab_op")]
 		public static bool begin_grab_op (Mutter.MetaDisplay display, Mutter.MetaScreen screen, Mutter.MetaWindow window, Mutter.MetaGrabOp op, bool pointer_already_grabbed, bool frame_action, int button, ulong modmask, uint32 timestamp, int root_x, int root_y);
 		[CCode (cname = "meta_display_end_grab_op")]
@@ -675,7 +675,7 @@
 	}
 	[Compact]
 	[CCode (cheader_filename = "mutter-plugins.h", cname = "MetaWindow")]
-	public class MetaWindow {
+	public class MetaWindow : GLib.Object {
 		[CCode (cname = "meta_window_activate")]
 		public static void activate (Mutter.MetaWindow window, uint32 current_time);
 		[CCode (cname = "meta_window_activate_with_workspace")]