keybindings: Split out check for filter_keybinding

This is a small code cleanup for clarity.
This commit is contained in:
Jasper St. Pierre 2014-03-20 10:24:43 -04:00
parent a53e094fcd
commit 15c59f9919

View File

@ -1680,8 +1680,13 @@ process_event (MetaDisplay *display,
event->hardware_keycode, event->hardware_keycode,
event->modifier_state); event->modifier_state);
if (!binding || if (!binding ||
(!window && binding->flags & META_KEY_BINDING_PER_WINDOW) || (!window && binding->flags & META_KEY_BINDING_PER_WINDOW))
meta_compositor_filter_keybinding (display->compositor, screen, binding)) goto not_found;
/* If the compositor filtered out the keybindings, that
* means they don't want the binding to trigger, so we do
* the same thing as if the binding didn't exist. */
if (meta_compositor_filter_keybinding (display->compositor, screen, binding))
goto not_found; goto not_found;
if (binding->handler == NULL) if (binding->handler == NULL)