Merge lp:~unity-team/unity/fix-lp1351591-trusty into lp:unity/7.2

[Christopher Townsend]

UScreen, PanelService: get monitor at position, ignoring pre-multipled Gdk scale factor

Get monitor position based on absolute coordinates, ignoring the pre-multipled scaling factor that Gdk applies to all the monitor sizes.

In this way we get the proper monitor index for absolute coordinates, independently from the scaling factor.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3831
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-7.2-ci/21/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3832
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-7.2-ci/23/rebuild

review: Approve (continuous-integration)

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

+1

review: Approve

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2015-03-11 18:11:24 +0000
+++ services/panel-service.c	2015-07-15 14:25:58 +0000
@@ -263,6 +263,15 @@
   g_type_class_add_private (obj_class, sizeof (PanelServicePrivate));
 }
 
+static gboolean
+is_point_in_rect (gint x, gint y, GdkRectangle* rect)
+{
+  g_return_val_if_fail (rect, FALSE);
+
+  return (x >= rect->x && x <= (rect->x + rect->width) &&
+          y >= rect->y && y <= (rect->y + rect->height));
+}
+
 IndicatorObjectEntry *
 get_entry_at (PanelService *self, gint x, gint y)
 {
@@ -280,8 +289,7 @@
           IndicatorObjectEntry *entry = k;
           GdkRectangle *geo = v;
 
-          if (x >= geo->x && x <= (geo->x + geo->width) &&
-              y >= geo->y && y <= (geo->y + geo->height))
+          if (is_point_in_rect (x, y, geo))
             {
               return entry;
             }
@@ -1621,11 +1629,41 @@
 }
 
 static int
+get_monitor_at (gint x, gint y)
+{
+  gint i;
+  gdouble scale;
+  GdkScreen *screen = gdk_screen_get_default ();
+  gint monitors = gdk_screen_get_n_monitors (screen);
+
+  for (i = 0; i < monitors; ++i)
+    {
+      GdkRectangle rect = { 0 };
+      gdk_screen_get_monitor_geometry (screen, i, &rect);
+      scale = gdk_screen_get_monitor_scale_factor (screen, i);
+
+      if (scale != 1.0)
+        {
+          rect.x *= scale;
+          rect.y *= scale;
+          rect.width *= scale;
+          rect.height *= scale;
+        }
+
+      if (is_point_in_rect (x, y, &rect))
+        {
+          return i;
+        }
+    }
+
+  return gdk_screen_get_monitor_at_point (screen, x, y);
+}
+
+static int
 get_monitor_scale_at (gint x, gint y)
 {
-  GdkScreen *screen = gdk_screen_get_default ();
-  int monitor = gdk_screen_get_monitor_at_point (screen, x, y);
-  return gdk_screen_get_monitor_scale_factor (screen, monitor);
+  gint monitor = get_monitor_at (x, y);
+  return gdk_screen_get_monitor_scale_factor (gdk_screen_get_default (), monitor);
 }
 
 static void
@@ -1639,7 +1677,7 @@
   PanelServicePrivate *priv = self->priv;
 
   GdkScreen *screen = gdk_screen_get_default ();
-  gint monitor = gdk_screen_get_monitor_at_point (screen, priv->last_x, priv->last_y);
+  gint monitor = get_monitor_at (priv->last_x, priv->last_y);
   gtk_menu_set_monitor (menu, monitor);
 
   gint scale = gdk_screen_get_monitor_scale_factor (screen, monitor);

=== modified file 'unity-shared/UScreen.cpp'
--- unity-shared/UScreen.cpp	2015-03-12 00:57:05 +0000
+++ unity-shared/UScreen.cpp	2015-07-15 14:25:58 +0000
@@ -18,6 +18,8 @@
 
 #include "UScreen.h"
 #include <NuxCore/Logger.h>
+#include <NuxCore/NuxCore.h>
+#include <NuxGraphics/GraphicsDisplay.h>
 
 namespace unity
 {
@@ -61,17 +63,8 @@
 
 int UScreen::GetMonitorWithMouse() const
 {
-  GdkDevice* device;
-  GdkDisplay *display;
-  int x;
-  int y;
-
-  display = gdk_display_get_default();
-  device = gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(display));
-
-  gdk_device_get_position(device, nullptr, &x, &y);
-
-  return GetMonitorAtPosition(x, y);
+  auto const& mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
+  return GetMonitorAtPosition(mouse.x, mouse.y);
 }
 
 int UScreen::GetPrimaryMonitor() const
@@ -170,7 +163,10 @@
     gdk_screen_get_monitor_geometry(screen_, i, &rect);
 
     float scale = gdk_screen_get_monitor_scale_factor(screen_, i);
-    nux::Geometry geo(rect.x*scale, rect.y*scale, rect.width*scale, rect.height*scale);
+    nux::Geometry geo(rect.x, rect.y, rect.width, rect.height);
+
+    if (scale != 1.0)
+      geo = geo * scale;
 
     // Check for mirrored displays
     if (geo == last_geo)