Merge lp:~unity-team/unity/multiple-monitor-support into lp:unity

[Neil J. Patel]

This adds some support for multi monitor setups. It basically makes Unity stick to screen 0, which is because it's currently not possible to have a left-edge panel on a monitor that isn't monitor 0.

We can fix that during the natty cycle, but at least this let's you use your other monitors somewhat normally :)

[Mirco Müller (macslow)]

review: Needs Resubmitting

[Mirco Müller (macslow)]

Code is ok. But I'm missing a way to test it on a real multi-monitor setup (using xrandr).

review: Approve

[Jason Smith (jassmith)]

+1 looks good

=== modified file 'targets/mutter/Makefile.am'
--- targets/mutter/Makefile.am	2010-08-18 13:53:39 +0000
+++ targets/mutter/Makefile.am	2010-09-19 17:17:45 +0000
@@ -43,6 +43,7 @@
   --pkg Dbusmenu-Glib-0.2 \
   --pkg dee-1.0 \
   --pkg gtk+-2.0 \
+  --pkg gdk-x11-2.0 \
   --pkg gee-1.0 \
   --pkg indicator \
   --pkg mutter-2.28 \

=== modified file 'targets/mutter/expose-manager.vala'
--- targets/mutter/expose-manager.vala	2010-08-24 12:02:16 +0000
+++ targets/mutter/expose-manager.vala	2010-09-19 17:17:45 +0000
@@ -260,12 +260,12 @@
     private ExposeClone? last_selected_clone = null;
 
 
-    public ExposeManager (Plugin plugin, Launcher.Launcher launcher)
+    public ExposeManager (Plugin owner, Launcher.Launcher launcher)
     {
       this.launcher = launcher;
-      this.owner = plugin;
+      this.owner = owner;
       this.exposed_windows = new List<ExposeClone> ();
-      this.stage = (Clutter.Stage)plugin.get_stage ();
+      this.stage = (Clutter.Stage)owner.get_stage ();
 
       hovered_opacity = 255;
       unhovered_opacity = 255;
@@ -394,23 +394,23 @@
     {
       Clutter.Actor last = null;
 
-      int middle_size = (int) (stage.width * 0.8f);
-      int width = (int) stage.width - left_buffer - right_buffer;
+      int middle_size = (int) (owner.primary_monitor.width * 0.8f);
+      int width = (int) owner.primary_monitor.width - left_buffer - right_buffer;
       int slice_width = width / 10;
 
-      int middle_y = (int) stage.height / 2;
+      int middle_y = (int) owner.primary_monitor.height / 2;
       int middle_x = left_buffer + width / 2;
 
       int middle_index = windows.index (active);
 
-      float scale = float.min (1f, (stage.height / 2) / float.max (active.height, active.width));
+      float scale = float.min (1f, (owner.primary_monitor.height / 2) / float.max (active.height, active.width));
       scale = 1f;
 
       active.set_anchor_point_from_gravity (Clutter.Gravity.CENTER);
       active.animate (Clutter.AnimationMode.EASE_IN_OUT_SINE, 250,
                       "x", (float) middle_x,
                       "y", (float) middle_y,
-                      "depth", stage.width * -0.7,
+                      "depth", owner.primary_monitor.width * -0.7,
                       "scale-x", scale,
                       "scale-y", scale,
                       "rotation-angle-y", 0f);
@@ -425,13 +425,13 @@
           actor.set_anchor_point_from_gravity (Clutter.Gravity.CENTER);
           actor.lower (last);
 
-          scale = float.min (1f, (stage.height / 2) / float.max (actor.height, actor.width));
+          scale = float.min (1f, (owner.primary_monitor.height / 2) / float.max (actor.height, actor.width));
           scale = 1f;
 
           actor.animate (Clutter.AnimationMode.EASE_IN_OUT_SINE, 250,
                           "x", (float) current_x,
                           "y", (float) middle_y,
-                          "depth", stage.width * -0.7,
+                          "depth", owner.primary_monitor.width * -0.7,
                           "scale-x", scale,
                           "scale-y", scale,
                           "rotation-angle-y", 60f);
@@ -448,13 +448,13 @@
           actor.set_anchor_point_from_gravity (Clutter.Gravity.CENTER);
           actor.lower (last);
 
-          scale = float.min (1f, (stage.height / 2) / float.max (actor.height, actor.width));
+          scale = float.min (1f, (owner.primary_monitor.height / 2) / float.max (actor.height, actor.width));
           scale = 1f;
 
           actor.animate (Clutter.AnimationMode.EASE_IN_OUT_SINE, 250,
                           "x", (float) current_x,
                           "y", (float) middle_y,
-                          "depth", stage.width * -0.7,
+                          "depth", owner.primary_monitor.width * -0.7,
                           "scale-x", scale,
                           "scale-y", scale,
                           "rotation-angle-y", -60f);
@@ -474,25 +474,32 @@
 
     public void position_windows_on_grid (List<Clutter.Actor> _windows, int top_buffer, int left_buffer, int right_buffer, int bottom_buffer)
     {
+      if (_windows.length () < 1)
+        {
+          warning ("There are no windows to position on grid");
+          return;
+        }
+
       List<Clutter.Actor> windows = _windows.copy ();
       windows.sort ((CompareFunc) direct_comparison);
 
       int count = (int) windows.length ();
       int cols = (int) Math.ceil (Math.sqrt (count));
+      if (cols < 1) cols = 1;
       int rows = 1;
 
       while (cols * rows < count)
         rows++;
 
-      int boxWidth = (int) ((stage.width - left_buffer - right_buffer) / cols);
-      int boxHeight = (int) ((stage.height - top_buffer - bottom_buffer) / rows);
+      int boxWidth = (int) ((owner.primary_monitor.width - left_buffer - right_buffer) / cols);
+      int boxHeight = (int) ((owner.primary_monitor.height - top_buffer - bottom_buffer) / rows);
 
       for (int row = 0; row < rows; row++)
         {
           if (row == rows - 1)
             {
               /* Last row, time to perform centering as needed */
-              boxWidth = (int) ((stage.width - left_buffer - right_buffer) / windows.length ());
+              boxWidth = (int) ((owner.primary_monitor.width - left_buffer - right_buffer) / windows.length ());
             }
 
           for (int col = 0; col < cols; col++)

=== modified file 'targets/mutter/main.c'
--- targets/mutter/main.c	2010-07-20 13:07:00 +0000
+++ targets/mutter/main.c	2010-09-19 17:17:45 +0000
@@ -174,16 +174,16 @@
       rects = g_new (XRectangle, 2);
 
       /* Panel first */
-      rects[0].x = 0;
-      rects[0].y = 0;
-      rects[0].width = width;
+      rects[0].x = plugin->primary_monitor.x;
+      rects[0].y = plugin->primary_monitor.y;
+      rects[0].width = plugin->primary_monitor.width;
       rects[0].height = unity_plugin_get_panel_height (plugin);
 
       /* Launcher */
-      rects[1].x = 0;
+      rects[1].x = plugin->primary_monitor.y;
       rects[1].y = rects[0].height;
       rects[1].width = unity_plugin_get_launcher_width (plugin) + 1;
-      rects[1].height = height - rects[0].height;
+      rects[1].height = plugin->primary_monitor.height - rects[0].height;
 
       /* Update region */
       region = XFixesCreateRegion (xdisplay, rects, 2);

=== modified file 'targets/mutter/plugin.vala'
--- targets/mutter/plugin.vala	2010-09-16 17:37:19 +0000
+++ targets/mutter/plugin.vala	2010-09-19 17:17:45 +0000
@@ -108,8 +108,7 @@
     }
 
     public ExposeManager expose_manager { get; private set; }
-    public Background    background     { get; private set; }
-
+    
     public bool menus_swallow_events { get { return false; } }
 
     private bool _super_key_active = false;
@@ -125,6 +124,9 @@
     private static const int QUICKLAUNCHER_WIDTH = 58;
     private static const string UNDECORATED_HINT = "UNDECORATED_HINT";
 
+    public Gee.ArrayList<Background> backgrounds;
+    public Gdk.Rectangle primary_monitor;
+
     private Clutter.Stage    stage;
     private Application      app;
     private WindowManagement wm;
@@ -231,6 +233,8 @@
       this.wm = new WindowManagement (this);
       this.maximus = new Maximus ();
 
+      (Clutter.Stage.get_default () as Clutter.Stage).color = { 0, 0, 0, 255 };
+
       END_FUNCTION ();
     }
 
@@ -286,10 +290,13 @@
         super_key_modifier_press (keysym);
       });
 
-      this.background = new Background ();
-      this.stage.add_actor (background);
-      this.background.lower_bottom ();
-      this.background.show ();
+      /* Setup the backgrounds */
+      unowned Gdk.Screen screen = Gdk.Screen.get_default ();
+      backgrounds = new Gee.ArrayList<Background> ();
+
+      /* Connect to interestng signals */
+      screen.monitors_changed.connect (relayout);
+      screen.size_changed.connect (relayout);
 
       this.launcher = new Launcher.Launcher (this);
       this.launcher.get_view ().opacity = 0;
@@ -453,41 +460,97 @@
         }
     }
 
+    private void refresh_n_backgrounds (int n_monitors)
+    {
+      int size = backgrounds.size;
+
+      if (size == n_monitors)
+        return;
+      else if (size < n_monitors)
+        {
+          for (int i = 0; i < n_monitors - size; i++)
+            {
+              var bg = new Background ();
+              backgrounds.add (bg);
+              stage.add_actor (bg);
+              bg.lower_bottom ();
+              bg.opacity = 0;
+              bg.show ();
+              bg.animate (Clutter.AnimationMode.EASE_IN_QUAD, 2000,
+                          "opacity", 255);
+            }
+        }
+      else
+        {
+          for (int i = 0; i < size - n_monitors; i++)
+            {
+              var bg = backgrounds.get (0);
+              if (bg is Clutter.Actor)
+                {
+                  backgrounds.remove (bg);
+                  stage.remove_actor (bg);
+                }
+            }
+        }
+    }
     private void relayout ()
     {
       START_FUNCTION ();
-      float width, height;
-
-      this.stage.get_size (out width, out height);
-
-      this.drag_dest.resize (this.QUICKLAUNCHER_WIDTH,
-                             (int)height - this.PANEL_HEIGHT);
-      this.drag_dest.move (0, this.PANEL_HEIGHT);
-
-      this.background.set_size (width, height);
-      this.background.set_position (0, 0);
+
+      unowned Gdk.Screen screen = Gdk.Screen.get_default ();
+      int x, y, width, height;
+
+      /* Figure out what should be the right size and location of Unity */
+      /* FIXME: This needs to always be monitor 0 right now as it doesn't
+       * seem possible to have panels on a vertical edge of a monitor unless
+       * it's the first or last monitor :(
+       */
+      screen.get_monitor_geometry (0, // Should be screen.get_primary_monitor()
+                                   out primary_monitor);
+      x = primary_monitor.x;
+      y = primary_monitor.y;
+      width = primary_monitor.width;
+      height = primary_monitor.height;
+
+      /* The drag-n-drop region */
+      drag_dest.resize (QUICKLAUNCHER_WIDTH,
+                        height - PANEL_HEIGHT);
+      drag_dest.move (x, y + PANEL_HEIGHT);
+
+      /* We're responsible for painting the backgrounds on all the monitors */
+      refresh_n_backgrounds (screen.get_n_monitors ());
+      for (int i = 0; i < screen.get_n_monitors (); i++)
+        {
+          var bg = backgrounds.get (i);
+          if (bg is Background)
+            {
+              Gdk.Rectangle rect;
+              screen.get_monitor_geometry (i, out rect);
+
+              bg.set_position (rect.x, rect.y);
+              bg.set_size (rect.width, rect.height);
+            }
+        }   
 
       this.launcher.get_container ().set_size (this.QUICKLAUNCHER_WIDTH,
                                    (height-this.PANEL_HEIGHT));
-      this.launcher.get_container ().set_position (0, this.PANEL_HEIGHT);
+      this.launcher.get_container ().set_position (x, y + this.PANEL_HEIGHT);
       this.launcher.get_container ().set_clip (0, 0,
                                    this.QUICKLAUNCHER_WIDTH,
                                    height-this.PANEL_HEIGHT);
+
       Utils.set_strut ((Gtk.Window)this.drag_dest,
-                       this.QUICKLAUNCHER_WIDTH, 0, (uint32)height,
-                       PANEL_HEIGHT, 0, (uint32)width);
+                       this.QUICKLAUNCHER_WIDTH, y, (uint32)height,
+                       PANEL_HEIGHT, x, (uint32)width);
 
       this.places.set_size (width - this.QUICKLAUNCHER_WIDTH, height);
-      this.places.set_position (this.QUICKLAUNCHER_WIDTH, 0);
-
-      this.panel.set_size (width, 24);
-      this.panel.set_position (0, 0);
-
-      /* Leaving this here to remind me that we need to use these when
-       * there are fullscreen windows etc
-       * this.plugin.set_stage_input_region (uint region);
-       * this.plugin.set_stage_reactive (true);
-       */
+      this.places.set_position (x + this.QUICKLAUNCHER_WIDTH, y);
+
+      this.panel.set_size (width, PANEL_HEIGHT);
+      this.panel.set_position (x, y);
+
+      ensure_input_region ();
+
       END_FUNCTION ();
     }
 
@@ -686,8 +749,8 @@
           (this.plugin.get_window_group () as Clutter.Container).add_actor (this.dark_box);
           this.dark_box.raise (plugin.get_normal_window_group ());
 
-          this.dark_box.set_position (0, 0);
-          this.dark_box.set_size (this.stage.width, this.stage.height);
+          this.dark_box.set_position (primary_monitor.x, primary_monitor.y);
+          this.dark_box.set_size (primary_monitor.width, primary_monitor.height);
 
           this.dark_box.show ();
 
@@ -1426,6 +1489,13 @@
             return false;
           });
         }
+      else if (window.get_window_type () == Mutter.MetaCompWindowType.DOCK)
+        {
+          if (win.get_xwindow (win) == Gdk.x11_drawable_get_xid (drag_dest.window))
+            {
+              window.opacity = 0;
+            }
+        }
 
       this.maximus.process_window (window);
       this.window_mapped (this, window);

=== modified file 'targets/mutter/spaces-manager.vala'
--- targets/mutter/spaces-manager.vala	2010-08-26 17:08:21 +0000
+++ targets/mutter/spaces-manager.vala	2010-09-19 17:17:45 +0000
@@ -370,7 +370,7 @@
             }
         }
 
-      ExposeClone background_clone = new ExposeClone (plugin.background);
+      ExposeClone background_clone = new ExposeClone (plugin.backgrounds.get (0));
       background_clone.fade_on_close = false;
 
       wsp.add_actor (background_clone);

=== modified file 'unity-private/testing/background.vala'
--- unity-private/testing/background.vala	2010-08-26 15:14:33 +0000
+++ unity-private/testing/background.vala	2010-09-19 17:17:45 +0000
@@ -156,9 +156,6 @@
           this.bg_texture.show ();
         }
 
-      this.x = 0.0f;
-      this.y = 0.0f;
-
       this.gbg.get_color (out type, out primary, out secondary);
 
       this.bg_texture.set_surface_size ((uint) this.width,