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

[Adam Tla/lka CVS]

CVS change done by Adam Tla/lka CVS

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

Modified Files:
	x11_common.c 
Log Message:
Unmap window before change in decor and size while flipping full screen mode


Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- x11_common.c	3 Apr 2004 13:46:00 -0000	1.168
+++ x11_common.c	5 Apr 2004 04:46:26 -0000	1.169
@@ -621,7 +621,6 @@
   if(vo_fsmode&8){
     XSetTransientForHint (vo_Display, w, RootWindow(vo_Display,mScreen));
   }
-
  vo_MotifHints=XInternAtom( vo_Display,"_MOTIF_WM_HINTS",0 );
  if ( vo_MotifHints != None )
   {
@@ -822,7 +821,8 @@
 
 void vo_x11_sizehint( int x, int y, int width, int height, int max )
 {
- vo_hint.flags=PPosition | PSize | PWinGravity;
+   vo_hint.flags=PPosition | PSize | PWinGravity;
+
  if(vo_x11_keepaspect)
  {
  	vo_hint.flags |= PAspect;
@@ -844,7 +844,7 @@
  vo_hint.min_width = vo_hint.min_height = 4; 
  vo_hint.flags |= PMinSize;
 
- vo_hint.win_gravity=StaticGravity;
+ vo_hint.win_gravity= StaticGravity;
  XSetWMNormalHints( mDisplay,vo_window,&vo_hint );
 }
 
@@ -1081,12 +1081,13 @@
 	else
 		old_gravity = vo_hint.win_gravity;
  }
- if(vo_wm_type==0 && !(vo_fsmode&16))
-//    XUnmapWindow( mDisplay,vo_window );  // required for MWM
-      XWithdrawWindow(mDisplay,vo_window,mScreen);
+ if(vo_wm_type==0 && !(vo_fsmode&16)) {
+    XUnmapWindow( mDisplay,vo_window );  // required for MWM
+    XWithdrawWindow(mDisplay,vo_window,mScreen);
+ }
 
  vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 0 : 1 );
- vo_x11_sizehint( x,y,w,h,0 );
+ vo_x11_sizehint( x,y,w,h,0);
  vo_x11_setlayer( mDisplay,vo_window,vo_fs );
 
  if ((!(vo_fs)) & vo_ontop) vo_x11_setlayer(mDisplay, vo_window,vo_ontop);