[MPlayer-cvslog] CVS: main/libvo x11_common.c,1.183,1.184

Alexander Strasser beastd syncmail at mplayerhq.hu
Sun Nov 21 11:53:30 CET 2004


CVS change done by Alexander Strasser (beastd)

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv26077/libvo

Modified Files:
	x11_common.c 
Log Message:
The GUI shouldn't handle key events at two places.


Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- x11_common.c	15 Nov 2004 14:56:18 -0000	1.183
+++ x11_common.c	21 Nov 2004 10:53:27 -0000	1.184
@@ -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;
                 }




More information about the MPlayer-cvslog mailing list