[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.164,1.165

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv5536

Modified Files:
	x11_common.c 
Log Message:
Don't mess with the window position in xinerama when -geometry changes it.
(Attila Kinali)


Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- x11_common.c	16 Mar 2004 05:15:44 -0000	1.164
+++ x11_common.c	16 Mar 2004 05:16:58 -0000	1.165
@@ -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);