summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Wilson <rjw@netsurf-browser.org>2004-07-13 20:08:53 +0000
committerRichard Wilson <rjw@netsurf-browser.org>2004-07-13 20:08:53 +0000
commit2fe0085f53b2b64f592df8393fd5eba5cd57eac5 (patch)
treeddbac089512d2d4c63a85e1be03547a336cc75a2
parentc04047f58639790c9a6e6004e39c117becce82c4 (diff)
downloadnetsurf-2fe0085f53b2b64f592df8393fd5eba5cd57eac5.tar.gz
netsurf-2fe0085f53b2b64f592df8393fd5eba5cd57eac5.tar.bz2
[project @ 2004-07-13 20:08:53 by rjw]
Adjust click on the iconbar icon opens the hotlist, Shift+Adjust opens the debug window. svn path=/import/netsurf/; revision=1075
-rw-r--r--riscos/gui.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/riscos/gui.c b/riscos/gui.c
index b6737aa9b..1502754cb 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -722,6 +722,7 @@ void ro_gui_mouse_click(wimp_pointer *pointer)
void ro_gui_icon_bar_click(wimp_pointer *pointer)
{
+ int key_down = 0;
if (pointer->buttons == wimp_CLICK_MENU) {
ro_gui_create_menu(iconbar_menu, pointer->pos.x - 64,
96 + iconbar_menu_height, NULL);
@@ -734,7 +735,17 @@ void ro_gui_icon_bar_click(wimp_pointer *pointer)
option_language)) >= 0 && length < (int)sizeof(url))
browser_window_create(url, NULL);
} else if (pointer->buttons == wimp_CLICK_ADJUST) {
- ro_gui_debugwin_open();
+ /* I've no idea what the correct way to scan for keys is when in the
+ desktop, so I've used os_byte to scan directly. This may cause some
+ weirdness for very unresponsive desktops due to the clicks being
+ buffered and the keypresses not.
+ */
+ xosbyte1(osbyte_SCAN_KEYBOARD, 0 ^ 0x80, 0, &key_down);
+ if (key_down == 0) {
+ ro_gui_hotlist_show();
+ } else {
+ ro_gui_debugwin_open();
+ }
}
}