From 79022d8ec22ea6cf6645f70d7c6d00cfec845360 Mon Sep 17 00:00:00 2001 From: John Tytgat Date: Mon, 10 Mar 2008 00:51:51 +0000 Subject: Foresee OSLib 7 and pre-OSLib 7 compatibility svn path=/trunk/netsurf/; revision=3913 --- riscos/oslib_pre7.h | 42 ++++++++++++++++++++++++++++++++++++++++++ riscos/plotters.c | 6 +++--- riscos/textarea.c | 3 ++- riscos/thumbnail.c | 3 ++- riscos/wimp.c | 3 ++- riscos/window.c | 3 ++- 6 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 riscos/oslib_pre7.h (limited to 'riscos') diff --git a/riscos/oslib_pre7.h b/riscos/oslib_pre7.h new file mode 100644 index 000000000..6dfece3a0 --- /dev/null +++ b/riscos/oslib_pre7.h @@ -0,0 +1,42 @@ +/* + * Copyright 2008 John Tytgat + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** \file + * Backward compatible defines to make NetSurf buildable with pre-OSLib 7 + * releases. + */ + +#ifndef _NETSURF_RISCOS_OSLIB_PRE7_H_ +#define _NETSURF_RISCOS_OSLIB_PRE7_H_ + +#include "oslib/colourtrans.h" + +/** + * After OSLib 6.90, there was a rename of colourtrans defines in order + * to avoid namespace clashes: + * svn diff -c 238 https://ro-oslib.svn.sourceforge.net/svnroot/ro-oslib/trunk/\!OSLib/Source/Core/oslib/ColourTrans.swi + * Foresee some backwards compatibility until we've switched to OSLib 7. +*/ +#ifndef colourtrans_SET_BG_GCOL +# define colourtrans_SET_BG_GCOL colourtrans_SET_BG +#endif +#ifndef colourtrans_USE_ECFS_GCOL +# define colourtrans_USE_ECFS_GCOL colourtrans_USE_ECFS +#endif + +#endif diff --git a/riscos/plotters.c b/riscos/plotters.c index 124774450..1044df3a4 100644 --- a/riscos/plotters.c +++ b/riscos/plotters.c @@ -29,10 +29,10 @@ #include "riscos/bitmap.h" #include "riscos/image.h" #include "riscos/gui.h" +#include "riscos/oslib_pre7.h" #include "utils/log.h" - static bool ro_plot_clg(colour c); static bool ro_plot_rectangle(int x0, int y0, int width, int height, int line_width, colour c, bool dotted, bool dashed); @@ -90,7 +90,7 @@ bool ro_plot_clg(colour c) { os_error *error; error = xcolourtrans_set_gcol(c << 8, - colourtrans_SET_BG | colourtrans_USE_ECFS, + colourtrans_SET_BG_GCOL | colourtrans_USE_ECFS_GCOL, os_ACTION_OVERWRITE, 0, 0); if (error) { LOG(("xcolourtrans_set_gcol: 0x%x: %s", @@ -330,7 +330,7 @@ bool ro_plot_fill(int x0, int y0, int x1, int y1, colour c) { os_error *error; - error = xcolourtrans_set_gcol(c << 8, colourtrans_USE_ECFS, + error = xcolourtrans_set_gcol(c << 8, colourtrans_USE_ECFS_GCOL, os_ACTION_OVERWRITE, 0, 0); if (error) { LOG(("xcolourtrans_set_gcol: 0x%x: %s", diff --git a/riscos/textarea.c b/riscos/textarea.c index 474347b01..63a2356c0 100644 --- a/riscos/textarea.c +++ b/riscos/textarea.c @@ -35,6 +35,7 @@ #include "rufl.h" #include "riscos/gui.h" +#include "riscos/oslib_pre7.h" #include "riscos/textarea.h" #include "riscos/ucstables.h" #include "riscos/wimp.h" @@ -1091,7 +1092,7 @@ void textarea_redraw_internal(wimp_draw *redraw, bool update) error = xcolourtrans_set_gcol( (ta->flags & TEXTAREA_READONLY) ? 0xD9D9D900 : 0xFFFFFF00, - colourtrans_SET_BG | colourtrans_USE_ECFS, + colourtrans_SET_BG_GCOL | colourtrans_USE_ECFS_GCOL, os_ACTION_OVERWRITE, 0, 0); if (error) { LOG(("xcolourtrans_set_gcol: 0x%x: %s", diff --git a/riscos/thumbnail.c b/riscos/thumbnail.c index e081d531a..f8cd37217 100644 --- a/riscos/thumbnail.c +++ b/riscos/thumbnail.c @@ -39,6 +39,7 @@ #include "riscos/bitmap.h" #include "riscos/gui.h" #include "riscos/options.h" +#include "riscos/oslib_pre7.h" #include "riscos/thumbnail.h" #include "riscos/tinct.h" #include "utils/log.h" @@ -124,7 +125,7 @@ bool thumbnail_create(struct content *content, struct bitmap *bitmap, return false; } rufl_invalidate_cache(); - colourtrans_set_gcol(os_COLOUR_WHITE, colourtrans_SET_BG, + colourtrans_set_gcol(os_COLOUR_WHITE, colourtrans_SET_BG_GCOL, os_ACTION_OVERWRITE, 0); os_clg(); content_redraw(content, 0, 0, bitmap->width, bitmap->height, diff --git a/riscos/wimp.c b/riscos/wimp.c index e8d216caf..a45454606 100644 --- a/riscos/wimp.c +++ b/riscos/wimp.c @@ -34,6 +34,7 @@ #include "oslib/wimpspriteop.h" #include "desktop/gui.h" #include "riscos/gui.h" +#include "riscos/oslib_pre7.h" #include "riscos/theme.h" #include "riscos/wimp.h" #include "utils/log.h" @@ -866,7 +867,7 @@ void ro_gui_user_redraw(wimp_draw *redraw, bool user_fill, while (more) { if (user_fill) { error = xcolourtrans_set_gcol(user_colour, - colourtrans_SET_BG, + colourtrans_SET_BG_GCOL, os_ACTION_OVERWRITE, 0, 0); if (error) { LOG(("xcolourtrans_set_gcol: 0x%x: %s", diff --git a/riscos/window.c b/riscos/window.c index be843b31c..a50e7b4c4 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -59,6 +59,7 @@ #include "riscos/gui/status_bar.h" #include "riscos/menus.h" #include "riscos/options.h" +#include "riscos/oslib_pre7.h" #include "riscos/save.h" #include "riscos/theme.h" #include "riscos/thumbnail.h" @@ -1580,7 +1581,7 @@ void ro_gui_window_update_boxes(void) { if (data->redraw.full_redraw) { if (clear_background) { error = xcolourtrans_set_gcol(os_COLOUR_WHITE, - colourtrans_SET_BG, + colourtrans_SET_BG_GCOL, os_ACTION_OVERWRITE, 0, 0); if (error) { LOG(("xcolourtrans_set_gcol: 0x%x: %s", -- cgit v1.2.3