[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.99,1.100 vo_xmga.c,1.64,1.65 vo_xv.c,1.83,1.84

[Zoltan Ponekker]

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

Modified Files:
	vo_x11.c vo_xmga.c vo_xv.c 
Log Message:
-fs bug fix with mwm

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- vo_x11.c	6 May 2002 16:56:41 -0000	1.99
+++ vo_x11.c	6 May 2002 19:46:55 -0000	1.100
@@ -343,11 +343,12 @@
                          xswa.border_pixel,depth,CopyFromParent,vinfo.visual,xswamask,&xswa );
 
     vo_x11_classhint( mDisplay,vo_window,"x11" );
+    if ( flags&1 ) vo_x11_decoration( mDisplay,vo_window,0 );
     vo_hidecursor(mDisplay,vo_window);
     XSelectInput( mDisplay,vo_window,StructureNotifyMask );
     XSetStandardProperties( mDisplay,vo_window,title,title,None,NULL,0,&hint );
     XMapWindow( mDisplay,vo_window );
-    if ( fullscreen ) vo_x11_fullscreen();
+    if ( flags&1 ) vo_x11_fullscreen();
 #ifdef HAVE_XINERAMA
    vo_x11_xinerama_move(mDisplay,vo_window);
 #endif

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- vo_xmga.c	6 May 2002 16:56:41 -0000	1.64
+++ vo_xmga.c	6 May 2002 19:46:55 -0000	1.65
@@ -292,7 +292,7 @@
    vo_x11_classhint( mDisplay,vo_window,"xmga" );
    vo_hidecursor(mDisplay,vo_window);
 
-//   if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 );
+   if ( fullscreen&1 ) vo_x11_decoration( mDisplay,vo_window,0 );
 
    XStoreName( mDisplay,vo_window,mTitle );
    XMapWindow( mDisplay,vo_window );

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- vo_xv.c	6 May 2002 16:56:41 -0000	1.83
+++ vo_xv.c	6 May 2002 19:46:55 -0000	1.84
@@ -436,7 +436,7 @@
    );
    XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint);
    XSetWMNormalHints( mDisplay,vo_window,&hint );
-//   if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 );
+   if ( flags&1 ) vo_x11_decoration( mDisplay,vo_window,0 );
    XMapWindow(mDisplay, vo_window);
    if ( flags&1 ) vo_x11_fullscreen();
 #ifdef HAVE_XINERAMA