summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Wilson <rjw@netsurf-browser.org>2006-07-04 14:50:15 +0000
committerRichard Wilson <rjw@netsurf-browser.org>2006-07-04 14:50:15 +0000
commitbd732e40edefd3a4b804329c98e51ed6864724c9 (patch)
tree39511475127f7b0de74dc43694512904ffa37cf4
parente68f20d1c0612877afefcc581237bb5c70c8dbe6 (diff)
downloadnetsurf-bd732e40edefd3a4b804329c98e51ed6864724c9.tar.gz
netsurf-bd732e40edefd3a4b804329c98e51ed6864724c9.tar.bz2
Respect CMOS configuration for full-size toggles on small contents.
svn path=/trunk/netsurf/; revision=2709
-rw-r--r--riscos/window.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/riscos/window.c b/riscos/window.c
index ffdd4bc49..f92159115 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -1115,6 +1115,8 @@ void ro_gui_window_open(struct gui_window *g, wimp_open *open)
os_error *error;
int key_down = 0;
int inset = 0;
+ int iconbar_cmos = 0;
+ bool iconbar_clear;
if (open->next == wimp_TOP && g->iconise_icon >= 0) {
/* window is no longer iconised, release its sprite number */
@@ -1142,7 +1144,11 @@ void ro_gui_window_open(struct gui_window *g, wimp_open *open)
* such we do the really horrible thing of testing for Shift directly and
* decreasing the value accordingly. Yuck. */
xosbyte1(osbyte_SCAN_KEYBOARD, 0 ^ 0x80, 0, &key_down);
- if (key_down != 0)
+ iconbar_clear = (key_down != 0);
+ xosbyte2(osbyte_READ_CMOS, 28, 0, &iconbar_cmos);
+ if (iconbar_cmos & (1 << 4))
+ iconbar_clear = !iconbar_clear;
+ if (iconbar_clear)
inset = 160 + ro_get_hscroll_height(0);
if ((content->height * 2 * g->option.scale) < screen_height - inset) {
open->visible.y0 = inset;