summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authoral <al@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-21 10:53:27 +0000
committeral <al@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-21 10:53:27 +0000
commit20de42b61d88818a32fcfe50cf3d70c985741c56 (patch)
treeffbfe3588f2a2d20451a566245ee1c1ed8a4dfe1 /libvo
parentd2d9a23ca9f631ddf608c52507dc1f326c2962ca (diff)
downloadmpv-20de42b61d88818a32fcfe50cf3d70c985741c56.tar.bz2
mpv-20de42b61d88818a32fcfe50cf3d70c985741c56.tar.xz
The GUI shouldn't handle key events at two places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14002 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/x11_common.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index f442b9639c..4d2f4f445b 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -1057,6 +1057,10 @@ int vo_x11_check_events(Display * mydisplay)
{
int key;
+#ifdef HAVE_NEW_GUI
+ if ( use_gui ) { break; }
+#endif
+
XLookupString(&Event.xkey, buf, sizeof(buf), &keySym,
&stat);
#ifdef XF86XK_AudioPause
@@ -1065,10 +1069,6 @@ int vo_x11_check_events(Display * mydisplay)
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;
}