Merge lp:~smspillaz/nux/nux.fix_861341 into lp:nux

[Sam Spilsbury]

Fix bug 861341

[Jay Taoko (jaytaoko)]

review: Approve

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2011-09-28 10:24:48 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2011-09-28 12:34:00 +0000
@@ -199,6 +199,8 @@
                                          bool FullscreenFlag,
                                          bool create_rendering_data)
   {
+    int xinerama_event, xinerama_error;
+    int xinerama_major, xinerama_minor;
     NScopeLock Scope (&CreateOpenGLWindow_CriticalSection);
 
     m_GfxInterfaceCreated = false;
@@ -223,6 +225,8 @@
 
     m_X11Screen = DefaultScreen (m_X11Display);
     XF86VidModeQueryVersion (m_X11Display, &_x11_major, &_x11_minor);
+    XineramaQueryVersion (m_X11Display, &xinerama_major, &xinerama_minor);
+    XineramaQueryExtension (m_X11Display, &xinerama_event, &xinerama_error);
 
     XF86VidModeGetAllModeLines (m_X11Display, m_X11Screen, &m_NumVideoModes, &m_X11VideoModes);
     m_X11OriginalVideoMode = *m_X11VideoModes[0];

=== modified file 'NuxGraphics/GraphicsDisplayX11.h'
--- NuxGraphics/GraphicsDisplayX11.h	2011-05-26 21:08:18 +0000
+++ NuxGraphics/GraphicsDisplayX11.h	2011-09-28 12:34:00 +0000
@@ -36,6 +36,7 @@
 #include <X11/keysym.h>
 
 #include <X11/extensions/xf86vmode.h>
+#include <X11/extensions/Xinerama.h>
 
 namespace nux
 {
@@ -312,6 +313,7 @@
     
     void * KeyboardGrabData () { return _global_keyboard_grab_data; }
     void * PointerGrabData () { return _global_pointer_grab_data; }
+
   private:
     void InitGlobalGrabWindow ();
   

=== modified file 'NuxGraphics/XInputWindow.cpp'
--- NuxGraphics/XInputWindow.cpp	2011-09-20 06:03:43 +0000
+++ NuxGraphics/XInputWindow.cpp	2011-09-28 12:34:00 +0000
@@ -103,15 +103,69 @@
 
   void XInputWindow::SetStruts()
   {
-    int screenHeight, screenWidth;
+    int n_info;
+    XineramaScreenInfo *info = XineramaQueryScreens (display_, &n_info);
+    Region             screen_region;
+    Region             total_screen_region = XCreateRegion ();
+    Region             input_window_region = XCreateRegion ();
+    Region             intersection = XCreateRegion ();
+    XineramaScreenInfo monitor;
+    XRectangle         tmp_rect;
+    int largestWidth = 0, largestHeight = 0;
+    int screenWidth, screenHeight;
     long int data[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-    screenHeight = XDisplayHeight(display_, 0);
-    screenWidth = XDisplayWidth(display_, 0);
+    /* Find the screen that this region intersects */
+    tmp_rect.x = geometry_.x;
+    tmp_rect.y = geometry_.y;
+    tmp_rect.width = geometry_.width;
+    tmp_rect.height = geometry_.height;
+
+    XUnionRectWithRegion (&tmp_rect, input_window_region, input_window_region);
+
+    for (int i = 0; i < n_info; i++)
+    {
+      tmp_rect.x = info[i].x_org;
+      tmp_rect.y = info[i].y_org;
+      tmp_rect.width = info[i].width;
+      tmp_rect.height = info[i].height;
+
+      screen_region = XCreateRegion ();
+
+      XUnionRectWithRegion (&tmp_rect, screen_region, screen_region);
+      XUnionRegion (screen_region, total_screen_region, total_screen_region);
+      XIntersectRegion (screen_region, input_window_region, intersection);
+
+      if (!XEmptyRegion (intersection))
+      {
+        int width = intersection->extents.x2 - intersection->extents.x1;
+        int height = intersection->extents.y2 - intersection->extents.y1;
+
+        if ((width * height) > (largestWidth * largestHeight))
+        {
+          largestWidth = width;
+          largestHeight = height;
+
+          monitor = info[i];
+        }
+      }
+
+      XDestroyRegion (screen_region);
+    }
+
+    screenWidth = total_screen_region->extents.x2 - total_screen_region->extents.x1;
+    screenHeight = total_screen_region->extents.y2 - total_screen_region->extents.y1;
+
+    XDestroyRegion (input_window_region);
+    XDestroyRegion (intersection);
+    XDestroyRegion (total_screen_region);
+
+    if (info)
+      XFree (info);
 
     if (geometry_.width > geometry_.height)
     {
-      if (geometry_.y < screenHeight / 2)
+      if (geometry_.y - monitor.y_org < monitor.height / 2)
       {
         /* top */
         data[2] = geometry_.y + geometry_.height;
@@ -128,7 +182,7 @@
     }
     else
     {
-      if (geometry_.x < screenWidth / 2)
+      if (geometry_.x - monitor.x_org < monitor.width / 2)
       {
         /* left */
         data[0] = geometry_.x + geometry_.width;

=== modified file 'NuxGraphics/XInputWindow.h'
--- NuxGraphics/XInputWindow.h	2011-09-20 06:03:43 +0000
+++ NuxGraphics/XInputWindow.h	2011-09-28 12:34:00 +0000
@@ -28,6 +28,7 @@
 #include <X11/Xatom.h>
 /* keysym.h contains keysymbols which we use to resolv what keys that are being pressed */
 #include <X11/keysym.h>
+#include <X11/Xregion.h>
 
 #include <X11/extensions/xf86vmode.h>
 

=== modified file 'NuxGraphics/nux-graphics.pc.in'
--- NuxGraphics/nux-graphics.pc.in	2011-09-20 06:03:43 +0000
+++ NuxGraphics/nux-graphics.pc.in	2011-09-28 12:34:00 +0000
@@ -8,4 +8,4 @@
 Version: @VERSION@
 Libs: -L${libdir} -lnux-graphics-@NUX_API_VERSION@
 Cflags: -I${includedir}/Nux-@NUX_API_VERSION@
-Requires: glib-2.0 nux-core-@NUX_API_VERSION@ nux-image-@NUX_API_VERSION@ gl glu xxf86vm glew glewmx 
+Requires: glib-2.0 nux-core-@NUX_API_VERSION@ nux-image-@NUX_API_VERSION@ gl glu xxf86vm glew glewmx xinerama

=== modified file 'configure.ac'
--- configure.ac	2011-09-26 09:42:41 +0000
+++ configure.ac	2011-09-28 12:34:00 +0000
@@ -143,6 +143,7 @@
                   glewmx
                   xxf86vm
                   sigc++-2.0
+		  xinerama
                   )
 AC_SUBST(NUX_GRAPHICS_CFLAGS)
 AC_SUBST(NUX_GRAPHICS_LIBS)