mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 20:46:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

move text colour settings into plotters.c, and use palette-map capable function

Browse Source
This commit is contained in:
Chris Young 2012-08-04 18:05:26 +01:00
parent 6f64713977
commit dad8065f0a
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amiga/font.c
View File

@ -712,8 +712,6 @@ ULONG ami_unicode_text(struct RastPort *rp,const char *string,ULONG length,const
outf16 = utf16; outf16 = utf16;
if(!(ofont = ami_open_outline_font(fstyle, 0))) return 0; if(!(ofont = ami_open_outline_font(fstyle, 0))) return 0;
if(rp) SetRPAttrs(rp,RPTAG_APenColor,p96EncodeColor(RGBFB_A8B8G8R8,fstyle->foreground),TAG_DONE);
while(*utf16 != 0) while(*utf16 != 0)
{ {
if (*utf16 < 0xD800 || 0xDFFF < *utf16) if (*utf16 < 0xD800 || 0xDFFF < *utf16)

23
amiga/plotters.c
View File

@ -19,24 +19,29 @@
#include "amiga/plotters.h" #include "amiga/plotters.h"
#include "amiga/bitmap.h" #include "amiga/bitmap.h"
#include "amiga/font.h" #include "amiga/font.h"
#include "amiga/gui.h"
#include "amiga/utf8.h"
#include "desktop/options.h"
#include "utils/utils.h"
#include "utils/log.h"
#include <proto/Picasso96API.h> #include <proto/Picasso96API.h>
#include <proto/exec.h>
#include <proto/intuition.h>
#include <intuition/intuition.h> #include <intuition/intuition.h>
#include <graphics/rpattr.h> #include <graphics/rpattr.h>
#include <graphics/gfxmacros.h> #include <graphics/gfxmacros.h>
#include <graphics/gfxbase.h> #include <graphics/gfxbase.h>
#include "amiga/utf8.h"
#include "desktop/options.h"
#ifdef __amigaos4__ #ifdef __amigaos4__
#include <graphics/blitattr.h> #include <graphics/blitattr.h>
#include <graphics/composite.h> #include <graphics/composite.h>
#endif #endif
#include "utils/log.h"
#include <math.h> #include <math.h>
#include <assert.h> #include <assert.h>
#include <proto/exec.h>
#include <proto/intuition.h>
#include "amiga/gui.h"
#include "utils/utils.h"
static void ami_bitmap_tile_hook(struct Hook *hook,struct RastPort *rp,struct BackFillMessage *bfmsg); static void ami_bitmap_tile_hook(struct Hook *hook,struct RastPort *rp,struct BackFillMessage *bfmsg);
@ -231,6 +236,8 @@ void ami_plot_setapen(ULONG colour)
(colour & 0x00ff0000) << 8, (colour & 0x00ff0000) << 8,
NULL); NULL);
if(pen == -1) LOG(("WARNING: Cannot allocate pen for ABGR:%lx", colour));
SetAPen(glob->rp, pen); SetAPen(glob->rp, pen);
} }
} }
@ -499,7 +506,9 @@ bool ami_text(int x, int y, const char *text, size_t length,
LOG(("[ami_plotter] Entered ami_text()")); LOG(("[ami_plotter] Entered ami_text()"));
#endif #endif
ami_plot_setapen(fstyle->foreground);
ami_unicode_text(glob->rp,text,length,fstyle,x,y); ami_unicode_text(glob->rp,text,length,fstyle,x,y);
return true; return true;
} }