Ticket #1916: xrandr.patch

build/premake/extern_libs4.lua

@@ -649 +649 @@
             })
         end,
     },
+    xrandr = {
+        link_settings = function()
+            add_default_links({
+                unix_names = { "Xrandr" },
+            })
+        end,
+    },
     zlib = {
         compile_settings = function()
             if os.is("windows") then

build/premake/premake4.lua

@@ -751 +751 @@
     -- X11 should only be linked on *nix
     table.insert(used_extern_libs, "x11")
     table.insert(used_extern_libs, "xcursor")
+    table.insert(used_extern_libs, "xrandr")
 end
 
 if not _OPTIONS["without-audio"] then

source/lib/sysdep/os/unix/x/x.cpp

@@ -44 +44 @@
 #include <stdlib.h>
 #include <Xatom.h>
 #include <Xcursor/Xcursor.h>
+#include <X11/extensions/Xrandr.h>
 
 #include "SDL.h"
 #include "SDL_syswm.h"
@@ -71 +72 @@
 
     int screen = XDefaultScreen(disp);
     
-    /* 2004-07-13
-    NOTE: The XDisplayWidth/Height functions don't actually return the current
-    display mode - they return the size of the root window. This means that
-    users with "Virtual Desktops" bigger than what their monitors/graphics
-    card can handle will have to set their 0AD screen resolution manually.
-    
-    There's supposed to be an X extension that can give you the actual display
-    mode, probably including refresh rate info etc, but it's not worth
-    researching and implementing that at this stage.
+    /* 2013-04-13
+    NOTE: Game starts on primary output. In multi-monitor configuration,
+    for SDL 1.2 users primary output has to be the left-most (at 0,0).
     */
-    
+
+    XRRScreenResources *screen_resources = XRRGetScreenResources(disp, DefaultRootWindow(disp));
+    RROutput primary_output = XRRGetOutputPrimary(disp, DefaultRootWindow(disp));
+    XRROutputInfo *output_info = XRRGetOutputInfo(disp, screen_resources, primary_output);
+    XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(disp, screen_resources, output_info->crtc);
+
     if(xres)
-        *xres = XDisplayWidth(disp, screen);
+        *xres = crtc_info->width;
     if(yres)
-        *yres = XDisplayHeight(disp, screen);
+        *yres = crtc_info->height;
+
+    XRRFreeCrtcInfo(crtc_info);
+    XRRFreeOutputInfo(output_info);
+    XRRFreeScreenResources(screen_resources);
+
     if(bpp)
         *bpp = XDefaultDepth(disp, screen);
     if(freq)