# HG changeset patch
# User diego
# Date 1079414218 0
# Node ID 8cc4d4344c0fd4ca568b27e68cb24e95ec3f071e
# Parent  0c2b8b731d421ae7ecf280e60d8fa6dbd530a3fd
Don't mess with the window position in xinerama when -geometry changes it.
(Attila Kinali)

diff -r 0c2b8b731d42 -r 8cc4d4344c0f libvo/x11_common.c
--- a/libvo/x11_common.c	Tue Mar 16 05:15:44 2004 +0000
+++ b/libvo/x11_common.c	Tue Mar 16 05:16:58 2004 +0000
@@ -17,6 +17,7 @@
 
 #include "video_out.h"
 #include "aspect.h"
+#include "geometry.h"
 #include "help_mp.h"
 #include "../osdep/timer.h"
 
@@ -1313,7 +1314,7 @@
 #ifdef HAVE_XINERAMA
 void vo_x11_xinerama_move(Display *dsp, Window w)
 {
-	if(XineramaIsActive(dsp))
+	if(XineramaIsActive(dsp) && ! geometry_xy_changed)
 	{
 		 /* printf("XXXX Xinerama screen: x: %hd y: %hd\n",xinerama_x,xinerama_y); */
 		XMoveWindow(dsp,w,xinerama_x,xinerama_y);