isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-19 14:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

keybindings: Fix ungrabbing of keys

Browse Source 
XUngrabKey() doesn't work for XI2 grabs and XI2 doesn't provide API
with similar functionality. As such, we have to refactor the code a
bit to be able to call XIUngrabKeycode() for each key binding, then
reload keybindings and finally grab the new ones.

https://bugzilla.gnome.org/show_bug.cgi?id=697003
This commit is contained in:
Rui Matos 2013-03-31 19:06:40 +02:00
parent 7cfaa6a6a8
commit c7dc6928a9
1 changed files with 88 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
src/core/keybindings.c
View File

@ -147,7 +147,8 @@ static gboolean process_workspace_switch_grab (MetaDisplay *display,
XIDeviceEvent *event, XIDeviceEvent *event,
KeySym keysym); KeySym keysym);
static void regrab_key_bindings (MetaDisplay *display); static void grab_key_bindings (MetaDisplay *display);
static void ungrab_key_bindings (MetaDisplay *display);
static GHashTable *key_handlers; static GHashTable *key_handlers;
@ -531,7 +532,7 @@ rebuild_special_bindings (MetaDisplay *display)
} }
static void static void
regrab_key_bindings (MetaDisplay *display) ungrab_key_bindings (MetaDisplay *display)
{ {
GSList *tmp; GSList *tmp;
GSList *windows; GSList *windows;
@ -544,7 +545,6 @@ regrab_key_bindings (MetaDisplay *display)
MetaScreen *screen = tmp->data; MetaScreen *screen = tmp->data;
meta_screen_ungrab_keys (screen); meta_screen_ungrab_keys (screen);
meta_screen_grab_keys (screen);
tmp = tmp->next; tmp = tmp->next;
} }
@ -556,6 +556,38 @@ regrab_key_bindings (MetaDisplay *display)
MetaWindow *w = tmp->data; MetaWindow *w = tmp->data;
meta_window_ungrab_keys (w); meta_window_ungrab_keys (w);
tmp = tmp->next;
}
meta_error_trap_pop (display);
g_slist_free (windows);
}
static void
grab_key_bindings (MetaDisplay *display)
{
GSList *tmp;
GSList *windows;
meta_error_trap_push (display); /* for efficiency push outer trap */
tmp = display->screens;
while (tmp != NULL)
{
MetaScreen *screen = tmp->data;
meta_screen_grab_keys (screen);
tmp = tmp->next;
}
windows = meta_display_list_windows (display, META_LIST_DEFAULT);
tmp = windows;
while (tmp != NULL)
{
MetaWindow *w = tmp->data;
meta_window_grab_keys (w); meta_window_grab_keys (w);
tmp = tmp->next; tmp = tmp->next;
@ -796,6 +828,8 @@ meta_display_process_mapping_event (MetaDisplay *display,
if (keymap_changed || modmap_changed) if (keymap_changed || modmap_changed)
{ {
ungrab_key_bindings (display);
if (keymap_changed) if (keymap_changed)
reload_keymap (display); reload_keymap (display);
@ -809,7 +843,7 @@ meta_display_process_mapping_event (MetaDisplay *display,
reload_modifiers (display); reload_modifiers (display);
regrab_key_bindings (display); grab_key_bindings (display);
} }
} }
@ -824,11 +858,12 @@ bindings_changed_callback (MetaPreference pref,
switch (pref) switch (pref)
{ {
case META_PREF_KEYBINDINGS: case META_PREF_KEYBINDINGS:
ungrab_key_bindings (display);
rebuild_key_binding_table (display); rebuild_key_binding_table (display);
rebuild_special_bindings (display); rebuild_special_bindings (display);
reload_keycodes (display); reload_keycodes (display);
reload_modifiers (display); reload_modifiers (display);
regrab_key_bindings (display); grab_key_bindings (display);
break; break;
default: default:
break; break;
@ -947,21 +982,12 @@ meta_change_keygrab (MetaDisplay *display,
} }
static void static void
meta_grab_key (MetaDisplay *display, change_binding_keygrabs (MetaKeyBinding *bindings,
Window xwindow, int n_bindings,
int keysym, MetaDisplay *display,
unsigned int keycode, Window xwindow,
int modmask) gboolean binding_per_window,
{ gboolean grab)
meta_change_keygrab (display, xwindow, TRUE, keysym, keycode, modmask);
}
static void
grab_keys (MetaKeyBinding *bindings,
int n_bindings,
MetaDisplay *display,
Window xwindow,
gboolean binding_per_window)
{ {
int i; int i;
@ -976,10 +1002,10 @@ grab_keys (MetaKeyBinding *bindings,
!!(bindings[i].handler->flags & META_KEY_BINDING_PER_WINDOW) && !!(bindings[i].handler->flags & META_KEY_BINDING_PER_WINDOW) &&
bindings[i].keycode != 0) bindings[i].keycode != 0)
{ {
meta_grab_key (display, xwindow, meta_change_keygrab (display, xwindow, grab,
bindings[i].keysym, bindings[i].keysym,
bindings[i].keycode, bindings[i].keycode,
bindings[i].mask); bindings[i].mask);
} }
++i; ++i;
@ -989,51 +1015,33 @@ grab_keys (MetaKeyBinding *bindings,
} }
static void static void
ungrab_all_keys (MetaDisplay *display, meta_screen_change_keygrabs (MetaScreen *screen,
Window xwindow) gboolean grab)
{ {
if (meta_is_debugging ()) MetaDisplay *display = screen->display;
meta_error_trap_push_with_return (display);
else
meta_error_trap_push (display);
XUngrabKey (display->xdisplay, AnyKey, AnyModifier, if (display->overlay_key_combo.keycode != 0)
xwindow); meta_change_keygrab (display, screen->xroot, grab,
display->overlay_key_combo.keysym,
display->overlay_key_combo.keycode,
display->overlay_key_combo.modifiers);
if (meta_is_debugging ()) change_binding_keygrabs (screen->display->key_bindings,
{ screen->display->n_key_bindings,
int result; screen->display, screen->xroot,
FALSE, grab);
result = meta_error_trap_pop_with_return (display);
if (result != Success)
meta_topic (META_DEBUG_KEYBINDINGS,
"Ungrabbing all keys on 0x%lx failed\n", xwindow);
}
else
meta_error_trap_pop (display);
} }
void void
meta_screen_grab_keys (MetaScreen *screen) meta_screen_grab_keys (MetaScreen *screen)
{ {
MetaDisplay *display = screen->display;
if (screen->all_keys_grabbed) if (screen->all_keys_grabbed)
return; return;
if (screen->keys_grabbed) if (screen->keys_grabbed)
return; return;
if (display->overlay_key_combo.keycode != 0) meta_screen_change_keygrabs (screen, TRUE);
meta_grab_key (display, screen->xroot,
display->overlay_key_combo.keysym,
display->overlay_key_combo.keycode,
display->overlay_key_combo.modifiers);
grab_keys (screen->display->key_bindings,
screen->display->n_key_bindings,
screen->display, screen->xroot,
FALSE);
screen->keys_grabbed = TRUE; screen->keys_grabbed = TRUE;
} }
@ -1041,11 +1049,23 @@ meta_screen_grab_keys (MetaScreen *screen)
void void
meta_screen_ungrab_keys (MetaScreen *screen) meta_screen_ungrab_keys (MetaScreen *screen)
{ {
if (screen->keys_grabbed) if (!screen->keys_grabbed)
{ return;
ungrab_all_keys (screen->display, screen->xroot);
screen->keys_grabbed = FALSE; meta_screen_change_keygrabs (screen, FALSE);
}
screen->keys_grabbed = FALSE;
}
static void
meta_window_change_keygrabs (MetaWindow *window,
Window xwindow,
gboolean grab)
{
change_binding_keygrabs (window->display->key_bindings,
window->display->n_key_bindings,
window->display, xwindow,
TRUE, grab);
} }
void void
@ -1058,7 +1078,7 @@ meta_window_grab_keys (MetaWindow *window)
|| window->override_redirect) || window->override_redirect)
{ {
if (window->keys_grabbed) if (window->keys_grabbed)
ungrab_all_keys (window->display, window->xwindow); meta_window_change_keygrabs (window, window->xwindow, FALSE);
window->keys_grabbed = FALSE; window->keys_grabbed = FALSE;
return; return;
} }
@ -1066,7 +1086,7 @@ meta_window_grab_keys (MetaWindow *window)
if (window->keys_grabbed) if (window->keys_grabbed)
{ {
if (window->frame && !window->grab_on_frame) if (window->frame && !window->grab_on_frame)
ungrab_all_keys (window->display, window->xwindow); meta_window_change_keygrabs (window, window->xwindow, FALSE);
else if (window->frame == NULL && else if (window->frame == NULL &&
window->grab_on_frame) window->grab_on_frame)
; /* continue to regrab on client window */ ; /* continue to regrab on client window */
@ -1074,11 +1094,9 @@ meta_window_grab_keys (MetaWindow *window)
return; /* already all good */ return; /* already all good */
} }
grab_keys (window->display->key_bindings, meta_window_change_keygrabs (window,
window->display->n_key_bindings, window->frame ? window->frame->xwindow : window->xwindow,
window->display, TRUE);
window->frame ? window->frame->xwindow : window->xwindow,
TRUE);
window->keys_grabbed = TRUE; window->keys_grabbed = TRUE;
window->grab_on_frame = window->frame != NULL; window->grab_on_frame = window->frame != NULL;
@ -1091,11 +1109,9 @@ meta_window_ungrab_keys (MetaWindow *window)
{ {
if (window->grab_on_frame && if (window->grab_on_frame &&
window->frame != NULL) window->frame != NULL)
ungrab_all_keys (window->display, meta_window_change_keygrabs (window, window->frame->xwindow, FALSE);
window->frame->xwindow);
else if (!window->grab_on_frame) else if (!window->grab_on_frame)
ungrab_all_keys (window->display, meta_window_change_keygrabs (window, window->xwindow, FALSE);
window->xwindow);
window->keys_grabbed = FALSE; window->keys_grabbed = FALSE;
} }
@ -1151,7 +1167,7 @@ meta_display_grab_accelerator (MetaDisplay *display,
for (l = display->screens; l; l = l->next) for (l = display->screens; l; l = l->next)
{ {
MetaScreen *screen = l->data; MetaScreen *screen = l->data;
meta_grab_key (display, screen->xroot, keysym, keycode, mask); meta_change_keygrab (display, screen->xroot, TRUE, keysym, keycode, mask);
} }
grab = g_new0 (MetaKeyGrab, 1); grab = g_new0 (MetaKeyGrab, 1);