From ad4e3d665734b14a28f1ba5fa874663772dab3e7 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 26 Mar 2007 07:52:13 +0000 Subject: First step of charcell LCD code rework: * Make it fully unicode aware so that adding non-ISO8859-1 scripts becomes possible (limited by the LCD capabilities of course). * Make the API more similar to the bitmap LCD code's API. * Moved hardware dependent parts to target tree. * Simplified code. * Jumpscroll temporarily non-functional. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12916 a1c6a512-1295-4272-9138-f99709370657 --- apps/screen_access.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'apps/screen_access.h') diff --git a/apps/screen_access.h b/apps/screen_access.h index 54f2d64fdb..c1d8b5f9b8 100644 --- a/apps/screen_access.h +++ b/apps/screen_access.h @@ -60,24 +60,19 @@ struct screen #ifdef HAS_BUTTONBAR bool has_buttonbar; #endif - -#if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) /* always bitmap */ void (*setmargins)(int x, int y); int (*getxmargin)(void); int (*getymargin)(void); - void (*setfont)(int newfont); int (*getstringsize)(const unsigned char *str, int *w, int *h); - void (*putsxy)(int x, int y, const unsigned char *str); +#if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) /* always bitmap */ + void (*setfont)(int newfont); void (*scroll_step)(int pixels); - void (*puts_offset)(int x, int y, const unsigned char *str, int offset); void (*puts_style_offset)(int x, int y, const unsigned char *str, int style, int offset); void (*puts_scroll_style)(int x, int y, const unsigned char *string, int style); - void (*puts_scroll_offset)(int x, int y, const unsigned char *string, - int offset); void (*puts_scroll_style_offset)(int x, int y, const unsigned char *string, int style, int offset); void (*mono_bitmap)(const unsigned char *src, @@ -114,17 +109,22 @@ struct screen #ifdef HAVE_LCD_CHARCELLS /* no charcell remote LCDs so far */ void (*double_height)(bool on); - void (*putc)(int x, int y, unsigned short ch); + void (*putc)(int x, int y, unsigned long ucs); void (*icon)(int icon, bool enable); + unsigned long (*get_locked_pattern)(void); + void (*define_pattern)(unsigned long ucs, const char *pattern); #endif void (*init)(void); + void (*putsxy)(int x, int y, const unsigned char *str); + void (*puts)(int x, int y, const unsigned char *str); + void (*puts_offset)(int x, int y, const unsigned char *str, int offset); void (*puts_scroll)(int x, int y, const unsigned char *string); + void (*puts_scroll_offset)(int x, int y, const unsigned char *string, + int offset); void (*scroll_speed)(int speed); void (*scroll_delay)(int ms); void (*stop_scroll)(void); void (*clear_display)(void); - unsigned char (*get_locked_pattern)(void); - void (*define_pattern)(int pat, const char *pattern); #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) || defined(SIMULATOR) void (*update)(void); #endif @@ -132,7 +132,6 @@ struct screen void (*backlight_off)(void); bool (*is_backlight_on)(void); void (*backlight_set_timeout)(int index); - void (*puts)(int x, int y, const unsigned char *str); }; /* -- cgit v1.2.3