[MPlayer-cvslog] r31622 - trunk/libvo/x11_common.c

[reimar]

Author: reimar
Date: Fri Jul  2 21:50:23 2010
New Revision: 31622

Log:
Re-enable keyboard input for GUI video window.

Modified:
   trunk/libvo/x11_common.c

Modified: trunk/libvo/x11_common.c
==============================================================================
--- trunk/libvo/x11_common.c	Fri Jul  2 21:19:21 2010	(r31621)
+++ trunk/libvo/x11_common.c	Fri Jul  2 21:50:23 2010	(r31622)
@@ -1085,9 +1085,14 @@ void vo_x11_create_vo_window(XVisualInfo
       XInstallColormap(mDisplay, col_map);
     }
     if (WinID) {
-      vo_x11_update_geometry();
       // Expose events can only really be handled by us, so request them.
-      vo_x11_selectinput_witherr(mDisplay, vo_window, ExposureMask);
+      // Do not remove existing masks so GUI keeps working.
+      XWindowAttributes attribs;
+      XGetWindowAttributes(mDisplay, vo_window, &attribs);
+      vo_x11_selectinput_witherr(mDisplay, vo_window,
+                                 attribs.your_event_mask | ExposureMask);
+
+      vo_x11_update_geometry();
     } else
       // Do not capture events since it might break the parent application
       // if it relies on events being forwarded to the parent of WinID.