summaryrefslogtreecommitdiffstats
path: root/libvo/x11_common.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-07 11:57:33 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-07 11:57:33 +0000
commitd751518e07385c327359fd1ee6d2a6c7c21e5a5a (patch)
treec3f1d8346f524170886dd6af660d1ebc0f65d810 /libvo/x11_common.c
parenteb57e0fd471fa6ace4eec7772e462ef312565cae (diff)
downloadmpv-d751518e07385c327359fd1ee6d2a6c7c21e5a5a.tar.bz2
mpv-d751518e07385c327359fd1ee6d2a6c7c21e5a5a.tar.xz
small bug fixed and workarounds :(
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4975 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/x11_common.c')
-rw-r--r--libvo/x11_common.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 5a7a12373f..d5ab2db3b5 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -473,9 +473,16 @@ int vo_x11_check_events(Display *mydisplay){
ret|=VO_EVENT_RESIZE;
break;
case KeyPress:
- XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat );
- vo_x11_putkey( ( (keySym&0xff00) != 0?( (keySym&0x00ff) + 256 ):( keySym ) ) );
- ret|=VO_EVENT_KEYPRESS;
+ {
+ int key;
+ XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat );
+ key=( (keySym&0xff00) != 0?( (keySym&0x00ff) + 256 ):( keySym ) );
+ #ifdef HAVE_NEW_GUI
+ if ( ( use_gui )&&( key == wsEnter ) ) break;
+ #endif
+ vo_x11_putkey( key );
+ ret|=VO_EVENT_KEYPRESS;
+ }
break;
#ifdef HAVE_NEW_INPUT
case ButtonPress: