Fix handling of Ctrl-Left/Right/Up/Down in browser windows.

Reverse Ctrl-Left/Right actions to match reality.
Make Ctrl-Down duplicate End action.
Tidy mixed usage of + and | in key definitions.
This commit is contained in:
Steve Fryatt 2013-02-24 19:25:50 +00:00
parent cc7f45898b
commit bbd46de011
1 changed files with 8 additions and 7 deletions

View File

@ -2088,13 +2088,14 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key,
case IS_WIMP_KEY | wimp_KEY_RIGHT:
case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_LEFT:
case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_RIGHT:
case IS_WIMP_KEY + wimp_KEY_UP:
case IS_WIMP_KEY + wimp_KEY_DOWN:
case IS_WIMP_KEY + wimp_KEY_PAGE_UP:
case IS_WIMP_KEY + wimp_KEY_PAGE_DOWN:
case IS_WIMP_KEY | wimp_KEY_UP:
case IS_WIMP_KEY | wimp_KEY_DOWN:
case IS_WIMP_KEY | wimp_KEY_PAGE_UP:
case IS_WIMP_KEY | wimp_KEY_PAGE_DOWN:
case wimp_KEY_HOME:
case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_UP:
case IS_WIMP_KEY + wimp_KEY_END:
case IS_WIMP_KEY | wimp_KEY_END:
case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_DOWN:
if (is_toolbar)
return false;
break;
@ -2113,10 +2114,10 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key,
xscroll = wimp_SCROLL_COLUMN_RIGHT;
break;
case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_LEFT:
xscroll = 0x80000000;
xscroll = 0x7fffffff;
break;
case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_RIGHT:
xscroll = 0x7fffffff;
xscroll = 0x80000000;
break;
case IS_WIMP_KEY | wimp_KEY_UP:
yscroll = wimp_SCROLL_LINE_UP;