mirror of
https://github.com/mpv-player/mpv
synced 2025-01-01 04:36:24 +01:00
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
This commit is contained in:
parent
d2d9a23ca9
commit
20de42b61d
@ -1057,6 +1057,10 @@ int vo_x11_check_events(Display * mydisplay)
|
|||||||
{
|
{
|
||||||
int key;
|
int key;
|
||||||
|
|
||||||
|
#ifdef HAVE_NEW_GUI
|
||||||
|
if ( use_gui ) { break; }
|
||||||
|
#endif
|
||||||
|
|
||||||
XLookupString(&Event.xkey, buf, sizeof(buf), &keySym,
|
XLookupString(&Event.xkey, buf, sizeof(buf), &keySym,
|
||||||
&stat);
|
&stat);
|
||||||
#ifdef XF86XK_AudioPause
|
#ifdef XF86XK_AudioPause
|
||||||
@ -1065,10 +1069,6 @@ int vo_x11_check_events(Display * mydisplay)
|
|||||||
key =
|
key =
|
||||||
((keySym & 0xff00) !=
|
((keySym & 0xff00) !=
|
||||||
0 ? ((keySym & 0x00ff) + 256) : (keySym));
|
0 ? ((keySym & 0x00ff) + 256) : (keySym));
|
||||||
#ifdef HAVE_NEW_GUI
|
|
||||||
if ((use_gui) && (key == wsEnter))
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
vo_x11_putkey(key);
|
vo_x11_putkey(key);
|
||||||
ret |= VO_EVENT_KEYPRESS;
|
ret |= VO_EVENT_KEYPRESS;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user