Fix annoying bug where alt-tab and friends would jump backwards a space on

2008-10-12  Thomas Thurman  <tthurman@gnome.org>

        Fix annoying bug where alt-tab and friends would jump
        backwards a space on initial movement.

        * src/core/screen-bindings.h: although reversed bindings
        are necessarily reversible, don't set both bits in the
        constant, or when we test for them we'll get confused.


svn path=/trunk/; revision=3950
This commit is contained in:
Thomas Thurman 2008-10-12 15:09:48 +00:00 committed by Thomas James Alexander Thurman
parent b625ed254d
commit acd81439eb
2 changed files with 21 additions and 7 deletions

View File

@ -1,3 +1,12 @@
2008-10-12 Thomas Thurman <tthurman@gnome.org>
Fix annoying bug where alt-tab and friends would jump
backwards a space on initial movement.
* src/core/screen-bindings.h: although reversed bindings
are necessarily reversible, don't set both bits in the
constant, or when we test for them we'll get confused.
2008-10-12 Thomas Thurman <tthurman@gnome.org> 2008-10-12 Thomas Thurman <tthurman@gnome.org>
An attempt to make life a little easier for our beloved translators; An attempt to make life a little easier for our beloved translators;

View File

@ -81,7 +81,7 @@
#define BINDING_PER_WINDOW 0x01 #define BINDING_PER_WINDOW 0x01
#define BINDING_REVERSES 0x02 #define BINDING_REVERSES 0x02
#define BINDING_IS_REVERSED 0x06 /* REVERSES is implied */ #define BINDING_IS_REVERSED 0x04
/* FIXME: There is somewhere better for these; remove them */ /* FIXME: There is somewhere better for these; remove them */
#define PANEL_MAIN_MENU -1 #define PANEL_MAIN_MENU -1
@ -91,6 +91,9 @@
/***********************************/ /***********************************/
/* convenience, since in this file they must always be set together */
#define REVERSES_AND_REVERSED (BINDING_REVERSES | BINDING_IS_REVERSED)
item (switch_to_workspace, "_1", 1, 0, item (switch_to_workspace, "_1", 1, 0,
_("Switch to workspace 1"), _("Switch to workspace 1"),
_("The keybinding that switches to workspace 1."), _("The keybinding that switches to workspace 1."),
@ -185,7 +188,7 @@ item (switch, "_group", META_TAB_LIST_GROUP, BINDING_REVERSES,
_("Move between windows of an application with popup"), _("Move between windows of an application with popup"),
_("The keybinding used to move focus between windows of an" _("The keybinding used to move focus between windows of an"
"application, using a popup window."), NULL) "application, using a popup window."), NULL)
item (switch, "_group_backwards", META_TAB_LIST_GROUP, BINDING_IS_REVERSED, item (switch, "_group_backwards", META_TAB_LIST_GROUP, REVERSES_AND_REVERSED,
_("Move backwards between windows of an application with popup"), _("Move backwards between windows of an application with popup"),
_("The keybinding used to move focus backwards between windows" _("The keybinding used to move focus backwards between windows"
"of an application, using a popup window."), NULL) "of an application, using a popup window."), NULL)
@ -193,7 +196,7 @@ item (switch, "_windows", META_TAB_LIST_NORMAL, BINDING_REVERSES,
_("Move between windows with popup"), _("Move between windows with popup"),
_("The keybinding used to move focus between windows, " _("The keybinding used to move focus between windows, "
"using a popup window."), "<Alt>Tab") "using a popup window."), "<Alt>Tab")
item (switch, "_windows_backwards",META_TAB_LIST_NORMAL, BINDING_IS_REVERSED, item (switch, "_windows_backwards",META_TAB_LIST_NORMAL, REVERSES_AND_REVERSED,
_("Move focus backwards between windows using popup display"), _("Move focus backwards between windows using popup display"),
_("The keybinding used to move focus backwards between windows, " _("The keybinding used to move focus backwards between windows, "
"using a popup window."), NULL) "using a popup window."), NULL)
@ -201,7 +204,7 @@ item (switch, "_panels", META_TAB_LIST_DOCKS, BINDING_REVERSES,
_("Move between panels and the desktop with popup"), _("Move between panels and the desktop with popup"),
_("The keybinding used to move focus between panels and the desktop, " _("The keybinding used to move focus between panels and the desktop, "
"using a popup window."), "<Control><Alt>Tab") "using a popup window."), "<Control><Alt>Tab")
item (switch, "_panels_backwards", META_TAB_LIST_DOCKS, BINDING_IS_REVERSED, item (switch, "_panels_backwards", META_TAB_LIST_DOCKS, REVERSES_AND_REVERSED,
_("Move backwards between panels and the desktop with popup"), _("Move backwards between panels and the desktop with popup"),
_("The keybinding used to move focus backwards between panels " _("The keybinding used to move focus backwards between panels "
"and the desktop, using a popup window."), NULL) "and the desktop, using a popup window."), NULL)
@ -209,7 +212,7 @@ item (cycle, "_group", META_TAB_LIST_GROUP, BINDING_REVERSES,
_("Move between windows of an application immediately"), _("Move between windows of an application immediately"),
_("The keybinding used to move focus between windows of an " _("The keybinding used to move focus between windows of an "
"application without a popup window."), "<Alt>F6") "application without a popup window."), "<Alt>F6")
item (cycle, "_group_backwards", META_TAB_LIST_GROUP, BINDING_IS_REVERSED, item (cycle, "_group_backwards", META_TAB_LIST_GROUP, REVERSES_AND_REVERSED,
_("Move backwards between windows of an application immediately"), _("Move backwards between windows of an application immediately"),
_("The keybinding used to move focus backwards between windows " _("The keybinding used to move focus backwards between windows "
"of an application without a popup window."), NULL) "of an application without a popup window."), NULL)
@ -217,7 +220,7 @@ item (cycle, "_windows", META_TAB_LIST_NORMAL, BINDING_REVERSES,
_("Move between windows immediately"), _("Move between windows immediately"),
_("The keybinding used to move focus between windows without " _("The keybinding used to move focus between windows without "
"a popup window."), "<Alt>Escape") "a popup window."), "<Alt>Escape")
item (cycle, "_windows_backwards",META_TAB_LIST_NORMAL, BINDING_IS_REVERSED, item (cycle, "_windows_backwards",META_TAB_LIST_NORMAL, REVERSES_AND_REVERSED,
_("Move backwards between windows immediately"), _("Move backwards between windows immediately"),
_("The keybinding used to move focus backwards between windows " _("The keybinding used to move focus backwards between windows "
"without a popup window."), NULL) "without a popup window."), NULL)
@ -225,7 +228,7 @@ item (cycle, "_panels", META_TAB_LIST_DOCKS, BINDING_REVERSES,
_("Move between panels and the desktop immediately"), _("Move between panels and the desktop immediately"),
_("The keybinding used to move focus between panels and " _("The keybinding used to move focus between panels and "
"the desktop, without a popup window."), "<Control><Alt>Escape") "the desktop, without a popup window."), "<Control><Alt>Escape")
item (cycle, "_panels_backwards", META_TAB_LIST_DOCKS, BINDING_IS_REVERSED, item (cycle, "_panels_backwards", META_TAB_LIST_DOCKS, REVERSES_AND_REVERSED,
_("Move backward between panels and the desktop immediately"), _("Move backward between panels and the desktop immediately"),
_("The keybinding used to move focus backwards between panels and " _("The keybinding used to move focus backwards between panels and "
"the desktop, without a popup window."), NULL) "the desktop, without a popup window."), NULL)
@ -303,5 +306,7 @@ item (run_terminal, "", 0, 0,
/* No descriptions because this is undocumented */ /* No descriptions because this is undocumented */
item (set_spew_mark, "", 0, 0, NULL, NULL, NULL) item (set_spew_mark, "", 0, 0, NULL, NULL, NULL)
#undef REVERSES_AND_REVERSED
/* eof screen-bindings.h */ /* eof screen-bindings.h */