[mutter] keybindings: Clean up code a tiny bit
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] keybindings: Clean up code a tiny bit
- Date: Tue, 20 May 2014 16:26:07 +0000 (UTC)
commit 80266d3071f8f9a3c9e9d311b840384014115548
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue May 20 09:59:45 2014 -0400
keybindings: Clean up code a tiny bit
src/core/keybindings.c | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 01d310a..74fb16a 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1081,7 +1081,7 @@ typedef struct
{
MetaDisplay *display;
Window xwindow;
- gboolean binding_per_window;
+ gboolean only_per_window;
gboolean grab;
} ChangeKeygrabData;
@@ -1092,29 +1092,31 @@ change_keygrab_foreach (gpointer key,
{
ChangeKeygrabData *data = user_data;
MetaKeyBinding *binding = value;
+ gboolean binding_is_per_window = (binding->flags & META_KEY_BINDING_PER_WINDOW) != 0;
- if (!!data->binding_per_window ==
- !!(binding->flags & META_KEY_BINDING_PER_WINDOW) &&
- binding->keycode != 0)
- {
- meta_change_keygrab (data->display, data->xwindow, data->grab,
- binding->keysym,
- binding->keycode,
- binding->mask);
- }
+ if (data->only_per_window != binding_is_per_window)
+ return;
+
+ if (binding->keycode == 0)
+ return;
+
+ meta_change_keygrab (data->display, data->xwindow, data->grab,
+ binding->keysym,
+ binding->keycode,
+ binding->mask);
}
static void
-change_binding_keygrabs (MetaDisplay *display,
- Window xwindow,
- gboolean binding_per_window,
- gboolean grab)
+change_binding_keygrabs (MetaDisplay *display,
+ Window xwindow,
+ gboolean only_per_window,
+ gboolean grab)
{
ChangeKeygrabData data;
data.display = display;
data.xwindow = xwindow;
- data.binding_per_window = binding_per_window;
+ data.only_per_window = only_per_window;
data.grab = grab;
g_hash_table_foreach (display->key_bindings, change_keygrab_foreach, &data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]