isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-28 20:48:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enforce a policy of single-handling of key events

Browse Source 
Only process each key event once. If all keys are grabbed, then
don't also look for handlers for a key shortcut after processing
the grab op. If all keys are grabbed or we find a key shortcut,
don't pass the event on to the compositing mananger.

http://bugzilla.gnome.org/show_bug.cgi?id=590754
This commit is contained in:
Owen W. Taylor
2009-08-11 19:41:50 -04:00
parent 7a6968cb46
commit b1776b5ae5
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/display.c
View File

@@ -1509,6 +1509,7 @@ event_callback (XEvent *event,
MetaDisplay *display;
Window modified;
gboolean frame_was_receiver;
gboolean bypass_compositor;
gboolean filter_out_event;
display = data;
@@ -1522,6 +1523,7 @@ event_callback (XEvent *event,
sn_display_process_event (display->sn_display, event);
#endif
bypass_compositor = FALSE;
filter_out_event = FALSE;
display->current_time = event_get_time (display, event);
display->xinerama_cache_invalidated = TRUE;
@@ -1668,7 +1670,13 @@ event_callback (XEvent *event,
{
case KeyPress:
case KeyRelease:
meta_display_process_key_event (display, window, event);
/* For key events, it's important to enforce single-handling, or
* we can get into a confused state. So if a keybinding is
* handled (because it's one of our hot-keys, or because we are
* in a keyboard-grabbed mode like moving a window, we don't
* want to pass the key event to the compositor at all.
*/
bypass_compositor = meta_display_process_key_event (display, window, event);
break;
case ButtonPress:
if (event->xbutton.button == 4 || event->xbutton.button == 5)
@@ -2534,7 +2542,7 @@ event_callback (XEvent *event,
break;
}
if (display->compositor)
if (display->compositor && !bypass_compositor)
{
if (meta_compositor_process_event (display->compositor,
event,