Merge lp:~unity-team/unity/death-to-wncky into lp:unity

[Jason Smith]

Removes build deps on libwnck except in the testing case.

[Gord Allott (gordallott)]

seems to work okay for me, approved

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2010-06-08 08:55:30 +0000
+++ configure.ac	2010-06-10 00:36:28 +0000
@@ -107,7 +107,6 @@
                   gconf-2.0
                   indicator
                   libbamf >= 0.2
-                  libwnck-1.0 >= 2.28.0
                   unique-1.0
                   unity-misc
                   x11)

=== modified file 'targets/mutter/Makefile.am'
--- targets/mutter/Makefile.am	2010-06-04 11:23:01 +0000
+++ targets/mutter/Makefile.am	2010-06-10 00:36:28 +0000
@@ -44,7 +44,6 @@
   --pkg gee-1.0 \
   --pkg indicator \
   --pkg mutter-2.28 \
-  --pkg libwnck-1.0 \
   --pkg unique-1.0 \
   --pkg x11 \
   --pkg unity-const \

=== modified file 'targets/mutter/expose-manager.vala'
--- targets/mutter/expose-manager.vala	2010-04-26 13:47:08 +0000
+++ targets/mutter/expose-manager.vala	2010-06-10 00:36:28 +0000
@@ -26,7 +26,7 @@
     private Clutter.Actor darken_box;
     private bool hovered;
 
-    public unowned Mutter.Window source { get; private set; }
+    public unowned Clutter.Actor source { get; private set; }
 
     public uint8 hovered_opacity { get; set; }
     public uint8 unhovered_opacity { get; set; }
@@ -41,7 +41,7 @@
       }
     }
 
-    public ExposeClone (Mutter.Window source)
+    public ExposeClone (Clutter.Actor source)
     {
       darken = 0;
       hovered_opacity = 255;
@@ -130,7 +130,7 @@
     {
     }
 
-    public void start_expose (SList<Wnck.Window> windows)
+    public void start_expose (SList<Clutter.Actor> windows)
     {
       var controller = Launcher.QuicklistController.get_default ();
       if (controller.menu_is_open ())
@@ -150,36 +150,28 @@
       expose_group.raise_top ();
       expose_group.show ();
 
-      unowned GLib.List<Mutter.Window> mutter_windows = owner.plugin.get_windows ();
-      foreach (Mutter.Window w in mutter_windows)
+      foreach (Clutter.Actor actor in windows)
         {
-          bool keep = false;
-          ulong xid = (ulong) Mutter.MetaWindow.get_xwindow (w.get_meta_window ());
-          foreach (Wnck.Window window in windows)
-            {
-              if (window.get_xid () == xid)
-                {
-                  keep = true;
-                  break;
-                }
-            }
-
-          if (keep)
-            {
-              ExposeClone clone = new ExposeClone (w);
-              clone.set_position (w.x, w.y);
-              clone.set_size (w.width, w.height);
-              exposed_windows.append (clone);
-              clone.reactive = true;
-
-              expose_group.add_actor (clone);
-
-              clone.hovered_opacity = hovered_opacity;
-              clone.unhovered_opacity = unhovered_opacity;
-              clone.opacity = unhovered_opacity;
-              clone.darken = darken;
-
-              clone.enter_event.connect (() => {
+          if (!(actor is Mutter.Window) || 
+               ((actor as Mutter.Window).get_window_type () != Mutter.MetaCompWindowType.NORMAL &&
+                (actor as Mutter.Window).get_window_type () != Mutter.MetaCompWindowType.DIALOG &&
+                (actor as Mutter.Window).get_window_type () != Mutter.MetaCompWindowType.MODAL_DIALOG))
+            continue;
+        
+          ExposeClone clone = new ExposeClone (actor);
+          clone.set_position (actor.x, actor.y);
+          clone.set_size (actor.width, actor.height);
+          exposed_windows.append (clone);
+          clone.reactive = true;
+          
+          expose_group.add_actor (clone);
+          
+          clone.hovered_opacity = hovered_opacity;
+          clone.unhovered_opacity = unhovered_opacity;
+          clone.opacity = unhovered_opacity;
+          clone.darken = darken;
+          
+          clone.enter_event.connect (() => {
                 var ql_controller = Launcher.QuicklistController.get_default ();
                 if (ql_controller.menu_is_open () && this.menu_in_hover_close_state)
                   {
@@ -188,7 +180,7 @@
                 return false;
               });
 
-              clone.leave_event.connect (() => {
+          clone.leave_event.connect (() => {
                 var ql_controller = Launcher.QuicklistController.get_default ();
                 if (ql_controller.menu_is_open () && this.menu_in_hover_close_state)
                   {
@@ -196,8 +188,11 @@
                   }
                 return false;
               });
-            }
-
+        }
+      
+      unowned GLib.List<Mutter.Window> mutter_windows = owner.plugin.get_windows ();
+      foreach (Mutter.Window w in mutter_windows)
+        {
             if (w.get_window_type () == Mutter.MetaCompWindowType.DESKTOP)
               continue;
 

=== modified file 'targets/mutter/plugin.vala'
--- targets/mutter/plugin.vala	2010-06-08 13:50:40 +0000
+++ targets/mutter/plugin.vala	2010-06-10 00:36:28 +0000
@@ -238,12 +238,6 @@
       this.background.lower_bottom ();
       this.background.show ();
 
-      /* Allows us to activate windows, essential as we are the WM */
-/*
-      LibLauncher.Application.set_window_activate_func (this.on_window_activated,
-                                                     this.plugin);
-*/
-
       this.launcher = new Launcher.Launcher (this);
       this.launcher.get_view ().opacity = 0;
 
@@ -297,100 +291,9 @@
         }
 
       this.ensure_input_region ();
-
-      Wnck.Screen.get_default ().active_window_changed.connect (on_active_window_changed);
-
-      if (Wnck.Screen.get_default ().get_active_window () != null)
-        Wnck.Screen.get_default ().get_active_window ().state_changed.connect (on_active_window_state_changed);
-
       return false;
     }
 
-    private static void on_window_activated (Wnck.Window  window,
-                                             uint32       timestamp,
-                                             void        *data)
-    {
-      Mutter.Plugin plugin = data as Mutter.Plugin;
-
-      unowned GLib.List<Mutter.Window> mutter_windows = plugin.get_windows ();
-      foreach (Mutter.Window w in mutter_windows)
-        {
-          ulong xid = (ulong) Mutter.MetaWindow.get_xwindow (w.get_meta_window ());
-          if (window.get_xid () == xid)
-            {
-              unowned Mutter.MetaWindow win  = w.get_meta_window ();
-
-              Mutter.MetaWorkspace.activate (Mutter.MetaWindow.get_workspace(win),
-                                             timestamp);
-              Mutter.MetaWindow.activate (win, timestamp);
-              break;
-            }
-        }
-    }
-
-    private void on_active_window_state_changed (Wnck.WindowState change_mask, Wnck.WindowState new_state)
-    {
-      check_fullscreen_obstruction ();
-    }
-
-    private void on_active_window_changed (Wnck.Window? previous_window)
-    {
-      if (previous_window != null)
-        previous_window.state_changed.disconnect (on_active_window_state_changed);
-
-
-      Wnck.Window current = Wnck.Screen.get_default ().get_active_window ();
-      if (current == null)
-        return;
-
-      current.state_changed.connect (on_active_window_state_changed);
-
-      check_fullscreen_obstruction ();
-    }
-
-/*
-    private void on_launcher_changed_event (LauncherView? last, LauncherView? current)
-    {
-      if (last != null)
-        {
-          last.menu_opened.disconnect (on_launcher_menu_opened);
-          last.menu_closed.disconnect (on_launcher_menu_closed);
-        }
-
-      if (current != null)
-        {
-          current.menu_opened.connect (on_launcher_menu_opened);
-          current.menu_closed.connect (on_launcher_menu_closed);
-        }
-
-      check_fullscreen_obstruction ();
-    }
-*/
-/*
-
-    private void on_launcher_menu_opened (LauncherView sender)
-    {
-      if (sender != quicklauncher.manager.active_launcher || sender == null)
-        return;
-
-      if (sender.model is ApplicationModel && sender.model.is_active)
-        {
-          if (QuicklistController.get_default ().menu_is_open ())
-            expose_windows ((sender.model as ApplicationModel).windows);
-        }
-    }
-*/
-/*
-
-    private void on_launcher_menu_closed (LauncherView sender)
-    {
-      if (sender != quicklauncher.manager.active_launcher)
-        return;
-
-      dexpose_windows ();
-    }
-*/
-
     private void got_screensaver_changed (dynamic DBus.Object screensaver, bool changed)
     {
       if (changed)
@@ -410,51 +313,23 @@
         }
     }
 
-    bool window_is_obstructing (Wnck.Window window)
-    {
-      if (window.is_fullscreen ())
-          return true;
-
-      /* Sometimes we're not getting the fullscreen hint updating fast enough
-       * but the geometry seems to mostly be in sync. Seeing if the window is
-       * size-wise fullscreen seems to give us a good fallback when the props
-       * aren't in-sync.
-       * The -2.0 is because we have some variation when converting float to int
-       * from the stage.
-       */
-      int x, y, w, h;
-      window.get_geometry (out x, out y, out w, out h);
-
-      if (w >= (int)this.stage.width - 2.0
-          && h >= (int)this.stage.height - 2.0)
-          return true;
-
-      /* Finally try figuring out if the window is fullscreen in Mutter
-       * itself */
-      unowned GLib.List<Mutter.Window> mutter_windows = plugin.get_windows ();
-      foreach (Mutter.Window win in mutter_windows)
-        {
-          ulong xid = (ulong) Mutter.MetaWindow.get_xwindow (win.get_meta_window ());
-          if (xid == window.get_xid ())
-            {
-              if (win.width >= ((int)this.stage.width - 2.0) &&
-                  win.height >= ((int)this.stage.height - 2.0))
-                {
-                  return true;
-                }
-            }
-        }
-
-      return false;
-    }
-
     void check_fullscreen_obstruction ()
     {
-      Wnck.Window current = Wnck.Screen.get_default ().get_active_window ();
-      if (current == null)
+      Mutter.Window focus = null;
+      bool fullscreen = false;
+
+      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;
+        }
+      
+      if (focus == null)
         return;
-
-      if (window_is_obstructing (current))
+      
+      (focus.get_meta_window () as GLib.Object).get ("fullscreen", ref fullscreen);
+      if (fullscreen)
         {
           this.launcher.get_view ().animate (Clutter.AnimationMode.EASE_IN_SINE, 200, "x", -100f);
           this.panel.animate (Clutter.AnimationMode.EASE_IN_SINE, 200, "opacity", 0);
@@ -576,24 +451,12 @@
           return;
         }
 
+      GLib.SList <Clutter.Actor> windows = null;
+
       unowned GLib.List<Mutter.Window> mutter_windows = this.plugin.get_windows ();
-
-      GLib.SList <Wnck.Window> windows = null;
-
       foreach (Mutter.Window window in mutter_windows)
         {
-          int type = window.get_window_type ();
-
-          if (type == Mutter.MetaWindowType.NORMAL ||
-              type == Mutter.MetaWindowType.DIALOG ||
-              type == Mutter.MetaWindowType.MODAL_DIALOG
-              )
-            {
-              ulong xid = (ulong) Mutter.MetaWindow.get_xwindow (window.get_meta_window ());
-              Wnck.Window wnck_window = Wnck.Window.get (xid);
-              if (wnck_window is Wnck.Window)
-               windows.append (wnck_window);
-            }
+          windows.append (window as Clutter.Actor);
         }
 
       this.expose_windows (windows, 80);
@@ -609,58 +472,69 @@
       for (int i = 0; i < xids.length; i++)
         {
           uint32 xid = xids.index (i);
-          Wnck.Window window = Wnck.Window.get (xid);
-          if (window is Wnck.Window)
-            window.close (Clutter.get_current_event_time ());
+          
+          unowned GLib.List<Mutter.Window> mutter_windows = this.plugin.get_windows ();
+          foreach (Mutter.Window window in mutter_windows)
+            {
+              uint32 wxid = (uint32) Mutter.MetaWindow.get_xwindow (window.get_meta_window ());
+              if (wxid == xid)
+                {
+                  Mutter.MetaWindow.delete (window.get_meta_window (), Clutter.get_current_event_time ());
+                }
+            }
         }
     }
 
-		public void	expose_xids (Array<uint32> xids)
-		{
-			SList<Wnck.Window> windows = new SList<Wnck.Window> ();
-			for (int i = 0; i < xids.length; i++)
+    public void expose_xids (Array<uint32> xids)
+    {
+      SList<Clutter.Actor> windows = new SList<Clutter.Actor> ();
+      for (int i = 0; i < xids.length; i++)
         {
           uint32 xid = xids.index (i);
-          Wnck.Window window = Wnck.Window.get (xid);
-          if (window is Wnck.Window)
-            windows.append (window);
+          
+          unowned GLib.List<Mutter.Window> mutter_windows = plugin.get_windows ();
+          foreach (Mutter.Window w in mutter_windows)
+            {
+              uint32 wxid = (uint32) Mutter.MetaWindow.get_xwindow (w.get_meta_window ());
+              if (wxid == xid)
+                {
+                  windows.append (w);
+                  break;
+                }
+            }
         }
-			expose_windows (windows);
-		}
+        
+      expose_windows (windows);
+    }
 
-		public void stop_expose ()
-		{
-			dexpose_windows ();
-		}
+    public void stop_expose ()
+    {
+      dexpose_windows ();
+    }
 
     public void show_window (uint32 xid)
     {
-      Wnck.Window window = Wnck.Window.get (xid);
-      if (window is Wnck.Window)
+      unowned GLib.List<Mutter.Window> mutter_windows = this.plugin.get_windows ();
+
+      foreach (Mutter.Window mutter_window in mutter_windows)
         {
-          unowned GLib.List<Mutter.Window> mutter_windows = this.plugin.get_windows ();
-
-          foreach (Mutter.Window mutter_window in mutter_windows)
-            {
-              int type = mutter_window.get_window_type ();
-
-              if (type == Mutter.MetaWindowType.NORMAL ||
-                  type == Mutter.MetaWindowType.DIALOG ||
-                  type == Mutter.MetaWindowType.MODAL_DIALOG
-                  )
-                {
-                  ulong window_xid = (ulong) Mutter.MetaWindow.get_xwindow (mutter_window.get_meta_window ());
-                  if (window_xid == xid)
-                    {
-                      uint32 time_;
-                      unowned Mutter.MetaWindow meta = mutter_window.get_meta_window ();
-
-                      time_ = Mutter.MetaDisplay.get_current_time (Mutter.MetaWindow.get_display (meta));
-                      Mutter.MetaWorkspace.activate (Mutter.MetaWindow.get_workspace (meta), time_);
-                      Mutter.MetaWindow.activate (meta, time_);
-                    }
-                }
-            }
+          ulong window_xid = (ulong) Mutter.MetaWindow.get_xwindow (mutter_window.get_meta_window ());
+          if (window_xid != xid)
+            continue;
+          
+          int type = mutter_window.get_window_type ();
+
+          if (type != Mutter.MetaWindowType.NORMAL &&
+              type != Mutter.MetaWindowType.DIALOG &&
+              type != Mutter.MetaWindowType.MODAL_DIALOG)
+            continue;
+          
+          uint32 time_;
+          unowned Mutter.MetaWindow meta = mutter_window.get_meta_window ();
+
+          time_ = Mutter.MetaDisplay.get_current_time (Mutter.MetaWindow.get_display (meta));
+          Mutter.MetaWorkspace.activate (Mutter.MetaWindow.get_workspace (meta), time_);
+          Mutter.MetaWindow.activate (meta, time_);
         }
     }
 
@@ -674,7 +548,7 @@
       return this.panel.get_indicators_width ();
     }
 
-    public void expose_windows (GLib.SList<Wnck.Window> windows,
+    public void expose_windows (GLib.SList<Clutter.Actor> windows,
                                 int left_buffer = 250)
     {
       expose_manager.left_buffer = left_buffer;
@@ -801,21 +675,6 @@
     {
       this.maximus.process_window (window);
       this.window_mapped (this, window);
-
-/*
-      int type = window.get_window_type ();
-
-      if (type == Mutter.MetaWindowType.NORMAL ||
-          type == Mutter.MetaWindowType.DIALOG ||
-          type == Mutter.MetaWindowType.MODAL_DIALOG
-          )
-        {
-          ulong xid = (ulong) Mutter.MetaWindow.get_xwindow (window.get_meta_window ());
-          Wnck.Window wnck_window = Wnck.Window.get (xid);
-          if (wnck_window is Wnck.Window)
-            Launcher.Session.get_default ().update_windows (wnck_window);
-        }
-*/
     }
 
     public void destroy (Mutter.Window window)

=== modified file 'targets/mutter/window-management.vala'
--- targets/mutter/window-management.vala	2010-03-16 20:37:10 +0000
+++ targets/mutter/window-management.vala	2010-06-10 00:36:28 +0000
@@ -295,20 +295,16 @@
 
       int speed = get_animation_speed (window);
 
-      ulong xid = (ulong) Mutter.MetaWindow.get_xwindow (window.get_meta_window ());
-      Wnck.Window wnck_window = Wnck.Window.get (xid);
-
       Mutter.MetaRectangle rect = {0, 0, 0, 0};
-      if (wnck_window is Wnck.Window &&
-          Mutter.MetaWindow.get_icon_geometry (window.get_meta_window (), rect))
+      if (Mutter.MetaWindow.get_icon_geometry (window.get_meta_window (), rect))
         {
-          int x, y, w, h;
-          wnck_window.get_geometry (out x, out y, out w, out h);
+          rect = {0, 0, 0, 0};
+          Mutter.MetaWindow.get_outer_rect (window.get_meta_window (), rect);
           actor.set ("scale-gravity", Clutter.Gravity.CENTER);
           anim = actor.animate (Clutter.AnimationMode.EASE_IN_SINE, speed,
                          "opacity", 255,
-                         "x", (float) x,
-                         "y", (float) y,
+                         "x", (float) rect.x,
+                         "y", (float) rect.y,
                          "scale-x", 1f,
                          "scale-y", 1f);
         }

=== modified file 'targets/unity/Makefile.am'
--- targets/unity/Makefile.am	2010-06-04 16:13:17 +0000
+++ targets/unity/Makefile.am	2010-06-10 00:36:28 +0000
@@ -44,7 +44,6 @@
   --pkg x11 \
   --pkg gtk+-2.0 \
   --pkg gee-1.0 \
-  --pkg libwnck-1.0 \
   --pkg unique-1.0 \
   --pkg unity \
   --pkg unity-const \

=== modified file 'targets/unity/main.vala'
--- targets/unity/main.vala	2010-04-07 15:39:23 +0000
+++ targets/unity/main.vala	2010-06-10 00:36:28 +0000
@@ -191,7 +191,6 @@
         });
       }
 
-    Wnck.set_client_type (Wnck.ClientType.PAGER);
     Gtk.main ();
 
     /* Restore envvar */

=== modified file 'tests/ui/Makefile.am'
--- tests/ui/Makefile.am	2010-06-09 03:02:57 +0000
+++ tests/ui/Makefile.am	2010-06-10 00:36:28 +0000
@@ -38,7 +38,6 @@
   --pkg indicator \
   --pkg clutk-0.3 \
   --pkg launcher-0.3 \
-  --pkg libwnck-1.0 \
   --pkg test-const \
   --pkg unique-1.0 \
   --pkg unity \

=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	2010-06-04 17:03:39 +0000
+++ tests/unit/Makefile.am	2010-06-10 00:36:28 +0000
@@ -39,7 +39,6 @@
   --pkg indicator \
   --pkg clutk-0.3 \
   --pkg launcher-0.3 \
-  --pkg libwnck-1.0 \
   --pkg test-const \
   --pkg unique-1.0 \
   --pkg unity \

=== modified file 'unity-private/testing/test-window.vala'
--- unity-private/testing/test-window.vala	2010-06-02 22:38:51 +0000
+++ unity-private/testing/test-window.vala	2010-06-10 00:36:28 +0000
@@ -237,7 +237,7 @@
     /*
      * UNDERLAY WINDOW MANAGEMENT
      */
-    public void on_active_window_changed (Wnck.Window? previous_window)
+    private void on_active_window_changed (Wnck.Window? previous_window)
     {
       Wnck.Window new_window = this.wnck_screen.get_active_window ();
       if (new_window == null)

=== modified file 'unity/Makefile.am'
--- unity/Makefile.am	2010-06-03 10:22:01 +0000
+++ unity/Makefile.am	2010-06-10 00:36:28 +0000
@@ -49,7 +49,6 @@
   --pkg gtk+-2.0 \
   --pkg gee-1.0 \
   --pkg Bamf-0.2 \
-  --pkg libwnck-1.0 \
   --pkg unique-1.0 \
   --pkg unity-const \
   $(MAINTAINER_VALAFLAGS)