[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.47,1.48 vo_xmga.c,1.39,1.40 vo_xv.c,1.42,1.43 vo_xvidix.c,1.10,1.11

[Zoltan Ponekker]

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

Modified Files:
	vo_x11.c vo_xmga.c vo_xv.c vo_xvidix.c 
Log Message:
fix screen saver bug under gui

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- vo_x11.c	7 Jan 2002 17:33:59 -0000	1.47
+++ vo_x11.c	23 Jan 2002 15:16:20 -0000	1.48
@@ -431,8 +431,8 @@
 #endif 
   {
    XSelectInput( mDisplay,mywindow,StructureNotifyMask | KeyPressMask );
-   saver_off(mDisplay);
   }
+ saver_off(mDisplay);
  return 0;
 }
 
@@ -579,11 +579,11 @@
 static void
 uninit(void)
 {
+ saver_on(mDisplay); // screen saver back on
 #ifdef HAVE_NEW_GUI
  if ( vo_window == None )
 #endif
  {
-  saver_on(mDisplay); // screen saver back on
   XDestroyWindow( mDisplay,mywindow );
  } 
 #ifdef HAVE_XF86VM

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- vo_xmga.c	22 Jan 2002 12:00:15 -0000	1.39
+++ vo_xmga.c	23 Jan 2002 15:16:20 -0000	1.40
@@ -368,11 +368,8 @@
    XFlush( mDisplay );
    XSync( mDisplay,False );
  }
- 
-#ifdef HAVE_NEW_GUI
- if ( vo_window == None )
-#endif
-  saver_off(mDisplay);
+
+ saver_off(mDisplay);
 
  return 0;
 }
@@ -384,11 +381,11 @@
 static void
 uninit(void)
 {
+ saver_on(mDisplay);
 #ifdef HAVE_NEW_GUI
  if ( vo_window == None )
 #endif
  {
-  saver_on(mDisplay);
   XDestroyWindow( mDisplay,mWindow );
  }
  mga_uninit();

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- vo_xv.c	22 Jan 2002 18:19:02 -0000	1.42
+++ vo_xv.c	23 Jan 2002 15:16:20 -0000	1.43
@@ -376,10 +376,7 @@
        drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
        printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
       }
-#ifdef HAVE_NEW_GUI
-     if ( vo_window == None )
-#endif
-      saver_off(mDisplay);  // turning off screen saver
+     saver_off(mDisplay);  // turning off screen saver
      return 0;
     }
   }
@@ -584,11 +581,11 @@
 static void uninit(void) 
 {
  int i;
+ saver_on(mDisplay); // screen saver back on
 #ifdef HAVE_NEW_GUI
  if ( vo_window == None )
 #endif
  {
-  saver_on(mDisplay); // screen saver back on
   XDestroyWindow( mDisplay,mywindow );
  }
  for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i );

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vo_xvidix.c	19 Jan 2002 22:43:19 -0000	1.10
+++ vo_xvidix.c	23 Jan 2002 15:16:20 -0000	1.11
@@ -380,9 +380,6 @@
 	XSync(mDisplay, False);
     }
 
-#ifdef HAVE_NEW_GUI
-    if (vo_window == None)
-#endif
     saver_off(mDisplay); /* turning off screen saver */
 
     return(0);
@@ -468,12 +465,12 @@
 static void uninit(void)
 {
     vidix_term();
+    saver_on(mDisplay); /* screen saver back on */
 #ifdef HAVE_NEW_GUI
     /* destroy window only if it's not controlled by GUI */
     if (vo_window == None)
 #endif
     {
-	saver_on(mDisplay); /* screen saver back on */
 	if (!(WinID > 0)) /* don't destory window if -wid specified */
 	{
 	    XDestroyWindow(mDisplay, mWindow);