[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.98,1.99 vo_xmga.c,1.63,1.64 vo_xv.c,1.82,1.83

[Zoltan Ponekker]

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

Modified Files:
	vo_x11.c vo_xmga.c vo_xv.c 
Log Message:
fix -fs and 'f'

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- vo_x11.c	3 May 2002 20:57:13 -0000	1.98
+++ vo_x11.c	6 May 2002 16:56:41 -0000	1.99
@@ -303,11 +303,11 @@
    }
     else
 #endif
-    if ( fullscreen )
-     {
-      hint.width=vo_screenwidth;
-      hint.height=vo_screenheight;
-     }
+//    if ( fullscreen )
+//     {
+//      hint.width=vo_screenwidth;
+//      hint.height=vo_screenheight;
+//     }
     hint.flags=PPosition | PSize;
 
     bg=WhitePixel( mDisplay,mScreen );
@@ -344,10 +344,10 @@
 
     vo_x11_classhint( mDisplay,vo_window,"x11" );
     vo_hidecursor(mDisplay,vo_window);
-    if ( fullscreen ) vo_x11_decoration( mDisplay,vo_window,0 );
     XSelectInput( mDisplay,vo_window,StructureNotifyMask );
     XSetStandardProperties( mDisplay,vo_window,title,title,None,NULL,0,&hint );
     XMapWindow( mDisplay,vo_window );
+    if ( fullscreen ) 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.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- vo_xmga.c	5 May 2002 18:16:27 -0000	1.63
+++ vo_xmga.c	6 May 2002 16:56:41 -0000	1.64
@@ -232,11 +232,11 @@
  mvWidth=width; mvHeight=height;
 
  wndX=0; wndY=0;
- vo_fs=fullscreen&1;
  vo_dwidth=d_width; vo_dheight=d_height;
- if ( vo_fs )
-  { vo_old_width=d_width; vo_old_height=d_height; }
  vo_mouse_autohide=1;
+// vo_fs=fullscreen&1;
+// if ( vo_fs )
+//  { vo_old_width=d_width; vo_old_height=d_height; }
 
  switch ( vo_depthonscreen )
   {
@@ -259,8 +259,8 @@
   {
    if ( vo_fs )
     {
-     vo_dwidth=vo_screenwidth;
-     vo_dheight=vo_screenheight;
+//     vo_dwidth=vo_screenwidth;
+//     vo_dheight=vo_screenheight;
 #ifdef X11_FULLSCREEN
      aspect(&dwidth,&dheight,A_ZOOM);
 #endif
@@ -292,10 +292,12 @@
    vo_x11_classhint( mDisplay,vo_window,"xmga" );
    vo_hidecursor(mDisplay,vo_window);
 
-   if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 );
+//   if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 );
 
    XStoreName( mDisplay,vo_window,mTitle );
    XMapWindow( mDisplay,vo_window );
+
+   if ( fullscreen&1 ) vo_x11_fullscreen();
 		   
 #ifdef HAVE_XINERAMA
    vo_x11_xinerama_move(mDisplay,vo_window);

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- vo_xv.c	5 May 2002 18:16:27 -0000	1.82
+++ vo_xv.c	6 May 2002 16:56:41 -0000	1.83
@@ -337,9 +337,9 @@
  vo_mouse_autohide=1;
 
  vo_dwidth=d_width; vo_dheight=d_height;
- vo_fs=flags&1;
- if ( vo_fs )
-  { vo_old_width=d_width; vo_old_height=d_height; }
+// vo_fs=flags&1;
+// if ( vo_fs )
+//  { vo_old_width=d_width; vo_old_height=d_height; }
      
 #ifdef HAVE_XF86VM
  if( flags&0x02 ) vm = 1;
@@ -387,8 +387,8 @@
 #endif
    if ( vo_fs )
     {
-     hint.width=vo_screenwidth;
-     hint.height=vo_screenheight;
+//     hint.width=vo_screenwidth;
+//     hint.height=vo_screenheight;
 #ifdef X11_FULLSCREEN
      /* this code replaces X11_FULLSCREEN hack in mplayer.c
       * aspect() is available through aspect.h for all vos.
@@ -436,8 +436,9 @@
    );
    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 ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 );
    XMapWindow(mDisplay, vo_window);
+   if ( flags&1 ) vo_x11_fullscreen();
 #ifdef HAVE_XINERAMA
    vo_x11_xinerama_move(mDisplay,vo_window);
 #endif