mirror of
https://github.com/netsurf-browser/netsurf
synced 2025-02-22 17:34:19 +03:00
Foresee OSLib 7 and pre-OSLib 7 compatibility
svn path=/trunk/netsurf/; revision=3913
This commit is contained in:
John Tytgat
parent
b79b0dbd82
commit
79022d8ec2
42
riscos/oslib_pre7.h
Normal file
42
riscos/oslib_pre7.h
Normal file
@ -0,0 +1,42 @@
|
||||
/*
|
||||
* Copyright 2008 John Tytgat <John.Tytgat@aaug.net>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/** \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
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user