Ticket #861: xinerama_override_screenwh.patch

libvo/x11_common.c

@@ -391 +391 @@
         }
         if (screen < 0)
             screen = 0;
-        vo_screenwidth = screens[screen].width;
-        vo_screenheight = screens[screen].height;
+        if (vo_screenwidth_overridable)
+            vo_screenwidth = screens[screen].width;
+        if (vo_screenheight_overridable)
+            vo_screenheight = screens[screen].height;
         xinerama_x = screens[screen].x_org;
         xinerama_y = screens[screen].y_org;
 
@@ -455 +457 @@
 
         XF86VidModeGetModeLine(mDisplay, mScreen, &clock, &modeline);
         if (!vo_screenwidth)
-            vo_screenwidth = modeline.hdisplay;
+        {
+            vo_screenwidth = modeline.hdisplay;
+            vo_screenwidth_overridable = 1;
+        }
         if (!vo_screenheight)
+        {
             vo_screenheight = modeline.vdisplay;
+            vo_screenheight_overridable = 1;
+        }
     }
 #endif
     {
         if (!vo_screenwidth)
+        {
             vo_screenwidth = DisplayWidth(mDisplay, mScreen);
+            vo_screenwidth_overridable = 1;
+        }
         if (!vo_screenheight)
+        {
             vo_screenheight = DisplayHeight(mDisplay, mScreen);
+            vo_screenheight_overridable = 1;
+        }
     }
     // get color depth (from root window, or the best visual):
     XGetWindowAttributes(mDisplay, mRootWin, &attribs);

libvo/video_out.c

@@ -29 +29 @@
 int vo_depthonscreen=0;
 int vo_screenwidth=0;
 int vo_screenheight=0;
+int vo_screenwidth_overridable=0;
+int vo_screenheight_overridable=0;
 
 int vo_config_count=0;
 

libvo/video_out.h

@@ -198 +198 @@
 extern int vo_depthonscreen;
 extern int vo_screenwidth;
 extern int vo_screenheight;
+extern int vo_screenwidth_overridable;
+extern int vo_screenheight_overridable;
 
 // requested resolution/bpp:  (-x -y -bpp options)
 extern int vo_dx;