1 files changed, 236 insertions, 82 deletions

diff --git a/riscos/theme.c b/riscos/theme.c
index 2febebc0b..20195196c 100644
--- a/riscos/theme.c
+++ b/riscos/theme.c
@@ -4,6 +4,7 @@
  *                http://www.opensource.org/licenses/gpl-license
  * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
  * Copyright 2003 James Bursa <bursa@users.sourceforge.net>
+ * Copyright 2004 Richard Wilson <not_ginger_matt@users.sourceforge.net>
  */
 
 /** \file
@@ -14,16 +15,27 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
+#include "oslib/os.h"
 #include "oslib/osfile.h"
 #include "oslib/osspriteop.h"
 #include "oslib/wimp.h"
+#include "oslib/wimpspriteop.h"
 #include "netsurf/riscos/gui.h"
 #include "netsurf/riscos/theme.h"
+#include "netsurf/riscos/toolbar.h"
+#include "netsurf/riscos/wimp.h"
 #include "netsurf/utils/utils.h"
+#include "netsurf/utils/log.h"
 
-static wimp_window *theme_toolbar_template = 0;
+/*	Current sprite area
+*/
 static osspriteop_area *theme_sprite_area = 0;
-unsigned int theme_throbs;
+
+/*	Throbber details
+*/
+int theme_throbs;
+static int throbber_width;
+static int throbber_height;
 
 
 /**
@@ -33,72 +45,74 @@ unsigned int theme_throbs;
  * and a Sprites file containing icons.
  */
 
-void ro_theme_load(char *pathname)
-{
-	char name[] = "toolbar";
-	int context, window_size, data_size, size, i;
-	static char *data = 0;
-        char *filename = alloca(strlen(pathname) + 12);
+void ro_theme_load(char *pathname) {
+	osbool mask;
+	os_mode mode;
+ 	os_coord dimensions;
+	int size, i, n;
+	char filename[strlen(pathname) + 16];
 	fileswitch_object_type obj_type;
 
-	/* free old theme data */
-	free(theme_toolbar_template);
-	free(data);
+	/*	Release previous sprite are
+	*/
 	free(theme_sprite_area);
+	theme_sprite_area = NULL;
 
-	/* load template */
-	sprintf(filename, "%s.Templates", pathname);
-	wimp_open_template(filename);
+	/*	Reset the throbber variables
+	*/
+	theme_throbs = 0;
+	throbber_height = 0;
+	throbber_width = 0;
 
-	/* find required buffer sizes */
-	context = wimp_load_template(wimp_GET_SIZE, 0, 0, wimp_NO_FONTS,
-			name, 0, &window_size, &data_size);
-	assert(context != 0);
+	/*	Load the sprites
+	*/
+	sprintf(filename, "%s.Sprites", pathname);
+	xosfile_read_no_path(filename, &obj_type, 0, 0, &size, 0);
 
-	theme_toolbar_template = xcalloc((unsigned int) window_size, 1);
-	data = xcalloc((unsigned int) data_size, 1);
+	/*	Claim memory for a sprite file if we have one
+	*/
+	if (obj_type & fileswitch_IS_FILE) theme_sprite_area = malloc(size + 16);
 
-	/* load */
-	wimp_load_template(theme_toolbar_template, data, data + data_size,
-			wimp_NO_FONTS, name, 0, 0, 0);
+	/*	Load the sprite file if we have any memory
+	*/
+	if (theme_sprite_area) {
 
-	wimp_close_template();
+	  	/*	Initialise then load
+	  	*/
+		theme_sprite_area->size = size + 16;
+		theme_sprite_area->sprite_count = 0;
+		theme_sprite_area->first = 16;
+		theme_sprite_area->used = 16;
+		xosspriteop_clear_sprites(osspriteop_USER_AREA, theme_sprite_area);
+		xosspriteop_load_sprite_file(osspriteop_USER_AREA, theme_sprite_area,
+				filename);
 
-	assert(ICON_TOOLBAR_RELOAD < theme_toolbar_template->icon_count);
-	theme_toolbar_template->flags |= wimp_WINDOW_FURNITURE_WINDOW;
-	theme_toolbar_template->icons[ICON_TOOLBAR_URL].data.indirected_text.size = 256;
-	theme_toolbar_template->icons[ICON_TOOLBAR_STATUS].data.indirected_text.size = 256;
+		/*	Find the highest sprite called 'throbber%i', and get the maximum
+			dimensions for all 'thobber%i' icons. We use the filename buffer
+			as the temporary spritename buffer as it is guaranteed to be at
+			least 12 bytes (max sprite name size).
+		*/
+		for (i = 1; i <= theme_sprite_area->sprite_count; i++) {
+			osspriteop_return_name(osspriteop_USER_AREA,
+					theme_sprite_area, filename, 12, i);
+			if (strncmp(filename, "throbber", 8) == 0) {
+			  	/*	Get the max sprite width/height
+			  	*/
+				xosspriteop_read_sprite_info(osspriteop_USER_AREA,
+					theme_sprite_area, (osspriteop_id)filename,
+					&dimensions.x, &dimensions.y, &mask, &mode);
+				ro_convert_pixels_to_os_units(&dimensions, mode);
+				if (dimensions.x > throbber_width) throbber_width = dimensions.x;
+				if (dimensions.y > throbber_height) throbber_height = dimensions.y;
 
-	/* load sprites */
-	sprintf(filename, "%s.Sprites", pathname);
-	obj_type = osfile_read_no_path(filename, 0, 0, &size, 0);
-	assert(obj_type & fileswitch_IS_FILE);
-
-	theme_sprite_area = xcalloc((unsigned int)(size + 16), 1);
-	theme_sprite_area->size = size + 16;
-	theme_sprite_area->sprite_count = 0;
-	theme_sprite_area->first = 16;
-	theme_sprite_area->used = 16;
-	osspriteop_clear_sprites(osspriteop_USER_AREA, theme_sprite_area);
-	osspriteop_load_sprite_file(osspriteop_USER_AREA, theme_sprite_area,
-			filename);
-
-	theme_toolbar_template->sprite_area = theme_sprite_area;
-	theme_toolbar_template->icons[ICON_TOOLBAR_THROBBER].data.indirected_sprite.area =
-			theme_sprite_area;
-
-	/* find the highest sprite called throbber%i */
-	theme_throbs = 0;
-	for (i = 1; i <= theme_sprite_area->sprite_count; i++) {
-		char name[32];
-		osspriteop_return_name(osspriteop_USER_AREA,
-				theme_sprite_area, name, 32, i);
-		if (strncmp(name, "throbber", 8) == 0) {
-			unsigned int n = atoi(name + 8);
-			if (theme_throbs < n)
-				theme_throbs = n;
+				/*	Get the throbber number
+				*/
+				n = atoi(filename + 8);
+				if (theme_throbs < n) theme_throbs = n;
+			}
 		}
 	}
+
 }
 
 
@@ -109,44 +123,184 @@ void ro_theme_load(char *pathname)
  * throbber_buffer at least 12 bytes;
  */
 
-wimp_w ro_theme_create_toolbar(char *url_buffer, char *status_buffer,
-		char *throbber_buffer)
-{
-	wimp_w w;
+void ro_theme_create_toolbar(gui_window *g) {
+  	struct toolbar *toolbar;
 
-	theme_toolbar_template->icons[ICON_TOOLBAR_URL].data.indirected_text.text = url_buffer;
-	theme_toolbar_template->icons[ICON_TOOLBAR_STATUS].data.indirected_text.text = status_buffer;
-	theme_toolbar_template->icons[ICON_TOOLBAR_THROBBER].data.indirected_sprite.id =
-			(osspriteop_id) throbber_buffer;
+	/*	Destroy any previous toolbar (paranoia)
+	*/
+	if (g->data.browser.toolbar) {
+		ro_toolbar_destroy(g->data.browser.toolbar);
+		g->data.browser.toolbar = NULL;
+	}
+  	/*	Create a toolbar
+  	*/
+  	toolbar = ro_toolbar_create(theme_sprite_area, g->url, g->status, g->throb_buf);
+  	if (toolbar == NULL) return;
+
+  	/*	Set up the throbber
+  	*/
+  	toolbar->throbber_width = throbber_width;
+  	toolbar->throbber_height = throbber_height;
+  	toolbar->status_width = 640;
+
+  	/*	Store our toolbar
+  	*/
+  	g->data.browser.toolbar = toolbar;
 
-	w = wimp_create_window(theme_toolbar_template);
-	return w;
+  	/*	Update the toolbar
+  	*/
+  	ro_theme_update_toolbar(g);
 }
 
 
 /**
- * Return the height of the current toolbar.
+ * Updates any toolbar flags (eg closes windows, hides icons etc)
+ *
+ * \return non-zero if the toolbar height has changed
  */
+int ro_theme_update_toolbar(gui_window *g) {
+	wimp_outline outline;
+	wimp_window_state state;
+	struct toolbar *toolbar;
+	int return_value = 0;
+
+	/*	Set an update as pending
+	*/
+	toolbar = g->data.browser.toolbar;
+	toolbar->update_pending = true;
+
+  	/*	Close the status window if we should, or resize it
+  	*/
+  	if (toolbar->status_window) {
 
-int ro_theme_toolbar_height(void)
-{
-	return abs(theme_toolbar_template->extent.y1 - theme_toolbar_template->extent.y0) + 2;
+	  	/*	Update the status height
+  		*/
+  		ro_toolbar_resize_status(toolbar, ro_get_hscroll_height(g->window) - 2);
+  	} else {
+  	  	xwimp_close_window(toolbar->status_handle);
+  	}
+
+	/*	Update the toolbar height
+	*/
+	return_value = ro_theme_resize_toolbar(g);
+
+	/*	Open/close the toolbar
+	*/
+	if (toolbar->height > 0) {
+		outline.w = g->window;
+		xwimp_get_window_outline(&outline);
+		state.w = g->window;
+		xwimp_get_window_state(&state);
+		state.w = toolbar->toolbar_handle;
+		state.visible.x1 = outline.outline.x1 - 2;
+		state.visible.y0 = state.visible.y1 - toolbar->height;
+		state.xscroll = 0;
+		state.yscroll = 0;
+		state.next = wimp_TOP;
+		xwimp_open_window_nested((wimp_open *)&state, g->window,
+				wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT
+						<< wimp_CHILD_XORIGIN_SHIFT |
+				wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT
+						<< wimp_CHILD_YORIGIN_SHIFT |
+				wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT
+						<< wimp_CHILD_LS_EDGE_SHIFT |
+				wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT
+						<< wimp_CHILD_BS_EDGE_SHIFT |
+				wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT
+						<< wimp_CHILD_RS_EDGE_SHIFT |
+				wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT
+						<< wimp_CHILD_TS_EDGE_SHIFT);
+	} else {
+	  	xwimp_close_window(toolbar->toolbar_handle);
+	}
+
+	/*	Return
+	*/
+	return return_value;
 }
 
 
 /**
- * Resize the URL icon in a toolbar.
+ * Resize the status and toolbar windows.
+ *
+ * \return non-zero if the toolbar height has changed
  */
+int ro_theme_resize_toolbar(gui_window *g) {
+	os_box extent = { 0, 0, 0, 0 };
+	struct toolbar *toolbar;
+	wimp_outline outline;
+	wimp_outline status_outline;
+	wimp_window_state state;
+	int width, status_width;
+	int return_value = 0;
+
+	/*	Paranoia
+	*/
+	toolbar = g->data.browser.toolbar;
+	if (toolbar == NULL) return 0;
 
-void ro_theme_resize_toolbar(wimp_w w, int width, int height)
-{
-	wimp_icon_state ic;
-	ic.w = w;
-	ic.i = ICON_TOOLBAR_URL;
-	wimp_get_icon_state(&ic);
-
-	wimp_resize_icon(w, ICON_TOOLBAR_URL, ic.icon.extent.x0, ic.icon.extent.y0,
-			width - 8, ic.icon.extent.y1);
-	wimp_force_redraw(w, ic.icon.extent.x0, ic.icon.extent.y0,
-			width, ic.icon.extent.y1);
+	/*	Get the toolbar width
+	*/
+	outline.w = g->window;
+	if (xwimp_get_window_outline(&outline)) return 0;
+	width = outline.outline.x1 - outline.outline.x0 - 2;
+
+	/*	Reformat if we should
+	*/
+	if ((toolbar->width != width) || (toolbar->resize_status) || (toolbar->update_pending)) {
+ 	  	if (toolbar->resize_status) {
+		 	status_outline.w = toolbar->status_handle;
+			if (xwimp_get_window_outline(&status_outline)) return 0;
+			toolbar->status_width = width -
+					(status_outline.outline.x1 - status_outline.outline.x0 - 4);
+  	  	  	toolbar->resize_status = 0;
+  	  	} else {
+  	  	  	/*	Update the extent of the status window
+  	  	  	*/
+ 	  		state.w = g->window;
+ 	  		if (xwimp_get_window_state(&state)) return 0;
+ 	  		extent.x1 = state.visible.x1 - state.visible.x0;
+ 	  		extent.y1 = toolbar->status_height - 2;
+ 	  		xwimp_set_extent(toolbar->status_handle, &extent);
+
+		  	/*	Re-open the status window as we can't use the nested
+		  		wimp to manage everything as it would keep extending
+		  		the size incorrectly.
+		  	*/
+		  	status_width = width - toolbar->status_width;
+		  	if (status_width < 12) status_width = 12;
+		  	if (toolbar->status_window) {
+		  		state.w = toolbar->status_handle;
+				state.xscroll = 0;
+				state.yscroll = 0;
+				state.next = wimp_TOP;
+				state.visible.x0 = outline.outline.x0;
+				state.visible.x1 = outline.outline.x0 + status_width;
+				state.visible.y0 = outline.outline.y0 - toolbar->status_height;
+				state.visible.y1 = outline.outline.y0 - 2;
+				xwimp_open_window_nested((wimp_open *) &state, g->window,
+						wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT
+								<< wimp_CHILD_XORIGIN_SHIFT |
+						wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT
+								<< wimp_CHILD_YORIGIN_SHIFT |
+						wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT
+								<< wimp_CHILD_LS_EDGE_SHIFT |
+						wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT
+								<< wimp_CHILD_BS_EDGE_SHIFT |
+						wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT
+								<< wimp_CHILD_RS_EDGE_SHIFT |
+						wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT
+								<< wimp_CHILD_TS_EDGE_SHIFT);
+	  		} else {
+	  		 	if (toolbar->update_pending) {
+	  		 		xwimp_close_window(toolbar->status_handle);
+	  		 	}
+	  		}
+		}
+
+	  	/*	Resize the toolbar
+	  	*/
+		return ro_toolbar_reformat(toolbar, width);
+	}
+	return return_value;
 }