[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.94,1.95

[Arpi of Ize]

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

Modified Files:
	x11_common.c 
Log Message:
this piece of code should prevent major fullscreen screwups, which can
be otherwise triggered by rapid switching to fullscreen and back.

patch by Jindrich Makovicka <makovick at kmlinux.fjfi.cvut.cz>



Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- x11_common.c	9 Aug 2002 17:43:49 -0000	1.94
+++ x11_common.c	21 Aug 2002 21:24:23 -0000	1.95
@@ -588,6 +588,8 @@
            ret|=VO_EVENT_EXPOSE;
            break;
       case ConfigureNotify:
+	   if (!vo_fs && (Event.xconfigure.width == vo_screenwidth || Event.xconfigure.height == vo_screenheight)) break;
+	   if (vo_fs && Event.xconfigure.width != vo_screenwidth && Event.xconfigure.height != vo_screenheight) break;
            vo_dwidth=Event.xconfigure.width;
            vo_dheight=Event.xconfigure.height;
 #if 0
@@ -755,6 +757,9 @@
  int x=0,y=0,w=vo_screenwidth,h=vo_screenheight;
 
  if ( WinID >= 0 ) return;
+
+ if ( !vo_fs && (vo_dwidth == vo_screenwidth || vo_dheight == vo_screenheight)) return;
+ if ( vo_fs && vo_dwidth != vo_screenwidth && vo_dheight != vo_screenheight) return;
 
  if ( vo_fs )
   { vo_fs=VO_FALSE; x=vo_old_x; y=vo_old_y; w=vo_old_width; h=vo_old_height; }