1 files changed, 95 insertions, 84 deletions

diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index fbf7b1652..f4229207b 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -354,7 +354,8 @@ static struct gui_window *gui_window_create(struct browser_window *bw,
 		return 0;
 	}
 
-	LOG("Creating gui window %p for browser window %p", g, bw);
+	NSLOG(netsurf, INFO, "Creating gui window %p for browser window %p",
+	      g, bw);
 
 	g->bw = bw;
 	g->mouse.state = 0;
@@ -436,25 +437,27 @@ void nsbeos_dispatch_event(BMessage *message)
 		continue;
 
 	if (gui && gui != z) {
-		LOG("discarding event for destroyed gui_window");
+		NSLOG(netsurf, INFO,
+		      "discarding event for destroyed gui_window");
 		delete message;
 		return;
 	}
 	if (scaffold && (!y || scaffold != y->scaffold)) {
-		LOG("discarding event for destroyed scaffolding");
+		NSLOG(netsurf, INFO,
+		      "discarding event for destroyed scaffolding");
 		delete message;
 		return;
 	}
 
 	// messages for top-level
 	if (scaffold) {
-		LOG("dispatching to top-level");
+		NSLOG(netsurf, INFO, "dispatching to top-level");
 		nsbeos_scaffolding_dispatch_event(scaffold, message);
 		delete message;
 		return;
 	}
 
-	//LOG("processing message");
+	NSLOG(netsurf, DEEPDEBUG, "processing message");
 	switch (message->what) {
 		case B_QUIT_REQUESTED:
 			// from the BApplication
@@ -763,7 +766,8 @@ void nsbeos_window_keypress_event(BView *view, gui_window *g, BMessage *event)
 	if (!numbytes)
 		numbytes = strlen(bytes);
 
-	LOG("mods 0x%08lx key %ld raw %ld byte[0] %d", mods, key, raw_char, buff[0]);
+	NSLOG(netsurf, INFO, "mods 0x%08lx key %ld raw %ld byte[0] %d", mods,
+	      key, raw_char, buff[0]);
 
 	char byte;
 	if (numbytes == 1) {
@@ -911,28 +915,6 @@ void nsbeos_reflow_all_windows(void)
 }
 
 
-
-/**
- * callback from core to reformat a window.
- */
-static void beos_window_reformat(struct gui_window *g)
-{
-        if (g == NULL) {
-                return;
-        }
-
-        NSBrowserFrameView *view = g->view;
-        if (view && view->LockLooper()) {
-                BRect bounds = view->Bounds();
-                view->UnlockLooper();
-#warning XXX why - 1 & - 2 !???
-                browser_window_reformat(g->bw,
-                                        false,
-                                        bounds.Width() + 1 /* - 2*/,
-                                        bounds.Height() + 1);
-        }        
-}
-
 void nsbeos_window_destroy_browser(struct gui_window *g)
 {
 	browser_window_destroy(g->bw);
@@ -952,10 +934,10 @@ static void gui_window_destroy(struct gui_window *g)
 		g->next->prev = g->prev;
 
 
-	LOG("Destroying gui_window %p", g);
+	NSLOG(netsurf, INFO, "Destroying gui_window %p", g);
 	assert(g != NULL);
 	assert(g->bw != NULL);
-	LOG("     Scaffolding: %p", g->scaffold);
+	NSLOG(netsurf, INFO, "     Scaffolding: %p", g->scaffold);
 
 	if (g->view == NULL)
 		return;
@@ -1000,39 +982,39 @@ void nsbeos_redraw_caret(struct gui_window *g)
 	g->view->UnlockLooper();
 }
 
-static void gui_window_redraw_window(struct gui_window *g)
-{
-	if (g->view == NULL)
-		return;
-	if (!g->view->LockLooper())
-		return;
-
-	nsbeos_current_gc_set(g->view);
-
-	g->view->Invalidate();
-
-	nsbeos_current_gc_set(NULL);
-	g->view->UnlockLooper();
-}
-
-static void gui_window_update_box(struct gui_window *g, const struct rect *rect)
+/**
+ * Invalidate an area of a beos browser window
+ *
+ * \param g The netsurf window being invalidated.
+ * \param rect area to redraw or NULL for entrire window area.
+ * \return NSERROR_OK or appropriate error code.
+ */
+static nserror
+beos_window_invalidate_area(struct gui_window *g, const struct rect *rect)
 {
-	if (browser_window_has_content(g->bw) == false)
-		return;
+	if (browser_window_has_content(g->bw) == false) {
+		return NSERROR_OK;
+	}
 
-	if (g->view == NULL)
-		return;
-	if (!g->view->LockLooper())
-		return;
+	if (g->view == NULL) {
+		return NSERROR_OK;
+	}
 
-	nsbeos_current_gc_set(g->view);
+	if (!g->view->LockLooper()) {
+		return NSERROR_OK;
+	}
 
-//XXX +1 ??
-	g->view->Invalidate(BRect(rect->x0, rect->y0,
-				   rect->x1 - 1, rect->y1 - 1));
+	if (rect != NULL) {
+		//XXX +1 ??
+		g->view->Invalidate(BRect(rect->x0, rect->y0,
+					  rect->x1 - 1, rect->y1 - 1));
+	} else {
+		g->view->Invalidate();
+	}
 
-	nsbeos_current_gc_set(NULL);
 	g->view->UnlockLooper();
+
+	return NSERROR_OK;
 }
 
 static bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy)
@@ -1053,21 +1035,39 @@ static bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy)
 	return true;
 }
 
-static void gui_window_set_scroll(struct gui_window *g, int sx, int sy)
+/**
+ * Set the scroll position of a beos browser window.
+ *
+ * Scrolls the viewport to ensure the specified rectangle of the
+ *   content is shown. The beos implementation scrolls the contents so
+ *   the specified point in the content is at the top of the viewport.
+ *
+ * \param g gui window to scroll
+ * \param rect The rectangle to ensure is shown.
+ * \return NSERROR_OK on success or apropriate error code.
+ */
+static nserror
+gui_window_set_scroll(struct gui_window *g, const struct rect *rect)
 {
 	//CALLED();
-	if (g->view == NULL)
-		return;
-	if (!g->view->LockLooper())
-		return;
+	if (g->view == NULL) {
+		return NSERROR_BAD_PARAMETER;
+	}
+	if (!g->view->LockLooper()) {
+		return NSERROR_BAD_PARAMETER;
+        }
 
 #warning XXX: report to view frame ?
-	if (g->view->ScrollBar(B_HORIZONTAL))
-		g->view->ScrollBar(B_HORIZONTAL)->SetValue(sx);
-	if (g->view->ScrollBar(B_VERTICAL))
-		g->view->ScrollBar(B_VERTICAL)->SetValue(sy);
+	if (g->view->ScrollBar(B_HORIZONTAL)) {
+		g->view->ScrollBar(B_HORIZONTAL)->SetValue(rect->x0);
+        }
+	if (g->view->ScrollBar(B_VERTICAL)) {
+		g->view->ScrollBar(B_VERTICAL)->SetValue(rect->y0);
+        }
 		
 	g->view->UnlockLooper();
+
+        return NSERROR_OK;
 }
 
 
@@ -1094,8 +1094,9 @@ static void gui_window_update_extent(struct gui_window *g)
 	x_max -= g->view->Bounds().Width() + 1;
 	y_max -= g->view->Bounds().Height() + 1;
 
-	LOG("x_max = %d y_max = %d x_prop = %f y_prop = %f\n",
-            x_max, y_max, x_prop, y_prop);
+	NSLOG(netsurf, INFO,
+	      "x_max = %d y_max = %d x_prop = %f y_prop = %f\n", x_max,
+	      y_max, x_prop, y_prop);
 
 	if (g->view->ScrollBar(B_HORIZONTAL)) {
 		g->view->ScrollBar(B_HORIZONTAL)->SetRange(0, x_max);
@@ -1331,31 +1332,42 @@ static struct gui_clipboard_table clipboard_table = {
 
 struct gui_clipboard_table *beos_clipboard_table = &clipboard_table;
 
-static void gui_window_get_dimensions(struct gui_window *g, int *width, int *height,
-			       bool scaled)
+/**
+ * Find the current dimensions of a beos browser window content area.
+ *
+ * \param g The gui window to measure content area of.
+ * \param width receives width of window
+ * \param height receives height of window
+ * \param scaled whether to return scaled values
+ * \return NSERROR_OK on sucess and width and height updated
+ *          else error code.
+ */
+static nserror
+gui_window_get_dimensions(struct gui_window *g, int *width, int *height,
+                          bool scaled)
 {
-	if (g->view && g->view->LockLooper()) {
-		*width = g->view->Bounds().Width() + 1;
-		*height = g->view->Bounds().Height() + 1;
-		g->view->UnlockLooper();
-	}
-
-	if (scaled) {
-		*width /= g->scale;
-		*height /= g->scale;
-	}
+        if (g->view &&
+            g->view->LockLooper()) {
+                *width = g->view->Bounds().Width() + 1;
+                *height = g->view->Bounds().Height() + 1;
+                g->view->UnlockLooper();
+
+                if (scaled) {
+                        *width /= g->scale;
+                        *height /= g->scale;
+                }
+        }
+        return NSERROR_OK;
 }
 
 static struct gui_window_table window_table = {
 	gui_window_create,
 	gui_window_destroy,
-	gui_window_redraw_window,
-	gui_window_update_box,
+	beos_window_invalidate_area,
 	gui_window_get_scroll,
 	gui_window_set_scroll,
 	gui_window_get_dimensions,
 	gui_window_update_extent,
-        beos_window_reformat,
 
 	/* from scaffold */
 	gui_window_set_title,
@@ -1369,7 +1381,6 @@ static struct gui_window_table window_table = {
 	gui_window_stop_throbber,
 	NULL, //drag_start
 	NULL, //save_link
-	NULL, //scroll_visible
 	NULL, //scroll_start
 	gui_window_new_content,
 	NULL, //create_form_select_menu