summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--riscos/bitmap.c22
-rw-r--r--riscos/bitmap.h2
-rw-r--r--riscos/gui.h7
-rw-r--r--riscos/image.c6
-rw-r--r--riscos/print.c2
-rw-r--r--riscos/search.c2
-rw-r--r--riscos/window.c113
7 files changed, 82 insertions, 72 deletions
diff --git a/riscos/bitmap.c b/riscos/bitmap.c
index b758e82e7..1fad86ff9 100644
--- a/riscos/bitmap.c
+++ b/riscos/bitmap.c
@@ -39,7 +39,7 @@ struct bitmap *bitmap_create(int width, int height)
osspriteop_area *sprite_area;
osspriteop_header *sprite;
- if ((width == 0) || (height == 0))
+ if (width == 0 || height == 0)
return NULL;
area_size = 16 + 44 + width * height * 4;
@@ -47,6 +47,10 @@ struct bitmap *bitmap_create(int width, int height)
if (!bitmap)
return NULL;
+ bitmap->width = width;
+ bitmap->height = height;
+ bitmap->opaque = false;
+
/* area control block */
sprite_area = &bitmap->sprite_area;
sprite_area->size = area_size;
@@ -151,22 +155,6 @@ void bitmap_destroy(struct bitmap *bitmap)
/**
- * Render a bitmap.
- */
-
-bool bitmap_redraw(struct content *c, int x, int y,
- int width, int height,
- int clip_x0, int clip_y0, int clip_x1, int clip_y1,
- float scale, unsigned long background_colour)
-{
- return image_redraw(&(c->bitmap->sprite_area), x, y, width, height,
- c->width * 2, c->height * 2, background_colour,
- false, false, ((c->bitmap->opaque) ?
- IMAGE_PLOT_TINCT_OPAQUE : IMAGE_PLOT_TINCT_ALPHA));
-}
-
-
-/**
* Save a bitmap in the platform's native format.
*
* \param bitmap a bitmap, as returned by bitmap_create()
diff --git a/riscos/bitmap.h b/riscos/bitmap.h
index 17ff16340..7a5fbf5c7 100644
--- a/riscos/bitmap.h
+++ b/riscos/bitmap.h
@@ -11,6 +11,8 @@
struct osspriteop_area;
struct bitmap {
+ int width;
+ int height;
bool opaque;
osspriteop_area sprite_area;
};
diff --git a/riscos/gui.h b/riscos/gui.h
index f2394e641..6dc19ece0 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -23,6 +23,7 @@
#define THEMES_DIR "<NetSurf$Dir>.Themes"
struct toolbar;
+struct plotter_table;
extern wimp_w dialog_info, dialog_saveas, dialog_config, dialog_config_br,
dialog_config_prox, dialog_config_th, dialog_zoom, dialog_pageinfo,
@@ -250,6 +251,12 @@ void ro_gui_print_open(struct gui_window *g, int x, int y, bool sub_menu, bool k
void ro_gui_print_click(wimp_pointer *pointer);
bool ro_gui_print_keypress(wimp_key *key);
+/* in plotters.c */
+extern const struct plotter_table ro_plotters;
+extern int ro_plot_origin_x;
+extern int ro_plot_origin_y;
+void ro_plot_set_scale(float scale);
+
/* toolbar types */
#define TOOLBAR_BROWSER 0
#define TOOLBAR_HOTLIST 1
diff --git a/riscos/image.c b/riscos/image.c
index 67775f980..e0b06b6ca 100644
--- a/riscos/image.c
+++ b/riscos/image.c
@@ -47,6 +47,10 @@ bool image_redraw(osspriteop_area *area, int x, int y, int req_width,
unsigned long background_colour,
bool repeatx, bool repeaty,image_type type)
{
+ req_width *= 2;
+ req_height *= 2;
+ width *= 2;
+ height *= 2;
switch (type) {
case IMAGE_PLOT_TINCT_ALPHA:
return image_redraw_tinct(area, x, y,
@@ -127,7 +131,7 @@ bool image_redraw_tinct(osspriteop_area *area, int x, int y,
error = _swix(Tinct_PlotScaled, _INR(2,7),
(char*)area + area->first, x, y - req_height,
req_width, req_height, tinct_options);
- }
+ }
if (error) {
LOG(("xtinct_plotscaled%s: 0x%x: %s", (alpha ? "alpha" : ""),
diff --git a/riscos/print.c b/riscos/print.c
index 336863a7c..ed77d0c97 100644
--- a/riscos/print.c
+++ b/riscos/print.c
@@ -490,7 +490,7 @@ void print_document(struct gui_window *g, const char *filename)
LOG(("Printing page (%d)", print_max_sheets));
if (c->type == CONTENT_HTML)
- box = c->data.html.layout->children;
+ box = c->data.html.layout;
/* Read Printer Driver Features */
e = xpdriver_info(0, 0, 0, &features, 0, 0, 0, 0);
diff --git a/riscos/search.c b/riscos/search.c
index 781a43f63..73e495b6a 100644
--- a/riscos/search.c
+++ b/riscos/search.c
@@ -238,7 +238,7 @@ void do_search(char *string, bool from_top, bool case_sens, bool forwards)
if (c->type != CONTENT_HTML)
return;
- box = c->data.html.layout->children;
+ box = c->data.html.layout;
if (!box)
return;
diff --git a/riscos/window.c b/riscos/window.c
index a1e9ff8bc..033193379 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -23,6 +23,7 @@
#include "oslib/wimpspriteop.h"
#include "netsurf/utils/config.h"
#include "netsurf/css/css.h"
+#include "netsurf/desktop/plotters.h"
#include "netsurf/render/box.h"
#include "netsurf/render/form.h"
#include "netsurf/riscos/buffer.h"
@@ -403,8 +404,12 @@ void ro_gui_window_redraw(struct gui_window *g, wimp_draw *redraw)
osbool more;
bool clear_background = false;
struct content *c = g->bw->current_content;
+ int clip_x0, clip_y0, clip_x1, clip_y1;
os_error *error;
+ plot = ro_plotters;
+ ro_plot_set_scale(g->option.scale);
+
/* Set the current redraw gui_window to get options from
*/
ro_gui_current_redraw_gui = g;
@@ -438,15 +443,15 @@ void ro_gui_window_redraw(struct gui_window *g, wimp_draw *redraw)
}
if (c) {
- content_redraw(c,
- redraw->box.x0 - redraw->xscroll,
- redraw->box.y1 - redraw->yscroll,
- c->width * 2,
- c->height * 2,
- redraw->clip.x0,
- redraw->clip.y0,
- redraw->clip.x1 - 1,
- redraw->clip.y1 - 1,
+ ro_plot_origin_x = redraw->box.x0 - redraw->xscroll;
+ ro_plot_origin_y = redraw->box.y1 - redraw->yscroll;
+ clip_x0 = (redraw->clip.x0 - ro_plot_origin_x) / 2;
+ clip_y0 = (ro_plot_origin_y - redraw->clip.y1) / 2;
+ clip_x1 = (redraw->clip.x1 - ro_plot_origin_x) / 2;
+ clip_y1 = (ro_plot_origin_y - redraw->clip.y0) / 2;
+ content_redraw(c, 0, 0,
+ c->width * 2, c->height * 2,
+ clip_x0, clip_y0, clip_x1, clip_y1,
g->option.scale,
0xFFFFFF);
}
@@ -454,18 +459,17 @@ void ro_gui_window_redraw(struct gui_window *g, wimp_draw *redraw)
ro_gui_buffer_close();
}
error = xwimp_get_rectangle(redraw, &more);
- if (error) {
- /* RISC OS 3.7 returns the following error is enough buffer
- is claimed to cause a new dynamic area to be created. It
- doesn't actually stop anything working, so we mask it out
- for now until a better fix is found.
- */
- if ((!ro_gui_current_redraw_gui->option.buffer_everything) ||
- (error->errnum != 0x286)) {
- LOG(("xwimp_get_rectangle: 0x%x: %s",
- error->errnum, error->errmess));
- warn_user("WimpError", error->errmess);
- }
+ /* RISC OS 3.7 returns an error here if enough buffer was
+ claimed to cause a new dynamic area to be created. It
+ doesn't actually stop anything working, so we mask it out
+ for now until a better fix is found. This appears to be a
+ bug in RISC OS. */
+ if (error && !(ro_gui_current_redraw_gui->
+ option.buffer_everything &&
+ error->errnum == error_WIMP_GET_RECT)) {
+ LOG(("xwimp_get_rectangle: 0x%x: %s",
+ error->errnum, error->errmess));
+ warn_user("WimpError", error->errmess);
ro_gui_current_redraw_gui = NULL;
return;
}
@@ -493,6 +497,7 @@ void gui_window_update_box(struct gui_window *g,
bool clear_background = false;
bool use_buffer = g->option.buffer_everything;
wimp_draw update;
+ int clip_x0, clip_y0, clip_x1, clip_y1;
os_error *error;
update.w = g->window;
@@ -514,7 +519,13 @@ void gui_window_update_box(struct gui_window *g,
/* Set the current redraw gui_window to get options from
*/
ro_gui_current_redraw_gui = g;
- if (data->redraw.full_redraw) use_buffer |= g->option.buffer_animations;
+/* if (data->redraw.full_redraw) */
+ use_buffer = use_buffer || g->option.buffer_animations;
+
+ plot = ro_plotters;
+ ro_plot_origin_x = update.box.x0 - update.xscroll;
+ ro_plot_origin_y = update.box.y1 - update.yscroll;
+ ro_plot_set_scale(g->option.scale);
/* We should clear the background, except for HTML.
*/
@@ -522,8 +533,13 @@ void gui_window_update_box(struct gui_window *g,
clear_background = true;
while (more) {
+ clip_x0 = (update.clip.x0 - ro_plot_origin_x) / 2;
+ clip_y0 = (ro_plot_origin_y - update.clip.y1) / 2;
+ clip_x1 = (update.clip.x1 - ro_plot_origin_x) / 2;
+ clip_y1 = (ro_plot_origin_y - update.clip.y0) / 2;
- if (use_buffer) ro_gui_buffer_open(&update);
+ if (use_buffer)
+ ro_gui_buffer_open(&update);
if (data->redraw.full_redraw) {
if (clear_background) {
error = xcolourtrans_set_gcol(os_COLOUR_WHITE,
@@ -538,47 +554,40 @@ void gui_window_update_box(struct gui_window *g,
os_clg();
}
- content_redraw(c,
- update.box.x0 - update.xscroll,
- update.box.y1 - update.yscroll,
+ content_redraw(c, 0, 0,
c->width * 2, c->height * 2,
- update.clip.x0, update.clip.y0,
- update.clip.x1 - 1, update.clip.y1 - 1,
+ clip_x0, clip_y0, clip_x1, clip_y1,
g->option.scale,
0xFFFFFF);
} else {
assert(data->redraw.object);
content_redraw(data->redraw.object,
- update.box.x0 - update.xscroll +
- floorf(data->redraw.object_x * 2 *
+ floorf(data->redraw.object_x *
g->option.scale),
- update.box.y1 - update.yscroll -
- ceilf(data->redraw.object_y * 2 *
+ ceilf(data->redraw.object_y *
g->option.scale),
- data->redraw.object_width * 2 *
+ data->redraw.object_width *
g->option.scale,
- data->redraw.object_height * 2 *
+ data->redraw.object_height *
g->option.scale,
- update.clip.x0, update.clip.y0,
- update.clip.x1 - 1, update.clip.y1 - 1,
+ clip_x0, clip_y0, clip_x1, clip_y1,
g->option.scale,
0xFFFFFF);
}
- if (use_buffer) ro_gui_buffer_close();
+ if (use_buffer)
+ ro_gui_buffer_close();
error = xwimp_get_rectangle(&update, &more);
-
- if (error) {
- /* RISC OS 3.7 returns the following error is enough buffer
- is claimed to cause a new dynamic area to be created. It
- doesn't actually stop anything working, so we mask it out
- for now until a better fix is found.
- */
- if ((!use_buffer) || (error->errnum != 0x286)) {
- LOG(("xwimp_get_rectangle: 0x%x: %s",
- error->errnum, error->errmess));
- warn_user("WimpError", error->errmess);
- }
+ /* RISC OS 3.7 returns an error here if enough buffer was
+ claimed to cause a new dynamic area to be created. It
+ doesn't actually stop anything working, so we mask it out
+ for now until a better fix is found. This appears to be a
+ bug in RISC OS. */
+ if (error && !(use_buffer &&
+ error->errnum == error_WIMP_GET_RECT)) {
+ LOG(("xwimp_get_rectangle: 0x%x: %s",
+ error->errnum, error->errmess));
+ warn_user("WimpError", error->errmess);
ro_gui_current_redraw_gui = NULL;
return;
}
@@ -1067,7 +1076,7 @@ void ro_gui_toolbar_click(struct gui_window *g, wimp_pointer *pointer)
/* Store the toolbar
*/
current_toolbar = g->toolbar;
-
+
/* Handle Menu clicks
*/
if (pointer->buttons == wimp_CLICK_MENU) {
@@ -1402,7 +1411,7 @@ bool ro_gui_window_keypress(struct gui_window *g, int key, bool toolbar)
case wimp_KEY_F9: /* Dump content for debugging. */
switch (content->type) {
case CONTENT_HTML:
- box_dump(content->data.html.layout->children, 0);
+ box_dump(content->data.html.layout, 0);
break;
case CONTENT_CSS:
css_dump_stylesheet(content->data.css.css);
@@ -1419,7 +1428,7 @@ bool ro_gui_window_keypress(struct gui_window *g, int key, bool toolbar)
return true;
case wimp_KEY_SHIFT + wimp_KEY_F11: /* Toggle display of box outlines. */
- gui_redraw_debug = !gui_redraw_debug;
+ html_redraw_debug = !html_redraw_debug;
gui_window_redraw_window(g);
return true;