diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-22 15:22:27 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-22 15:22:27 +0000 |
| commit | 5d1b7ddc7883f40bdaa4c6fd76847c0fabc37e12 (patch) | |
| tree | 3039cc2ef4b01af11e7ec42446cadb6105075b41 /libvo/vo_x11.c | |
| parent | 6505ed2c9a7db402d100929772b527f090717121 (diff) | |
| download | mpv-5d1b7ddc7883f40bdaa4c6fd76847c0fabc37e12.tar.bz2 mpv-5d1b7ddc7883f40bdaa4c6fd76847c0fabc37e12.tar.xz | |
mondom fix bazmeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4806 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_x11.c')
| -rw-r--r-- | libvo/vo_x11.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 6bbb779ba7..862650ab6d 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -290,8 +290,7 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t aspect= ((1<<16)*d_width + d_height/2)/d_height; #ifdef HAVE_NEW_GUI - if ( vo_window != None ) { vo_window=vo_window; vo_gc=vo_gc; } - else + if ( vo_window == None ) #endif { if( !vo_init() ) return 0; // Can't open X11 @@ -376,6 +375,8 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t XSync( mDisplay,False ); vo_gc=XCreateGC( mDisplay,vo_window,0L,&xgcv ); + XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask ); + #ifdef HAVE_XF86VM if ( vm ) { @@ -431,16 +432,6 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t return -1; } -#ifdef HAVE_NEW_GUI - if ( vo_window == None ) -#endif - { - XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask -#ifdef HAVE_NEW_INPUT - | ButtonPressMask | ButtonReleaseMask -#endif - ); - } saver_off(mDisplay); return 0; } |