# HG changeset patch # User al # Date 1101034407 0 # Node ID 7032d122c7335e47eb8e61967857009fda540167 # Parent aa11fc0f2b087e4b7f061fe8d68ce2cff1f99e86 The GUI shouldn't handle key events at two places. diff -r aa11fc0f2b08 -r 7032d122c733 libvo/x11_common.c --- a/libvo/x11_common.c Sun Nov 21 10:15:10 2004 +0000 +++ b/libvo/x11_common.c Sun Nov 21 10:53:27 2004 +0000 @@ -1057,6 +1057,10 @@ { 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 @@ 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; }