[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.71,1.72

[Adam Tla/lka]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv15920/libvo

Modified Files:
	vo_x11.c 
Log Message:
changes in fullscreen/window switching code to obtain returning to
old window position (icewm aware) while using -vo x11 -zoom


Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- vo_x11.c	17 Feb 2002 08:24:43 -0000	1.71
+++ vo_x11.c	21 Feb 2002 10:49:57 -0000	1.72
@@ -618,10 +618,12 @@
 	int foo;
 	Window root;
 
+        vo_x11_decoration( mDisplay,mywindow,0 );
 	XGetGeometry(mDisplay, mywindow, &root, &foo, &foo,
-	    &vo_fs_oldwidth, &vo_fs_oldheight, &foo, &foo);
-	XTranslateCoordinates(mDisplay, mywindow, root, 0, 0,
-	    &vo_fs_oldx, &vo_fs_oldy, &foo);
+		     &vo_fs_oldwidth, &vo_fs_oldheight, &foo, &foo);
+	    
+        XTranslateCoordinates(mDisplay, mywindow, root, 0, 0,
+				  &vo_fs_oldx, &vo_fs_oldy,(Window *) &foo);
 
 	mp_msg(MSGT_VO,MSGL_V,"X11 Fullscreen: saved old place: %dx%d-%dx%d\n",
 	    vo_fs_oldx, vo_fs_oldy, vo_fs_oldwidth, vo_fs_oldheight);
@@ -631,12 +633,13 @@
 	vo_dheight = vo_screenheight;
 	XMoveResizeWindow(mDisplay, mywindow, 0, 0,
 	    vo_screenwidth, vo_screenheight);
-	vo_x11_decoration( mDisplay,mywindow,0 );
+	XSync(mDisplay, False);
     }
     else
     {
 	XMoveResizeWindow(mDisplay, mywindow, vo_fs_oldx, vo_fs_oldy, 
 	    vo_fs_oldwidth, vo_fs_oldheight);
+	vo_x11_decoration( mDisplay,mywindow,1 );
 
 	/* restore */
 	vo_dwidth = vo_fs_oldwidth;
@@ -645,6 +648,7 @@
 	/* clean */
 	vo_fs_oldwidth = -1;
 	vo_fs_oldheight = -1;
+	XSync(mDisplay, False);
     }
   }
   return VO_NOTIMPL;