diff libvo/x11_common.c @ 7111:b65b78640d49

removed old input code
author alex
date Wed, 28 Aug 2002 15:55:58 +0000
parents 9a69417e2e0f
children ec6dd0a29d93
line wrap: on
line diff
--- a/libvo/x11_common.c	Wed Aug 28 14:17:06 2002 +0000
+++ b/libvo/x11_common.c	Wed Aug 28 15:55:58 2002 +0000
@@ -32,10 +32,8 @@
 #include <X11/extensions/xf86vmode.h>
 #endif
 
-#ifdef HAVE_NEW_INPUT
 #include "../input/input.h"
 #include "../input/mouse.h"
-#endif
 
 #ifdef HAVE_NEW_GUI
 #include "../Gui/interface.h"
@@ -366,6 +364,7 @@
 
  vo_wm_type=vo_wm_detect();
 
+ saver_off(mDisplay);
  return 1;
 }
 
@@ -532,6 +531,7 @@
 
 void vo_x11_uninit()
 {
+    saver_on(mDisplay);
     if(vo_window!=None) vo_showcursor( mDisplay,vo_window );
 
 #ifdef HAVE_NEW_GUI
@@ -624,7 +624,6 @@
       case MotionNotify:
            if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; }
            break;
-#ifdef HAVE_NEW_INPUT
       case ButtonPress:
            if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; }
            // Ignore mouse whell press event
@@ -646,7 +645,6 @@
 	   #endif
            mplayer_put_key(MOUSE_BTN0+Event.xbutton.button-1);
            break;
-#endif
       case PropertyNotify: 
     	   {
 	    char * name = XGetAtomName( mydisplay,Event.xproperty.atom );