[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.169,1.170

[Dominik Mierzejewski CVS]

CVS change done by Dominik Mierzejewski CVS

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

Modified Files:
	x11_common.c 
Log Message:
full screen flipping synchronization corrections (by Adam Tla/lka)


Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- x11_common.c	5 Apr 2004 21:33:51 -0000	1.169
+++ x11_common.c	5 Apr 2004 21:35:30 -0000	1.170
@@ -78,6 +78,7 @@
 int vo_mouse_autohide = 0;
 int vo_wm_type = 0;
 static int vo_fs_type = 0;
+static int vo_fs_flip = 0;
 char** vo_fstype_list;
 
 /* if equal to 1 means that WM is a metacity (broken as hell) */
@@ -814,6 +815,7 @@
       case MapNotify:
 		vo_hint.win_gravity = old_gravity;
 		XSetWMNormalHints( mDisplay,vo_window,&vo_hint );
+		vo_fs_flip = 0;
 	   break;
      }
   }
@@ -1056,7 +1058,7 @@
 {
  int x,y,w,h;
 
- if ( WinID >= 0 ) return;
+ if ( WinID >= 0 || vo_fs_flip) return;
 
  if ( vo_fs ){
    // fs->win
@@ -1084,6 +1086,7 @@
  if(vo_wm_type==0 && !(vo_fsmode&16)) {
     XUnmapWindow( mDisplay,vo_window );  // required for MWM
     XWithdrawWindow(mDisplay,vo_window,mScreen);
+    vo_fs_flip = 1;
  }
 
  vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 0 : 1 );