[Mplayer-cvslog] CVS: main/libvo geometry.h, 1.5, 1.6 geometry.c, 1.11, 1.12 x11_common.c, 1.164, 1.165

[Attila Kinali CVS]

CVS change done by Attila Kinali CVS

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

Modified Files:
	geometry.h geometry.c x11_common.c 
Log Message:
dont mess with the window position in xinerama when -geometry changes it.


Index: geometry.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/geometry.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geometry.h	15 Oct 2003 15:17:09 -0000	1.5
+++ geometry.h	24 Feb 2004 21:09:21 -0000	1.6
@@ -4,5 +4,6 @@
 
 extern char *vo_geometry;
 extern int geometry_wh_changed;
+extern int geometry_xy_changed;
 int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh);
 #endif /* !__GEOMETRY_H */

Index: geometry.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/geometry.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- geometry.c	15 Oct 2003 15:17:09 -0000	1.11
+++ geometry.c	24 Feb 2004 21:09:21 -0000	1.12
@@ -9,6 +9,7 @@
 char *vo_geometry = NULL;
 // set when either width or height is changed
 int geometry_wh_changed = 0;
+int geometry_xy_changed = 0;
 
 #define RESET_GEOMETRY width = height = xoff = yoff = xper = yper = -1;
 
@@ -85,6 +86,8 @@
 
 		if( width != -1 || height != -1)
 		    geometry_wh_changed = 1;
+		if( xoff != -1 || yoff != -1)
+		    geometry_xy_changed = 1;
         }
 	return 1;
 }

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	24 Feb 2004 20:08:18 -0000	1.164
+++ x11_common.c	24 Feb 2004 21:09:21 -0000	1.165
@@ -17,6 +17,7 @@
 
 #include "video_out.h"
 #include "aspect.h"
+#include "geometry.h"
 #include "help_mp.h"
 
 #include <X11/Xmd.h>
@@ -1314,7 +1315,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);