Merge lp:~unity-team/unity/places-fixes-17-08-2010 into lp:unity

[Neil J. Patel]

Doesn't fix actually much places stuff, sorry for the mis-naming. The links bugs should provide the low-down on what should be fixed.

[Mirco Müller (macslow)]

Approved

=== modified file 'targets/mutter/Makefile.am'
--- targets/mutter/Makefile.am	2010-07-12 08:50:07 +0000
+++ targets/mutter/Makefile.am	2010-08-18 20:18:44 +0000
@@ -22,6 +22,7 @@
   -I$(top_srcdir)/unity \
   -I$(top_srcdir)/unity-private \
   -I$(top_srcdir)/src \
+  -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
   $(BASE_CFLAGS) \
   $(MUTTER_CFLAGS) \
   $(MAINTAINER_CFLAGS)

=== modified file 'targets/mutter/expose-manager.vala'
--- targets/mutter/expose-manager.vala	2010-08-18 16:07:48 +0000
+++ targets/mutter/expose-manager.vala	2010-08-18 20:18:44 +0000
@@ -70,6 +70,8 @@
       else
         clone = new Clutter.Clone (source);
 
+      source.destroy.connect (on_source_destroyed);
+
       add_actor (clone);
       clone.show ();
       clone.reactive = true;
@@ -91,6 +93,11 @@
       this.leave_event.connect (this.on_mouse_leave);
       this.button_press_event.connect (this.on_button_press);
     }
+
+    private void on_source_destroyed ()
+    {
+      destroy ();
+    }
     
     private bool on_button_press (Clutter.Event evnt)
     {
@@ -299,6 +306,8 @@
 
           expose_group.add_actor (clone);
 
+          clone.destroy.connect (on_clone_destroyed);
+
           clone.hovered_opacity = hovered_opacity;
           clone.unhovered_opacity = unhovered_opacity;
           clone.opacity = unhovered_opacity;
@@ -327,6 +336,12 @@
       stage.captured_event.connect (on_stage_captured_event);
     }
 
+    private void on_clone_destroyed ()
+    {
+      if (expose_group.get_children ().length () <= 1)
+        end_expose ();
+    }
+
     public void end_expose ()
     {
       if (!expose_showing)

=== modified file 'targets/mutter/plugin.vala'
--- targets/mutter/plugin.vala	2010-08-12 11:41:51 +0000
+++ targets/mutter/plugin.vala	2010-08-18 20:18:44 +0000
@@ -133,7 +133,6 @@
     private Places.Controller  places_controller;
     private Places.View        places;
     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;
@@ -702,11 +701,6 @@
       this.grab_enabled = grab;
     }
 
-    private bool envvar_is_enabled (string name)
-    {
-      return (Environment.get_variable (name) != null);
-    }
-
     private unowned Mutter.MetaWindow? get_window_for_xid (uint32 xid)
     {
       unowned GLib.List<Mutter.Window> mutter_windows = this.plugin.get_windows ();
@@ -788,13 +782,10 @@
                           int           width,
                           int           height)
     {
-      /*FIXME: This doesn't work in Mutter
       if (window.get_data<string> (UNDECORATED_HINT) == null)
         {
-          uint32 xid = (uint32)window.get_x_window ();
-          Utils.window_set_decorations (xid, 0);
+          Utils.window_set_decorations (Mutter.MetaWindow.get_xwindow (window.get_meta_window ()), 0);
         }
-        */
 
       this.window_maximized (this, window, x, y, width, height);
 
@@ -807,13 +798,10 @@
                             int           width,
                             int           height)
     {
-      /* FIXME: This doesn't work in Mutter
       if (window.get_data<string> (UNDECORATED_HINT) == null)
         {
-          uint32 xid = (uint32)window.get_x_window ();
-          Utils.window_set_decorations (xid, 1);
+          Utils.window_set_decorations (Mutter.MetaWindow.get_xwindow (window.get_meta_window ()), 1);
         }
-      */
 
       this.window_unmaximized (this, window, x, y, width, height);
 
@@ -822,11 +810,30 @@
 
     public void map (Mutter.Window window)
     {
-      /* FIXME: This doesn't work in Mutter
-      uint32 xid = (uint32)window.get_x_window ();
-      if (Utils.window_is_decorated (xid) == false)
-        window.set_data (UNDECORATED_HINT, "%s".printf ("true"));
-      */
+      unowned Mutter.MetaWindow win = window.get_meta_window ();
+
+      if (window.get_window_type () == Mutter.MetaCompWindowType.NORMAL)
+        {
+          Idle.add (() => {
+            if (win is Object)
+              {
+                if (Utils.window_is_decorated (Mutter.MetaWindow.get_xwindow (win)) == false && Mutter.MetaWindow.is_maximized (win) == false)
+                  {
+                    window.set_data (UNDECORATED_HINT, "%s".printf ("true"));
+                  }
+                else
+                  {
+                    if (Mutter.MetaWindow.is_maximized (win))
+                      {
+                        Utils.window_set_decorations (Mutter.MetaWindow.get_xwindow (win), 0);
+                      }
+                  }
+              }
+            
+            return false;
+          });
+        }
+
       this.maximus.process_window (window);
       this.window_mapped (this, window);
 

=== modified file 'targets/mutter/spaces-manager.vala'
--- targets/mutter/spaces-manager.vala	2010-08-18 03:21:28 +0000
+++ targets/mutter/spaces-manager.vala	2010-08-18 20:18:44 +0000
@@ -31,7 +31,7 @@
       this.parent = _parent;
       parent.notify["showing"].connect (on_notify_showing);
 
-      name = "Workspace Overview";
+      name = _("Workspaces");
       load_icon_from_icon_name ("workspace-switcher");
     }
 
@@ -52,6 +52,26 @@
       else
         parent.show_spaces_picker ();
     }
+    public override QuicklistController? get_menu_controller ()
+    {
+      return new ApplicationQuicklistController (this);
+    }
+
+    public override void get_menu_actions (ScrollerChildController.menu_cb callback)
+    {
+      callback (null);
+    }
+
+    public override void get_menu_navigation (ScrollerChildController.menu_cb callback)
+    {
+      callback (null);
+    }
+
+    public override bool can_drag ()
+    {
+      return true;
+    }
+
   }
   
   public class WorkspaceClone : Clutter.Group
@@ -109,7 +129,6 @@
     Clutter.Actor background;
     List<Clutter.Actor> clones;
     Plugin plugin;
-    unowned Mutter.MetaScreen screen;
     ScrollerChild _button;
     SpacesButtonController controller;
 
@@ -169,6 +188,8 @@
       showing = true;
       plugin.add_fullscreen_request (this);
 
+      global_shell.get_stage ().captured_event.connect (on_stage_capture_event);
+
       if (background is Clutter.Actor)
         background.destroy ();
         
@@ -226,6 +247,20 @@
             (w as Clutter.Actor).opacity = 0;
         }
     }
+
+    private bool on_stage_capture_event (Clutter.Event event)
+    {
+      if (event.type == Clutter.EventType.BUTTON_PRESS)
+        {
+          if (event.button.y <= global_shell.get_panel_height_foobar () ||
+              event.button.x <= global_shell.get_launcher_width_foobar ())
+            {
+              select_workspace (null);
+            }
+        }
+
+      return false;
+    }
     
     private void select_workspace (Mutter.MetaWorkspace? workspace) {
       if (workspace == null)
@@ -240,6 +275,8 @@
       Mutter.MetaWorkspace.activate (workspace, time_);
       plugin.remove_fullscreen_request (this);
       showing = false;
+
+      global_shell.get_stage ().captured_event.disconnect (on_stage_capture_event);
     }
     
     private Clutter.Actor workspace_clone (Mutter.MetaWorkspace workspace) {
@@ -249,8 +286,6 @@
       windows = plugin.plugin.get_windows ();
       wsp = new WorkspaceClone (workspace, plugin);
 
-      int active_workspace = Mutter.MetaScreen.get_active_workspace_index (plugin.plugin.get_screen ());
-
       foreach (Mutter.Window window in windows)
         {
           if (Mutter.MetaWindow.is_on_all_workspaces (window.get_meta_window ()) ||

=== modified file 'targets/mutter/window-management.vala'
--- targets/mutter/window-management.vala	2010-07-20 12:59:01 +0000
+++ targets/mutter/window-management.vala	2010-08-18 20:18:44 +0000
@@ -22,7 +22,6 @@
   public class WindowManagement : Object
   {
     private Plugin plugin;
-    private int switch_signals_to_send;
 
     private unowned Mutter.Window last_mapped;
 

=== modified file 'unity-private/panel/panel-tray.vala'
--- unity-private/panel/panel-tray.vala	2010-06-17 19:27:41 +0000
+++ unity-private/panel/panel-tray.vala	2010-08-18 20:18:44 +0000
@@ -57,7 +57,19 @@
       string? disable_tray = Environment.get_variable ("UNITY_DISABLE_TRAY");
 
       if (disable_tray == null)
-        this.manager.manage_stage (this.stage);
+        {
+          Gdk.error_trap_push ();
+          
+          this.manager.manage_stage (this.stage);
+          Gdk.flush ();
+
+          int err = 0;
+          if ((err = Gdk.error_trap_pop ()) != 0)
+            {
+              warning ("Unable to connect to the system tray: Error code: %d",
+                       err);
+            }
+        }
 
       return false;
     }

=== modified file 'unity-private/panel/panel-window-buttons.vala'
--- unity-private/panel/panel-window-buttons.vala	2010-07-30 12:46:52 +0000
+++ unity-private/panel/panel-window-buttons.vala	2010-08-18 20:18:44 +0000
@@ -25,7 +25,6 @@
     private Ctk.Text     appname;
     private WindowButton close;
     private WindowButton minimize;
-    private WindowButton maximize;
     private WindowButton unmaximize;
 
     private unowned Bamf.Matcher matcher;
@@ -47,28 +46,21 @@
       appname.max_length = 9;
       pack (appname, true, true);
 
-      close = new WindowButton ("close.png");
+      close = new WindowButton ("close");
       pack (close, false, false);
       close.clicked.connect (() => {
         if (last_xid > 0)
           global_shell.do_window_action (last_xid, WindowAction.CLOSE);
       });
 
-      minimize = new WindowButton ("minimize.png");
+      minimize = new WindowButton ("minimize");
       pack (minimize, false, false);
       minimize.clicked.connect (() => {
         if (last_xid > 0)
           global_shell.do_window_action (last_xid, WindowAction.MINIMIZE);
       });
 
-      maximize = new WindowButton ("maximize.png");
-      pack (maximize, false, false);
-      maximize.clicked.connect (() => {
-        if (last_xid > 0)
-          global_shell.do_window_action (last_xid, WindowAction.MAXIMIZE);
-      });
-
-      unmaximize = new WindowButton ("unmaximize.png");
+      unmaximize = new WindowButton ("unmaximize");
       pack (unmaximize, false, false);
       unmaximize.clicked.connect (() => {
         if (last_xid > 0)
@@ -91,6 +83,13 @@
           return false;
         });
       });
+
+      Idle.add (() => {
+        unowned Bamf.Window? win = matcher.get_active_window ();
+        on_active_window_changed (null, win as GLib.Object);
+
+        return false;
+      });
     }
 
     private void on_active_window_changed (GLib.Object? object,
@@ -113,7 +112,6 @@
               appname.hide ();
               close.show ();
               minimize.show ();
-              maximize.hide ();
               unmaximize.show ();
             }
           else
@@ -121,7 +119,6 @@
               appname.show ();
               close.hide ();
               minimize.hide ();
-              maximize.hide ();
               unmaximize.hide ();
             }
 
@@ -150,7 +147,6 @@
           appname.hide ();
           close.hide ();
           minimize.hide ();
-          maximize.hide ();
           unmaximize.hide ();
           last_xid = 0;
         }
@@ -168,10 +164,15 @@
   public class WindowButton : Ctk.Button
   {
     public static const string AMBIANCE = "/usr/share/themes/Ambiance/metacity-1";
+    public static const string AMBIANCE_BETA = "/usr/share/themes/Ambiance-maverick-beta/metacity-1";
 
     public string filename { get; construct; }
     public Clutter.Actor bg;
 
+    private bool using_beta = false;
+    private int  icon_size = 18;
+    private string directory = AMBIANCE;
+
     public WindowButton (string filename)
     {
       Object (filename:filename);
@@ -179,40 +180,46 @@
 
     construct
     {
+      if (using_beta = FileUtils.test (AMBIANCE_BETA, FileTest.EXISTS))
+        {
+          icon_size = 19;
+          directory = AMBIANCE_BETA;
+        }
       try {
-
-        bg = new Ctk.Image.from_filename (20, AMBIANCE + "/" + filename);
-        add_actor (bg);
+        bg = new Ctk.Image.from_filename (icon_size,
+                                          directory +
+                                          "/" +
+                                          filename +
+                                          ".png");
+        set_background_for_state (Ctk.ActorState.STATE_NORMAL, bg);
+        bg.show ();
+
+        bg = new Ctk.Image.from_filename (icon_size,
+                                          directory +
+                                          "/" +
+                                          filename + 
+                                          "_focused_prelight.png");
+        set_background_for_state (Ctk.ActorState.STATE_PRELIGHT, bg);
+        bg.show ();
+
+        bg = new Ctk.Image.from_filename (icon_size,
+                                          directory +
+                                          "/" +
+                                          filename + 
+                                          "_focused_pressed.png");
+        set_background_for_state (Ctk.ActorState.STATE_ACTIVE, bg);
         bg.show ();
 
       } catch (Error e) {
         warning (@"Unable to load window button theme: You need Ambiance installed: $(e.message)");
       }
-
-      notify["state"].connect (() => {
-        switch (state)
-          {
-          case Ctk.ActorState.STATE_NORMAL:
-            bg.opacity = 255;
-            break;
-
-          case Ctk.ActorState.STATE_PRELIGHT:
-            bg.opacity = 120;
-            break;
-
-          case Ctk.ActorState.STATE_ACTIVE:
-          default:
-            bg.opacity = 50;
-            break;
-          }
-      });
     }
 
     private override void get_preferred_width (float     for_height,
                                                out float min_width,
                                                out float nat_width)
     {
-      min_width = 20.0f;
+      min_width = icon_size;
       nat_width = min_width;
     }
 
@@ -220,7 +227,7 @@
                                                 out float min_height,
                                                 out float nat_height)
     {
-      min_height = 18.0f;
+      min_height = icon_size;
       nat_height = min_height;
     }
   }

=== modified file 'unity-private/unity-utils.c'
--- unity-private/unity-utils.c	2010-08-17 16:00:00 +0000
+++ unity-private/unity-utils.c	2010-08-18 20:18:44 +0000
@@ -55,7 +55,7 @@
 #define _XA_MOTIF_WM_HINTS		"_MOTIF_WM_HINTS"
 
 gboolean
-utils_window_is_decorated (guint32 xid)
+utils_window_is_decorated (Window xid)
 {
   GdkDisplay *display = gdk_display_get_default();
   Atom hints_atom = None;
@@ -76,20 +76,23 @@
 		                  False, AnyPropertyType, &type, &format, &nitems,
 		                  &bytes_after, &data);
   
-  if (type == None || !data) return TRUE;
+  if (type == None || !data)
+    {
+      return TRUE;
+    }
   
   hints = (MotifWmHints *)data; 
   
   retval = hints->decorations;
-  
+ 
   if (data)
     XFree (data);
 
-  return retval;
+  return retval == 1;
 }
 
 static void
-gdk_window_set_mwm_hints (guint32        xid,
+gdk_window_set_mwm_hints (Window        xid,
                           MotifWmHints *new_hints)
 {
   GdkDisplay *display = gdk_display_get_default();
@@ -103,7 +106,7 @@
 
   g_return_if_fail (GDK_IS_DISPLAY (display));
 
-  g_debug ("gdk_window_set_mwm_hints: %u %lu\n", xid, new_hints->decorations);
+  g_debug ("gdk_window_set_mwm_hints: %lu %lu\n", xid, new_hints->decorations);
   
   hints_atom = gdk_x11_get_xatom_by_name_for_display (display, 
                                                       _XA_MOTIF_WM_HINTS);
@@ -148,7 +151,7 @@
 }
 
 void
-utils_window_set_decorations (guint32          xid,
+utils_window_set_decorations (Window          xid,
 			                        GdkWMDecoration decorations)
 {
   MotifWmHints *hints;

=== modified file 'unity-private/utils.vala'
--- unity-private/utils.vala	2010-08-17 16:00:00 +0000
+++ unity-private/utils.vala	2010-08-18 20:18:44 +0000
@@ -117,10 +117,10 @@
                                            string img2_path);
 
   [CCode (lower_case_prefix = "utils_")]
-  public extern bool window_is_decorated (uint32 xid);
+  public extern bool window_is_decorated (X.Window window);
 
   [CCode (lower_case_prefix = "utils_")]
-  public extern void window_set_decorations (uint32 xid, uint decorations);
+  public extern void window_set_decorations (X.Window window, uint decorations);
 
   [CCode (lower_case_prefix = "utils_")]
   public extern void volume_eject (GLib.Volume volume);