Mercurial > mplayer.hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 7110:86c478bea7ce | 7111:b65b78640d49 |
|---|---|
| 30 | 30 |
| 31 #ifdef HAVE_XF86VM | 31 #ifdef HAVE_XF86VM |
| 32 #include <X11/extensions/xf86vmode.h> | 32 #include <X11/extensions/xf86vmode.h> |
| 33 #endif | 33 #endif |
| 34 | 34 |
| 35 #ifdef HAVE_NEW_INPUT | |
| 36 #include "../input/input.h" | 35 #include "../input/input.h" |
| 37 #include "../input/mouse.h" | 36 #include "../input/mouse.h" |
| 38 #endif | |
| 39 | 37 |
| 40 #ifdef HAVE_NEW_GUI | 38 #ifdef HAVE_NEW_GUI |
| 41 #include "../Gui/interface.h" | 39 #include "../Gui/interface.h" |
| 42 #include "../mplayer.h" | 40 #include "../mplayer.h" |
| 43 #endif | 41 #endif |
| 364 depth, vo_depthonscreen, | 362 depth, vo_depthonscreen, |
| 365 dispName,mLocalDisplay?"local":"remote"); | 363 dispName,mLocalDisplay?"local":"remote"); |
| 366 | 364 |
| 367 vo_wm_type=vo_wm_detect(); | 365 vo_wm_type=vo_wm_detect(); |
| 368 | 366 |
| 367 saver_off(mDisplay); | |
| 369 return 1; | 368 return 1; |
| 370 } | 369 } |
| 371 | 370 |
| 372 void vo_uninit( void ) | 371 void vo_uninit( void ) |
| 373 { | 372 { |
| 530 } | 529 } |
| 531 #endif | 530 #endif |
| 532 | 531 |
| 533 void vo_x11_uninit() | 532 void vo_x11_uninit() |
| 534 { | 533 { |
| 534 saver_on(mDisplay); | |
| 535 if(vo_window!=None) vo_showcursor( mDisplay,vo_window ); | 535 if(vo_window!=None) vo_showcursor( mDisplay,vo_window ); |
| 536 | 536 |
| 537 #ifdef HAVE_NEW_GUI | 537 #ifdef HAVE_NEW_GUI |
| 538 /* destroy window only if it's not controlled by GUI */ | 538 /* destroy window only if it's not controlled by GUI */ |
| 539 if ( !use_gui ) | 539 if ( !use_gui ) |
| 622 } | 622 } |
| 623 break; | 623 break; |
| 624 case MotionNotify: | 624 case MotionNotify: |
| 625 if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; } | 625 if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; } |
| 626 break; | 626 break; |
| 627 #ifdef HAVE_NEW_INPUT | |
| 628 case ButtonPress: | 627 case ButtonPress: |
| 629 if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; } | 628 if ( vo_mouse_autohide ) { vo_showcursor( mydisplay,vo_window ); vo_mouse_counter=vo_mouse_timer_const; } |
| 630 // Ignore mouse whell press event | 629 // Ignore mouse whell press event |
| 631 if(Event.xbutton.button > 3) { | 630 if(Event.xbutton.button > 3) { |
| 632 mplayer_put_key(MOUSE_BTN0+Event.xbutton.button-1); | 631 mplayer_put_key(MOUSE_BTN0+Event.xbutton.button-1); |
| 644 // Ignor mouse button 1 - 3 under gui | 643 // Ignor mouse button 1 - 3 under gui |
| 645 if ( use_gui && ( Event.xbutton.button >= 1 )&&( Event.xbutton.button <= 3 ) ) break; | 644 if ( use_gui && ( Event.xbutton.button >= 1 )&&( Event.xbutton.button <= 3 ) ) break; |
| 646 #endif | 645 #endif |
| 647 mplayer_put_key(MOUSE_BTN0+Event.xbutton.button-1); | 646 mplayer_put_key(MOUSE_BTN0+Event.xbutton.button-1); |
| 648 break; | 647 break; |
| 649 #endif | |
| 650 case PropertyNotify: | 648 case PropertyNotify: |
| 651 { | 649 { |
| 652 char * name = XGetAtomName( mydisplay,Event.xproperty.atom ); | 650 char * name = XGetAtomName( mydisplay,Event.xproperty.atom ); |
| 653 int wm = vo_wm_Unknown; | 651 int wm = vo_wm_Unknown; |
| 654 | 652 |