Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/6a5dcf12d65c6bac6b38d48139af965bac60486d
...commit
http://git.netsurf-browser.org/netsurf.git/commit/6a5dcf12d65c6bac6b38d48139af965bac60486d
...tree
http://git.netsurf-browser.org/netsurf.git/tree/6a5dcf12d65c6bac6b38d48139af965bac60486d
The branch, chris/ndk32 has been updated
via 6a5dcf12d65c6bac6b38d48139af965bac60486d (commit)
via 6d278450de112f97957b263efbefb3facc7880dc (commit)
via d09bb58bfecd0c91dd07f1d941c33b12b391ac06 (commit)
via 6451155a3b5b8ad4e42515fb6708d43af14b1c0b (commit)
via 6471c6dd8b05a8e994830471ae413b7335aa7ae6 (commit)
via b3cdb2da0bc60030e44588f219985861deed2bf7 (commit)
via bdc414e239e27d28a76c1622b2bf2c442bdaa811 (commit)
via 5612e6f15a85b8725fa2510ef068872be7a73ba3 (commit)
from 1770a8d9b621c53717ddf026e2314d2693321d8a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=6a5dcf12d65c6bac6b38d48139af965bac60486d
commit 6a5dcf12d65c6bac6b38d48139af965bac60486d
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Amiga: diskfont v47 compatibility
diff --git a/frontends/amiga/font_scan.c b/frontends/amiga/font_scan.c
index 3fa71f7..d7f970b 100644
--- a/frontends/amiga/font_scan.c
+++ b/frontends/amiga/font_scan.c
@@ -225,10 +225,6 @@ static ULONG ami_font_scan_font(const char *fontname,
lwc_string **glypharray)
if(!ofont) return 0;
-#ifndef __amigaos4__
- struct BulletBase *BulletBase = ofont->BulletBase;
-#endif
-
if(ESetInfo(AMI_OFONT_ENGINE,
OT_PointHeight, 10 * (1 << 16),
OT_GlyphCode, 0x0000,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=6d278450de112f97957b263efbefb3facc7880dc
commit 6d278450de112f97957b263efbefb3facc7880dc
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Amiga: squash warnings
diff --git a/frontends/amiga/font_cache.c b/frontends/amiga/font_cache.c
index 86e2381..b8039d2 100644
--- a/frontends/amiga/font_cache.c
+++ b/frontends/amiga/font_cache.c
@@ -17,11 +17,13 @@
*/
#include "amiga/os3support.h"
-#include <string.h>
#include <proto/timer.h>
#include <proto/utility.h>
+#include <string.h>
+#include <stdlib.h>
+
#include "utils/log.h"
#include "amiga/font.h"
@@ -97,12 +99,12 @@ static void ami_font_cache_cleanup(struct MinList
*ami_font_cache_list)
{
nnode=(struct nsObject *)GetSucc((struct Node *)node);
fnode = node->objstruct;
- GetSysTime(&curtime);
- SubTime(&curtime, &fnode->lastused);
+ GetSysTime((struct timeval *)&curtime);
+ SubTime((struct timeval *)&curtime, (struct timeval
*)&fnode->lastused);
if(curtime.Seconds > 300)
{
NSLOG(netsurf, INFO,
- "Freeing %s not used for %ld seconds",
+ "Freeing %s not used for %d seconds",
node->dtz_Node.ln_Name,
curtime.Seconds);
DelObject(node);
@@ -152,7 +154,7 @@ struct ami_font_cache_node *ami_font_cache_locate(const
char *font)
return nodedata;
}
- NSLOG(netsurf, INFO, "Font cache miss: %s (%lx)", font, hash);
+ NSLOG(netsurf, INFO, "Font cache miss: %s (%x)", font, hash);
return NULL;
}
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=d09bb58bfecd0c91dd07f1d941c33b12b391ac06
commit d09bb58bfecd0c91dd07f1d941c33b12b391ac06
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Amiga: TimeVal and TimeRequest are different between OS4 and OS3.2
We are redefining some common words, so may need to rethink this if it
causes problems.
diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h
index 1c130d3..ce7ae70 100644
--- a/frontends/amiga/os3support.h
+++ b/frontends/amiga/os3support.h
@@ -126,6 +126,12 @@
/* Renamed structures */
#define AnchorPathOld AnchorPath
+/* TimeVal/TimeRequest */
+#define Seconds tv_secs
+#define Microseconds tv_micro
+#define Request tr_node
+#define Time tr_time
+
/* ReAction (ClassAct) macros */
#define GetFileEnd End
#define GetFontEnd End
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=6451155a3b5b8ad4e42515fb6708d43af14b1c0b
commit 6451155a3b5b8ad4e42515fb6708d43af14b1c0b
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Amiga: use diskfont v47 API when building for AmigaOS 3
diff --git a/frontends/amiga/font_bullet.c b/frontends/amiga/font_bullet.c
index dec39a1..5813e0f 100644
--- a/frontends/amiga/font_bullet.c
+++ b/frontends/amiga/font_bullet.c
@@ -25,15 +25,13 @@
#include <stdlib.h>
-#ifndef __amigaos4__
-#include <proto/bullet.h>
-#endif
#include <proto/diskfont.h>
#include <proto/exec.h>
#include <proto/graphics.h>
#include <proto/utility.h>
#include <diskfont/diskfonttag.h>
+#include <diskfont/glyph.h> /* for FIXED */
#include <diskfont/oterrors.h>
#include "utils/log.h"
@@ -527,10 +525,6 @@ static struct OutlineFont *ami_open_outline_font(const
plot_font_style_t *fstyle
ofont = designed_node->font;
}
-#ifndef __amigaos4__
- struct BulletBase *BulletBase = ofont->BulletBase;
-#endif
-
if(ESetInfo(AMI_OFONT_ENGINE,
OT_DeviceDPI, ami_font_dpi_get_devicedpi(),
OT_PointHeight, ysize,
@@ -555,9 +549,6 @@ static inline int32 ami_font_plot_glyph(struct OutlineFont
*ofont, struct RastPo
ULONG glyphmaptag;
ULONG template_type;
uint32 long_char_1 = 0, long_char_2 = 0;
-#ifndef __amigaos4__
- struct BulletBase *BulletBase = ofont->BulletBase;
-#endif
#ifndef __amigaos4__
if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) {
@@ -662,9 +653,6 @@ static inline int32 ami_font_width_glyph(struct OutlineFont
*ofont,
bool skip_c2 = false;
uint32 long_char_1 = 0;
uint32 long_char_2;
-#ifndef __amigaos4__
- struct BulletBase *BulletBase = ofont->BulletBase;
-#endif
#ifndef __amigaos4__
if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) {
diff --git a/frontends/amiga/font_scan.h b/frontends/amiga/font_scan.h
index 7d61e2d..f1dd397 100755
--- a/frontends/amiga/font_scan.h
+++ b/frontends/amiga/font_scan.h
@@ -21,13 +21,9 @@
#include "amiga/os3support.h"
#include <libwapcaplet/libwapcaplet.h>
-/* Compatibliity define used by font.c and font_scan.c
+/* Compatibility define used by font.c and font_scan.c
* It's here because this file is included by both. */
-#ifdef __amigaos4__
#define AMI_OFONT_ENGINE &ofont->olf_EEngine
-#else
-#define AMI_OFONT_ENGINE ofont->GEngine
-#endif
void ami_font_scan_init(const char *filename, bool force_scan, bool save,
lwc_string **glypharray);
@@ -36,4 +32,3 @@ void ami_font_scan_save(const char *filename, lwc_string
**glypharray);
const char *ami_font_scan_lookup(const uint16 *code, lwc_string **glypharray);
#endif
-
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=6471c6dd8b05a8e994830471ae413b7335aa7ae6
commit 6471c6dd8b05a8e994830471ae413b7335aa7ae6
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Amiga: remove some unneeded old ReAction compatiblity
diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h
index c66588b..1c130d3 100644
--- a/frontends/amiga/os3support.h
+++ b/frontends/amiga/os3support.h
@@ -81,7 +81,6 @@
#define GA_HintInfo TAG_IGNORE
#define GAUGEIA_Level TAG_IGNORE
#define IA_InBorder TAG_IGNORE
-#define IA_Label TAG_IGNORE
#define LBNCA_SoftStyle TAG_IGNORE
#define LISTBROWSER_Striping TAG_IGNORE
#define SA_Compositing TAG_IGNORE
@@ -92,7 +91,6 @@
#define WA_ContextMenuHook TAG_IGNORE
#define WA_ToolBox TAG_IGNORE
#define WINDOW_BuiltInScroll TAG_IGNORE
-#define WINDOW_NewMenu TAG_IGNORE
#define WINDOW_NewPrefsHook TAG_IGNORE
/* raw keycodes */
@@ -120,7 +118,6 @@
#define TITLEPEN FILLPEN
/* Other constants */
-#define BVS_DISPLAY BVS_NONE
#define DN_FULLPATH 0
#define BGBACKFILL JAM1
#define ML_SEPARATOR NM_BARLABEL
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=b3cdb2da0bc60030e44588f219985861deed2bf7
commit b3cdb2da0bc60030e44588f219985861deed2bf7
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Amiga: diskfont v47 also contains ObtainCharsetInfo(), although it appears
to be undocumented
diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h
index 0deda9a..c66588b 100644
--- a/frontends/amiga/os3support.h
+++ b/frontends/amiga/os3support.h
@@ -141,10 +141,6 @@
/* application */
#define Notify(...) (void)0
-/* diskfont */
-/* Only used in one place we haven't ifdeffed, where it returns the charset
name */
-#define ObtainCharsetInfo(A,B,C) (const char *)nsoption_charp(local_charset)
-
/* DOS */
#define AllocSysObjectTags(A,B,C,D) CreateMsgPort() /* Assume ASOT_PORT for
now */
#define FOpen(A,B,C) Open(A,B)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=bdc414e239e27d28a76c1622b2bf2c442bdaa811
commit bdc414e239e27d28a76c1622b2bf2c442bdaa811
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Amiga: squash warning
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index e160f93..6a6f860 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -155,9 +155,9 @@ void *amiga_bitmap_create(int width, int height, unsigned
int state)
return bitmap;
}
+#ifdef __amigaos4__
static void amiga_bitmap_unmap_buffer(void *p)
{
-#ifdef __amigaos4__
struct bitmap *bm = p;
if((nsoption_bool(use_extmem) == true) && (bm->pixdata != NULL)) {
@@ -168,8 +168,8 @@ static void amiga_bitmap_unmap_buffer(void *p)
bm->iextmem->Unmap(bm->pixdata, bm->size);
bm->pixdata = NULL;
}
-#endif
}
+#endif
/* exported function documented in amiga/bitmap.h */
unsigned char *amiga_bitmap_get_buffer(void *bitmap)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=5612e6f15a85b8725fa2510ef068872be7a73ba3
commit 5612e6f15a85b8725fa2510ef068872be7a73ba3
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Amiga: remove compatibility functions that are in diskfont v47
May need to add these back in, force bitmap fonts, or drop compatiblity
with OS3.5/9
diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c
index 63037da..23e922a 100644
--- a/frontends/amiga/os3support.c
+++ b/frontends/amiga/os3support.c
@@ -200,138 +200,6 @@ long long int strtoll(const char *nptr, char **endptr,
int base)
return (long long int)strtol(nptr, endptr, base);
}
-/* Diskfont */
-struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG
flags)
-{
- BPTR fh = 0;
- int64 size = 0;
- struct TagItem *ti;
- UBYTE *buffer;
- STRPTR fname, otagpath, fontpath;
- struct BulletBase *BulletBase;
- struct OutlineFont *of = NULL;
- struct GlyphEngine *gengine;
- char *p = 0;
- struct FontContentsHeader fch;
-
- if((p = strrchr(fileName, '.')))
- *p = '\0';
-
- fontpath = (STRPTR)ASPrintf("FONTS:%s.font", fileName);
- fh = Open(fontpath, MODE_OLDFILE);
-
- if(fh == 0) {
- NSLOG(netsurf, INFO, "Unable to open FONT %s", fontpath);
- FreeVec(fontpath);
- return NULL;
- }
-
- if(Read(fh, &fch, sizeof(struct FontContentsHeader)) != sizeof(struct
FontContentsHeader)) {
- NSLOG(netsurf, INFO, "Unable to read FONT %s", fontpath);
- FreeVec(fontpath);
- Close(fh);
- return NULL;
- }
-
- Close(fh);
-
- if(fch.fch_FileID != OFCH_ID) {
- NSLOG(netsurf, INFO, "%s is not an outline font!", fontpath);
- FreeVec(fontpath);
- return NULL;
- }
-
- otagpath = (STRPTR)ASPrintf("FONTS:%s.otag", fileName);
- fh = Open(otagpath, MODE_OLDFILE);
-
- if(p) *p = '.';
-
- if(fh == 0) {
- NSLOG(netsurf, INFO, "Unable to open OTAG %s", otagpath);
- FreeVec(otagpath);
- return NULL;
- }
-
- size = GetFileSize(fh);
- buffer = (UBYTE *)malloc(size);
- if(buffer == NULL) {
- NSLOG(netsurf, INFO, "Unable to allocate memory");
- Close(fh);
- FreeVec(otagpath);
- return NULL;
- }
-
- Read(fh, buffer, size);
- Close(fh);
-
- /* The first tag is supposed to be OT_FileIdent and should equal 'size'
*/
- struct TagItem *tag = (struct TagItem *)buffer;
- if((tag->ti_Tag != OT_FileIdent) || (tag->ti_Data != (ULONG)size)) {
- NSLOG(netsurf, INFO, "Invalid OTAG file");
- free(buffer);
- FreeVec(otagpath);
- return NULL;
- }
-
- /* Relocate all the OT_Indirect tags */
- while((ti = NextTagItem(&tag))) {
- if(ti->ti_Tag & OT_Indirect) {
- ti->ti_Data += (ULONG)buffer;
- }
- }
-
- /* Find OT_Engine and open the font engine */
- if(ti = FindTagItem(OT_Engine, buffer)) {
- NSLOG(netsurf, INFO, "Using font engine %s", ti->ti_Data);
- fname = ASPrintf("%s.library", ti->ti_Data);
- } else {
- NSLOG(netsurf, INFO, "Cannot find OT_Engine tag");
- free(buffer);
- FreeVec(otagpath);
- return NULL;
- }
-
- BulletBase = (struct BulletBase *)OpenLibrary(fname, 0L);
-
- if(BulletBase == NULL) {
- NSLOG(netsurf, INFO, "Unable to open font engine %s", fname);
- free(buffer);
- FreeVec(fname);
- FreeVec(otagpath);
- }
-
- FreeVec(fname);
-
- gengine = OpenEngine();
-
- SetInfo(gengine,
- OT_OTagPath, (ULONG)otagpath,
- OT_OTagList, (ULONG)buffer,
- TAG_DONE);
-
- of = calloc(1, sizeof(struct OutlineFont));
- if(of == NULL) return NULL;
-
- of->BulletBase = BulletBase;
- of->GEngine = gengine;
- of->OTagPath = otagpath;
- of->olf_OTagList = buffer;
-
- return of;
-}
-
-void CloseOutlineFont(struct OutlineFont *of, struct List *list)
-{
- struct BulletBase *BulletBase = of->BulletBase;
-
- CloseEngine(of->GEngine);
- CloseLibrary((struct Library *)BulletBase);
-
- FreeVec(of->OTagPath);
- free(of->olf_OTagList);
- free(of);
-}
-
/* DOS */
int64 GetFileSize(BPTR fh)
diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h
index f511012..0deda9a 100644
--- a/frontends/amiga/os3support.h
+++ b/frontends/amiga/os3support.h
@@ -123,8 +123,6 @@
#define BVS_DISPLAY BVS_NONE
#define DN_FULLPATH 0
#define BGBACKFILL JAM1
-#define OFF_OPEN 0
-#define AFF_OTAG 0
#define ML_SEPARATOR NM_BARLABEL
#define LBS_ROWS 0
@@ -144,10 +142,6 @@
#define Notify(...) (void)0
/* diskfont */
-#define EReleaseInfo ReleaseInfo
-#define EObtainInfo ObtainInfo
-#define ESetInfo SetInfo
-
/* Only used in one place we haven't ifdeffed, where it returns the charset
name */
#define ObtainCharsetInfo(A,B,C) (const char *)nsoption_charp(local_charset)
@@ -181,14 +175,6 @@ typedef uint32_t uint32;
typedef int64_t int64;
typedef uint64_t uint64;
-/* OutlineFont */
-struct OutlineFont {
- struct BulletBase *BulletBase;
- struct GlyphEngine *GEngine;
- STRPTR OTagPath;
- struct TagItem *olf_OTagList;
-};
-
/* BackFillMessage */
struct BackFillMessage {
struct Layer *Layer;
@@ -218,10 +204,6 @@ enum {
};
/* Functions */
-/* Diskfont */
-void CloseOutlineFont(struct OutlineFont *of, struct List *list);
-struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG
flags);
-
/* DOS */
int64 GetFileSize(BPTR fh);
void FreeSysObject(ULONG type, APTR obj);
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/bitmap.c | 4 +-
frontends/amiga/font_bullet.c | 14 +----
frontends/amiga/font_cache.c | 12 ++--
frontends/amiga/font_scan.c | 4 --
frontends/amiga/font_scan.h | 7 +--
frontends/amiga/os3support.c | 132 -----------------------------------------
frontends/amiga/os3support.h | 31 ++--------
7 files changed, 17 insertions(+), 187 deletions(-)
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index e160f93..6a6f860 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -155,9 +155,9 @@ void *amiga_bitmap_create(int width, int height, unsigned
int state)
return bitmap;
}
+#ifdef __amigaos4__
static void amiga_bitmap_unmap_buffer(void *p)
{
-#ifdef __amigaos4__
struct bitmap *bm = p;
if((nsoption_bool(use_extmem) == true) && (bm->pixdata != NULL)) {
@@ -168,8 +168,8 @@ static void amiga_bitmap_unmap_buffer(void *p)
bm->iextmem->Unmap(bm->pixdata, bm->size);
bm->pixdata = NULL;
}
-#endif
}
+#endif
/* exported function documented in amiga/bitmap.h */
unsigned char *amiga_bitmap_get_buffer(void *bitmap)
diff --git a/frontends/amiga/font_bullet.c b/frontends/amiga/font_bullet.c
index dec39a1..5813e0f 100644
--- a/frontends/amiga/font_bullet.c
+++ b/frontends/amiga/font_bullet.c
@@ -25,15 +25,13 @@
#include <stdlib.h>
-#ifndef __amigaos4__
-#include <proto/bullet.h>
-#endif
#include <proto/diskfont.h>
#include <proto/exec.h>
#include <proto/graphics.h>
#include <proto/utility.h>
#include <diskfont/diskfonttag.h>
+#include <diskfont/glyph.h> /* for FIXED */
#include <diskfont/oterrors.h>
#include "utils/log.h"
@@ -527,10 +525,6 @@ static struct OutlineFont *ami_open_outline_font(const
plot_font_style_t *fstyle
ofont = designed_node->font;
}
-#ifndef __amigaos4__
- struct BulletBase *BulletBase = ofont->BulletBase;
-#endif
-
if(ESetInfo(AMI_OFONT_ENGINE,
OT_DeviceDPI, ami_font_dpi_get_devicedpi(),
OT_PointHeight, ysize,
@@ -555,9 +549,6 @@ static inline int32 ami_font_plot_glyph(struct OutlineFont
*ofont, struct RastPo
ULONG glyphmaptag;
ULONG template_type;
uint32 long_char_1 = 0, long_char_2 = 0;
-#ifndef __amigaos4__
- struct BulletBase *BulletBase = ofont->BulletBase;
-#endif
#ifndef __amigaos4__
if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) {
@@ -662,9 +653,6 @@ static inline int32 ami_font_width_glyph(struct OutlineFont
*ofont,
bool skip_c2 = false;
uint32 long_char_1 = 0;
uint32 long_char_2;
-#ifndef __amigaos4__
- struct BulletBase *BulletBase = ofont->BulletBase;
-#endif
#ifndef __amigaos4__
if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) {
diff --git a/frontends/amiga/font_cache.c b/frontends/amiga/font_cache.c
index 86e2381..b8039d2 100644
--- a/frontends/amiga/font_cache.c
+++ b/frontends/amiga/font_cache.c
@@ -17,11 +17,13 @@
*/
#include "amiga/os3support.h"
-#include <string.h>
#include <proto/timer.h>
#include <proto/utility.h>
+#include <string.h>
+#include <stdlib.h>
+
#include "utils/log.h"
#include "amiga/font.h"
@@ -97,12 +99,12 @@ static void ami_font_cache_cleanup(struct MinList
*ami_font_cache_list)
{
nnode=(struct nsObject *)GetSucc((struct Node *)node);
fnode = node->objstruct;
- GetSysTime(&curtime);
- SubTime(&curtime, &fnode->lastused);
+ GetSysTime((struct timeval *)&curtime);
+ SubTime((struct timeval *)&curtime, (struct timeval
*)&fnode->lastused);
if(curtime.Seconds > 300)
{
NSLOG(netsurf, INFO,
- "Freeing %s not used for %ld seconds",
+ "Freeing %s not used for %d seconds",
node->dtz_Node.ln_Name,
curtime.Seconds);
DelObject(node);
@@ -152,7 +154,7 @@ struct ami_font_cache_node *ami_font_cache_locate(const
char *font)
return nodedata;
}
- NSLOG(netsurf, INFO, "Font cache miss: %s (%lx)", font, hash);
+ NSLOG(netsurf, INFO, "Font cache miss: %s (%x)", font, hash);
return NULL;
}
diff --git a/frontends/amiga/font_scan.c b/frontends/amiga/font_scan.c
index 3fa71f7..d7f970b 100644
--- a/frontends/amiga/font_scan.c
+++ b/frontends/amiga/font_scan.c
@@ -225,10 +225,6 @@ static ULONG ami_font_scan_font(const char *fontname,
lwc_string **glypharray)
if(!ofont) return 0;
-#ifndef __amigaos4__
- struct BulletBase *BulletBase = ofont->BulletBase;
-#endif
-
if(ESetInfo(AMI_OFONT_ENGINE,
OT_PointHeight, 10 * (1 << 16),
OT_GlyphCode, 0x0000,
diff --git a/frontends/amiga/font_scan.h b/frontends/amiga/font_scan.h
index 7d61e2d..f1dd397 100755
--- a/frontends/amiga/font_scan.h
+++ b/frontends/amiga/font_scan.h
@@ -21,13 +21,9 @@
#include "amiga/os3support.h"
#include <libwapcaplet/libwapcaplet.h>
-/* Compatibliity define used by font.c and font_scan.c
+/* Compatibility define used by font.c and font_scan.c
* It's here because this file is included by both. */
-#ifdef __amigaos4__
#define AMI_OFONT_ENGINE &ofont->olf_EEngine
-#else
-#define AMI_OFONT_ENGINE ofont->GEngine
-#endif
void ami_font_scan_init(const char *filename, bool force_scan, bool save,
lwc_string **glypharray);
@@ -36,4 +32,3 @@ void ami_font_scan_save(const char *filename, lwc_string
**glypharray);
const char *ami_font_scan_lookup(const uint16 *code, lwc_string **glypharray);
#endif
-
diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c
index 63037da..23e922a 100644
--- a/frontends/amiga/os3support.c
+++ b/frontends/amiga/os3support.c
@@ -200,138 +200,6 @@ long long int strtoll(const char *nptr, char **endptr,
int base)
return (long long int)strtol(nptr, endptr, base);
}
-/* Diskfont */
-struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG
flags)
-{
- BPTR fh = 0;
- int64 size = 0;
- struct TagItem *ti;
- UBYTE *buffer;
- STRPTR fname, otagpath, fontpath;
- struct BulletBase *BulletBase;
- struct OutlineFont *of = NULL;
- struct GlyphEngine *gengine;
- char *p = 0;
- struct FontContentsHeader fch;
-
- if((p = strrchr(fileName, '.')))
- *p = '\0';
-
- fontpath = (STRPTR)ASPrintf("FONTS:%s.font", fileName);
- fh = Open(fontpath, MODE_OLDFILE);
-
- if(fh == 0) {
- NSLOG(netsurf, INFO, "Unable to open FONT %s", fontpath);
- FreeVec(fontpath);
- return NULL;
- }
-
- if(Read(fh, &fch, sizeof(struct FontContentsHeader)) != sizeof(struct
FontContentsHeader)) {
- NSLOG(netsurf, INFO, "Unable to read FONT %s", fontpath);
- FreeVec(fontpath);
- Close(fh);
- return NULL;
- }
-
- Close(fh);
-
- if(fch.fch_FileID != OFCH_ID) {
- NSLOG(netsurf, INFO, "%s is not an outline font!", fontpath);
- FreeVec(fontpath);
- return NULL;
- }
-
- otagpath = (STRPTR)ASPrintf("FONTS:%s.otag", fileName);
- fh = Open(otagpath, MODE_OLDFILE);
-
- if(p) *p = '.';
-
- if(fh == 0) {
- NSLOG(netsurf, INFO, "Unable to open OTAG %s", otagpath);
- FreeVec(otagpath);
- return NULL;
- }
-
- size = GetFileSize(fh);
- buffer = (UBYTE *)malloc(size);
- if(buffer == NULL) {
- NSLOG(netsurf, INFO, "Unable to allocate memory");
- Close(fh);
- FreeVec(otagpath);
- return NULL;
- }
-
- Read(fh, buffer, size);
- Close(fh);
-
- /* The first tag is supposed to be OT_FileIdent and should equal 'size'
*/
- struct TagItem *tag = (struct TagItem *)buffer;
- if((tag->ti_Tag != OT_FileIdent) || (tag->ti_Data != (ULONG)size)) {
- NSLOG(netsurf, INFO, "Invalid OTAG file");
- free(buffer);
- FreeVec(otagpath);
- return NULL;
- }
-
- /* Relocate all the OT_Indirect tags */
- while((ti = NextTagItem(&tag))) {
- if(ti->ti_Tag & OT_Indirect) {
- ti->ti_Data += (ULONG)buffer;
- }
- }
-
- /* Find OT_Engine and open the font engine */
- if(ti = FindTagItem(OT_Engine, buffer)) {
- NSLOG(netsurf, INFO, "Using font engine %s", ti->ti_Data);
- fname = ASPrintf("%s.library", ti->ti_Data);
- } else {
- NSLOG(netsurf, INFO, "Cannot find OT_Engine tag");
- free(buffer);
- FreeVec(otagpath);
- return NULL;
- }
-
- BulletBase = (struct BulletBase *)OpenLibrary(fname, 0L);
-
- if(BulletBase == NULL) {
- NSLOG(netsurf, INFO, "Unable to open font engine %s", fname);
- free(buffer);
- FreeVec(fname);
- FreeVec(otagpath);
- }
-
- FreeVec(fname);
-
- gengine = OpenEngine();
-
- SetInfo(gengine,
- OT_OTagPath, (ULONG)otagpath,
- OT_OTagList, (ULONG)buffer,
- TAG_DONE);
-
- of = calloc(1, sizeof(struct OutlineFont));
- if(of == NULL) return NULL;
-
- of->BulletBase = BulletBase;
- of->GEngine = gengine;
- of->OTagPath = otagpath;
- of->olf_OTagList = buffer;
-
- return of;
-}
-
-void CloseOutlineFont(struct OutlineFont *of, struct List *list)
-{
- struct BulletBase *BulletBase = of->BulletBase;
-
- CloseEngine(of->GEngine);
- CloseLibrary((struct Library *)BulletBase);
-
- FreeVec(of->OTagPath);
- free(of->olf_OTagList);
- free(of);
-}
-
/* DOS */
int64 GetFileSize(BPTR fh)
diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h
index f511012..ce7ae70 100644
--- a/frontends/amiga/os3support.h
+++ b/frontends/amiga/os3support.h
@@ -81,7 +81,6 @@
#define GA_HintInfo TAG_IGNORE
#define GAUGEIA_Level TAG_IGNORE
#define IA_InBorder TAG_IGNORE
-#define IA_Label TAG_IGNORE
#define LBNCA_SoftStyle TAG_IGNORE
#define LISTBROWSER_Striping TAG_IGNORE
#define SA_Compositing TAG_IGNORE
@@ -92,7 +91,6 @@
#define WA_ContextMenuHook TAG_IGNORE
#define WA_ToolBox TAG_IGNORE
#define WINDOW_BuiltInScroll TAG_IGNORE
-#define WINDOW_NewMenu TAG_IGNORE
#define WINDOW_NewPrefsHook TAG_IGNORE
/* raw keycodes */
@@ -120,17 +118,20 @@
#define TITLEPEN FILLPEN
/* Other constants */
-#define BVS_DISPLAY BVS_NONE
#define DN_FULLPATH 0
#define BGBACKFILL JAM1
-#define OFF_OPEN 0
-#define AFF_OTAG 0
#define ML_SEPARATOR NM_BARLABEL
#define LBS_ROWS 0
/* Renamed structures */
#define AnchorPathOld AnchorPath
+/* TimeVal/TimeRequest */
+#define Seconds tv_secs
+#define Microseconds tv_micro
+#define Request tr_node
+#define Time tr_time
+
/* ReAction (ClassAct) macros */
#define GetFileEnd End
#define GetFontEnd End
@@ -143,14 +144,6 @@
/* application */
#define Notify(...) (void)0
-/* diskfont */
-#define EReleaseInfo ReleaseInfo
-#define EObtainInfo ObtainInfo
-#define ESetInfo SetInfo
-
-/* Only used in one place we haven't ifdeffed, where it returns the charset
name */
-#define ObtainCharsetInfo(A,B,C) (const char *)nsoption_charp(local_charset)
-
/* DOS */
#define AllocSysObjectTags(A,B,C,D) CreateMsgPort() /* Assume ASOT_PORT for
now */
#define FOpen(A,B,C) Open(A,B)
@@ -181,14 +174,6 @@ typedef uint32_t uint32;
typedef int64_t int64;
typedef uint64_t uint64;
-/* OutlineFont */
-struct OutlineFont {
- struct BulletBase *BulletBase;
- struct GlyphEngine *GEngine;
- STRPTR OTagPath;
- struct TagItem *olf_OTagList;
-};
-
/* BackFillMessage */
struct BackFillMessage {
struct Layer *Layer;
@@ -218,10 +203,6 @@ enum {
};
/* Functions */
-/* Diskfont */
-void CloseOutlineFont(struct OutlineFont *of, struct List *list);
-struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG
flags);
-
/* DOS */
int64 GetFileSize(BPTR fh);
void FreeSysObject(ULONG type, APTR obj);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
