diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2002-08-13 20:29:09 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2002-08-13 20:29:09 +0000 |
| commit | 5e3e8162ec9bf43b996817f13b1f0bb1ede9997d (patch) | |
| tree | 28e572e43df448a7aad47e87661a553b0834c89b /firmware/drivers/lcd.c | |
| parent | 3f8879767101200069829059139c72825a31c72e (diff) | |
If we're having loadable/proportional fonts, use them for everything
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1722 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/lcd.c')
| -rw-r--r-- | firmware/drivers/lcd.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index b67be4e761..ff02783da4 100644 --- a/firmware/drivers/lcd.c +++ b/firmware/drivers/lcd.c @@ -322,7 +322,7 @@ static void lcd_write(bool command, int byte) #endif /* ASM_IMPLEMENTATION */ #endif /* !SIMULATOR */ -unsigned char icon_mirror[11]; +static unsigned char icon_mirror[11]; /*** model specific code */ @@ -424,7 +424,7 @@ void lcd_define_pattern (int which,char *pattern,int length) int i; lcd_write(true,LCD_PRAM|which); for (i=0;i<length;i++) - lcd_write(false,pattern[i]); + lcd_write(false,pattern[i]); } void lcd_double_height(bool on) @@ -881,12 +881,18 @@ void lcd_puts(int x, int y, unsigned char *str) } +void lcd_putsxy(int x, int y, unsigned char *str, int thisfont) +{ +#ifdef LOADABLE_FONTS + lcd_putsldfxy(x,y,str); + (void)thisfont; +#elif LCD_PROPFONTS + lcd_putspropxy(x,y,str,thisfont); +#else /* * Put a string at specified bit position */ -void lcd_putsxy(int x, int y, unsigned char *str, int thisfont) -{ int nx = fonts[thisfont]; int ny = fontheight[thisfont]; int ch; @@ -919,6 +925,7 @@ void lcd_putsxy(int x, int y, unsigned char *str, int thisfont) lcd_x += nx; } +#endif } /* |