isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-06 16:44:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

During a discussion with Rodney Dawes about making life easier for the

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

        During a discussion with Rodney Dawes about making life easier
        for the translators, he pointed out that the short and long
        forms of almost all the keybindings say much the same thing
        in different words.  I believe this is an unconscionable burden
        to place on translators, and have therefore merged the short
        and long descriptions into the short description.  The long
        is now a general explanation of the format, plus possibly a
        notice about reversibility.  Closes #469361, and should solve
        the l10n issue previously mentioned.

        * src/core/keybindings.c: reflect changes in *-bindings.h
        * src/core/schema-bindings.c: reflect changes in *-bindings.h
        * src/core/prefs.c: reflect changes in *-bindings.h
        * src/core/window-bindings.h: Add flags field, always the same
          currently, so that it's the same as screen-bindings.h.
          Also, lose ONLY_BOUND_BY_DEFAULT, since we already had a
          rather more elegant way to perform the same effect.
          And merge the long and short descriptions.
        * src/core/screen-bindings.h (, item): Merge the long and
          short descriptions.


svn path=/trunk/; revision=3966
This commit is contained in:
Thomas Thurman
2008-10-18 04:33:14 +00:00
committed by Thomas James Alexander Thurman
parent a8f1a61242
commit 493408167b
6 changed files with 233 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/keybindings.c
View File

@@ -55,7 +55,7 @@ typedef void (* MetaKeyHandlerFunc) (MetaDisplay *display,
MetaKeyBinding *binding);
/* Prototypes for handlers */
#define item(name, suffix, param, short, long, stroke) \
#define item(name, suffix, param, flags, description, stroke) \
static void \
handle_##name (MetaDisplay *display,\
MetaScreen *screen,\
@@ -65,7 +65,7 @@ handle_##name (MetaDisplay *display,\
#include "window-bindings.h"
#undef item
#define item(name, suffix, param, can_reverse, short, long, stroke) \
#define item(name, suffix, param, flags, description, stroke) \
static void \
handle_##name (MetaDisplay *display,\
MetaScreen *screen,\
@@ -135,7 +135,7 @@ struct _MetaKeyBinding
};
static const MetaKeyHandler screen_handlers[] = {
#define item(name, suffix, param, flags, short, long, stroke) \
#define item(name, suffix, param, flags, description, stroke) \
{ #name suffix, handle_##name, param, flags },
#include "screen-bindings.h"
#undef item
@@ -143,14 +143,11 @@ static const MetaKeyHandler screen_handlers[] = {
};
static const MetaKeyHandler window_handlers[] = {
/* FIXME: The flags=1 thing is pretty ugly here, but it'll really have
* to wait until and if we merge the window and screen binding files.
*
* TODO: Are window bindings only ever called on non-null windows?
/* TODO: Are window bindings only ever called on non-null windows?
* If so, we can remove the check from all of them.
*/
#define item(name, suffix, param, short, long, stroke) \
{ #name suffix, handle_##name, param, 1 },
#define item(name, suffix, param, flags, description, stroke) \
{ #name suffix, handle_##name, param, flags },
#include "window-bindings.h"
#undef item
{ NULL, NULL, 0, 0 }