[mutter] keybindings: Generalize mechanism to generate dynamic keybinding actions



commit 4df3e987c6a5132ae1af57db9ed0d59976391537
Author: Florian Müllner <fmuellner gnome org>
Date:   Fri Dec 21 11:32:55 2012 +0100

    keybindings: Generalize mechanism to generate dynamic keybinding actions
    
    https://bugzilla.gnome.org/show_bug.cgi?id=643111

 src/core/keybindings.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index cd980d9..7f6be7e 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -542,6 +542,12 @@ display_get_keybinding (MetaDisplay  *display,
   return NULL;
 }
 
+static guint
+next_dynamic_keybinding_action () {
+  static guint num_dynamic_bindings = 0;
+  return META_KEYBINDING_ACTION_LAST + (++num_dynamic_bindings);
+}
+
 static gboolean
 add_keybinding_internal (MetaDisplay          *display,
                          const char           *name,
@@ -622,14 +628,12 @@ meta_display_add_keybinding (MetaDisplay         *display,
                              gpointer             user_data,
                              GDestroyNotify       free_data)
 {
-  static guint num_dynamic_bindings = 0;
-  guint new_action = META_KEYBINDING_ACTION_LAST + num_dynamic_bindings;
+  guint new_action = next_dynamic_keybinding_action ();
 
   if (!add_keybinding_internal (display, name, settings, flags, new_action,
                                 handler, 0, user_data, free_data))
     return META_KEYBINDING_ACTION_NONE;
 
-  ++num_dynamic_bindings;
   return new_action;
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]