r5462 chris_y - in /trunk/netsurf: Makefile.sources amiga/arexx.c amiga/arexx.h amiga/gui.c
by netsurf＠semichrome.net
Author: chris_y
Date: Mon Sep 29 14:35:30 2008
New Revision: 5462
URL: http://source.netsurf-browser.org?rev=5462&view=rev
Log:
Minimal ARexx port.
Port name: NETSURF
Commands supported: OPEN
OPEN URL/A
Opens URL specified by URL argument in new browser window.
Added:
trunk/netsurf/amiga/arexx.c (with props)
trunk/netsurf/amiga/arexx.h (with props)
Modified:
trunk/netsurf/Makefile.sources
trunk/netsurf/amiga/gui.c
Modified: trunk/netsurf/Makefile.sources
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.sources?rev=5462...
==============================================================================
--- trunk/netsurf/Makefile.sources (original)
+++ trunk/netsurf/Makefile.sources Mon Sep 29 14:35:30 2008
@@ -88,7 +88,7 @@
# S_AMIGA are sources purely for the Amiga build
S_AMIGA := compat.c gui.c tree.c history.c hotlist.c schedule.c \
thumbnail.c misc.c bitmap.c font.c filetype.c utf8.c login.c \
- plotters.c object.c menu.c save_pdf.c
+ plotters.c object.c menu.c save_pdf.c arexx.c
S_AMIGA := $(addprefix amiga/,$(S_AMIGA))
# S_FRAMEBUFFER are sources purely for the framebuffer build
Added: trunk/netsurf/amiga/arexx.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/arexx.c?rev=5462&vi...
==============================================================================
--- trunk/netsurf/amiga/arexx.c (added)
+++ trunk/netsurf/amiga/arexx.c Mon Sep 29 14:35:30 2008
@@ -1,0 +1,65 @@
+/*
+ * Copyright 2008 Chris Young <chris(a)unsatisfactorysoftware.co.uk>
+ *
+ * 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/>.
+ */
+
+#include "arexx.h"
+#include <reaction/reaction_macros.h>
+#include <string.h>
+#include <proto/intuition.h>
+#include "desktop/browser.h"
+
+enum
+{
+ RX_OPEN=0,
+};
+
+STATIC VOID rx_open(struct ARexxCmd *, struct RexxMsg *);
+
+STATIC struct ARexxCmd Commands[] =
+{
+ {"OPEN",RX_OPEN,rx_open,"URL/A", 0, NULL, 0, 0, NULL },
+ { NULL, 0, NULL, NULL, 0, NULL, 0, 0, NULL }
+};
+
+void ami_arexx_init()
+{
+ if(arexx_obj = ARexxObject,
+ AREXX_HostName,"NETSURF",
+ AREXX_Commands,Commands,
+ AREXX_NoSlot,TRUE,
+ AREXX_ReplyHook,NULL,
+ AREXX_DefExtension,"nsrx",
+ End)
+ {
+ GetAttr(AREXX_SigMask, arexx_obj, &rxsig);
+ }
+}
+
+void ami_arexx_handle()
+{
+ RA_HandleRexx(arexx_obj);
+}
+
+void ami_arexx_cleanup()
+{
+ if(arexx_obj) DisposeObject(arexx_obj);
+}
+
+STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
+{
+ browser_window_create((char *)cmd->ac_ArgList[0],NULL,NULL,true,false);
+}
Propchange: trunk/netsurf/amiga/arexx.c
------------------------------------------------------------------------------
amiga:protection = ----rwed ---- ----
Propchange: trunk/netsurf/amiga/arexx.c
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/netsurf/amiga/arexx.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/arexx.h?rev=5462&vi...
==============================================================================
--- trunk/netsurf/amiga/arexx.h (added)
+++ trunk/netsurf/amiga/arexx.h Mon Sep 29 14:35:30 2008
@@ -1,0 +1,32 @@
+/*
+ * Copyright 2008 Chris Young <chris(a)unsatisfactorysoftware.co.uk>
+ *
+ * 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/>.
+ */
+
+#ifndef AMIGA_AREXX_H
+#define AMIGA_AREXX_H
+
+#include <proto/arexx.h>
+#include <classes/arexx.h>
+
+void ami_arexx_init(void);
+void ami_arexx_handle(void);
+void ami_arexx_execute(char *);
+void ami_arexx_cleanup(void);
+
+Object *arexx_obj;
+ULONG rxsig;
+#endif
Propchange: trunk/netsurf/amiga/arexx.h
------------------------------------------------------------------------------
amiga:protection = ----rwed ---- ----
Propchange: trunk/netsurf/amiga/arexx.h
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=5462&r1=5...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Mon Sep 29 14:35:30 2008
@@ -65,6 +65,7 @@
#include "amiga/login.h"
#include "utils/url.h"
#include <string.h>
+#include "amiga/arexx.h"
#ifdef WITH_HUBBUB
#include <hubbub/hubbub.h>
@@ -185,6 +186,8 @@
}
filereq = (struct FileRequester *)AllocAslRequest(ASL_FileRequest,NULL);
+
+ ami_arexx_init();
if(iffh = AllocIFF())
{
@@ -841,7 +844,7 @@
ULONG winsignal = 1L << sport->mp_SigBit;
ULONG appsig = 1L << appport->mp_SigBit;
ULONG schedulesig = 1L << msgport->mp_SigBit;
- ULONG signalmask = winsignal | appsig | schedulesig;
+ ULONG signalmask = winsignal | appsig | schedulesig | rxsig;
ULONG signal;
struct Message *timermsg = NULL;
@@ -854,6 +857,10 @@
else if(signal & appsig)
{
ami_handle_appmsg();
+ }
+ else if(signal & rxsig)
+ {
+ ami_arexx_handle();
}
else if(signal & schedulesig)
{
@@ -928,6 +935,7 @@
if(iffh->iff_Stream) CloseClipboard((struct ClipboardHandle *)iffh->iff_Stream);
if(iffh) FreeIFF(iffh);
+ ami_arexx_cleanup();
FreeSysObject(ASOT_PORT,appport);
FreeSysObject(ASOT_PORT,sport);
15 years, 2 months
r5460 chris_y - /trunk/netsurf/amiga/gui.c
by netsurf＠semichrome.net
Author: chris_y
Date: Sun Sep 28 17:50:13 2008
New Revision: 5460
URL: http://source.netsurf-browser.org?rev=5460&view=rev
Log:
- Accept a URL as an argument to open that page on startup (this is needed for OpenURL
support)
- Fix loads of warnings
Modified:
trunk/netsurf/amiga/gui.c
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=5460&r1=5...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Sun Sep 28 17:50:13 2008
@@ -60,6 +60,11 @@
#include <proto/icon.h>
#include <workbench/icon.h>
#include "amiga/tree.h"
+#include <parserutils/charset/mibenum.h>
+#include "utils/utils.h"
+#include "amiga/login.h"
+#include "utils/url.h"
+#include <string.h>
#ifdef WITH_HUBBUB
#include <hubbub/hubbub.h>
@@ -151,14 +156,6 @@
BPTR lock=0;
Object *dto;
-/* ttengine.library
- if(!ami_open_tte())
- {
- char errormsg[100];
- die(sprintf(errormsg,"%s ttengine.library",messages_get("OpenError")));
- }
-*/
-
msgport = AllocSysObjectTags(ASOT_PORT,
ASO_NoTrack,FALSE,
TAG_DONE);
@@ -254,39 +251,39 @@
#endif
if((!option_cookie_file) || (option_cookie_file[0] == '\0'))
- option_cookie_file = strdup("Resources/Cookies");
+ option_cookie_file = (char *)strdup("Resources/Cookies");
if((!option_hotlist_file) || (option_hotlist_file[0] == '\0'))
- option_hotlist_file = strdup("Resources/Hotlist");
+ option_hotlist_file = (char *)strdup("Resources/Hotlist");
if((!option_url_file) || (option_url_file[0] == '\0'))
- option_url_file = strdup("Resources/URLs");
+ option_url_file = (char *)strdup("Resources/URLs");
/*
if((!option_cookie_jar) || (option_cookie_jar[0] == '\0'))
- option_cookie_jar = strdup("Resources/CookieJar");
+ option_cookie_jar = (char *)strdup("Resources/CookieJar");
*/
if((!option_ca_bundle) || (option_ca_bundle[0] == '\0'))
- option_ca_bundle = strdup("devs:curl-ca-bundle.crt");
+ option_ca_bundle = (char *)strdup("devs:curl-ca-bundle.crt");
if((!option_font_sans) || (option_font_sans[0] == '\0'))
- option_font_sans = strdup("DejaVu Sans");
+ option_font_sans = (char *)strdup("DejaVu Sans");
if((!option_font_serif) || (option_font_serif[0] == '\0'))
- option_font_serif = strdup("DejaVu Serif");
+ option_font_serif = (char *)strdup("DejaVu Serif");
if((!option_font_mono) || (option_font_mono[0] == '\0'))
- option_font_mono = strdup("DejaVu Sans Mono");
+ option_font_mono = (char *)strdup("DejaVu Sans Mono");
if((!option_font_cursive) || (option_font_cursive[0] == '\0'))
- option_font_cursive = strdup("DejaVu Sans");
+ option_font_cursive = (char *)strdup("DejaVu Sans");
if((!option_font_fantasy) || (option_font_fantasy[0] == '\0'))
- option_font_fantasy = strdup("DejaVu Serif");
+ option_font_fantasy = (char *)strdup("DejaVu Serif");
if((!option_toolbar_images) || (option_toolbar_images[0] == '\0'))
- option_toolbar_images = strdup("TBImages:");
+ option_toolbar_images = (char *)strdup("TBImages:");
if(!option_window_width) option_window_width = 800;
if(!option_window_height) option_window_height = 600;
@@ -349,7 +346,14 @@
{
struct browser_window *bw;
ULONG id;
-// const char *addr = NETSURF_HOMEPAGE; //"http://netsurf-browser.org/welcome/";
+ long rarray[] = {0};
+ struct RDArgs *args;
+ STRPTR template = "URL/A";
+
+ enum
+ {
+ A_URL
+ };
InitRastPort(&dummyrp);
dummyrp.BitMap = p96AllocBitMap(1,1,32,
@@ -358,8 +362,20 @@
if(!dummyrp.BitMap) die(messages_get("NoMemory"));
+ if(argc) // argc==0 is started from wb
+ {
+ if(args = ReadArgs(template,rarray,NULL))
+ {
+ if(rarray[A_URL])
+ {
+ option_homepage_url = (char *)strdup(rarray[A_URL]);
+ }
+ FreeArgs(args);
+ }
+ }
+
if ((!option_homepage_url) || (option_homepage_url[0] == '\0'))
- option_homepage_url = strdup(NETSURF_HOMEPAGE);
+ option_homepage_url = (char *)strdup(NETSURF_HOMEPAGE);
if(option_modeid)
{
@@ -437,12 +453,12 @@
switch(result & WMHI_CLASSMASK) // class
{
case WMHI_MOUSEMOVE:
- GetAttr(SPACE_AreaBox,gwin->gadgets[GID_BROWSER],&bbox);
-
- GetAttr(SCROLLER_Top,gwin->objects[OID_HSCROLL],&xs);
+ GetAttr(SPACE_AreaBox,gwin->gadgets[GID_BROWSER],(ULONG *)&bbox);
+
+ GetAttr(SCROLLER_Top,gwin->objects[OID_HSCROLL],(ULONG *)&xs);
x = gwin->win->MouseX - bbox->Left +xs;
- GetAttr(SCROLLER_Top,gwin->objects[OID_VSCROLL],&ys);
+ GetAttr(SCROLLER_Top,gwin->objects[OID_VSCROLL],(ULONG *)&ys);
y = gwin->win->MouseY - bbox->Top + ys;
width=bbox->Width;
@@ -473,9 +489,9 @@
case WMHI_MOUSEBUTTONS:
GetAttr(SPACE_AreaBox,gwin->gadgets[GID_BROWSER],(ULONG *)&bbox);
- GetAttr(SCROLLER_Top,gwin->objects[OID_HSCROLL],&xs);
+ GetAttr(SCROLLER_Top,gwin->objects[OID_HSCROLL],(ULONG *)&xs);
x = gwin->win->MouseX - bbox->Left +xs;
- GetAttr(SCROLLER_Top,gwin->objects[OID_VSCROLL],&ys);
+ GetAttr(SCROLLER_Top,gwin->objects[OID_VSCROLL],(ULONG *)&ys);
y = gwin->win->MouseY - bbox->Top + ys;
width=bbox->Width;
@@ -533,7 +549,7 @@
switch(result & WMHI_GADGETMASK) //gadaddr->GadgetID) //result & WMHI_GADGETMASK)
{
case GID_URL:
- GetAttr(STRINGA_TextVal,gwin->gadgets[GID_URL],&storage);
+ GetAttr(STRINGA_TextVal,gwin->gadgets[GID_URL],(ULONG *)&storage);
browser_window_go(gwin->bw,(char *)storage,NULL,true);
//printf("%s\n",(char *)storage);
break;
@@ -706,16 +722,16 @@
while(appmsg=(struct AppMessage *)GetMsg(appport))
{
- GetAttr(WINDOW_UserData,appmsg->am_ID,(ULONG *)&gwin);
+ GetAttr(WINDOW_UserData,(struct Window *)appmsg->am_ID,(ULONG *)&gwin);
if(appmsg->am_Type == AMTYPE_APPWINDOW)
{
- GetAttr(SPACE_AreaBox,gwin->gadgets[GID_BROWSER],&bbox);
-
- GetAttr(SCROLLER_Top,gwin->objects[OID_HSCROLL],&xs);
+ GetAttr(SPACE_AreaBox,gwin->gadgets[GID_BROWSER],(ULONG *)&bbox);
+
+ GetAttr(SCROLLER_Top,gwin->objects[OID_HSCROLL],(ULONG *)&xs);
x = (appmsg->am_MouseX) - (bbox->Left) +xs;
- GetAttr(SCROLLER_Top,gwin->objects[OID_VSCROLL],&ys);
+ GetAttr(SCROLLER_Top,gwin->objects[OID_VSCROLL],(ULONG *)&ys);
y = appmsg->am_MouseY - bbox->Top + ys;
width=bbox->Width;
@@ -767,7 +783,7 @@
}
if(!file_box && !text_box)
- return false;
+ return;
if(file_box)
{
@@ -776,14 +792,14 @@
if(utf8_from_local_encoding(filename,0,&utf8_fn) != UTF8_CONVERT_OK)
{
- warn_user("NoMemory");
+ warn_user("NoMemory","");
return;
}
free(file_box->gadget->value);
file_box->gadget->value = utf8_fn;
- box_coords(file_box, &x, &y);
+ box_coords(file_box, (int *)&x, (int *)&y);
gui_window_redraw(gwin->bw->window,x,y,
x + file_box->width,
y + file_box->height);
@@ -998,7 +1014,7 @@
if(!gwin)
{
- warn_user("NoMemory");
+ warn_user("NoMemory","");
return NULL;
}
@@ -1228,7 +1244,7 @@
if(!gwin->win)
{
- warn_user("NoMemory");
+ warn_user("NoMemory","");
FreeVec(gwin);
return NULL;
}
@@ -1243,7 +1259,7 @@
if(!gwin->bm)
{
- warn_user("NoMemory");
+ warn_user("NoMemory","");
browser_window_destroy(bw);
return NULL;
}
@@ -1260,7 +1276,7 @@
if((!gwin->areabuf) || (!gwin->rp.AreaInfo))
{
- warn_user("NoMemory");
+ warn_user("NoMemory","");
browser_window_destroy(bw);
return NULL;
}
@@ -1271,7 +1287,7 @@
if((!gwin->tmprasbuf) || (!gwin->rp.TmpRas))
{
- warn_user("NoMemory");
+ warn_user("NoMemory","");
browser_window_destroy(bw);
return NULL;
}
@@ -1358,8 +1374,8 @@
if(!g) return;
GetAttr(SPACE_AreaBox,g->gadgets[GID_BROWSER],(ULONG *)&bbox);
- GetAttr(SCROLLER_Top,g->objects[OID_HSCROLL],&hcurrent);
- GetAttr(SCROLLER_Top,g->objects[OID_VSCROLL],&vcurrent);
+ GetAttr(SCROLLER_Top,g->objects[OID_HSCROLL],(ULONG *)&hcurrent);
+ GetAttr(SCROLLER_Top,g->objects[OID_VSCROLL],(ULONG *)&vcurrent);
// DebugPrintF("DOING REDRAW\n");
@@ -1416,8 +1432,8 @@
struct IBox *bbox;
GetAttr(SPACE_AreaBox,g->gadgets[GID_BROWSER],(ULONG *)&bbox);
- GetAttr(SCROLLER_Top,g->objects[OID_HSCROLL],&hcurrent);
- GetAttr(SCROLLER_Top,g->objects[OID_VSCROLL],&vcurrent);
+ GetAttr(SCROLLER_Top,g->objects[OID_HSCROLL],(ULONG *)&hcurrent);
+ GetAttr(SCROLLER_Top,g->objects[OID_VSCROLL],(ULONG *)&vcurrent);
// DebugPrintF("DOING REDRAW\n");
@@ -1767,7 +1783,7 @@
void gui_window_start_throbber(struct gui_window *g)
{
struct IBox *bbox;
- GetAttr(SPACE_AreaBox,g->gadgets[GID_THROBBER],&bbox);
+ GetAttr(SPACE_AreaBox,g->gadgets[GID_THROBBER],(ULONG *)&bbox);
g->throbber_frame=1;
@@ -1777,7 +1793,7 @@
void gui_window_stop_throbber(struct gui_window *g)
{
struct IBox *bbox;
- GetAttr(SPACE_AreaBox,g->gadgets[GID_THROBBER],&bbox);
+ GetAttr(SPACE_AreaBox,g->gadgets[GID_THROBBER],(ULONG *)&bbox);
BltBitMapRastPort(throbber,0,0,g->win->RPort,bbox->Left,bbox->Top,throbber_width,throbber_height,0x0C0);
@@ -1796,7 +1812,7 @@
g->throbber_update_count = 0;
- GetAttr(SPACE_AreaBox,g->gadgets[GID_THROBBER],&bbox);
+ GetAttr(SPACE_AreaBox,g->gadgets[GID_THROBBER],(ULONG *)&bbox);
g->throbber_frame++;
if(g->throbber_frame > (option_throbber_frames-1))
@@ -1837,8 +1853,8 @@
if(!g) return;
GetAttr(SPACE_AreaBox,g->gadgets[GID_BROWSER],(ULONG *)&bbox);
- GetAttr(SCROLLER_Top,g->objects[OID_HSCROLL],&xs);
- GetAttr(SCROLLER_Top,g->objects[OID_VSCROLL],&ys);
+ GetAttr(SCROLLER_Top,g->objects[OID_HSCROLL],(ULONG *)&xs);
+ GetAttr(SCROLLER_Top,g->objects[OID_VSCROLL],(ULONG *)&ys);
BltBitMapRastPort(g->bm,g->c_x,g->c_y,g->win->RPort,bbox->Left+g->c_x-xs,bbox->Top+g->c_y-ys,2+1,g->c_h+1,0x0C0);
@@ -1910,7 +1926,7 @@
return NULL;
}
- SetComment(&fname,url);
+ SetComment(fname,url);
dw->objects[OID_MAIN] = WindowObject,
WA_ScreenTitle,nsscreentitle,
@@ -1985,7 +2001,7 @@
void gui_download_window_error(struct gui_download_window *dw,
const char *error_msg)
{
- warn_user("Unwritten");
+ warn_user("Unwritten","");
gui_download_window_done(dw);
}
15 years, 2 months
r5459 joty - in /trunk/netsurf: content/ css/ image/ render/ riscos/
by netsurf＠semichrome.net
Author: joty
Date: Sun Sep 28 17:37:13 2008
New Revision: 5459
URL: http://source.netsurf-browser.org?rev=5459&view=rev
Log:
'unsigned long' -> 'colour' where it made sense.
Modified:
trunk/netsurf/content/content.c
trunk/netsurf/content/content.h
trunk/netsurf/css/css.c
trunk/netsurf/image/bmp.c
trunk/netsurf/image/bmp.h
trunk/netsurf/image/gif.c
trunk/netsurf/image/gif.h
trunk/netsurf/image/ico.c
trunk/netsurf/image/ico.h
trunk/netsurf/image/jpeg.c
trunk/netsurf/image/jpeg.h
trunk/netsurf/image/mng.c
trunk/netsurf/image/mng.h
trunk/netsurf/image/png.c
trunk/netsurf/image/png.h
trunk/netsurf/image/rsvg.c
trunk/netsurf/image/rsvg.h
trunk/netsurf/image/svg.c
trunk/netsurf/image/svg.h
trunk/netsurf/render/html.h
trunk/netsurf/render/html_redraw.c
trunk/netsurf/render/textplain.c
trunk/netsurf/render/textplain.h
trunk/netsurf/riscos/image.c
trunk/netsurf/riscos/image.h
trunk/netsurf/riscos/plugin.c
trunk/netsurf/riscos/plugin.h
Modified: trunk/netsurf/content/content.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/content.c?rev=545...
==============================================================================
--- trunk/netsurf/content/content.c (original)
+++ trunk/netsurf/content/content.c Sun Sep 28 17:37:13 2008
@@ -256,11 +256,11 @@
bool (*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);
+ float scale, colour background_colour);
bool (*redraw_tiled)(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y);
void (*open)(struct content *c, struct browser_window *bw,
struct content *page, unsigned int index,
@@ -1000,7 +1000,7 @@
bool content_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)
+ float scale, colour background_colour)
{
assert(c != 0);
// LOG(("%p %s", c, c->url));
@@ -1025,7 +1025,7 @@
bool content_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y)
{
int x0, y0, x1, y1;
Modified: trunk/netsurf/content/content.h
URL: http://source.netsurf-browser.org/trunk/netsurf/content/content.h?rev=545...
==============================================================================
--- trunk/netsurf/content/content.h (original)
+++ trunk/netsurf/content/content.h Sun Sep 28 17:37:13 2008
@@ -299,11 +299,11 @@
bool content_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);
+ float scale, colour background_colour);
bool content_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y);
bool content_add_user(struct content *c,
void (*callback)(content_msg msg, struct content *c,
Modified: trunk/netsurf/css/css.c
URL: http://source.netsurf-browser.org/trunk/netsurf/css/css.c?rev=5459&r1=545...
==============================================================================
--- trunk/netsurf/css/css.c (original)
+++ trunk/netsurf/css/css.c Sun Sep 28 17:37:13 2008
@@ -1589,7 +1589,7 @@
else if (style->z == CSS_COLOR_NONE) \
fprintf(stream, s ": none; "); \
else \
- fprintf(stream, s ": #%.6lx; ", style->z); \
+ fprintf(stream, s ": #%.6x; ", style->z); \
}
#define DUMP_KEYWORD(z, s, n) \
@@ -1748,7 +1748,7 @@
else if (style->border[i].color == CSS_COLOR_NOT_SET)
;
else
- fprintf(stream, " #%.6lx",
+ fprintf(stream, " #%.6x",
style->border[i].color);
fprintf(stream, "; ");
}
@@ -2137,7 +2137,7 @@
else if (style->outline.color.value == CSS_COLOR_NOT_SET)
fprintf(stream, " .");
else
- fprintf(stream, " #%.6lx", style->outline.color.value);
+ fprintf(stream, " #%.6x", style->outline.color.value);
break;
case CSS_OUTLINE_COLOR_NOT_SET:
break;
Modified: trunk/netsurf/image/bmp.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/bmp.c?rev=5459&r1=5...
==============================================================================
--- trunk/netsurf/image/bmp.c (original)
+++ trunk/netsurf/image/bmp.c Sun Sep 28 17:37:13 2008
@@ -114,7 +114,7 @@
bool nsbmp_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)
+ float scale, colour background_colour)
{
if (!c->data.bmp.bmp->decoded)
@@ -129,7 +129,7 @@
bool nsbmp_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y)
{
Modified: trunk/netsurf/image/bmp.h
URL: http://source.netsurf-browser.org/trunk/netsurf/image/bmp.h?rev=5459&r1=5...
==============================================================================
--- trunk/netsurf/image/bmp.h (original)
+++ trunk/netsurf/image/bmp.h Sun Sep 28 17:37:13 2008
@@ -46,11 +46,11 @@
bool nsbmp_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);
+ float scale, colour background_colour);
bool nsbmp_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y);
void *nsbmp_bitmap_create(int width, int height, unsigned int bmp_state);
Modified: trunk/netsurf/image/gif.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/gif.c?rev=5459&r1=5...
==============================================================================
--- trunk/netsurf/image/gif.c (original)
+++ trunk/netsurf/image/gif.c Sun Sep 28 17:37:13 2008
@@ -154,7 +154,7 @@
bool nsgif_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)
+ float scale, colour background_colour)
{
if (c->data.gif.current_frame != c->data.gif.gif->decoded_frame)
if (nsgif_get_frame(c) != GIF_OK)
@@ -168,7 +168,7 @@
bool nsgif_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y)
{
if (c->data.gif.current_frame != c->data.gif.gif->decoded_frame)
Modified: trunk/netsurf/image/gif.h
URL: http://source.netsurf-browser.org/trunk/netsurf/image/gif.h?rev=5459&r1=5...
==============================================================================
--- trunk/netsurf/image/gif.h (original)
+++ trunk/netsurf/image/gif.h Sun Sep 28 17:37:13 2008
@@ -43,11 +43,11 @@
bool nsgif_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);
+ float scale, colour background_colour);
bool nsgif_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y);
void *nsgif_bitmap_create(int width, int height);
Modified: trunk/netsurf/image/ico.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/ico.c?rev=5459&r1=5...
==============================================================================
--- trunk/netsurf/image/ico.c (original)
+++ trunk/netsurf/image/ico.c Sun Sep 28 17:37:13 2008
@@ -101,7 +101,7 @@
bool nsico_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)
+ float scale, colour background_colour)
{
struct bmp_image *bmp = ico_find(c->data.ico.ico, width, height);
if (!bmp->decoded)
@@ -116,7 +116,7 @@
bool nsico_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y)
{
struct bmp_image *bmp = ico_find(c->data.ico.ico, width, height);
Modified: trunk/netsurf/image/ico.h
URL: http://source.netsurf-browser.org/trunk/netsurf/image/ico.h?rev=5459&r1=5...
==============================================================================
--- trunk/netsurf/image/ico.h (original)
+++ trunk/netsurf/image/ico.h Sun Sep 28 17:37:13 2008
@@ -41,11 +41,11 @@
bool nsico_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);
+ float scale, colour background_colour);
bool nsico_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y);
#endif /* WITH_BMP */
Modified: trunk/netsurf/image/jpeg.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/jpeg.c?rev=5459&r1=...
==============================================================================
--- trunk/netsurf/image/jpeg.c (original)
+++ trunk/netsurf/image/jpeg.c Sun Sep 28 17:37:13 2008
@@ -236,7 +236,7 @@
bool nsjpeg_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)
+ float scale, colour background_colour)
{
return plot.bitmap(x, y, width, height,
c->bitmap, background_colour, c);
@@ -250,7 +250,7 @@
bool nsjpeg_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y)
{
return plot.bitmap_tile(x, y, width, height,
Modified: trunk/netsurf/image/jpeg.h
URL: http://source.netsurf-browser.org/trunk/netsurf/image/jpeg.h?rev=5459&r1=...
==============================================================================
--- trunk/netsurf/image/jpeg.h (original)
+++ trunk/netsurf/image/jpeg.h Sun Sep 28 17:37:13 2008
@@ -40,11 +40,11 @@
bool nsjpeg_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);
+ float scale, colour background_colour);
bool nsjpeg_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y);
#endif /* WITH_JPEG */
Modified: trunk/netsurf/image/mng.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/mng.c?rev=5459&r1=5...
==============================================================================
--- trunk/netsurf/image/mng.c (original)
+++ trunk/netsurf/image/mng.c Sun Sep 28 17:37:13 2008
@@ -495,7 +495,7 @@
bool nsmng_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)
+ float scale, colour background_colour)
{
bool ret;
@@ -522,7 +522,7 @@
bool nsmng_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y)
{
bool ret;
Modified: trunk/netsurf/image/mng.h
URL: http://source.netsurf-browser.org/trunk/netsurf/image/mng.h?rev=5459&r1=5...
==============================================================================
--- trunk/netsurf/image/mng.h (original)
+++ trunk/netsurf/image/mng.h Sun Sep 28 17:37:13 2008
@@ -48,11 +48,11 @@
bool nsmng_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);
+ float scale, colour background_colour);
bool nsmng_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y);
#endif /* WITH_MNG */
Modified: trunk/netsurf/image/png.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/png.c?rev=5459&r1=5...
==============================================================================
--- trunk/netsurf/image/png.c (original)
+++ trunk/netsurf/image/png.c Sun Sep 28 17:37:13 2008
@@ -266,7 +266,7 @@
bool nspng_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)
+ float scale, colour background_colour)
{
if (c->bitmap != NULL) {
return plot.bitmap(x, y, width, height, c->bitmap,
@@ -278,7 +278,7 @@
bool nspng_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y)
{
if (c->bitmap != NULL) {
Modified: trunk/netsurf/image/png.h
URL: http://source.netsurf-browser.org/trunk/netsurf/image/png.h?rev=5459&r1=5...
==============================================================================
--- trunk/netsurf/image/png.h (original)
+++ trunk/netsurf/image/png.h Sun Sep 28 17:37:13 2008
@@ -46,10 +46,10 @@
bool nspng_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);
+ float scale, colour background_colour);
bool nspng_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y);
#endif
Modified: trunk/netsurf/image/rsvg.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/rsvg.c?rev=5459&r1=...
==============================================================================
--- trunk/netsurf/image/rsvg.c (original)
+++ trunk/netsurf/image/rsvg.c Sun Sep 28 17:37:13 2008
@@ -180,7 +180,7 @@
bool rsvg_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)
+ float scale, colour background_colour)
{
plot.bitmap(x, y, width, height, c->bitmap, background_colour, c);
return true;
@@ -188,7 +188,7 @@
bool rsvg_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y)
{
return true;
Modified: trunk/netsurf/image/rsvg.h
URL: http://source.netsurf-browser.org/trunk/netsurf/image/rsvg.h?rev=5459&r1=...
==============================================================================
--- trunk/netsurf/image/rsvg.h (original)
+++ trunk/netsurf/image/rsvg.h Sun Sep 28 17:37:13 2008
@@ -47,11 +47,11 @@
bool rsvg_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);
+ float scale, colour background_colour);
bool rsvg_redraw_tiled(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,
+ float scale, colour background_colour,
bool repeat_x, bool repeat_y);
#endif /* WITH_RSVG */
Modified: trunk/netsurf/image/svg.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/svg.c?rev=5459&r1=5...
==============================================================================
--- trunk/netsurf/image/svg.c (original)
+++ trunk/netsurf/image/svg.c Sun Sep 28 17:37:13 2008
@@ -88,7 +88,7 @@
bool svg_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)
+ float scale, colour background_colour)
{
float transform[6];
struct svgtiny_diagram *diagram = c->data.svg.diagram;
Modified: trunk/netsurf/image/svg.h
URL: http://source.netsurf-browser.org/trunk/netsurf/image/svg.h?rev=5459&r1=5...
==============================================================================
--- trunk/netsurf/image/svg.h (original)
+++ trunk/netsurf/image/svg.h Sun Sep 28 17:37:13 2008
@@ -38,6 +38,6 @@
bool svg_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);
+ float scale, colour background_colour);
#endif
Modified: trunk/netsurf/render/html.h
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html.h?rev=5459&r1...
==============================================================================
--- trunk/netsurf/render/html.h (original)
+++ trunk/netsurf/render/html.h Sun Sep 28 17:37:13 2008
@@ -189,7 +189,7 @@
bool html_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);
+ float scale, colour background_colour);
/* redraw a short text string, complete with highlighting
Modified: trunk/netsurf/render/html_redraw.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html_redraw.c?rev=...
==============================================================================
--- trunk/netsurf/render/html_redraw.c (original)
+++ trunk/netsurf/render/html_redraw.c Sun Sep 28 17:37:13 2008
@@ -113,7 +113,7 @@
bool html_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)
+ float scale, colour background_colour)
{
struct box *box;
bool result, want_knockout;
Modified: trunk/netsurf/render/textplain.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/textplain.c?rev=54...
==============================================================================
--- trunk/netsurf/render/textplain.c (original)
+++ trunk/netsurf/render/textplain.c Sun Sep 28 17:37:13 2008
@@ -326,7 +326,7 @@
bool textplain_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)
+ float scale, colour background_colour)
{
struct browser_window *bw = current_redraw_browser;
char *utf8_data = c->data.textplain.utf8_data;
Modified: trunk/netsurf/render/textplain.h
URL: http://source.netsurf-browser.org/trunk/netsurf/render/textplain.h?rev=54...
==============================================================================
--- trunk/netsurf/render/textplain.h (original)
+++ trunk/netsurf/render/textplain.h Sun Sep 28 17:37:13 2008
@@ -54,7 +54,7 @@
bool textplain_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);
+ float scale, colour background_colour);
/* access to lines for text selection and searching */
#define textplain_line_count(c) ((c)->data.textplain.physical_line_count)
Modified: trunk/netsurf/riscos/image.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/image.c?rev=5459&r...
==============================================================================
--- trunk/netsurf/riscos/image.c (original)
+++ trunk/netsurf/riscos/image.c Sun Sep 28 17:37:13 2008
@@ -30,7 +30,7 @@
static bool image_redraw_tinct(osspriteop_id header, int x, int y,
int req_width, int req_height, int width, int height,
- unsigned long background_colour, bool repeatx, bool repeaty,
+ colour background_colour, bool repeatx, bool repeaty,
bool alpha, unsigned int tinct_options);
static bool image_redraw_os(osspriteop_id header, int x, int y,
int req_width, int req_height, int width, int height);
@@ -54,7 +54,7 @@
*/
bool image_redraw(osspriteop_area *area, int x, int y, int req_width,
int req_height, int width, int height,
- unsigned long background_colour,
+ colour background_colour,
bool repeatx, bool repeaty, bool background, image_type type)
{
unsigned int tinct_options;
@@ -115,7 +115,7 @@
*/
bool image_redraw_tinct(osspriteop_id header, int x, int y,
int req_width, int req_height, int width, int height,
- unsigned long background_colour, bool repeatx, bool repeaty,
+ colour background_colour, bool repeatx, bool repeaty,
bool alpha, unsigned int tinct_options)
{
_kernel_oserror *error;
Modified: trunk/netsurf/riscos/image.h
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/image.h?rev=5459&r...
==============================================================================
--- trunk/netsurf/riscos/image.h (original)
+++ trunk/netsurf/riscos/image.h Sun Sep 28 17:37:13 2008
@@ -20,6 +20,7 @@
#define _NETSURF_RISCOS_IMAGE_H_
#include <stdbool.h>
+#include "css/css.h"
#include "oslib/osspriteop.h"
struct osspriteop_area;
@@ -32,7 +33,7 @@
bool image_redraw(osspriteop_area *area, int x, int y, int req_width,
int req_height, int width, int height,
- unsigned long background_colour,
+ colour background_colour,
bool repeatx, bool repeaty, bool background, image_type type);
#endif
Modified: trunk/netsurf/riscos/plugin.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/plugin.c?rev=5459&...
==============================================================================
--- trunk/netsurf/riscos/plugin.c (original)
+++ trunk/netsurf/riscos/plugin.c Sun Sep 28 17:37:13 2008
@@ -250,7 +250,7 @@
bool plugin_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)
+ float scale, colour background_colour)
{
/* do nothing */
LOG(("plugin_redraw"));
Modified: trunk/netsurf/riscos/plugin.h
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/plugin.h?rev=5459&...
==============================================================================
--- trunk/netsurf/riscos/plugin.h (original)
+++ trunk/netsurf/riscos/plugin.h Sun Sep 28 17:37:13 2008
@@ -59,7 +59,7 @@
bool plugin_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);
+ float scale, colour background_colour);
void plugin_open(struct content *c, struct browser_window *bw,
struct content *page, unsigned int index, struct box *box,
struct object_params *params);
15 years, 2 months
r5458 joty - in /trunk: hubbub/Makefile hubbub/Makefile-riscos libnsbmp/Makefile libnsgif/Makefile libparserutils/Makefile-riscos libsvgtiny/makefile pencil/makefile rufl/makefile
by netsurf＠semichrome.net
Author: joty
Date: Sun Sep 28 15:35:57 2008
New Revision: 5458
URL: http://source.netsurf-browser.org?rev=5458&view=rev
Log:
GCCSDK 4 build compatibility (not finished yet)
Modified:
trunk/hubbub/Makefile
trunk/hubbub/Makefile-riscos
trunk/libnsbmp/Makefile
trunk/libnsgif/Makefile
trunk/libparserutils/Makefile-riscos
trunk/libsvgtiny/makefile
trunk/pencil/makefile
trunk/rufl/makefile
Modified: trunk/hubbub/Makefile
URL: http://source.netsurf-browser.org/trunk/hubbub/Makefile?rev=5458&r1=5457&...
==============================================================================
--- trunk/hubbub/Makefile (original)
+++ trunk/hubbub/Makefile Sun Sep 28 15:35:57 2008
@@ -21,7 +21,7 @@
WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -Werror -pedantic
-CFLAGS += -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS)
+CFLAGS = -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS)
RELEASECFLAGS = $(CFLAGS) -DNDEBUG -O2
DEBUGCFLAGS = $(CFLAGS) -O0 -g
ARFLAGS := -cru
Modified: trunk/hubbub/Makefile-riscos
URL: http://source.netsurf-browser.org/trunk/hubbub/Makefile-riscos?rev=5458&r...
==============================================================================
--- trunk/hubbub/Makefile-riscos (original)
+++ trunk/hubbub/Makefile-riscos Sun Sep 28 15:35:57 2008
@@ -2,9 +2,9 @@
GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
GCCSDK_INSTALL_ENV ?= /home/riscos/env
-CC := $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR := $(GCCSDK_INSTALL_CROSSBIN)/ar
-LD := $(GCCSDK_INSTALL_CROSSBIN)/gcc
+CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+LD := $(CC)
CP := cp
RM := rm
@@ -16,15 +16,15 @@
PKGCONFIG := $(GCCSDK_INSTALL_ENV)/ro-pkg-config
INSTALL := install
SED := sed
+TOUCH := touch
LCOV := echo
GENHTML := echo
-TOUCH := touch
# Toolchain flags
WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -Werror -pedantic
-CFLAGS += -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS) \
+CFLAGS = -std=c99 -D_BSD_SOURCE -I$(TOP)/include/ $(WARNFLAGS) \
-mpoke-function-name
RELEASECFLAGS = $(CFLAGS) -DNDEBUG -O2
DEBUGCFLAGS = $(CFLAGS) -O0 -g
@@ -40,7 +40,11 @@
PKGCONFIGFLAGS :=
TOUCHFLAGS :=
-EXEEXT := ,ff8
+ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+ EXEEXT := ,e1f
+else
+ EXEEXT := ,ff8
+endif
# Default installation prefix
PREFIX ?= $(GCCSDK_INSTALL_ENV)
Modified: trunk/libnsbmp/Makefile
URL: http://source.netsurf-browser.org/trunk/libnsbmp/Makefile?rev=5458&r1=545...
==============================================================================
--- trunk/libnsbmp/Makefile (original)
+++ trunk/libnsbmp/Makefile Sun Sep 28 15:35:57 2008
@@ -18,29 +18,29 @@
DOXYGEN = doxygen
ifeq ($(TARGET),riscos)
-GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
-GCCSDK_INSTALL_ENV ?= /home/riscos/env
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/ar
-CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include
-LIBS = -L$(GCCSDK_INSTALL_ENV)/lib
-EXEEXT ?= ,ff8
-PREFIX = $(GCCSDK_INSTALL_ENV)
+ GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
+ GCCSDK_INSTALL_ENV ?= /home/riscos/env
+ CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+ AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+ CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include
+ LIBS = -L$(GCCSDK_INSTALL_ENV)/lib
+ ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+ EXEEXT := ,e1f
+ SUBTARGET := -elf-
+ else
+ EXEEXT := ,ff8
+ SUBTARGET := -aof-
+ endif
+ PREFIX = $(GCCSDK_INSTALL_ENV)
else
-CFLAGS += -g
-LIBS =
-PREFIX = /usr/local
+ CFLAGS += -g
+ LIBS =
+ PREFIX = /usr/local
endif
-ifeq ($(TARGET),)
-OBJDIR = objects
-LIBDIR = lib
-BINDIR = bin
-else
-OBJDIR = $(TARGET)-objects
-LIBDIR = $(TARGET)-lib
-BINDIR = $(TARGET)-bin
-endif
+OBJDIR = $(TARGET)$(SUBTARGET)objects
+LIBDIR = $(TARGET)$(SUBTARGET)lib
+BINDIR = $(TARGET)$(SUBTARGET)bin
OBJS = $(addprefix $(OBJDIR)/, $(SOURCE:.c=.o))
Modified: trunk/libnsgif/Makefile
URL: http://source.netsurf-browser.org/trunk/libnsgif/Makefile?rev=5458&r1=545...
==============================================================================
--- trunk/libnsgif/Makefile (original)
+++ trunk/libnsgif/Makefile Sun Sep 28 15:35:57 2008
@@ -18,29 +18,29 @@
DOXYGEN = doxygen
ifeq ($(TARGET),riscos)
-GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
-GCCSDK_INSTALL_ENV ?= /home/riscos/env
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/ar
-CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include
-LIBS = -L$(GCCSDK_INSTALL_ENV)/lib
-EXEEXT ?= ,ff8
-PREFIX = $(GCCSDK_INSTALL_ENV)
+ GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
+ GCCSDK_INSTALL_ENV ?= /home/riscos/env
+ CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+ AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+ CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include
+ LIBS = -L$(GCCSDK_INSTALL_ENV)/lib
+ ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+ EXEEXT := ,e1f
+ SUBTARGET := -elf-
+ else
+ EXEEXT := ,ff8
+ SUBTARGET := -aof-
+ endif
+ PREFIX = $(GCCSDK_INSTALL_ENV)
else
-CFLAGS += -g
-LIBS =
-PREFIX = /usr/local
+ CFLAGS += -g
+ LIBS =
+ PREFIX = /usr/local
endif
-ifeq ($(TARGET),)
-OBJDIR = objects
-LIBDIR = lib
-BINDIR = bin
-else
-OBJDIR = $(TARGET)-objects
-LIBDIR = $(TARGET)-lib
-BINDIR = $(TARGET)-bin
-endif
+OBJDIR = $(TARGET)$(SUBTARGET)objects
+LIBDIR = $(TARGET)$(SUBTARGET)lib
+BINDIR = $(TARGET)$(SUBTARGET)bin
OBJS = $(addprefix $(OBJDIR)/, $(SOURCE:.c=.o))
Modified: trunk/libparserutils/Makefile-riscos
URL: http://source.netsurf-browser.org/trunk/libparserutils/Makefile-riscos?re...
==============================================================================
--- trunk/libparserutils/Makefile-riscos (original)
+++ trunk/libparserutils/Makefile-riscos Sun Sep 28 15:35:57 2008
@@ -2,9 +2,9 @@
GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
GCCSDK_INSTALL_ENV ?= /home/riscos/env
-CC := $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR := $(GCCSDK_INSTALL_CROSSBIN)/ar
-LD := $(GCCSDK_INSTALL_CROSSBIN)/gcc
+CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+LD := $(CC)
CP := cp
RM := rm
@@ -40,7 +40,11 @@
PKGCONFIGFLAGS :=
TOUCHFLAGS :=
-EXEEXT := ,ff8
+ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+ EXEEXT := ,e1f
+else
+ EXEEXT := ,ff8
+endif
# Default installation prefix
PREFIX ?= $(GCCSDK_INSTALL_ENV)
Modified: trunk/libsvgtiny/makefile
URL: http://source.netsurf-browser.org/trunk/libsvgtiny/makefile?rev=5458&r1=5...
==============================================================================
--- trunk/libsvgtiny/makefile (original)
+++ trunk/libsvgtiny/makefile Sun Sep 28 15:35:57 2008
@@ -16,30 +16,30 @@
INSTALL = install
ifeq ($(TARGET),riscos)
-GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
-GCCSDK_INSTALL_ENV ?= /home/riscos/env
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/ar
-CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include \
+ GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
+ GCCSDK_INSTALL_ENV ?= /home/riscos/env
+ CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+ AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+ CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include \
-I$(GCCSDK_INSTALL_ENV)/include/libxml2
-LIBS = -L$(GCCSDK_INSTALL_ENV)/lib -lxml2 -lz
-EXEEXT ?= ,ff8
-PREFIX = $(GCCSDK_INSTALL_ENV)
+ LIBS = -L$(GCCSDK_INSTALL_ENV)/lib -lxml2 -lz
+ ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+ EXEEXT := ,e1f
+ SUBTARGET := -elf-
+ else
+ EXEEXT := ,ff8
+ SUBTARGET := -aof-
+ endif
+ PREFIX = $(GCCSDK_INSTALL_ENV)
else
-CFLAGS += -g `xml2-config --cflags` -fgnu89-inline
-LIBS = `xml2-config --libs`
-PREFIX = /usr/local
+ CFLAGS += -g `xml2-config --cflags` -fgnu89-inline
+ LIBS = `xml2-config --libs`
+ PREFIX = /usr/local
endif
-ifeq ($(TARGET),)
-OBJDIR = objects
-LIBDIR = lib
-BINDIR = bin
-else
-OBJDIR = $(TARGET)-objects
-LIBDIR = $(TARGET)-lib
-BINDIR = $(TARGET)-bin
-endif
+OBJDIR = $(TARGET)$(SUBTARGET)objects
+LIBDIR = $(TARGET)$(SUBTARGET)lib
+BINDIR = $(TARGET)$(SUBTARGET)bin
OBJS = $(addprefix $(OBJDIR)/, $(SOURCE:.c=.o))
Modified: trunk/pencil/makefile
URL: http://source.netsurf-browser.org/trunk/pencil/makefile?rev=5458&r1=5457&...
==============================================================================
--- trunk/pencil/makefile (original)
+++ trunk/pencil/makefile Sun Sep 28 15:35:57 2008
@@ -11,21 +11,10 @@
GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
GCCSDK_INSTALL_ENV ?= /home/riscos/env
-ifeq (${AB_ELFBUILD},yes)
-EXEEXT=,e1f
-else
-EXEEXT=,ff8
-endif
-
.PHONY: all install clean
-ifeq (${AB_ELFBUILD},yes)
-CC = $(GCCSDK_INSTALL_CROSSBIN)/arm-unknown-riscos-gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/arm-unknown-riscos-ar
-else
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/ar
-endif
+CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
CFLAGS = -std=c99 -O3 -W -Wall -Wundef -Wpointer-arith -Wcast-qual \
-Wcast-align -Wwrite-strings -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations \
@@ -34,6 +23,11 @@
ARFLAGS = cr
LIBS = -L$(GCCSDK_INSTALL_ENV)/lib -lOSLib32 -lrufl
INSTALL = $(GCCSDK_INSTALL_ENV)/ro-install
+ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+ EXEEXT=,e1f
+else
+ EXEEXT=,ff8
+endif
OBJS = $(SOURCE:.c=.o)
Modified: trunk/rufl/makefile
URL: http://source.netsurf-browser.org/trunk/rufl/makefile?rev=5458&r1=5457&r2...
==============================================================================
--- trunk/rufl/makefile (original)
+++ trunk/rufl/makefile Sun Sep 28 15:35:57 2008
@@ -16,25 +16,14 @@
rufl_find.c rufl_decompose.c rufl_metrics.c
HDRS = rufl.h rufl_internal.h
-ifeq (${AB_ELFBUILD},yes)
-EXEEXT=,e1f
-else
-EXEEXT=,ff8
-endif
-
.PHONY: all install clean
ifeq ($(COMPILER), gcc)
# cross-compiling using GCCSDK
GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
GCCSDK_INSTALL_ENV ?= /home/riscos/env
-ifeq (${AB_ELFBUILD},yes)
-CC = $(GCCSDK_INSTALL_CROSSBIN)/arm-unknown-riscos-gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/arm-unknown-riscos-ar
-else
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/ar
-endif
+CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
CFLAGS = -std=c99 -O3 -W -Wall -Wundef -Wpointer-arith -Wcast-qual \
-Wcast-align -Wwrite-strings -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations \
@@ -44,6 +33,11 @@
LIBS = -L$(GCCSDK_INSTALL_ENV)/lib -lOSLib32
INSTALL = $(GCCSDK_INSTALL_ENV)/ro-install
OBJS = $(SOURCE:.c=.o)
+ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+ EXEEXT=,e1f
+else
+ EXEEXT=,ff8
+endif
all: librufl.a rufl_test$(EXEEXT) rufl_chars$(EXEEXT)
@@ -63,8 +57,9 @@
MKDLK = makedlk
SOURCE += strfuncs.c
OBJS = $(SOURCE:.c=.o)
+EXEEXT =
-all: librufl.a rufl/pyd rufl_test,ff8 rufl_chars,ff8
+all: librufl.a rufl/pyd rufl_test rufl_chars
librufl.a: $(OBJS)
$(LD) $(LDFLAGS) -o $@ $(OBJS)
15 years, 2 months
r5457 joty - /trunk/rufl/
by netsurf＠semichrome.net
Author: joty
Date: Sun Sep 28 15:34:26 2008
New Revision: 5457
URL: http://source.netsurf-browser.org?rev=5457&view=rev
Log:
Ignore generated rufl_glyph_map.c
Modified:
trunk/rufl/ (props changed)
Propchange: trunk/rufl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 28 15:34:26 2008
@@ -1,0 +1,1 @@
+rufl_glyph_map.c
15 years, 2 months
r5455 chris_y - /trunk/netsurf/amiga/plotters.c
by netsurf＠semichrome.net
Author: chris_y
Date: Sun Sep 28 09:39:02 2008
New Revision: 5455
URL: http://source.netsurf-browser.org?rev=5455&view=rev
Log:
Stop scaled bitmaps from disappearing completely when the top of the image is
partially off-screen. Hopefully this also fixes some system freezes caused by this
code when run under OS4.1 on the SAM440.
Modified:
trunk/netsurf/amiga/plotters.c
Modified: trunk/netsurf/amiga/plotters.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/plotters.c?rev=5455...
==============================================================================
--- trunk/netsurf/amiga/plotters.c (original)
+++ trunk/netsurf/amiga/plotters.c Sun Sep 28 09:39:02 2008
@@ -239,6 +239,8 @@
{
struct RenderInfo ri;
+ if(!width || !height) return true;
+
// ami_fill(x,y,x+width,y+height,bg);
SetRPAttrs(currp,RPTAG_BPenColor,p96EncodeColor(RGBFB_A8B8G8R8,bg),
@@ -248,14 +250,13 @@
ri.BytesPerRow = bitmap->width * 4;
ri.RGBFormat = RGBFB_R8G8B8A8;
-/* check for black boxes under images! */
-/* disabled temporarily for SAM OS4.1
if((bitmap->width != width) || (bitmap->height != height))
{
- struct BitMap *tbm;
+ struct BitMap *tbm,*scaledbm;
struct RastPort trp;
struct BitScaleArgs bsa;
+ scaledbm = p96AllocBitMap(width,height,32,0,currp->BitMap,RGBFB_R8G8B8A8);
tbm = p96AllocBitMap(bitmap->width,bitmap->height,32,0,currp->BitMap,RGBFB_R8G8B8A8);
InitRastPort(&trp);
trp.BitMap = tbm;
@@ -264,26 +265,28 @@
bsa.bsa_SrcY = 0;
bsa.bsa_SrcWidth = bitmap->width;
bsa.bsa_SrcHeight = bitmap->height;
- bsa.bsa_DestX = x;
- bsa.bsa_DestY = y;
- bsa.bsa_DestWidth = width;
- bsa.bsa_DestHeight = height;
+ bsa.bsa_DestX = 0;
+ bsa.bsa_DestY = 0;
+// bsa.bsa_DestWidth = width;
+// bsa.bsa_DestHeight = height;
bsa.bsa_XSrcFactor = bitmap->width;
bsa.bsa_XDestFactor = width;
bsa.bsa_YSrcFactor = bitmap->height;
bsa.bsa_YDestFactor = height;
bsa.bsa_SrcBitMap = tbm;
- bsa.bsa_DestBitMap = currp->BitMap;
+ bsa.bsa_DestBitMap = scaledbm;
bsa.bsa_Flags = 0;
BitMapScale(&bsa);
+ BltBitMapRastPort(scaledbm,0,0,currp,x,y,width,height,0x0C0);
+
p96FreeBitMap(tbm);
+ p96FreeBitMap(scaledbm);
}
else
{
-*/
p96WritePixelArray((struct RenderInfo *)&ri,0,0,currp,x,y,width,height);
-// }
+ }
return true;
}
15 years, 2 months
r5454 joty - /trunk/libsvgtiny/
by netsurf＠semichrome.net
Author: joty
Date: Sun Sep 28 09:07:14 2008
New Revision: 5454
URL: http://source.netsurf-browser.org?rev=5454&view=rev
Log:
Ignore generated colors.c file.
Modified:
trunk/libsvgtiny/ (props changed)
Propchange: trunk/libsvgtiny/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 28 09:07:14 2008
@@ -1,0 +1,1 @@
+colors.c
15 years, 2 months