Merge lp:~cyphermox/unity/multimonitor into lp:unity

[Mathieu Trudel-Lapierre]

I've been testing this code on a laptop with an external screen and it seems to work fine with most resolution changes (all secondary screen res changes, most res changes of the primary screen with the notable exception of 800x600 by my test on my hardware).

This has already been working just fine when first starting unity, whichever resolution that happens to be with.

[Alex Launi (alexlauni)]

This looks pretty good to me. I can't test until nvidia drivers, but the code looks clean.

review: Approve

[Sam Spilsbury (smspillaz)]

Hi Mathieu,

Great initiative here - just nitpicking a few things before we merge this:

1) You've got merge markers in the source (eg <<<<<<< TREE MERGE SOURCE), you need to remove them or it won't build :p
2) You have strutHackTimeout in UnityScreen::Relayout - this means that on init you'll have strutHackTimeout being called twice. Remove it from UnityScreen::Relayout
3) s/g_warning/g_debug/ The screen size change is *not* a warning
4) you've got:

+ g_signal_connect_swapped (gdk_screen_get_default (), "monitors-changed", G_CALLBACK (&UnityScreen::Relayout), (void*) this);
+ g_signal_connect_swapped (gdk_screen_get_default (), "size-changed", G_CALLBACK (&UnityScreen::Relayout), (void*) this);

That is going to cause UnityScreen::Relayout to be called twice in cases where the monitors changed and the size changed. That's bad

5) This is probably going to be a point of contention between me and the other developers, but I'd actually prefer it if we hooked up this ::outputChangeNotify wrappable function in compiz. The reason why is because outputs are user-configurable in compiz in case your graphics driver is horribly broken or you need to do multihead testing. In addition, it means that we're reacting to the output change once the window manager has done everything it needs to do, meaning racy weirdness when compiz reshuffles windows about to handle the output change and we've already moved before that.

review: Needs Fixing

[Mirco Müller (macslow)]

I fixed all but 5.) of the issues Sam raised. I've pushed the corrected branch (and re-merged with trunk) to lp:~canonical-dx-team/unity/unity.fix-675862

This is to avoid messing with other people's personal branches.

=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-02-21 13:21:49 +0000
+++ src/unityshell.cpp	2011-02-21 17:09:08 +0000
@@ -38,6 +38,7 @@
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
+#include <gdk/gdk.h>
 
 #include <core/atoms.h>
 
@@ -543,6 +544,64 @@
   }
 }
 
+void
+UnityScreen::Relayout ()
+{
+  GdkScreen *scr;
+  GdkRectangle rect;
+  nux::Geometry lCurGeom, pCurGeom;
+  gint primary_monitor;
+
+  scr = gdk_screen_get_default ();
+  primary_monitor = gdk_screen_get_primary_monitor (scr);
+  gdk_screen_get_monitor_geometry (scr, primary_monitor, &rect);
+
+  pCurGeom = panelWindow->GetGeometry(); 
+  lCurGeom = launcherWindow->GetGeometry(); 
+
+  panelWindow->EnableInputWindow(false);
+  launcherWindow->EnableInputWindow(false);
+
+  panelView->SetMaximumWidth(rect.width);
+  launcher->SetMaximumHeight(rect.height - pCurGeom.height);
+
+  g_warning ("setting to primary screen rect: x=%d y=%d w=%d h=%d",
+		rect.x, rect.y, rect.width, rect.height );
+
+  panelWindow->SetGeometry(nux::Geometry(rect.x,
+					rect.y,
+					rect.width,
+					pCurGeom.height));
+  panelView->SetGeometry(nux::Geometry(rect.x,
+					rect.y,
+					rect.width,
+					pCurGeom.height));
+
+  launcherWindow->SetGeometry(nux::Geometry(rect.x,
+					rect.y + pCurGeom.height,
+					lCurGeom.width,
+					rect.height - pCurGeom.height));
+  launcher->SetGeometry(nux::Geometry(rect.x,
+					rect.y + pCurGeom.height,
+					lCurGeom.width,
+					rect.height - pCurGeom.height));
+
+  panelWindow->EnableInputWindow(true);
+  launcherWindow->EnableInputWindow(true);
+
+  strutHackTimeout(this);
+}
+
+gboolean
+UnityScreen::RelayoutTimeout (gpointer data)
+{
+  UnityScreen *uScr = (UnityScreen*) data;
+
+  uScr->Relayout();
+
+  return FALSE;
+}
+
 /* Handle changes in the number of workspaces by showing the switcher
  * or not showing the switcher */
 bool
@@ -651,6 +710,10 @@
 
   g_timeout_add (0, &UnityScreen::initPluginActions, this);
   g_timeout_add (5000, (GSourceFunc) write_logger_data_to_disk, NULL);
+
+  g_signal_connect_swapped (gdk_screen_get_default (), "monitors-changed", G_CALLBACK (&UnityScreen::Relayout), (void*) this);
+  g_signal_connect_swapped (gdk_screen_get_default (), "size-changed", G_CALLBACK (&UnityScreen::Relayout), (void*) this);
+
   END_FUNCTION ();
 }
 
@@ -749,6 +812,7 @@
   self->launcher->SetLaunchAnimation (Launcher::LAUNCH_ANIMATION_PULSE);
   self->launcher->SetUrgentAnimation (Launcher::URGENT_ANIMATION_WIGGLE);
   g_timeout_add (2000, &UnityScreen::strutHackTimeout, self);
+  g_timeout_add (2000, &UnityScreen::RelayoutTimeout, self);
 
   END_FUNCTION ();
 }

=== modified file 'src/unityshell.h'
--- src/unityshell.h	2011-02-21 11:34:16 +0000
+++ src/unityshell.h	2011-02-21 17:09:08 +0000
@@ -148,6 +148,12 @@
 	void
 	onRedrawRequested ();
 
+	void
+	Relayout ();
+
+	static gboolean
+	RelayoutTimeout (gpointer data);
+
 	static void
 	launcherWindowConfigureCallback(int WindowWidth, int WindowHeight, nux::Geometry& geo, void* user_data);