isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

keybindings: Remove keysym argument from meta_change_keygrab

Browse Source 
It's only used for a debug statement.
This commit is contained in:
Jasper St. Pierre 2015-01-06 18:41:01 -08:00
parent 36454542ae
commit e4e00b383e
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/keybindings.c
View File

@ -180,14 +180,6 @@ key_binding_key (guint32 keycode,
return (key << 16) | (mask & 0xffff); return (key << 16) | (mask & 0xffff);
} }
static const char *
keysym_name (xkb_keysym_t keysym)
{
static char name[32] = "";
xkb_keysym_get_name (keysym, name, sizeof (name));
return name;
}
static void static void
reload_modmap (MetaKeyBindingManager *keys) reload_modmap (MetaKeyBindingManager *keys)
{ {
@ -1207,7 +1199,6 @@ static void
meta_change_keygrab (MetaKeyBindingManager *keys, meta_change_keygrab (MetaKeyBindingManager *keys,
Window xwindow, Window xwindow,
gboolean grab, gboolean grab,
int keysym,
unsigned int keycode, unsigned int keycode,
int modmask) int modmask)
{ {
@ -1228,10 +1219,9 @@ meta_change_keygrab (MetaKeyBindingManager *keys,
*/ */
meta_topic (META_DEBUG_KEYBINDINGS, meta_topic (META_DEBUG_KEYBINDINGS,
"%s keybinding %s keycode %d mask 0x%x on 0x%lx\n", "%s keybinding keycode %d mask 0x%x on 0x%lx\n",
grab ? "Grabbing" : "Ungrabbing", grab ? "Grabbing" : "Ungrabbing",
keysym_name (keysym), keycode, keycode, modmask, xwindow);
modmask, xwindow);
ignored_mask = 0; ignored_mask = 0;
while (ignored_mask <= keys->ignored_modifier_mask) while (ignored_mask <= keys->ignored_modifier_mask)
@ -1288,7 +1278,6 @@ change_keygrab_foreach (gpointer key,
return; return;
meta_change_keygrab (data->keys, data->xwindow, data->grab, meta_change_keygrab (data->keys, data->xwindow, data->grab,
binding->keysym,
binding->keycode, binding->keycode,
binding->mask); binding->mask);
} }
@ -1318,7 +1307,6 @@ meta_screen_change_keygrabs (MetaScreen *screen,
if (keys->overlay_key_combo.keycode != 0) if (keys->overlay_key_combo.keycode != 0)
meta_change_keygrab (keys, screen->xroot, grab, meta_change_keygrab (keys, screen->xroot, grab,
keys->overlay_key_combo.keysym,
keys->overlay_key_combo.keycode, keys->overlay_key_combo.keycode,
keys->overlay_key_combo.modifiers); keys->overlay_key_combo.modifiers);
@ -1330,7 +1318,6 @@ meta_screen_change_keygrabs (MetaScreen *screen,
if (keys->iso_next_group_combos[i].keycode != 0) if (keys->iso_next_group_combos[i].keycode != 0)
{ {
meta_change_keygrab (keys, screen->xroot, grab, meta_change_keygrab (keys, screen->xroot, grab,
keys->iso_next_group_combos[i].keysym,
keys->iso_next_group_combos[i].keycode, keys->iso_next_group_combos[i].keycode,
keys->iso_next_group_combos[i].modifiers); keys->iso_next_group_combos[i].modifiers);
} }
@ -1482,7 +1469,7 @@ meta_display_grab_accelerator (MetaDisplay *display,
return META_KEYBINDING_ACTION_NONE; return META_KEYBINDING_ACTION_NONE;
if (META_IS_BACKEND_X11 (backend)) if (META_IS_BACKEND_X11 (backend))
meta_change_keygrab (keys, display->screen->xroot, TRUE, keysym, keycode, mask); meta_change_keygrab (keys, display->screen->xroot, TRUE, keycode, mask);
grab = g_new0 (MetaKeyGrab, 1); grab = g_new0 (MetaKeyGrab, 1);
grab->action = next_dynamic_keybinding_action (); grab->action = next_dynamic_keybinding_action ();
@ -1537,7 +1524,6 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
if (META_IS_BACKEND_X11 (backend)) if (META_IS_BACKEND_X11 (backend))
meta_change_keygrab (keys, display->screen->xroot, FALSE, meta_change_keygrab (keys, display->screen->xroot, FALSE,
binding->keysym,
binding->keycode, binding->keycode,
binding->mask); binding->mask);