(Apologies for huge commit; these were done on a transatlantic flight. This is why we need bzr.)

2008-11-22  Thomas Thurman  <tthurman@gnome.org>

        * src/core/all-keybindings.h: "backward", not "backwards" throughout.

2008-11-20  Thomas Thurman  <tthurman@gnome.org>

        * configure.in: turned on -Wall and -Werror in order to
          trap as many problems as possible.
        * src/ui/resizepopup.c: added correct #include.
        * src/ui/theme-viewer.c: initialised variable.
        * src/core/xprops.c: corrected cast.
        * src/core/main.c: added warning if chdir() fails.
        * src/core/schema-bindings.c: checking the return
          result of fgets().

2008-11-20  Thomas Thurman  <tthurman@gnome.org>

        Merged screen and window keybinding tables so that
        we can use just one file for the both.  Also incidentally
        closes #528337.  Further efficiencies of scale to come.

        * src/include/prefs.h: replace META_PREF_*_KEYBINDINGS
          with META_PREF_KEYBINDINGS
        * src/core/keybindings.c: replace *_bindings with key_bindings
          and similar throughout; all window-based functions are now
          guaranteed to receive a window so don't need to check for
          themselves
          (find_handler): moved so it can also be called from
                          rebuild_binding_table
        * src/core/display-private.h: replace *_bindings with key_bindings
        * src/core/prefs.c: update_*_binding becomes update_key_binding;
          (change_notify): tidy up references to "enormous if statement"
                           since it's almost entirely gone now
        * src/core/all-keybindings.h: new merged version of
                           screen-bindings.h and window-bindings.h.


svn path=/trunk/; revision=4022

1 files changed, 10 insertions, 9 deletions

diff --git a/src/include/prefs.h b/src/include/prefs.h
index 69f978c7..5acad233 100644
--- a/src/include/prefs.h
+++ b/src/include/prefs.h
@@ -44,8 +44,7 @@ typedef enum
   META_PREF_TITLEBAR_FONT,
   META_PREF_NUM_WORKSPACES,
   META_PREF_APPLICATION_BASED,
-  META_PREF_WINDOW_KEYBINDINGS,
-  META_PREF_SCREEN_KEYBINDINGS,
+  META_PREF_KEYBINDINGS,
   META_PREF_DISABLE_WORKAROUNDS,
   META_PREF_COMMANDS,
   META_PREF_TERMINAL_COMMAND,
@@ -183,7 +182,8 @@ typedef struct
 typedef struct
 {
   const char   *name;
-  /* a list of MetaKeyCombos. Each of them is bound to
+  /**
+   * A list of MetaKeyCombos. Each of them is bound to
    * this keypref. If one has keysym==modifiers==0, it is
    * ignored. For historical reasons, the first entry is
    * governed by the pref FOO and the remainder are
@@ -191,14 +191,15 @@ typedef struct
    */
   GSList *bindings;
 
-  /* for keybindings that can have shift or not like Alt+Tab */
-  gboolean      add_shift;
+  /** for keybindings that can have shift or not like Alt+Tab */
+  gboolean      add_shift:1;
+
+  /** for keybindings that apply only to a window */
+  gboolean      per_window:1;
 } MetaKeyPref;
 
-void meta_prefs_get_screen_bindings (const MetaKeyPref **bindings,
-                                     int                *n_bindings);
-void meta_prefs_get_window_bindings (const MetaKeyPref **bindings,
-                                     int                *n_bindings);
+void meta_prefs_get_key_bindings (const MetaKeyPref **bindings,
+                                  int                *n_bindings);
 
 MetaKeyBindingAction meta_prefs_get_keybinding_action (const char *name);