brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't screw up the event mask when "managing" our own windows

Browse Source 
When we do pseudo-management on an override-redirect window, we have to be
careful to augment the existing event mask, not replace it, or
delivery of pointer events will be disrupted.

When we unmanage a window, we shouldn't try to unselect events at all,
since that will interfere with event selection done by GDK.

http://bugzilla.gnome.org/show_bug.cgi?id=597763
This commit is contained in:
Owen W. Taylor 2010-07-14 16:08:16 -04:00
parent 77b620e50e
commit e590cd2b99
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/window.c
View File

@ -636,7 +636,11 @@ meta_window_new_with_attrs (MetaDisplay *display,
if (attrs->override_redirect) if (attrs->override_redirect)
event_mask |= StructureNotifyMask; event_mask |= StructureNotifyMask;
XSelectInput (display->xdisplay, xwindow, event_mask); /* If the window is from this client (a menu, say) we need to augment
* the event mask, not replace it. For windows from other clients,
* attrs->your_event_mask will be empty at this point.
*/
XSelectInput (display->xdisplay, xwindow, attrs->your_event_mask | event_mask);
has_shape = FALSE; has_shape = FALSE;
#ifdef HAVE_SHAPE #ifdef HAVE_SHAPE
@ -1518,19 +1522,24 @@ meta_window_unmanage (MetaWindow *window,
XRemoveFromSaveSet (window->display->xdisplay, XRemoveFromSaveSet (window->display->xdisplay,
window->xwindow); window->xwindow);
/* Don't get events on not-managed windows */ /* Even though the window is now unmanaged, we can't unselect events. This
XSelectInput (window->display->xdisplay, * window might be a window from this process, like a GdkMenu, in
window->xwindow, * which case it will have pointer events and so forth selected
NoEventMask); * for it by GDK. There's no way to disentangle those events from the events
* we've selected. Even for a window from a different X client,
* GDK could also have selected events for it for IPC purposes, so we
* can't unselect in that case either.
*
* Similarly, we can't unselected for events on window->user_time_window.
* It might be our own GDK focus window, or it might be a window that a
* different client is using for multiple different things:
* _NET_WM_USER_TIME_WINDOW and IPC, perhaps.
*/
/* Stop getting events for the window's _NET_WM_USER_TIME_WINDOW too */
if (window->user_time_window != None) if (window->user_time_window != None)
{ {
meta_display_unregister_x_window (window->display, meta_display_unregister_x_window (window->display,
window->user_time_window); window->user_time_window);
XSelectInput (window->display->xdisplay,
window->user_time_window,
NoEventMask);
window->user_time_window = None; window->user_time_window = None;
} }