Merge lp:~vanvugt/unity/fix-742544-alt-trunk into lp:unity

[Daniel van Vugt]

The primary monitor (the one the launcher appears on) should always be chosen by the user (LP: #742544)

You select the primary monitor in the Gnome Displays panel, or the NVIDIA control panel for the nvidia driver.

[Daniel van Vugt (vanvugt)]

This branch removes the fallback to the left-most monitor that was introduced late just before oneiric was released.

If you still want the old (oneiric-only) behaviour then see the more complex version of this fix:
https://code.launchpad.net/~vanvugt/unity/fix-742544-trunk/+merge/79492

[Sam Spilsbury (smspillaz)]

review: Approve

[Neil J. Patel (njpatel)]

The launcher is shown on the left-most screen for some user-experience reasons, specifically because the launcher, in it's default auto-hide mode, cannot be shown via the mouse if it's not on the left-most monitor easily. Most people just assume it's broken. Jason Smith is working on a fix for this for 5.0, and that will solve this bug. For 4.0, we can't make such a big change that Jason is doing, so I don't think this should be applied to it either.

[Sam Spilsbury (smspillaz)]

review: Abstain

[Daniel van Vugt (vanvugt)]

I know the justification but take a look at how many people this is upsetting: bug 742544

Also, if Jason is working on it then why wasn't the bug updated to show that? It's been assigned to me for 3 months and not a single comment from Jason or yourself to say any Unity devs were working on it.

[Tim Penhey (thumper)]

Hi Daniel,

With the new multi-monitor work and a launcher on each monitor, this change doesn't really make sense any more does it?

Tim

[Daniel van Vugt (vanvugt)]

Unity's inability to detect the correct primary monitor might become irrelevant by the sound of it. In which case, this proposal may become redundant. Though I haven't tested the new multi-monitor support to confirm.

[Alex Launi (alexlauni)]

Is this proposal still relevant or can it be dismissed?

[Daniel van Vugt (vanvugt)]

This proposal is still relevant as seen in bug 961281. I would not dismiss it until I'm sure this or something equivalent has been merged.

[Marco Trevisan (Treviño) (3v1n0)]

Daniel in current UScreen we alredy use gdk_screen_get_primary_monitor to get the primary monitor and we don't override that anymore.
So the only improvement that should be done on this side is supporting the NVIDIA drivers in some way to get a notification when the primary monitor has been changed for them.

review: Disapprove

=== modified file 'plugins/unityshell/src/UScreen.cpp'
--- plugins/unityshell/src/UScreen.cpp	2011-09-23 23:53:13 +0000
+++ plugins/unityshell/src/UScreen.cpp	2011-12-23 07:01:26 +0000
@@ -16,6 +16,7 @@
  * Authored by: Neil Jagdish Patel <[e-mail]>
  */
 
+#define G_LOG_DOMAIN "UScreen"
 #include "UScreen.h"
 
 static UScreen* _default_screen = NULL;
@@ -92,17 +93,18 @@
 void
 UScreen::Refresh()
 {
-  GdkScreen*    screen;
-  nux::Geometry last_geo(0, 0, 1, 1);
-
-  screen = gdk_screen_get_default();
-
-  _monitors.erase(_monitors.begin(), _monitors.end());
-
-  g_print("\nScreen geometry changed:\n");
-
-  int lowest_x = std::numeric_limits<int>::max();
-  int highest_y = std::numeric_limits<int>::min();
+  GdkScreen* screen = gdk_screen_get_default();
+  _monitors.clear();
+  g_message("Screen geometry changed:\n");
+
+  /*
+   * The primary monitor MUST be the one chosen by the user. You select the
+   * primary monitor in the Gnome Displays panel, or the NVIDIA control
+   * panel for the nvidia driver.
+   * Don't try to override what the user has chosen or they will be unhappy.
+   */
+  primary_ = gdk_screen_get_primary_monitor(screen);
+
   for (int i = 0; i < gdk_screen_get_n_monitors(screen); i++)
   {
     GdkRectangle rect = { 0 };
@@ -111,24 +113,18 @@
 
     nux::Geometry geo(rect.x, rect.y, rect.width, rect.height);
 
-    // Check for mirrored displays
-    if (geo == last_geo)
-      continue;
-    last_geo = geo;
-
     _monitors.push_back(geo);
 
-    if (geo.x < lowest_x || (geo.x == lowest_x && geo.y > highest_y))
-    {
-      lowest_x = geo.x;
-      highest_y = geo.y;
-      primary_ = i;
-    }
-
-    g_print("   %dx%dx%dx%d\n", geo.x, geo.y, geo.width, geo.height);
+    gchar *name = gdk_screen_get_monitor_plug_name(screen, i);
+    g_message("   #%d: %s %dx%d +%d+%d %s\n",
+              i,
+              name == NULL ? "?" : name,
+              geo.width, geo.height,
+              geo.x, geo.y,
+              i == primary_ ? "(primary)" : "");
+    if (name)
+      g_free(name);
   }
 
-  g_print("\n");
-
   changed.emit(primary_, _monitors);
 }