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

Slight transformation of the x-macros used in keybindings to make them

Browse Source 
2008-10-22  Thomas Thurman  <tthurman@gnome.org>

        Slight transformation of the x-macros used in keybindings
        to make them clearer: write handler names out in full
        because the old suffix system was confusing to people
        skim-reading, and switched the order of the last two
        parameters so more would generally fit on a screen.

        * src/core/keybindings.c, src/core/schema-bindings.c
          src/core/prefs.c: sympathy changes
        * src/core/window-bindings.h, src/core/screen-bindings.h:
          transformation as above


svn path=/trunk/; revision=3970
This commit is contained in:
Thomas Thurman
2008-10-22 01:02:45 +00:00
committed by Thomas James Alexander Thurman
parent fd01dbaaea
commit 671b69a251
6 changed files with 293 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/prefs.c
View File

@@ -1815,8 +1815,8 @@ meta_prefs_set_num_workspaces (int n_workspaces)
#endif /* HAVE_GCONF */
}
#define item(name, suffix, param, flags, description, stroke) \
{ #name suffix, NULL, flags & BINDING_REVERSES },
#define keybind(name, handler, param, flags, stroke, description) \
{ #name, NULL, flags & BINDING_REVERSES },
static MetaKeyPref screen_bindings[] = {
#include "screen-bindings.h"
{ NULL, NULL, FALSE}
@@ -1826,7 +1826,7 @@ static MetaKeyPref window_bindings[] = {
#include "window-bindings.h"
{ NULL, NULL, FALSE }
};
#undef item
#undef keybind
#ifndef HAVE_GCONF
typedef struct
@@ -1842,21 +1842,20 @@ typedef struct
* data and move it into code. Then the compiler would optimise away
* the problem lines.
*/
#define keybind(name, handler, param, flags, stroke, description) \
{ #name, keystroke },
static MetaSimpleKeyMapping screen_string_bindings[] = {
#define item(name, suffix, param, flags, description, keystroke) \
{ #name suffix, keystroke },
#include "screen-bindings.h"
#undef item
{ NULL, NULL }
};
static MetaSimpleKeyMapping window_string_bindings[] = {
#define item(name, suffix, param, flags, description, keystroke) \
{ #name suffix, keystroke },
#include "window-bindings.h"
#undef item
{ NULL, NULL }
};
#undef keybind
#endif /* NOT HAVE_GCONF */