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

meta_display_get_keybinding_action: remove keysym parameter

Browse Source 
meta_display_process_key_event() always looks up events based on the
"default" keysym for the keycode, so we should do the same here. This
fixes, eg, the lookup of Shift-Alt-Tab (which would otherwise be
unrecognized because the keysym would be XK_ISO_Left_Tab rather than
XK_Tab).

https://bugzilla.gnome.org/show_bug.cgi?id=632155
This commit is contained in:
Dan Winship 2010-10-14 11:24:38 -04:00
parent 8cbaee47a0
commit 03578b69f3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/keybindings.c
View File

@ -502,21 +502,21 @@ display_get_keybinding (MetaDisplay *display,
/** /**
* meta_display_get_keybinding_action: * meta_display_get_keybinding_action:
* @display: A #MetaDisplay * @display: A #MetaDisplay
* @keysym: Key symbol
* @keycode: Raw keycode * @keycode: Raw keycode
* @mask: Event mask * @mask: Event mask
* *
* Returns: The action that should be taken for the given key, or %META_KEYBINDING_ACTION_NONE. * Returns: The action that should be taken for the given key, or
* * %META_KEYBINDING_ACTION_NONE.
*/ */
MetaKeyBindingAction MetaKeyBindingAction
meta_display_get_keybinding_action (MetaDisplay *display, meta_display_get_keybinding_action (MetaDisplay *display,
unsigned int keysym,
unsigned int keycode, unsigned int keycode,
unsigned long mask) unsigned long mask)
{ {
MetaKeyBinding *binding; MetaKeyBinding *binding;
KeySym keysym;
keysym = XKeycodeToKeysym (display->xdisplay, keycode, 0);
mask = mask & 0xff & ~display->ignored_modifier_mask; mask = mask & 0xff & ~display->ignored_modifier_mask;
binding = display_get_keybinding (display, keysym, keycode, mask); binding = display_get_keybinding (display, keysym, keycode, mask);
@ -2778,7 +2778,6 @@ process_workspace_switch_grab (MetaDisplay *display,
MetaKeyBindingAction action; MetaKeyBindingAction action;
action = meta_display_get_keybinding_action (display, action = meta_display_get_keybinding_action (display,
keysym,
event->xkey.keycode, event->xkey.keycode,
display->grab_mask); display->grab_mask);

1
src/include/display.h
View File

@ -125,7 +125,6 @@ void meta_display_end_grab_op (MetaDisplay *display,
MetaGrabOp meta_display_get_grab_op (MetaDisplay *display); MetaGrabOp meta_display_get_grab_op (MetaDisplay *display);
MetaKeyBindingAction meta_display_get_keybinding_action (MetaDisplay *display, MetaKeyBindingAction meta_display_get_keybinding_action (MetaDisplay *display,
unsigned int keysym,
unsigned int keycode, unsigned int keycode,
unsigned long mask); unsigned long mask);