Fix and improve xinerama support

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18117 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 3 insertions, 4 deletions

diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index 944bdad4b6..31934fdaa3 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -127,7 +127,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 
     aspect_save_orig(width, height);
     aspect_save_prescale(d_width, d_height);
-    aspect_save_screenres(vo_screenwidth, vo_screenheight);
+    update_xinerama_info();
 
     mvWidth = width;
     mvHeight = height;
@@ -138,6 +138,8 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
     vo_dy = (vo_screenheight - d_height) / 2;
     geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth,
              vo_screenheight);
+    vo_dx += xinerama_x;
+    vo_dy += xinerama_y;
     vo_dwidth = d_width;
     vo_dheight = d_height;
     vo_mouse_autohide = 1;
@@ -241,9 +243,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
                 if (flags & VOFLAG_FULLSCREEN)
                     vo_x11_fullscreen();
 
-#ifdef HAVE_XINERAMA
-                vo_x11_xinerama_move(mDisplay, vo_window);
-#endif
             } else if (!(flags & VOFLAG_FULLSCREEN))
                 XMoveResizeWindow(mDisplay, vo_window, vo_dx, vo_dy,
                                   vo_dwidth, vo_dheight);