From 999410adc818e9bc9e566580b38954720d7dad55 Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Mon, 28 Nov 2011 23:23:28 +0000 Subject: I'm actually trying to simplify the frontend code, changes: - Optimized browser window caret, uses back-buffer now. ( So no content redraw is scheduled by the frontend just for a caret move ) - Fixed a double redraw issue when the browser reformat is pending and the AES also sends an redraw request because of the resize. - Started to use netsurfs textarea instead of a custom implementation ( to reduce code size ). svn path=/trunk/netsurf/; revision=13191 --- atari/font.c | 60 ++++-------------------------------------------------------- 1 file changed, 4 insertions(+), 56 deletions(-) (limited to 'atari/font.c') diff --git a/atari/font.c b/atari/font.c index caebefc6d..2098055eb 100755 --- a/atari/font.c +++ b/atari/font.c @@ -21,11 +21,6 @@ #include #include -/* -#include -#include FT_CACHE_H -*/ - #include "css/css.h" #include "render/font.h" #include "utils/utf8.h" @@ -45,68 +40,21 @@ extern GEM_FONT_PLOTTER fplotter; -/* TODO: this need a rework..., encoding to atari st doesn|t always work. ( gui_add_to_clipboard...) */ -utf8_convert_ret utf8_to_local_encoding(const char *string, - size_t len, - char **result) -{ - utf8_convert_ret r; - r = utf8_to_enc(string, "ATARIST", len, result); - if(r != UTF8_CONVERT_OK) { - r = utf8_to_enc(string, "UTF-8", len, result); - assert( r == UTF8_CONVERT_OK ); - } - return r; -} - -utf8_convert_ret local_encoding_to_utf8(const char *string, - size_t len, - char **result) -{ - return utf8_from_enc(string, "ATARIST", len, result); -} - - -/* borrowed from highwire project: */ -static const uint16_t Atari_to_Unicode[] = { - /* .0 .1 .2 .3 .4 .5 .6 .7 .8 .9 .A .B .C .D .E .F */ - /* 7F */ 0x0394, - /* 8. */ 0x00C7,0x00FC,0x00E9,0x00E2,0x00E4,0x00E0,0x00E5,0x00E7,0x00EA,0x00EB,0x00E8,0x00EF,0x00EE,0x00EC,0x00C4,0x00C5, - /* 9. */ 0x00C9,0x00E6,0x00C6,0x00F4,0x00F6,0x00F2,0x00FB,0x00F9,0x00FF,0x00D6,0x00DC,0x00A2,0x00A3,0x00A5,0x00DF,0x0192, - /* A. */ 0x00E1,0x00ED,0x00F3,0x00FA,0x00F1,0x00D1,0x00AA,0x00BA,0x00BF,0x2310,0x00AC,0x00BD,0x00BC,0x00A1,0x00AB,0x00BB, - /* B. */ 0x00C3,0x00F5,0x00D8,0x00F8,0x0153,0x0152,0x00C0,0x00C3,0x00D5,0x00A8,0x00B4,0x2020,0x00B6,0x00A9,0x00AE,0x2122, - /* C. */ 0x0133,0x0132,0x05D0,0x05D1,0x05D2,0x05D3,0x05D4,0x05D5,0x05D6,0x05D7,0x05D8,0x05D9,0x05DB,0x05DC,0x05DE,0x05E0, - /* D. */ 0x05E1,0x05E2,0x05E4,0x05E6,0x05E7,0x05E8,0x05E9,0x05EA,0x05DF,0x05DA,0x05DD,0x05E3,0x05E5,0x00A7,0x2038,0x221E, - /* E. */ 0x03B1,0x03B2,0x0393,0x03C0,0x03A3,0x03C3,0x00B5,0x03C4,0x03A6,0x0398,0x03A9,0x03B4,0x222E,0x03C6,0x2208,0x2229, - /* F. */ 0x2261,0x00B1,0x2265,0x2264,0x2320,0x2321,0x00F7,0x2248,0x00B0,0x2022,0x00B7,0x221A,0x207F,0x00B2,0x00B3,0x00AF -}; -#define BEG_Atari_to_Unicode 0x7F - -int atari_to_ucs4(unsigned char atari) -{ - uint32_t ucs4 = 0xfffd; - if ( atari >= BEG_Atari_to_Unicode && atari <= 0xFE ) - ucs4 = (int)Atari_to_Unicode[(short)atari - BEG_Atari_to_Unicode]; - else - ucs4 = (int)atari; - return( ucs4 ); -} - -static bool atari_font_position_in_string(const plot_font_style_t * fstyle,const char *string, +static bool atari_font_position_in_string(const plot_font_style_t * fstyle,const char *string, size_t length,int x, size_t *char_offset, int *actual_x ) { fplotter->pixel_pos(fplotter, fstyle, string, length, x, char_offset, actual_x ); return( true ); } -static bool atari_font_split( const plot_font_style_t * fstyle, const char *string, +static bool atari_font_split( const plot_font_style_t * fstyle, const char *string, size_t length,int x, size_t *char_offset, int *actual_x ) { fplotter->str_split( fplotter, fstyle, string, length, x, char_offset, actual_x ); - return( true ); + return( true ); } -static bool atari_font_width( const plot_font_style_t *fstyle, const char * str, +static bool atari_font_width( const plot_font_style_t *fstyle, const char * str, size_t length, int * width ) { fplotter->str_width( fplotter, fstyle, str, length, width ); -- cgit v1.2.3