mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-24 15:29:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements to output.

Browse Source 
svn path=/trunk/netsurf/; revision=5905
This commit is contained in:
Chris Young 2008-12-13 23:20:49 +00:00
parent 8a5ec4710e
commit b682523066
2 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
amiga/font.c
View File

@ -204,15 +204,7 @@ struct TextFont *ami_open_font(struct css_style *style)
}
*/
switch(style->font_size.size)
{
case CSS_FONT_SIZE_LENGTH:
tattr.tta_YSize = (UWORD)style->font_size.value.length.value;
break;
default:
printf("FONT SIZE TYPE: %ld\n",style->font_size.size);
break;
}
tattr.tta_YSize = css_len2px(&style->font_size.value.length, style);
if(tattr.tta_YSize < option_font_min_size)
tattr.tta_YSize = option_font_min_size;
@ -282,15 +274,7 @@ struct OutlineFont *ami_open_outline_font(struct css_style *style)
/* see diskfont implementation for currently unimplemented bold/italic stuff */
switch(style->font_size.size)
{
case CSS_FONT_SIZE_LENGTH:
ysize = style->font_size.value.length.value;
break;
default:
printf("FONT SIZE TYPE: %ld\n",style->font_size.size);
break;
}
ysize = css_len2px(&style->font_size.value.length, style);
if(ysize < option_font_min_size)
ysize = option_font_min_size;

29
amiga/plotters.c
View File

@ -27,6 +27,7 @@
#include <graphics/gfxmacros.h>
#include "amiga/utf8.h"
#include <proto/layers.h>
#include "amiga/options.h"
#define PATT_DOT 0xAAAA
#define PATT_DASH 0xCCCC
@ -137,7 +138,7 @@ bool ami_fill(int x0, int y0, int x1, int y1, colour c)
{
//DebugPrintF("fill %ld,%ld,%ld,%ld\n",x0,y0,x1,y1);
p96RectFill(currp,x0,y0,x1,y1,
p96RectFill(currp,x0,y0,x1-1,y1-1,
p96EncodeColor(RGBFB_A8B8G8R8,c));
return true;
@ -171,16 +172,20 @@ bool ami_text(int x, int y, const struct css_style *style,
const char *text, size_t length, colour bg, colour c)
{
char *buffer = NULL;
struct TextFont *tfont = ami_open_font(style);
struct TextFont *tfont;
SetRPAttrs(currp,RPTAG_APenColor,p96EncodeColor(RGBFB_A8B8G8R8,c),
if(option_quick_text)
{
tfont = ami_open_font(style);
SetRPAttrs(currp,RPTAG_APenColor,p96EncodeColor(RGBFB_A8B8G8R8,c),
RPTAG_BPenColor,p96EncodeColor(RGBFB_A8B8G8R8,bg),
// RPTAG_Font,tfont,
TAG_DONE);
utf8_to_local_encoding(text,length,&buffer);
utf8_to_local_encoding(text,length,&buffer);
if(!buffer) return true;
if(!buffer) return true;
/* Below function prints Unicode text direct to the RastPort.
* This is commented out due to lack of SDK which allows me to perform blits
@ -192,11 +197,15 @@ bool ami_text(int x, int y, const struct css_style *style,
* or, perhaps the ttengine.library version (far too slow):
* ami_tte_text(currp,text,length);
*/
Move(currp,x,y);
Text(currp,buffer,strlen(buffer));
ami_close_font(tfont);
ami_utf8_free(buffer);
Move(currp,x,y);
Text(currp,buffer,strlen(buffer));
ami_close_font(tfont);
ami_utf8_free(buffer);
}
else
{
ami_unicode_text(currp,text,length,style,x,y,c);
}
return true;
}