# HG changeset patch
# User pontscho
# Date 1011798980 0
# Node ID 9f8a618e87c3fb67899e2f235656a2711f3584a5
# Parent  0d5cba15772beb0ec61dcadf698c4718bd53cfb0
fix screen saver bug under gui

diff -r 0d5cba15772b -r 9f8a618e87c3 libvo/vo_x11.c
--- a/libvo/vo_x11.c	Wed Jan 23 14:11:19 2002 +0000
+++ b/libvo/vo_x11.c	Wed Jan 23 15:16:20 2002 +0000
@@ -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
diff -r 0d5cba15772b -r 9f8a618e87c3 libvo/vo_xmga.c
--- a/libvo/vo_xmga.c	Wed Jan 23 14:11:19 2002 +0000
+++ b/libvo/vo_xmga.c	Wed Jan 23 15:16:20 2002 +0000
@@ -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();
diff -r 0d5cba15772b -r 9f8a618e87c3 libvo/vo_xv.c
--- a/libvo/vo_xv.c	Wed Jan 23 14:11:19 2002 +0000
+++ b/libvo/vo_xv.c	Wed Jan 23 15:16:20 2002 +0000
@@ -377,10 +377,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;
     }
   }
@@ -585,11 +582,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 );
diff -r 0d5cba15772b -r 9f8a618e87c3 libvo/vo_xvidix.c
--- a/libvo/vo_xvidix.c	Wed Jan 23 14:11:19 2002 +0000
+++ b/libvo/vo_xvidix.c	Wed Jan 23 15:16:20 2002 +0000
@@ -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);