Author: tlsa Date: Thu Jun 30 12:51:58 2011 New Revision: 12545 URL: http://source.netsurf-browser.org?rev=12545&view=rev Log: Fix up RISC OS front end. Modified: trunk/netsurf/desktop/history_core.h trunk/netsurf/riscos/gui/progress_bar.c trunk/netsurf/riscos/gui/status_bar.c trunk/netsurf/riscos/toolbar.c trunk/netsurf/riscos/treeview.c Modified: trunk/netsurf/desktop/history_core.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/history_core.h?re... ============================================================================== --- trunk/netsurf/desktop/history_core.h (original) +++ trunk/netsurf/desktop/history_core.h Thu Jun 30 12:51:58 2011 @@ -29,6 +29,7 @@ struct history; struct browser_window; struct history_entry; +struct redraw_context; struct history *history_create(void); struct history *history_clone(struct history *history); Modified: trunk/netsurf/riscos/gui/progress_bar.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui/progress_bar.c... ============================================================================== --- trunk/netsurf/riscos/gui/progress_bar.c (original) +++ trunk/netsurf/riscos/gui/progress_bar.c Thu Jun 30 12:51:58 2011 @@ -473,7 +473,6 @@ int progress_ymid; /* initialise the plotters */ - plot = ro_plotters; ro_plot_origin_x = 0; ro_plot_origin_y = 0; @@ -502,14 +501,14 @@ redraw->box.y0 + pb->visible.y0) >> 1; if ((clip.x0 < clip.x1) && (clip.y0 < clip.y1)) { if (progress_icon) { - plot.clip(&clip); + ro_plotters.clip(&clip); _swix(Tinct_Plot, _IN(2) | _IN(3) | _IN(4) | _IN(7), progress_icon, redraw->box.x0 - pb->offset, progress_ymid - progress_height, tinct_FILL_HORIZONTALLY); } else { - plot.rectangle(clip.x0, clip.y0, + ro_plotters.rectangle(clip.x0, clip.y0, clip.x1, clip.y1, plot_style_fill_red); } Modified: trunk/netsurf/riscos/gui/status_bar.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui/status_bar.c?r... ============================================================================== --- trunk/netsurf/riscos/gui/status_bar.c (original) +++ trunk/netsurf/riscos/gui/status_bar.c Thu Jun 30 12:51:58 2011 @@ -449,7 +449,6 @@ assert(sb); /* initialise the plotters */ - plot = ro_plotters; ro_plot_origin_x = 0; ro_plot_origin_y = 0; @@ -487,7 +486,7 @@ } /* separate the widget from the text with a line */ - plot.rectangle((redraw->box.x0 + sb->width - WIDGET_WIDTH - 2) >> 1, + ro_plotters.rectangle((redraw->box.x0 + sb->width - WIDGET_WIDTH - 2) >> 1, -redraw->box.y0 >> 1, (redraw->box.x0 + sb->width - WIDGET_WIDTH) >> 1, -redraw->box.y1 >> 1, Modified: trunk/netsurf/riscos/toolbar.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/toolbar.c?rev=1254... ============================================================================== --- trunk/netsurf/riscos/toolbar.c (original) +++ trunk/netsurf/riscos/toolbar.c Thu Jun 30 12:51:58 2011 @@ -1011,8 +1011,6 @@ assert(toolbar != NULL); - plot = ro_plotters; - error = xwimp_redraw_window(redraw, &more); if (error) { LOG(("xwimp_redraw_window: 0x%x: %s", Modified: trunk/netsurf/riscos/treeview.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/treeview.c?rev=125... ============================================================================== --- trunk/netsurf/riscos/treeview.c (original) +++ trunk/netsurf/riscos/treeview.c Thu Jun 30 12:51:58 2011 @@ -317,8 +317,6 @@ wimp_draw update; osbool more; - plot = ro_plotters; - update.w = tv->w; update.box.x0 = (2 * x) + tv->origin.x; update.box.y0 = (-2 * (y + height)) + tv->origin.y; @@ -404,7 +402,7 @@ 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; - plot.clip(&clip); + ro_plotters.clip(&clip); } error = xwimp_get_rectangle(redraw, &more);