diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2005-07-06 22:58:02 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2005-07-06 22:58:02 +0000 |
| commit | f894a4c2691fbde1758a05407cb5eadcaec4a6c8 (patch) | |
| tree | 46cb7ce63c794020175ab251cf0299663be8bf3c /apps | |
| parent | 1076eb1d2720b88757616f642be0c39c6a3b76df (diff) | |
| download | rockbox-f894a4c2691fbde1758a05407cb5eadcaec4a6c8.zip rockbox-f894a4c2691fbde1758a05407cb5eadcaec4a6c8.tar.gz rockbox-f894a4c2691fbde1758a05407cb5eadcaec4a6c8.tar.bz2 rockbox-f894a4c2691fbde1758a05407cb5eadcaec4a6c8.tar.xz | |
4-shades greyscale graphics core for iriver H1x0. 4-grey rockbox logo and light grey background in splash() boxes. Simplified the splash() box creation as the new graphics core does clipping. Adapted screendump feature and added flexible preprocessing to construct the bmp header. Rockboy now uses 4-grey mode as well. 4-grey support for win32 simulator. Fixed win32 player sim to not use double bitmap conversion via a recorder-like framebuffer, and correctly display double-height text. X11 simulator temporarily adapted. The display won't be distorted, but it still shows b&w only.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7046 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
31 files changed, 553 insertions, 385 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index 37a8ff4..b887ed6 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c @@ -75,7 +75,7 @@ int show_logo( void ) lcd_bitmap(rockbox112x37, 0, 10, 112, 37); #endif #if LCD_WIDTH >= 160 - lcd_bitmap(rockbox160x53, 0, 10, 160, 53); + lcd_bitmap(rockbox160x53x2, 0, 10, 160, 53); #endif #ifdef HAVE_REMOTE_LCD diff --git a/apps/menu.c b/apps/menu.c index 459abe6..cdcafec 100644 --- a/apps/menu.c +++ b/apps/menu.c @@ -116,7 +116,7 @@ void put_cursorxy(int x, int y, bool on) /* place the cursor */ if(on) { #ifdef HAVE_LCD_BITMAP - lcd_bitmap(bitmap_icons_6x8[Cursor], xpos, ypos, 4, 8); + lcd_mono_bitmap(bitmap_icons_6x8[Cursor], xpos, ypos, 4, 8); #else lcd_putc(x, y, CURSOR_CHAR); #endif diff --git a/apps/misc.c b/apps/misc.c index 055bcd2..9a89015 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -136,35 +136,81 @@ int read_line(int fd, char* buffer, int buffer_size) } #ifdef HAVE_LCD_BITMAP -extern unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH]; -static const unsigned char bmpheader[] = -{ - 0x42, 0x4d, 0x3e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, - 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, LCD_WIDTH, 0x00, 0x00, 0x00, LCD_HEIGHT, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, -#if LCD_WIDTH == 160 - 0x00, 0x00, 0x00, 0x0a, + +#if LCD_DEPTH <= 8 +#define BMP_NUMCOLORS (1 << LCD_DEPTH) #else - 0x00, 0x00, 0x00, 0x04, +#define BMP_NUMCOLORS 0 #endif - 0x00, 0x00, 0xc4, 0x0e, 0x00, 0x00, 0xc4, 0x0e, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -#ifdef IRIVER_H100 - 0xe6, 0xd8, 0xad, + +#if LCD_DEPTH == 1 +#define BMP_BPP 1 +#define BMP_LINESIZE ((LCD_WIDTH/8 + 3) & ~3) +#elif LCD_DEPTH <= 4 +#define BMP_BPP 4 +#define BMP_LINESIZE ((LCD_WIDTH/2 + 3) & ~3) +#elif LCD_DEPTH <= 8 +#define BMP_BPP 8 +#define BMP_LINESIZE ((LCD_WIDTH + 3) & ~3) +#elif LCD_DEPTH <= 16 +#define BMP_BPP 16 +#define BMP_LINESIZE ((LCD_WIDTH*2 + 3) & ~3) #else - 0x90, 0xee, 0x90, +#define BMP_BPP 24 +#define BMP_LINESIZE ((LCD_WIDTH*3 + 3) & ~3) +#endif + +#define BMP_HEADERSIZE (54 + 4 * BMP_NUMCOLORS) +#define BMP_DATASIZE (BMP_LINESIZE * LCD_HEIGHT) +#define BMP_TOTALSIZE (BMP_HEADERSIZE + BMP_DATASIZE) + +#define LE16_CONST(x) (x)&0xff, ((x)>>8)&0xff +#define LE32_CONST(x) (x)&0xff, ((x)>>8)&0xff, ((x)>>16)&0xff, ((x)>>24)&0xff + +static const unsigned char bmpheader[] = +{ + 0x42, 0x4d, /* 'BM' */ + LE32_CONST(BMP_TOTALSIZE), /* Total file size */ + 0x00, 0x00, 0x00, 0x00, /* Reserved */ + LE32_CONST(BMP_HEADERSIZE), /* Offset to start of pixel data */ + + 0x28, 0x00, 0x00, 0x00, /* Size of (2nd) header */ + LE32_CONST(LCD_WIDTH), /* Width in pixels */ + LE32_CONST(LCD_HEIGHT), /* Height in pixels */ + 0x01, 0x00, /* Number of planes (always 1) */ + LE16_CONST(BMP_BPP), /* Bits per pixel 1/4/8/16/24 */ + 0x00, 0x00, 0x00, 0x00, /* Compression mode, 0 = none */ + LE32_CONST(BMP_DATASIZE), /* Size of bitmap data */ + 0xc4, 0x0e, 0x00, 0x00, /* Horizontal resolution (pixels/meter) */ + 0xc4, 0x0e, 0x00, 0x00, /* Vertical resolution (pixels/meter) */ + LE32_CONST(BMP_NUMCOLORS), /* Number of used colours */ + LE32_CONST(BMP_NUMCOLORS), /* Number of important colours */ + +#if LCD_DEPTH == 1 + 0x90, 0xee, 0x90, 0x00, /* Colour #0 */ + 0x00, 0x00, 0x00, 0x00 /* Colour #1 */ +#elif LCD_DEPTH == 2 + 0xe6, 0xd8, 0xad, 0x00, /* Colour #0 */ + 0x99, 0x90, 0x73, 0x00, /* Colour #1 */ + 0x4c, 0x48, 0x39, 0x00, /* Colour #2 */ + 0x00, 0x00, 0x00, 0x00 /* Colour #3 */ #endif - 0x00, 0x00, 0x00, - 0x00, 0x00 }; void screen_dump(void) { int fh; - int bx, by, ix, iy; - int src_byte, src_mask, dst_mask; + int bx, by, iy; + int src_byte; char filename[MAX_PATH]; - static unsigned char line_block[8][(LCD_WIDTH/8+3) & ~3]; +#if LCD_DEPTH == 1 + int ix, src_mask, dst_mask; + static unsigned char line_block[8][BMP_LINESIZE]; +#elif LCD_DEPTH == 2 + int src_byte2; + static unsigned char line_block[4][BMP_LINESIZE]; +#endif + #ifdef HAVE_RTC struct tm *tm = get_time(); @@ -213,6 +259,7 @@ void screen_dump(void) write(fh, bmpheader, sizeof(bmpheader)); /* BMP image goes bottom up */ +#if LCD_DEPTH == 1 for (by = LCD_HEIGHT/8 - 1; by >= 0; by--) { memset(&line_block[0][0], 0, sizeof(line_block)); @@ -236,6 +283,26 @@ void screen_dump(void) write(fh, &line_block[0][0], sizeof(line_block)); } +#elif LCD_DEPTH == 2 + for (by = LCD_HEIGHT/4 - 1; by >= 0; by--) + { + memset(&line_block[0][0], 0, sizeof(line_block)); + + for (bx = 0; bx < LCD_WIDTH/2; bx++) + { + src_byte = lcd_framebuffer[by][2*bx]; + src_byte2 = lcd_framebuffer[by][2*bx+1]; + for (iy = 3; iy >= 0; iy--) + { + line_block[iy][bx] = ((src_byte & 3) << 4) | (src_byte2 & 3); + src_byte >>= 2; + src_byte2 >>= 2; + } + } + + write(fh, &line_block[0][0], sizeof(line_block)); + } +#endif close(fh); } #endif diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 21ae4d7..32cc603 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c @@ -461,8 +461,8 @@ static void display_playlist(void) int offset=0; if ( viewer.line_height > 8 ) offset = (viewer.line_height - 8) / 2; - lcd_bitmap(bitmap_icons_6x8[File], - CURSOR_X * 6 + CURSOR_WIDTH, + lcd_mono_bitmap(bitmap_icons_6x8[File], + CURSOR_X * 6 + CURSOR_WIDTH, MARGIN_Y+(i*viewer.line_height) + offset, 6, 8); #else lcd_putc(LINE_X-1, i, File); diff --git a/apps/plugin.c b/apps/plugin.c index c92813d..6061e86 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -114,8 +114,8 @@ static const struct plugin_api rockbox_api = { lcd_vline, lcd_drawrect, lcd_fillrect, - lcd_bitmap_part, - lcd_bitmap, + lcd_mono_bitmap_part, + lcd_mono_bitmap, lcd_putsxy, lcd_puts_style, lcd_puts_scroll_style, diff --git a/apps/plugin.h b/apps/plugin.h index 46308a1..2f724f3 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -164,10 +164,10 @@ struct plugin_api { void (*lcd_vline)(int x, int y1, int y2); void (*lcd_drawrect)(int x, int y, int width, int height); void (*lcd_fillrect)(int x, int y, int width, int height); - void (*lcd_bitmap_part)(const unsigned char *src, int src_x, int src_y, - int stride, int x, int y, int width, int height); - void (*lcd_bitmap)(const unsigned char *src, int x, int y, - int width, int height); + void (*lcd_mono_bitmap_part)(const unsigned char *src, int src_x, int src_y, + int stride, int x, int y, int width, int height); + void (*lcd_mono_bitmap)(const unsigned char *src, int x, int y, + int width, int height); void (*lcd_putsxy)(int x, int y, const unsigned char *string); void (*lcd_puts_style)(int x, int y, const unsigned char *str, int style); void (*lcd_puts_scroll_style)(int x, int y, const unsigned char* string, diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 98dcd5f..676d8fe 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c @@ -309,8 +309,8 @@ static int scrollit(void) for(i=0, yy=y, xx=x; i< LETTERS_ON_SCREEN; i++) { letter = rock[(i+textpos) % rocklen ]; - rb->lcd_bitmap((char *)char_gen_12x16[letter-0x20], - xx, table[yy&(TABLE_SIZE-1)], 11, 16); + rb->lcd_mono_bitmap((char *)char_gen_12x16[letter-0x20], + xx, table[yy&(TABLE_SIZE-1)], 11, 16); yy += YADD; xx+= LCD_WIDTH/LETTERS_ON_SCREEN; } @@ -399,9 +399,9 @@ static int loopit(void) for(i=0, yy=y, xx=x; i<rocklen; i++, yy+=values[NUM_YDIST].num, xx+=values[NUM_XDIST].num) - rb->lcd_bitmap((char *)char_gen_12x16[rock[i]-0x20], - xtable[xx&(TABLE_SIZE-1)], table[yy&(TABLE_SIZE-1)], - 11, 16); + rb->lcd_mono_bitmap((char *)char_gen_12x16[rock[i]-0x20], + xtable[xx&(TABLE_SIZE-1)], + table[yy&(TABLE_SIZE-1)], 11, 16); rb->lcd_update(); rb->lcd_set_drawmode(DRMODE_SOLID); diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 1c394df..d81b71e 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -215,7 +215,7 @@ static void show_pause_mode(bool enabled) static const char pause_icon[] = {0x00,0x7f,0x7f,0x00,0x7f,0x7f,0x00}; if (enabled) - rb->lcd_bitmap(pause_icon, 52, 0, 7, 8); + rb->lcd_mono_bitmap(pause_icon, 52, 0, 7, 8); else { rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index fab5eab..e990742 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c @@ -1062,7 +1062,7 @@ static void chip8_update_display(void) } #ifdef SIMULATOR rb->lcd_set_drawmode(DRMODE_SOLID); - rb->lcd_bitmap(lcd_framebuf[0], CHIP8_X, CHIP8_Y, CHIP8_LCDWIDTH, CHIP8_HEIGHT); + rb->lcd_mono_bitmap(lcd_framebuf[0], CHIP8_X, CHIP8_Y, CHIP8_LCDWIDTH, CHIP8_HEIGHT); rb->lcd_update(); #else rb->lcd_blit(lcd_framebuf[0], CHIP8_X, CHIP8_Y>>3, CHIP8_LCDWIDTH, CHIP8_HEIGHT>>3 diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c index bddda15..6830c74 100644 --- a/apps/plugins/clock.c +++ b/apps/plugins/clock.c @@ -788,9 +788,9 @@ bool colon, bool lcd) if(settings.digital_12h) { if(hour > 12) - rb->lcd_bitmap(pm, 97, 55, 15, 8); + rb->lcd_mono_bitmap(pm, 97, 55, 15, 8); else - rb->lcd_bitmap(am, 1, 55, 15, 8); + rb->lcd_mono_bitmap(am, 1, 55, 15, 8); } } else @@ -798,9 +798,9 @@ bool colon, bool lcd) if(settings.lcd_12h) { if(hour > 12) - rb->lcd_bitmap(pm, 97, 55, 15, 8); + rb->lcd_mono_bitmap(pm, 97, 55, 15, 8); else - rb->lcd_bitmap(am, 1, 55, 15, 8); + rb->lcd_mono_bitmap(am, 1, 55, 15, 8); } } @@ -881,138 +881,138 @@ void binary(int hour, int minute, int second) *****/ if(temphour >= 32) { - rb->lcd_bitmap(bitmap_1, 0, 1, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 0, 1, 15, 20); temphour -= 32; } else - rb->lcd_bitmap(bitmap_0, 0, 1, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 0, 1, 15, 20); if(temphour >= 16) { - rb->lcd_bitmap(bitmap_1, 19, 1, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 19, 1, 15, 20); temphour -= 16; } else - rb->lcd_bitmap(bitmap_0, 19, 1, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 19, 1, 15, 20); if(temphour >= 8) { - rb->lcd_bitmap(bitmap_1, 38, 1, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 38, 1, 15, 20); temphour -= 8; } else - rb->lcd_bitmap(bitmap_0, 38, 1, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 38, 1, 15, 20); if(temphour >= 4) { - rb->lcd_bitmap(bitmap_1, 57, 1, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 57, 1, 15, 20); temphour -= 4; } else - rb->lcd_bitmap(bitmap_0, 57, 1, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 57, 1, 15, 20); if(temphour >= 2) { - rb->lcd_bitmap(bitmap_1, 76, 1, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 76, 1, 15, 20); temphour -= 2; } else - rb->lcd_bitmap(bitmap_0, 76, 1, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 76, 1, 15, 20); if(temphour >= 1) { - rb->lcd_bitmap(bitmap_1, 95, 1, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 95, 1, 15, 20); temphour -= 1; } else - rb->lcd_bitmap(bitmap_0, 95, 1, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 95, 1, 15, 20); /********* * MINUTES ********/ if(tempmin >= 32) { - rb->lcd_bitmap(bitmap_1, 0, 21, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 0, 21, 15, 20); tempmin -= 32; } else - rb->lcd_bitmap(bitmap_0, 0, 21, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 0, 21, 15, 20); if(tempmin >= 16) { - rb->lcd_bitmap(bitmap_1, 19, 21, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 19, 21, 15, 20); tempmin -= 16; } else - rb->lcd_bitmap(bitmap_0, 19, 21, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 19, 21, 15, 20); if(tempmin >= 8) { - rb->lcd_bitmap(bitmap_1, 38, 21, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 38, 21, 15, 20); tempmin -= 8; } else - rb->lcd_bitmap(bitmap_0, 38, 21, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 38, 21, 15, 20); if(tempmin >= 4) { - rb->lcd_bitmap(bitmap_1, 57, 21, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 57, 21, 15, 20); tempmin -= 4; } else - rb->lcd_bitmap(bitmap_0, 57, 21, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 57, 21, 15, 20); if(tempmin >= 2) { - rb->lcd_bitmap(bitmap_1, 76, 21, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 76, 21, 15, 20); tempmin -= 2; } else - rb->lcd_bitmap(bitmap_0, 76, 21, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 76, 21, 15, 20); if(tempmin >= 1) { - rb->lcd_bitmap(bitmap_1, 95, 21, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 95, 21, 15, 20); tempmin -= 1; } else - rb->lcd_bitmap(bitmap_0, 95, 21, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 95, 21, 15, 20); /********* * SECONDS ********/ if(tempsec >= 32) { - rb->lcd_bitmap(bitmap_1, 0, 42, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 0, 42, 15, 20); tempsec -= 32; } else - rb->lcd_bitmap(bitmap_0, 0, 42, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 0, 42, 15, 20); if(tempsec >= 16) { - rb->lcd_bitmap(bitmap_1, 19, 42, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 19, 42, 15, 20); tempsec -= 16; } else - rb->lcd_bitmap(bitmap_0, 19, 42, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 19, 42, 15, 20); if(tempsec >= 8) { - rb->lcd_bitmap(bitmap_1, 38, 42, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 38, 42, 15, 20); tempsec -= 8; } else - rb->lcd_bitmap(bitmap_0, 38, 42, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 38, 42, 15, 20); if(tempsec >= 4) { - rb->lcd_bitmap(bitmap_1, 57, 42, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 57, 42, 15, 20); tempsec -= 4; } else - rb->lcd_bitmap(bitmap_0, 57, 42, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 57, 42, 15, 20); if(tempsec >= 2) { - rb->lcd_bitmap(bitmap_1, 76, 42, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 76, 42, 15, 20); tempsec -= 2; } else - rb->lcd_bitmap(bitmap_0, 76, 42, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 76, 42, 15, 20); if(tempsec >= 1) { - rb->lcd_bitmap(bitmap_1, 95, 42, 15, 20); + rb->lcd_mono_bitmap(bitmap_1, 95, 42, 15, 20); tempsec -= 1; } else - rb->lcd_bitmap(bitmap_0, 95, 42, 15, 20); + rb->lcd_mono_bitmap(bitmap_0, 95, 42, 15, 20); rb->lcd_update(); } @@ -1039,7 +1039,7 @@ void show_logo(bool animate, bool show_clock_text) rb->lcd_drawline(0, y_position/2-1, 111, y_position/2-1); rb->lcd_drawline(0, y_position/2+38, 111, y_position/2+38); rb->lcd_set_drawmode(DRMODE_SOLID); - rb->lcd_bitmap(clogo, 0, y_position/2, 112, 37); + rb->lcd_mono_bitmap(clogo, 0, y_position/2, 112, 37); if(show_clock_text) rb->lcd_putsxy(LCD_WIDTH/2-buf_w/2, 48, buf); rb->lcd_update(); @@ -1051,7 +1051,7 @@ void show_logo(bool animate, bool show_clock_text) rb->lcd_drawline(0, y_position/2-1, 111, y_position/2-1); rb->lcd_drawline(0, y_position/2+38, 111, y_position/2+38); rb->lcd_set_drawmode(DRMODE_SOLID); - rb->lcd_bitmap(clogo, 0, y_position/2, 112, 37); + rb->lcd_mono_bitmap(clogo, 0, y_position/2, 112, 37); if(show_clock_text) rb->lcd_putsxy(LCD_WIDTH/2-buf_w/2, 48, buf); rb->lcd_update(); @@ -1063,7 +1063,7 @@ void show_logo(bool animate, bool show_clock_text) rb->lcd_drawline(0, y_position/2-1, 111, y_position/2-1); rb->lcd_drawline(0, y_position/2+38, 111, y_position/2+38); rb->lcd_set_drawmode(DRMODE_SOLID); - rb->lcd_bitmap(clogo, 0, y_position/2, 112, 37); + rb->lcd_mono_bitmap(clogo, 0, y_position/2, 112, 37); if(show_clock_text) rb->lcd_putsxy(LCD_WIDTH/2-buf_w/2, 48, buf); rb->lcd_update(); @@ -1071,7 +1071,7 @@ void show_logo(bool animate, bool show_clock_text) } else /* don't animate, just show */ { - rb->lcd_bitmap(clogo, 0, 10, 112, 37); + rb->lcd_mono_bitmap(clogo, 0, 10, 112, 37); if(show_clock_text) rb->lcd_putsxy(LCD_WIDTH/2-buf_w/2, 48, buf); rb->lcd_update(); @@ -1094,7 +1094,7 @@ void exit_logo(void) rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); rb->lcd_drawline(0, y_position/2-1, 111, y_position/2-1); rb->lcd_set_drawmode(DRMODE_SOLID); - rb->lcd_bitmap(clogo, 0, y_position/2, 112, 37); + rb->lcd_mono_bitmap(clogo, 0, y_position/2, 112, 37); rb->lcd_update(); } } @@ -1511,9 +1511,9 @@ bool f1_screen(void) void draw_checkbox(bool setting, int x, int y) { if(setting) /* checkbox is on */ - rb->lcd_bitmap(checkbox_full, x, y, 8, 6); + rb->lcd_mono_bitmap(checkbox_full, x, y, 8, 6); else /* checkbox is off */ - rb->lcd_bitmap(checkbox_empty, x, y, 8, 6); + rb->lcd_mono_bitmap(checkbox_empty, x, y, 8, 6); } void draw_settings(void) @@ -1544,18 +1544,18 @@ void draw_settings(void) draw_checkbox(settings.analog_digits, 1, 33); if(settings.analog_date == 0) - rb->lcd_bitmap(checkbox_empty, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_empty, 1, 41, 8, 6); else if(settings.analog_date == 1) - rb->lcd_bitmap(checkbox_half, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_half, 1, 41, 8, 6); else - rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_full, 1, 41, 8, 6); if(settings.analog_time == 0) - rb->lcd_bitmap(checkbox_empty, 1, 49, 8, 6); + rb->lcd_mono_bitmap(checkbox_empty, 1, 49, 8, 6); else if(settings.analog_time == 1) - rb->lcd_bitmap(checkbox_half, 1, 49, 8, 6); + rb->lcd_mono_bitmap(checkbox_half, 1, 49, 8, 6); else - rb->lcd_bitmap(checkbox_full, 1, 49, 8, 6); + rb->lcd_mono_bitmap(checkbox_full, 1, 49, 8, 6); draw_checkbox(settings.analog_secondhand, 1, 57); } @@ -1584,20 +1584,20 @@ void draw_settings(void) /* Draw checkboxes */ if(settings.digital_date == 0) - rb->lcd_bitmap(checkbox_empty, 1, 33, 8, 6); + rb->lcd_mono_bitmap(checkbox_empty, 1, 33, 8, 6); else if(settings.digital_date == 1) - rb->lcd_bitmap(checkbox_half, 1, 33, 8, 6); + rb->lcd_mono_bitmap(checkbox_half, 1, 33, 8, 6); else - rb->lcd_bitmap(checkbox_full, 1, 33, 8, 6); + rb->lcd_mono_bitmap(checkbox_full, 1, 33, 8, 6); if(settings.digital_seconds == 0) - rb->lcd_bitmap(checkbox_empty, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_empty, 1, 41, 8, 6); else if(settings.digital_seconds == 1) - rb->lcd_bitmap(checkbox_onethird, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_onethird, 1, 41, 8, 6); else if(settings.digital_seconds == 2) - rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_twothird, 1, 41, 8, 6); else - rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_full, 1, 41, 8, 6); draw_checkbox(settings.digital_blinkcolon, 1, 49); draw_checkbox(settings.digital_12h, 1, 57); @@ -1627,20 +1627,20 @@ void draw_settings(void) /* Draw checkboxes */ if(settings.lcd_date == 0) - rb->lcd_bitmap(checkbox_empty, 1, 33, 8, 6); + rb->lcd_mono_bitmap(checkbox_empty, 1, 33, 8, 6); else if(settings.lcd_date == 1) - rb->lcd_bitmap(checkbox_half, 1, 33, 8, 6); + rb->lcd_mono_bitmap(checkbox_half, 1, 33, 8, 6); else - rb->lcd_bitmap(checkbox_full, 1, 33, 8, 6); + rb->lcd_mono_bitmap(checkbox_full, 1, 33, 8, 6); if(settings.lcd_seconds == 0) - rb->lcd_bitmap(checkbox_empty, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_empty, 1, 41, 8, 6); else if(settings.lcd_seconds == 1) - rb->lcd_bitmap(checkbox_onethird, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_onethird, 1, 41, 8, 6); else if(settings.lcd_seconds == 2) - rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_twothird, 1, 41, 8, 6); else - rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_full, 1, 41, 8, 6); draw_checkbox(settings.lcd_blinkcolon, 1, 49); draw_checkbox(settings.lcd_12h, 1, 57); @@ -2131,16 +2131,16 @@ void general_settings(void) rb->lcd_getstringsize(buf, &buf_w, &buf_h); rb->lcd_putsxy(LCD_WIDTH/2-buf_w/2, 56, buf); - rb->lcd_bitmap(arrow, 1, 17, 8, 6); - rb->lcd_bitmap(arrow, 1, 25, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 17, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 25, 8, 6); draw_checkbox(settings.display_counter, 1, 33); if(settings.save_mode == 1) - rb->lcd_bitmap(checkbox_onethird, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_onethird, 1, 41, 8, 6); else if(settings.save_mode == 2) - rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_twothird, 1, 41, 8, 6); else - rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_full, 1, 41, 8, 6); switch(cursorpos) { @@ -2181,15 +2181,15 @@ void general_settings(void) rb->lcd_puts(2, 5, "Save: Automatic"); else rb->lcd_puts(2, 5, "Save: Manually"); - rb->lcd_bitmap(arrow, 1, 17, 8, 6); - rb->lcd_bitmap(arrow, 1, 25, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 17, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 25, 8, 6); draw_checkbox(settings.display_counter, 1, 33); if(settings.save_mode == 1) - rb->lcd_bitmap(checkbox_onethird, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_onethird, 1, 41, 8, 6); else if(settings.save_mode == 2) - rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_twothird, 1, 41, 8, 6); else - rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_full, 1, 41, 8, 6); cursor(0, cursor_y, 112, 8); rb->lcd_update(); @@ -2218,15 +2218,15 @@ void general_settings(void) rb->lcd_puts(2, 5, "Save: Automatic"); else rb->lcd_puts(2, 5, "Save: Manually"); - rb->lcd_bitmap(arrow, 1, 17, 8, 6); - rb->lcd_bitmap(arrow, 1, 25, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 17, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 25, 8, 6); draw_checkbox(settings.display_counter, 1, 33); if(settings.save_mode == 1) - rb->lcd_bitmap(checkbox_onethird, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_onethird, 1, 41, 8, 6); else if(settings.save_mode == 2) - rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_twothird, 1, 41, 8, 6); else - rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6); + rb->lcd_mono_bitmap(checkbox_full, 1, 41, 8, 6); cursor(0, cursor_y, 112, 8); rb->lcd_update(); @@ -2323,9 +2323,9 @@ void draw_extras(int year, int day, int month, int hour, int minute, int second) if(settings.analog_time == 2) { if(current_time->tm_hour > 12) /* PM */ - rb->lcd_bitmap(pm, 96, 1, 15, 8); + rb->lcd_mono_bitmap(pm, 96, 1, 15, 8); else /* AM */ - rb->lcd_bitmap(am, 96, 1, 15, 8); + rb->lcd_mono_bitmap(am, 96, 1, 15, 8); } } @@ -2460,11 +2460,11 @@ void select_mode(void) rb->lcd_puts(0, 7, "PLAY:Go|OFF:Cancel"); /* draw an arrow next to all of them */ - rb->lcd_bitmap(arrow, 1, 9, 8, 6); - rb->lcd_bitmap(arrow, 1, 17, 8, 6); - rb->lcd_bitmap(arrow, 1, 25, 8, 6); - rb->lcd_bitmap(arrow, 1, 33, 8, 6); - rb->lcd_bitmap(arrow, 1, 41, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 9, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 17, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 25, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 33, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 41, 8, 6); /* draw line selector */ switch(cursorpos) @@ -2501,11 +2501,11 @@ void select_mode(void) rb->lcd_puts(0, 7, "PLAY:Go|OFF:Cancel"); /* draw an arrow next to all of them */ - rb->lcd_bitmap(arrow, 1, 9, 8, 6); - rb->lcd_bitmap(arrow, 1, 17, 8, 6); - rb->lcd_bitmap(arrow, 1, 25, 8, 6); - rb->lcd_bitmap(arrow, 1, 33, 8, 6); - rb->lcd_bitmap(arrow, 1, 41, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 9, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 17, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 25, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 33, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 41, 8, 6); cursor(0, cursor_y, 112, 8); rb->lcd_update(); @@ -2535,11 +2535,11 @@ void select_mode(void) rb->lcd_puts(0, 7, "PLAY:Go|OFF:Cancel"); /* draw an arrow next to all of them */ - rb->lcd_bitmap(arrow, 1, 9, 8, 6); - rb->lcd_bitmap(arrow, 1, 17, 8, 6); - rb->lcd_bitmap(arrow, 1, 25, 8, 6); - rb->lcd_bitmap(arrow, 1, 33, 8, 6); - rb->lcd_bitmap(arrow, 1, 41, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 9, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 17, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 25, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 33, 8, 6); + rb->lcd_mono_bitmap(arrow, 1, 41, 8, 6); cursor(0, cursor_y, 112, 8); rb->lcd_update(); @@ -2580,7 +2580,7 @@ void counter_finished(void) rb->lcd_clear_display(); /* draw "TIME'S UP" text */ - rb->lcd_bitmap(times_up, 0, xpos, 112, 50); + rb->lcd_mono_bitmap(times_up, 0, xpos, 112, 50); /* invert lcd */ rb->lcd_set_drawmode(DRMODE_COMPLEMENT); diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index d8d8eeb..36411c2 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c @@ -72,9 +72,9 @@ static unsigned char cursor_pic[32] = { /* draw a spot at the coordinates (x,y), range of p is 0-19 */ static void draw_spot(int p) { ptr = spot_pic[spots[p]]; - rb->lcd_bitmap (ptr, (p%5)*16+1, (p/5)*16+1, 14, 8); + rb->lcd_mono_bitmap (ptr, (p%5)*16+1, (p/5)*16+1, 14, 8); ptr += 14; - rb->lcd_bitmap (ptr, (p%5)*16+1, (p/5)*16+9, 14, 6); + rb->lcd_mono_bitmap (ptr, (p%5)*16+1, (p/5)*16+9, 14, 6); } /* draw the cursor at the current cursor position */ @@ -84,9 +84,9 @@ static void draw_cursor(void) { j = (cursor_pos/5)*16; rb->lcd_set_drawmode(DRMODE_FG); ptr = cursor_pic; - rb->lcd_bitmap (ptr, i, j, 16, 8); + rb->lcd_mono_bitmap (ptr, i, j, 16, 8); ptr += 16; - rb->lcd_bitmap (ptr, i, j+8, 16, 8); + rb->lcd_mono_bitmap (ptr, i, j+8, 16, 8); rb->lcd_set_drawmode(DRMODE_SOLID); } diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 08e0266..ad8b8fd 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c @@ -230,7 +230,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { while (1) { #ifdef HAVE_LCD_BITMAP rb->lcd_clear_display(); - rb->lcd_bitmap(LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT); + rb->lcd_mono_bitmap(LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT); #ifdef REMOTE_LOGO rb->lcd_remote_clear_display(); rb->lcd_remote_bitmap(REMOTE_LOGO, diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 907aaf7..aec9ba1 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c @@ -381,7 +381,7 @@ int minesweeper(void) rb->lcd_putsxy(j*8+1,i*8+1,"b"); } else if(minefield[i][j].neighbors){ rb->lcd_set_drawmode(DRMODE_FG); - rb->lcd_bitmap(num[minefield[i][j].neighbors],j*8,i*8,8,8); + rb->lcd_mono_bitmap(num[minefield[i][j].neighbors],j*8,i*8,8,8); rb->lcd_set_drawmode(DRMODE_SOLID); } } else if(minefield[i][j].flag) { diff --git a/apps/plugins/rockboy/lcd-gb.h b/apps/plugins/rockboy/lcd-gb.h index 3a61288..0b863b6 100644 --- a/apps/plugins/rockboy/lcd-gb.h +++ b/apps/plugins/rockboy/lcd-gb.h @@ -16,7 +16,7 @@ struct scan { int bg[64]; int wnd[64]; -#ifdef GRAYSCALE +#if LCD_DEPTH == 2 byte buf[4][256]; #else byte buf[8][256]; diff --git a/apps/plugins/rockboy/lcd.c b/apps/plugins/rockboy/lcd.c index 651c822..9a7ead7 100644 --- a/apps/plugins/rockboy/lcd.c +++ b/apps/plugins/rockboy/lcd.c @@ -786,7 +786,7 @@ void lcd_refreshline(void) recolor(BUF+WX, 0x04, 160-WX); } spr_scan(); -#ifdef GRAYSCALE +#if LCD_DEPTH == 2 if (scanline_ind == 3) #else if (scanline_ind == 7) @@ -800,7 +800,7 @@ void lcd_refreshline(void) #if LCD_HEIGHT == 64 scanline_ind = (scanline_ind+1) % 8; #else -#ifdef GRAYSCALE +#if LCD_DEPTH == 2 scanline_ind = (scanline_ind+1) % 4; #else scanline_ind = (scanline_ind+1) % 8; diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c index 45608b9..e8a4923 100644 --- a/apps/plugins/rockboy/sys_rockbox.c +++ b/apps/plugins/rockboy/sys_rockbox.c @@ -245,21 +245,21 @@ void vid_update(int scanline) scanline-=16; else if (fb.mode==2) scanline-=8; -#ifdef GRAYSCALE +#if LCD_DEPTH == 2 scanline_remapped = scanline / 4; #else scanline_remapped = scanline / 8; #endif frameb = rb->lcd_framebuffer + scanline_remapped * LCD_WIDTH; while (cnt < 160) { -#ifdef GRAYSCALE +#if LCD_DEPTH == 2 *(frameb++) = (scan.buf[0][cnt]&0x3) | ((scan.buf[1][cnt]&0x3)<<2) | ((scan.buf[2][cnt]&0x3)<<4) | ((scan.buf[3][cnt]&0x3)<<6); cnt++; } - rb->lcd_update_rect(0, scanline & ~3, LCD_WIDTH, 4); //8); + rb->lcd_update_rect(0, scanline & ~3, LCD_WIDTH, 4); #else register unsigned scrbyte = 0; if (scan.buf[0][cnt] & 0x02) scrbyte |= 0x01; @@ -274,7 +274,7 @@ void vid_update(int scanline) cnt++; } rb->lcd_update_rect(0, scanline & ~7, LCD_WIDTH, 8); -#endif /* GRAYSCALE */ +#endif /* LCD_DEPTH */ #endif /* LCD_HEIGHT */ } diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 3b9fe01..acd66a0 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c @@ -149,7 +149,7 @@ static unsigned char picture[20][32] = { static void draw_spot(int p, int x, int y) { if (pic || p==20) { - rb->lcd_bitmap (picture[p-1], x, y, 16, 16); + rb->lcd_mono_bitmap (picture[p-1], x, y, 16, 16); } else { rb->lcd_drawrect(x, y, 16, 16); rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index e1f0c32..815867a 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c @@ -625,11 +625,11 @@ void draw_apple( void ) char pscore[5], counter[4]; rb->lcd_set_drawmode(DRMODE_FG); - rb->lcd_bitmap(snakebmp,0,0,BMPWIDTH_snakebmp,BMPHEIGHT_snakebmp); + rb->lcd_mono_bitmap(snakebmp,0,0,BMPWIDTH_snakebmp,BMPHEIGHT_snakebmp); rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); rb->lcd_fillrect(0,0,BMPWIDTH_snakeupbmp,BMPHEIGHT_snakeupbmp); rb->lcd_set_drawmode(DRMODE_FG); - rb->lcd_bitmap(snakeupbmp,0,0,BMPWIDTH_snakeupbmp,BMPHEIGHT_snakeupbmp); + rb->lcd_mono_bitmap(snakeupbmp,0,0,BMPWIDTH_snakeupbmp,BMPHEIGHT_snakeupbmp); rb->lcd_set_drawmode(DRMODE_SOLID); rb->snprintf(counter,sizeof(counter),"%d",applecount); @@ -1303,7 +1303,7 @@ void game_init(void) #if LCD_WIDTH >= 160 && LCD_HEIGHT >= 128 rb->lcd_set_drawmode(DRMODE_FG); - rb->lcd_bitmap(snakebmp,0,0,BMPWIDTH_snakebmp,BMPWIDTH_snakebmp); + rb->lcd_mono_bitmap(snakebmp,0,0,BMPWIDTH_snakebmp,BMPWIDTH_snakebmp); rb->lcd_set_drawmode(DRMODE_SOLID); rb->snprintf(plevel,sizeof(plevel),"%d",level); diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 75c5614..73ce386 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c @@ -118,8 +118,8 @@ static void snow_move(void) } if (particle_exists(i)) #ifdef HAVE_LCD_BITMAP - rb->lcd_bitmap(flake,particles[i][0],particles[i][1], - FLAKE_WIDTH,FLAKE_WIDTH); + rb->lcd_mono_bitmap(flake,particles[i][0],particles[i][1], + FLAKE_WIDTH,FLAKE_WIDTH); #else pgfx_drawpixel(particles[i][0],particles[i][1]); #endif diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 880b5a0..89cadc3 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -902,8 +902,8 @@ int solitaire(void){ rb->lcd_set_drawmode(DRMODE_SOLID); /* known card */ if(deck[c].known){ - rb->lcd_bitmap(numbers[deck[c].num], i*(LCD_WIDTH - CARD_WIDTH)/COL_NUM+1, j, 8, 8); - rb->lcd_bitmap(colors[deck[c].color], i*(LCD_WIDTH - CARD_WIDTH)/COL_NUM+7, j, 8, 8); + rb->lcd_mono_bitmap(numbers[deck[c].num], i*(LCD_WIDTH - CARD_WIDTH)/COL_NUM+1, j, 8, 8); + rb->lcd_mono_bitmap(colors[deck[c].color], i*(LCD_WIDTH - CARD_WIDTH)/COL_NUM+7, j, 8, 8); } /* draw top line of the card */ rb->lcd_drawline(i*(LCD_WIDTH - CARD_WIDTH)/COL_NUM+1,j,i*(LCD_WIDTH - CARD_WIDTH)/COL_NUM+CARD_WIDTH-1,j); @@ -946,9 +946,9 @@ int solitaire(void){ } } if(c != NOT_A_CARD) { - rb->lcd_bitmap(numbers[deck[c].num], LCD_WIDTH2 - CARD_WIDTH+1, i*CARD_HEIGHT, 8, 8); + rb->lcd_mono_bitmap(numbers[deck[c].num], LCD_WIDTH2 - CARD_WIDTH+1, i*CARD_HEIGHT, 8, 8); } - rb->lcd_bitmap(colors[i], LCD_WIDTH2 - CARD_WIDTH+7, i*CARD_HEIGHT, 8, 8); + rb->lcd_mono_bitmap(colors[i], LCD_WIDTH2 - CARD_WIDTH+7, i*CARD_HEIGHT, 8, 8); /* draw a selected card */ if(c != NOT_A_CARD) { if(sel_card == c){ @@ -978,8 +978,8 @@ int solitaire(void){ rb->lcd_drawline(LCD_WIDTH2,LCD_HEIGHT-CARD_HEIGHT,LCD_WIDTH2,LCD_HEIGHT-2); #endif if(cur_rem != NOT_A_CARD){ - rb->lcd_bitmap(numbers[deck[cur_rem].num], LCD_WIDTH2 - CARD_WIDTH+1, LCD_HEIGHT-CARD_HEIGHT, 8, 8); - rb->lcd_bitmap(colors[deck[cur_rem].color], LCD_WIDTH2 - CARD_WIDTH+7, LCD_HEIGHT-CARD_HEIGHT, 8, 8); + rb->lcd_mono_bitmap(numbers[deck[cur_rem].num], LCD_WIDTH2 - CARD_WIDTH+1, LCD_HEIGHT-CARD_HEIGHT, 8, 8); + rb->lcd_mono_bitmap(colors[deck[cur_rem].color], LCD_WIDTH2 - CARD_WIDTH+7, LCD_HEIGHT-CARD_HEIGHT, 8, 8); /* draw a selected card */ if(sel_card == cur_rem){ rb->lcd_drawrect(LCD_WIDTH2 - CARD_WIDTH+1, LCD_HEIGHT-CARD_HEIGHT,CARD_WIDTH-1, CARD_HEIGHT-1); diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index e6d8551..142590d 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c @@ -260,18 +260,18 @@ static void update_icons(void) rb->lcd_set_drawmode(DRMODE_SOLID); /* The CUT icon */ - rb->lcd_bitmap(CUT_BMP, + rb->lcd_mono_bitmap(CUT_BMP, LCD_WIDTH / 3 / 2 - BMPWIDTH / 2, LCD_HEIGHT - BMPHEIGHT, BMPWIDTH, BMPHEIGHT); /* The loop mode icon */ - rb->lcd_bitmap(LOOP_BMP[splitedit_get_loop_mode()], + rb->lcd_mono_bitmap(LOOP_BMP[splitedit_get_loop_mode()], LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT, BMPWIDTH, BMPHEIGHT); #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) /* The scale icon */ - rb->lcd_bitmap(SCALE_BMP[rb->peak_meter_get_use_dbfs()], + rb->lcd_mono_bitmap(SCALE_BMP[rb->peak_meter_get_use_dbfs()], 2 *LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT, BMPWIDTH, BMPHEIGHT); #else @@ -279,7 +279,7 @@ static void update_icons(void) static int idx; if (idx < 0 || idx > 1) idx = 0; idx = 1 - idx; - rb->lcd_bitmap(SCALE_BMP[idx], + rb->lcd_mono_bitmap(SCALE_BMP[idx], 2 *LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT, BMPWIDTH, BMPHEIGHT); } diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 9b2e0bb..9dd3659 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -485,11 +485,11 @@ static void star_display_board_info(void) rb->lcd_putsxy(0, label_offset_y, str_info); if (control == STAR_CONTROL_BALL) - rb->lcd_bitmap (ball_bmp, 103, label_offset_y + 1, STAR_TILE_SIZE, - STAR_TILE_SIZE); + rb->lcd_mono_bitmap (ball_bmp, 103, label_offset_y + 1, STAR_TILE_SIZE, + STAR_TILE_SIZE); else - rb->lcd_bitmap (block_bmp, 103, label_offset_y + 1, STAR_TILE_SIZE, - STAR_TILE_SIZE); + rb->lcd_mono_bitmap (block_bmp, 103, label_offset_y + 1, STAR_TILE_SIZE, + STAR_TILE_SIZE); rb->lcd_update_rect(0, label_offset_y, LCD_WIDTH, char_height); } @@ -520,37 +520,37 @@ static int star_load_level(int current_level) break; case STAR_WALL: - rb->lcd_bitmap (wall_bmp, - STAR_OFFSET_X + x * STAR_TILE_SIZE, - STAR_OFFSET_Y + y * STAR_TILE_SIZE, - STAR_TILE_SIZE, STAR_TILE_SIZE); + rb->lcd_mono_bitmap (wall_bmp, + STAR_OFFSET_X + x * STAR_TILE_SIZE, + STAR_OFFSET_Y + y * STAR_TILE_SIZE, + STAR_TILE_SIZE, STAR_TILE_SIZE); break; case STAR_STAR: - rb->lcd_bitmap (star_bmp, - STAR_OFFSET_X + x * STAR_TILE_SIZE, - STAR_OFFSET_Y + y * STAR_TILE_SIZE, - STAR_TILE_SIZE, STAR_TILE_SIZE); + rb->lcd_mono_bitmap (star_bmp, + STAR_OFFSET_X + x * STAR_TILE_SIZE, + STAR_OFFSET_Y + y * STAR_TILE_SIZE, + STAR_TILE_SIZE, STAR_TILE_SIZE); star_count++; break; case STAR_BALL: ball_x = x; ball_y = y; - rb->lcd_bitmap (ball_bmp, - STAR_OFFSET_X + x * STAR_TILE_SIZE, - STAR_OFFSET_Y + y * STAR_TILE_SIZE, - STAR_TILE_SIZE, STAR_TILE_SIZE); + rb->lcd_mono_bitmap (ball_bmp, + STAR_OFFSET_X + x * STAR_TILE_SIZE, + STAR_OFFSET_Y + y * STAR_TILE_SIZE, + STAR_TILE_SIZE, STAR_TILE_SIZE); break; case STAR_BLOCK: block_x = x; block_y = y; - rb->lcd_bitmap (block_bmp, - STAR_OFFSET_X + x * STAR_TILE_SIZE, - STAR_OFFSET_Y + y * STAR_TILE_SIZE, - STAR_TILE_SIZE, STAR_TILE_SIZE); + rb->lcd_mono_bitmap (block_bmp, + STAR_OFFSET_X + x * STAR_TILE_SIZE, + STAR_OFFSET_Y + y * STAR_TILE_SIZE, + STAR_TILE_SIZE, STAR_TILE_SIZE); break; } ptr_tab++; @@ -665,7 +665,7 @@ static int star_run_game(void) { for (i = 0 ; i < 7 ; i++) { - rb->lcd_bitmap( + rb->lcd_mono_bitmap( ball_bmp, STAR_OFFSET_X + ball_x * STAR_TILE_SIZE + move_x * i, STAR_OFFSET_Y + ball_y * STAR_TILE_SIZE + move_y * i, @@ -697,7 +697,7 @@ static int star_run_game(void) { for (i = 0 ; i < 7 ; i++) { - rb->lcd_bitmap( + rb->lcd_mono_bitmap( block_bmp, STAR_OFFSET_X + block_x * STAR_TILE_SIZE + move_x * i, STAR_OFFSET_Y + block_y * STAR_TILE_SIZE + move_y * i, @@ -766,8 +766,8 @@ static int star_menu(void) } move_y = 0; - rb->lcd_bitmap(arrow_bmp[anim_arrow[(anim_state & 0x38) >> 3]], - 2, menu_offset_y + menu_y * char_height, 7, 8); + rb->lcd_mono_bitmap(arrow_bmp[anim_arrow[(anim_state & 0x38) >> 3]], + 2, menu_offset_y + menu_y * char_height, 7, 8); rb->lcd_update_rect (2, menu_offset_y + menu_y * 8, 8, 8); rb->sleep(STAR_SLEEP); anim_state++; @@ -842,8 +842,8 @@ static int star_menu(void) rb->lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); rb->lcd_fillrect (2, 30, 7, 4 * 8); rb->lcd_set_drawmode(DRMODE_FG); - rb->lcd_bitmap(arrow_bmp[anim_arrow[(anim_state & 0x38) >> 3]], - 2, menu_offset_y + menu_y * 8 + move_y * i, 7, 8); + rb->lcd_mono_bitmap(arrow_bmp[anim_arrow[(anim_state & 0x38) >> 3]], + 2, menu_offset_y + menu_y * 8 + move_y * i, 7, 8); rb->lcd_update_rect(2, 30, 8, 4 * 8); anim_state++; rb->sleep(STAR_SLEEP); diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index d54f86d..c2db45e 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c @@ -278,54 +278,54 @@ void change_settings(void) } void draw_analog_minimeters(void) { - rb->lcd_bitmap(sound_speaker, 0, 12, 4, 8); + rb->lcd_mono_bitmap(sound_speaker, 0, 12, 4, 8); rb->lcd_set_drawmode(DRMODE_FG); if(5<left_needle_top_x) - rb->lcd_bitmap(sound_low_level, 5, 12, 2, 8); + rb->lcd_mono_bitmap(sound_low_level, 5, 12, 2, 8); if(12<left_needle_top_x) - rb->lcd_bitmap(sound_med_level, 7, 12, 2, 8); + rb->lcd_mono_bitmap(sound_med_level, 7, 12, 2, 8); if(24<left_needle_top_x) - rb->lcd_bitmap(sound_high_level, 9, 12, 2, 8); + rb->lcd_mono_bitmap(sound_high_level, 9, 12, 2, 8); if(40<left_needle_top_x) - rb->lcd_bitmap(sound_max_level, 12, 12, 3, 8); + rb->lcd_mono_bitmap(sound_max_level, 12, 12, 3, 8); rb->lcd_set_drawmode(DRMODE_SOLID); - rb->lcd_bitmap(sound_speaker, 54, 12, 4, 8); + rb->lcd_mono_bitmap(sound_speaker, 54, 12, 4, 8); rb->lcd_set_drawmode(DRMODE_FG); if(5<(right_needle_top_x-56)) - rb->lcd_bitmap(sound_low_level, 59, 12, 2, 8); + rb->lcd_mono_bitmap(sound_low_level, 59, 12, 2, 8); if(12<(right_needle_top_x-56)) - rb->lcd_bitmap(sound_med_level, 61, 12, 2, 8); + rb->lcd_mono_bitmap(sound_med_level, 61, 12, 2, 8); if(24<(right_needle_top_x-56)) - rb->lcd_bitmap(sound_high_level, 63, 12, 2, 8); + rb->lcd_mono_bitmap(sound_high_level, 63, 12, 2, 8); if(40<(right_needle_top_x-56)) - rb->lcd_bitmap(sound_max_level, 66, 12, 3, 8); + rb->lcd_mono_bitmap(sound_max_level, 66, 12, 3, 8); rb->lcd_set_drawmode(DRMODE_SOLID); } void draw_digital_minimeters(void) { - rb->lcd_bitmap(sound_speaker, 34, 24, 4, 8); + rb->lcd_mono_bitmap(sound_speaker, 34, 24, 4, 8); rb->lcd_set_drawmode(DRMODE_FG); if(1<num_left_leds) - rb->lcd_bitmap(sound_low_level, 39, 24, 2, 8); + rb->lcd_mono_bitmap(sound_low_level, 39, 24, 2, 8); if(2<num_left_leds) - rb->lcd_bitmap(sound_med_level, 41, 24, 2, 8); + rb->lcd_mono_bitmap(sound_med_level, 41, 24, 2, 8); if(5<num_left_leds) - rb->lcd_bitmap(sound_high_level, 43, 24, 2, 8); + rb->lcd_mono_bitmap(sound_high_level, 43, 24, 2, 8); if(8<num_left_leds) - rb->lcd_bitmap(sound_max_level, 46, 24, 3, 8); + rb->lcd_mono_bitmap(sound_max_level, 46, 24, 3, 8); rb->lcd_set_drawmode(DRMODE_SOLID); - rb->lcd_bitmap(sound_speaker, 34, 40, 4, 8); + rb->lcd_mono_bitmap(sound_speaker, 34, 40, 4, 8); rb->lcd_set_drawmode(DRMODE_FG); if(1<(num_right_leds)) - rb->lcd_bitmap(sound_low_level, 39, 40, 2, 8); + rb->lcd_mono_bitmap(sound_low_level, 39, 40, 2, 8); if(2<(num_right_leds)) - rb->lcd_bitmap(sound_med_level, 41, 40, 2, 8); + rb->lcd_mono_bitmap(sound_med_level, 41, 40, 2, 8); if(5<(num_right_leds)) - rb->lcd_bitmap(sound_high_level, 43, 40, 2, 8); + rb->lcd_mono_bitmap(sound_high_level, 43, 40, 2, 8); if(8<(num_right_leds)) - rb->lcd_bitmap(sound_max_level, 46, 40, 3, 8); + rb->lcd_mono_bitmap(sound_max_level, 46, 40, 3, 8); rb->lcd_set_drawmode(DRMODE_SOLID); } @@ -359,8 +359,8 @@ void analog_meter(void) { /* Needle covers */ rb->lcd_set_drawmode(DRMODE_FG); - rb->lcd_bitmap(needle_cover, 22, 59, 13, 5); - rb->lcd_bitmap(needle_cover, 78, 59, 13, 5); + rb->lcd_mono_bitmap(needle_cover, 22, 59, 13, 5); + rb->lcd_mono_bitmap(needle_cover, 78, 59, 13, 5); rb->lcd_set_drawmode(DRMODE_SOLID); /* Show Left/Right */ @@ -396,10 +396,10 @@ void digital_meter(void) { rb->lcd_set_drawmode(DRMODE_FG); /* LEDS */ for(i=0; i<num_left_leds; i++) - rb->lcd_bitmap(led, i*9+2+i, 14, 9, 5); + rb->lcd_mono_bitmap(led, i*9+2+i, 14, 9, 5); for(i=0; i<num_right_leds; i++) - rb->lcd_bitmap(led, i*9+2+i, 52, 9, 5); + rb->lcd_mono_bitmap(led, i*9+2+i, 52, 9, 5); rb->lcd_set_drawmode(DRMODE_SOLID); diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c index 7a5a7bd..6e60905 100644 --- a/apps/recorder/icons.c +++ b/apps/recorder/icons.c @@ -141,98 +141,202 @@ const unsigned char rockbox112x37[]={ #if LCD_WIDTH >= 160 /* iRiver LCD width */ -const unsigned char rockbox160x53[] = { - 0x00, 0x00, 0x00, 0x04, 0x04, 0xff, 0x04, 0xf4, 0xf4, 0xf4, 0xf4, 0xf4, 0xf4, - 0xf4, 0xf4, 0xf4, 0xf4, 0xf4, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfa, - 0xfa, 0xf2, 0xf4, 0xf4, 0xe8, 0xc8, 0x90, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, - 0x00, 0x80, 0x40, 0x20, 0x90, 0xc8, 0xe4, 0xf4, 0xf4, 0xf2, 0xfa, 0xfa, 0xfa, - 0xf4, 0xf4, 0xf4, 0xe8, 0xc8, 0x98, 0x04, 0x04, 0xf4, 0xf4, 0xf4, 0xf4, 0xf4, - 0x04, 0xff, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0xf4, 0xf4, 0xf4, 0xf4, - 0xf4, 0x74, 0x1c, 0x06, 0x05, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x5f, 0x5f, 0x5f, 0x5f, 0x9f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf0, - 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0xcf, - 0x4f, 0x9f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xe1, 0x0e, 0x70, 0x38, - 0x06, 0xf1, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x9f, 0x4f, 0x0f, - 0x1f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x00, 0xff, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x8f, - 0x83, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x1c, 0x34, 0xc4, 0x08, 0xf0, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x00, 0x00, 0x80, 0x80, 0xc1, 0x3e, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, - 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0xff, - 0x00, 0x01, 0x1e, 0xe0, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0xc0, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x7c, 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x00, 0xff, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, - 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, - 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, - 0x80, 0x80, 0x00, 0x00, - 0x00, 0x00, 0xf0, 0x1f, 0x0f, 0x70, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xfc, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x03, 0x00, - 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x08, 0x08, 0x3f, - 0x08, 0x08, 0x08, 0xff, 0x08, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x08, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xd9, 0x08, 0xff, 0x08, 0x08, 0x08, 0x08, 0xff, - 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xc0, 0xff, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, - 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x04, 0x08, 0x30, 0x60, 0x10, 0x08, 0x04, - 0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, - 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x06, - 0x1c, 0x32, 0x1d, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x30, 0x8c, - 0x67, 0x19, 0x06, 0x01, - 0x00, 0x1f, 0x7f, 0x60, 0xc4, 0xc2, 0x83, 0x30, 0x0e, 0x9c, 0xc1, 0xff, 0xff, - 0x03, 0xff, 0x03, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xc0, 0x00, - 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xc0, 0x3c, 0x83, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x03, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x1f, 0x60, 0x80, 0x00, 0xff, - 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x0f, 0x19, 0xe3, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xfc, 0x86, 0x01, 0x01, 0x00, 0x00, 0x02, 0x82, 0x85, - 0x79, 0x02, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x78, 0x86, 0x03, 0x01, 0x00, 0x00, 0x02, 0x02, 0x04, 0xc9, 0x33, - 0xce, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x20, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xec, 0x07, 0x71, 0x8c, 0x03, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x70, 0x0f, 0xff, 0xff, - 0x00, 0xff, 0x00, 0x00, 0x00, 0x03, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xf8, 0xc0, 0x03, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xfa, - 0xf9, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x03, 0x00, 0x00, 0x00, - 0x00, 0x07, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf9, 0xf9, 0xff, - 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x00, 0x00, 0x00, 0x07, 0x38, 0xc3, 0x1f, 0x7f, 0xff, 0xff, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x05, 0x05, 0x04, 0x04, - 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x30, 0x18, 0x20, 0xc0, 0x80, - 0x00, 0x00, 0x00, 0x01, 0x02, 0x06, 0x04, 0x04, 0x05, 0x05, 0x05, 0x06, 0x03, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, - 0x60, 0xb0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03, 0x06, 0x19, 0x72, 0xcc, - 0x10, 0x60, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x04, 0x06, 0x07, 0x07, 0x07, - 0x04, 0x1f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x07, 0x07, 0x07, - 0x07, 0x07, 0x07, 0x1c, 0x04, 0x04, 0x01, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, - 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x08, 0x08, 0x08, 0x08, 0x09, 0x0b, 0x0b, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, - 0x0f, 0x07, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x07, 0x1c, 0x07, 0x07, 0x04, 0x04, 0x04, - 0x04, 0x04, 0x04, 0x04, 0x06, 0x02, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, - 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x03, 0x02, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, - 0x06, 0x06, 0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x01, - 0x06, 0x01, 0x00, 0x01, 0x02, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, - 0x07, 0x06, 0x00, 0x06, +const unsigned char rockbox160x53x2[] = { + 0x00, 0x00, 0x00, 0x30, 0x30, 0xff, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, + 0x30, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xcc, + 0xcc, 0x0c, 0x30, 0x30, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x30, 0x30, 0x0c, 0xcc, 0xcc, 0xcc, + 0x30, 0x30, 0x30, 0xc0, 0xc0, 0xc0, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, + 0x30, 0xff, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, + 0x30, 0x30, 0xf0, 0x3c, 0x33, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xf0, 0xc0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xc3, 0x0c, 0x30, 0xc0, 0x00, 0x00, 0x00, + 0x00, 0xc0, 0x30, 0x0c, 0xc3, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xc3, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x3f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, + 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xc0, 0x03, 0xfc, 0x00, 0xc0, + 0x3c, 0x03, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x33, 0x33, 0x33, 0x33, 0xc3, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x03, 0x00, 0xf0, + 0x30, 0xc3, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x3f, 0x0f, + 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x03, 0xc3, 0x30, 0x00, + 0x03, 0x03, 0x0f, 0x3f, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0xff, 0x00, 0x00, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xc0, + 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + + 0xf0, 0x30, 0x30, 0xc0, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x03, 0xfc, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0xff, + 0x00, 0x03, 0xfc, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0xff, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + + 0x03, 0x0f, 0xf0, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0xc0, 0xc0, 0xf0, 0x0f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, + 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, + 0x00, 0x00, 0x03, 0xfc, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xf0, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xff, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0xff, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, + 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, + 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xc0, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, + 0xc0, 0xc0, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xf0, 0xff, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, + 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xff, + 0xc0, 0xc0, 0xc0, 0xff, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0xc0, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0xff, + 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0x5f, 0x57, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x57, 0x57, 0x5c, 0x5c, 0x70, 0xc0, 0x00, 0x00, 0x00, 0xc0, 0x70, + 0x5c, 0x5c, 0x57, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, + 0x57, 0x57, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x5f, 0x7c, + 0xf0, 0x0c, 0xf3, 0x7c, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xf5, + 0x3f, 0xc3, 0x3c, 0x03, + + 0x00, 0x00, 0xff, 0x03, 0x00, 0x3f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, + 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x5f, 0x7c, 0x57, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, + 0x57, 0x5f, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5, 0xfd, 0x0f, 0xc0, + 0x3c, 0x03, 0x00, 0x00, + + 0x00, 0xff, 0xff, 0x00, 0x30, 0x0c, 0x0f, 0x00, 0xfc, 0xf0, 0x03, 0xff, 0xff, + 0x0f, 0xff, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xc0, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xf0, 0x0f, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x0f, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xc3, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0xf5, 0x3d, 0x03, 0x03, 0x00, 0x00, 0x0c, 0x0c, 0x33, + 0xc3, 0x0d, 0xf5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, + 0x55, 0x55, 0xd5, 0x3d, 0x0f, 0x03, 0x00, 0x00, 0x0c, 0x0c, 0x30, 0xc3, 0x0f, + 0xfd, 0xd5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xf5, 0x3f, 0x03, 0xf0, 0x0f, 0x00, + 0x00, 0x00, 0x00, 0x00, + + 0x00, 0x03, 0x3f, 0x3c, 0xf0, 0xf0, 0xc0, 0x0f, 0x00, 0xc3, 0xf0, 0xff, 0xff, + 0x00, 0xff, 0x00, 0x03, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, + 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xf0, 0x0f, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x03, 0x3c, 0xc0, 0x00, 0xff, + 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfc, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x03, 0xfc, 0x03, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, + 0x3f, 0x00, 0xff, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x7f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, + 0xf0, 0x7f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x7f, 0x5d, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x7f, 0xf0, 0x00, 0x3f, 0xc0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, + 0x00, 0xff, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xc0, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xc0, 0xcc, + 0xc3, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, + 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xc3, 0xc3, 0xff, + 0xc0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x3f, 0xc0, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x57, 0x5c, 0x70, 0x70, 0x73, 0x73, 0x70, 0x70, + 0x5c, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x57, 0x5c, 0x7c, 0x70, 0x70, 0x73, 0x73, 0x73, 0x7c, 0x5f, + 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x5f, 0x7c, 0xc3, 0x0c, 0xf0, + 0x00, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x3f, 0x3f, 0x00, 0xff, 0xff, + 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xf0, 0x00, 0x03, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x03, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x03, 0x3f, 0xff, 0xff, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5, 0x35, 0x0f, 0x03, 0x0d, 0xf5, 0xd5, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5, + 0x3d, 0xcf, 0xfd, 0xd5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57, 0x7f, 0xf0, + 0x03, 0x3c, 0xc0, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x30, 0x3c, 0x3f, 0x3f, 0x3f, + 0x30, 0xff, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x3f, 0x3f, 0xf0, 0x30, 0x30, 0x03, 0x0f, 0x3f, 0x3f, 0xff, 0xff, 0xff, + 0xff, 0xff, 0x3f, 0x3f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0xc0, 0xc0, 0xc0, 0xc3, 0xcf, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0x3f, 0x3f, 0x0f, 0x03, 0x03, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x3f, 0xf0, 0x3f, 0x3f, 0x35, 0x35, 0x35, + 0x35, 0x35, 0x35, 0x35, 0x3d, 0x0d, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, + 0x35, 0x35, 0x35, 0x0d, 0x0d, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x0f, 0x0d, 0x3d, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, + 0x3d, 0x3d, 0x3f, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x3d, 0x03, + 0x3c, 0x03, 0x00, 0x03, 0x0d, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, + 0x3f, 0x3c, 0x00, 0x3c, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, }; #endif @@ -321,9 +425,9 @@ bool statusbar_icon_volume(int percent) volume = 100; if (volume==0) { - lcd_bitmap(bitmap_icons_7x8[Icon_Mute], - ICON_VOLUME_X_POS + ICON_VOLUME_WIDTH / 2 - 4, - STATUSBAR_Y_POS, 7, STATUSBAR_HEIGHT); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_Mute], + ICON_VOLUME_X_POS + ICON_VOLUME_WIDTH / 2 - 4, + STATUSBAR_Y_POS, 7, STATUSBAR_HEIGHT); } else { /* We want to redraw the icon later on */ @@ -370,8 +474,8 @@ bool statusbar_icon_volume(int percent) */ void statusbar_icon_play_state(int state) { - lcd_bitmap(bitmap_icons_7x8[state], ICON_PLAY_STATE_X_POS, STATUSBAR_Y_POS, - ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); + lcd_mono_bitmap(bitmap_icons_7x8[state], ICON_PLAY_STATE_X_POS, STATUSBAR_Y_POS, + ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); } /* @@ -379,8 +483,8 @@ void statusbar_icon_play_state(int state) */ void statusbar_icon_play_mode(int mode) { - lcd_bitmap(bitmap_icons_7x8[mode], ICON_PLAY_MODE_X_POS, STATUSBAR_Y_POS, - ICON_PLAY_MODE_WIDTH, STATUSBAR_HEIGHT); + lcd_mono_bitmap(bitmap_icons_7x8[mode], ICON_PLAY_MODE_X_POS, STATUSBAR_Y_POS, + ICON_PLAY_MODE_WIDTH, STATUSBAR_HEIGHT); } /* @@ -388,8 +492,8 @@ void statusbar_icon_play_mode(int mode) */ void statusbar_icon_shuffle(void) { - lcd_bitmap(bitmap_icons_7x8[Icon_Shuffle], ICON_SHUFFLE_X_POS, - STATUSBAR_Y_POS, ICON_SHUFFLE_WIDTH, STATUSBAR_HEIGHT); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_Shuffle], ICON_SHUFFLE_X_POS, + STATUSBAR_Y_POS, ICON_SHUFFLE_WIDTH, STATUSBAR_HEIGHT); } /* @@ -397,8 +501,8 @@ void statusbar_icon_shuffle(void) */ void statusbar_icon_lock(void) { - lcd_bitmap(bitmap_icons_5x8[Icon_Lock], LOCK_X_POS, - STATUSBAR_Y_POS, 5, 8); + lcd_mono_bitmap(bitmap_icons_5x8[Icon_Lock], LOCK_X_POS, + STATUSBAR_Y_POS, 5, 8); } #if CONFIG_LED == LED_VIRTUAL @@ -407,8 +511,8 @@ void statusbar_icon_lock(void) */ void statusbar_led(void) { - lcd_bitmap(bitmap_icon_disk, ICON_DISK_X_POS, - STATUSBAR_Y_POS, ICON_DISK_WIDTH, STATUSBAR_HEIGHT); + lcd_mono_bitmap(bitmap_icon_disk, ICON_DISK_X_POS, + STATUSBAR_Y_POS, ICON_DISK_WIDTH, STATUSBAR_HEIGHT); } #endif diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index b2900a1..c0b870f 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h @@ -72,7 +72,7 @@ extern const unsigned char bitmap_icon_disk[]; extern const unsigned char rockbox112x37[]; #endif #if LCD_WIDTH >= 160 -extern const unsigned char rockbox160x53[]; +extern const unsigned char rockbox160x53x2[]; #endif #define STATUSBAR_X_POS 0 diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c index 3bab002..7746fb9 100644 --- a/apps/recorder/peakmeter.c +++ b/apps/recorder/peakmeter.c @@ -1107,8 +1107,8 @@ void peak_meter_draw_trig(int xpos, int ypos) { case TRIG_READY: scrollbar(x, ypos + 1, TRIGBAR_WIDTH, TRIG_HEIGHT - 2, TRIGBAR_WIDTH, 0, 0, HORIZONTAL); - lcd_bitmap(bitmap_icons_7x8[Icon_Stop], xpos, ypos, - ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_Stop], xpos, ypos, + ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); break; case TRIG_STEADY: @@ -1117,17 +1117,17 @@ void peak_meter_draw_trig(int xpos, int ypos) { time_left = time_left * TRIGBAR_WIDTH / trig_strt_duration; scrollbar(x, ypos + 1, TRIGBAR_WIDTH, TRIG_HEIGHT - 2, TRIGBAR_WIDTH, 0, TRIGBAR_WIDTH - time_left, HORIZONTAL); - lcd_bitmap(bitmap_icons_7x8[Icon_Stop], xpos, ypos, - ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_Stop], xpos, ypos, + ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); break; case TRIG_GO: case TRIG_CONTINUE: scrollbar(x, ypos + 1, TRIGBAR_WIDTH, TRIG_HEIGHT - 2, TRIGBAR_WIDTH, TRIGBAR_WIDTH, TRIGBAR_WIDTH, HORIZONTAL); - lcd_bitmap(bitmap_icons_7x8[Icon_Record], - TRIG_WIDTH - ICON_PLAY_STATE_WIDTH, ypos, - ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_Record], + TRIG_WIDTH - ICON_PLAY_STATE_WIDTH, ypos, + ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); break; case TRIG_POSTREC: @@ -1135,9 +1135,9 @@ void peak_meter_draw_trig(int xpos, int ypos) { time_left = time_left * TRIGBAR_WIDTH / trig_stp_hold; scrollbar(x, ypos + 1, TRIGBAR_WIDTH, TRIG_HEIGHT - 2, TRIGBAR_WIDTH, time_left, TRIGBAR_WIDTH, HORIZONTAL); - lcd_bitmap(bitmap_icons_7x8[Icon_Record], - TRIG_WIDTH - ICON_PLAY_STATE_WIDTH, ypos, - ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_Record], + TRIG_WIDTH - ICON_PLAY_STATE_WIDTH, ypos, + ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); break; } diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 9e58cec..ea71538 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -869,8 +869,8 @@ bool f2_rec_screen(void) lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_RECORDING_QUALITY)); snprintf(buf, 32, "%d", global_settings.rec_quality); lcd_putsxy(0, LCD_HEIGHT/2-h, buf); - lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], - LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_FastBackward], + LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8); /* Frequency */ snprintf(buf, sizeof buf, "%s:", str(LANG_RECORDING_FREQUENCY)); @@ -879,8 +879,8 @@ bool f2_rec_screen(void) ptr = freq_str[global_settings.rec_frequency]; lcd_getstringsize(ptr, &w, &h); lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], - LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_DownArrow], + LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8); /* Channel mode */ switch ( global_settings.rec_channels ) { @@ -900,8 +900,8 @@ bool f2_rec_screen(void) lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h, str(LANG_F2_MODE)); lcd_getstringsize(ptr, &w, &h); lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], - LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_FastForward], + LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8); lcd_update(); @@ -994,15 +994,15 @@ bool f3_rec_screen(void) ptr = src_str[global_settings.rec_source]; lcd_getstringsize(ptr, &w, &h); lcd_putsxy(0, LCD_HEIGHT/2-h, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], - LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_FastBackward], + LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8); /* trigger setup */ ptr = str(LANG_RECORD_TRIGGER); lcd_getstringsize(ptr,&w,&h); lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h*2, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], - LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_DownArrow], + LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8); lcd_update(); diff --git a/apps/screens.c b/apps/screens.c index 8c90f02..494acd7 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -95,9 +95,9 @@ void usb_display_info(void) #ifdef HAVE_LCD_BITMAP /* Center bitmap on screen */ - lcd_bitmap(usb_logo, LCD_WIDTH/2-BMPWIDTH_usb_logo/2, - LCD_HEIGHT/2-BMPHEIGHT_usb_logo/2, BMPWIDTH_usb_logo, - BMPHEIGHT_usb_logo); + lcd_mono_bitmap(usb_logo, LCD_WIDTH/2-BMPWIDTH_usb_logo/2, + LCD_HEIGHT/2-BMPHEIGHT_usb_logo/2, BMPWIDTH_usb_logo, + BMPHEIGHT_usb_logo); status_draw(true); lcd_update(); #else @@ -234,15 +234,15 @@ void charging_display_info(bool animate) if (!animate) { /* draw the outline */ /* middle part */ - lcd_bitmap(charging_logo, pox_x, pox_y + 8, sizeof(charging_logo), 8); + lcd_mono_bitmap(charging_logo, pox_x, pox_y + 8, sizeof(charging_logo), 8); lcd_set_drawmode(DRMODE_FG); /* upper line */ charging_logo[0] = charging_logo[1] = 0x00; memset(charging_logo+2, 0x80, 34); - lcd_bitmap(charging_logo, pox_x, pox_y, sizeof(charging_logo), 8); + lcd_mono_bitmap(charging_logo, pox_x, pox_y, sizeof(charging_logo), 8); /* lower line */ memset(charging_logo+2, 0x01, 34); - lcd_bitmap(charging_logo, pox_x, pox_y + 16, sizeof(charging_logo), 8); + lcd_mono_bitmap(charging_logo, pox_x, pox_y + 16, sizeof(charging_logo), 8); lcd_set_drawmode(DRMODE_SOLID); } else @@ -258,7 +258,7 @@ void charging_display_info(bool animate) charging_logo[i] = 0x01 << bitpos; } } - lcd_bitmap(charging_logo, pox_x, pox_y + 8, sizeof(charging_logo), 8); + lcd_mono_bitmap(charging_logo, pox_x, pox_y + 8, sizeof(charging_logo), 8); phase++; } lcd_update(); @@ -415,8 +415,8 @@ int pitch_screen(void) ptr = str(LANG_PITCH_UP); lcd_getstringsize(ptr,&w,&h); lcd_putsxy((LCD_WIDTH-w)/2, 0, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_UpArrow], - LCD_WIDTH/2 - 3, h*2, 7, 8); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_UpArrow], + LCD_WIDTH/2 - 3, h*2, 7, 8); snprintf(buf, sizeof buf, "%d.%d%%", pitch / 10, pitch % 10 ); lcd_getstringsize(buf,&w,&h); @@ -425,14 +425,14 @@ int pitch_screen(void) ptr = str(LANG_PITCH_DOWN); lcd_getstringsize(ptr,&w,&h); lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], - LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_DownArrow], + LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8); ptr = str(LANG_PAUSE); lcd_getstringsize(ptr,&w,&h); lcd_putsxy((LCD_WIDTH-(w/2))/2, LCD_HEIGHT/2 - h/2, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_Pause], - (LCD_WIDTH-(w/2))/2-10, LCD_HEIGHT/2 - h/2, 7, 8); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_Pause], + (LCD_WIDTH-(w/2))/2-10, LCD_HEIGHT/2 - h/2, 7, 8); lcd_update(); } @@ -637,12 +637,12 @@ bool quick_screen(int context, int button) #endif } - lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], - LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8); - lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], - LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8); - lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], - LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_FastBackward], + LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_DownArrow], + LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_FastForward], + LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8); lcd_update(); key = button_get(true); @@ -862,24 +862,18 @@ void splash(int ticks, /* how long the splash is displayed */ } #ifdef HAVE_LCD_BITMAP - /* If we center the display and it wouldn't cover the full screen, - then just clear the box we need and put a nice little frame and - put the text in there! */ + /* If we center the display, then just clear the box we need and put + a nice little frame and put the text in there! */ if(center && (y > 2)) { - if(maxw < (LCD_WIDTH -4)) { - int xx = (LCD_WIDTH-maxw)/2 - 2; - lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); - lcd_fillrect(xx, y-2, maxw+4, LCD_HEIGHT-y*2+4); - lcd_set_drawmode(DRMODE_SOLID); - lcd_drawrect(xx, y-2, maxw+4, LCD_HEIGHT-y*2+4); - } - else { - lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); - lcd_fillrect(0, y-2, LCD_WIDTH, LCD_HEIGHT-y*2+4); - lcd_set_drawmode(DRMODE_SOLID); - lcd_hline(0, LCD_WIDTH-1, y-2); - lcd_hline(0, LCD_WIDTH-1, LCD_HEIGHT-y+2); - } + int xx = (LCD_WIDTH-maxw)/2 - 2; + /* The new graphics routines handle clipping, so no need to check */ +#if LCD_DEPTH > 1 + lcd_set_background(MAX_LEVEL-1); +#endif + lcd_set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); + lcd_fillrect(xx, y-2, maxw+4, LCD_HEIGHT-y*2+4); + lcd_set_drawmode(DRMODE_SOLID); + lcd_drawrect(xx, y-2, maxw+4, LCD_HEIGHT-y*2+4); } else #endif @@ -921,6 +915,9 @@ void splash(int ticks, /* how long the splash is displayed */ x += w+SPACE; /* pixels space! */ next = strtok_r(NULL, " ", &store); } +#if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH > 1) + lcd_set_background(MAX_LEVEL); +#endif lcd_update(); if(ticks) diff --git a/apps/status.c b/apps/status.c index 42204a6..3cb6722 100644 --- a/apps/status.c +++ b/apps/status.c @@ -244,12 +244,12 @@ void status_draw(bool force_redraw) /* draw power plug if charging */ if (info.inserted) - lcd_bitmap(bitmap_icons_7x8[Icon_Plug], ICON_PLUG_X_POS, - STATUSBAR_Y_POS, ICON_PLUG_WIDTH, STATUSBAR_HEIGHT); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_Plug], ICON_PLUG_X_POS, + STATUSBAR_Y_POS, ICON_PLUG_WIDTH, STATUSBAR_HEIGHT); #ifdef HAVE_USB_POWER else if (info.usb_power) - lcd_bitmap(bitmap_icons_7x8[Icon_USBPlug], ICON_PLUG_X_POS, - STATUSBAR_Y_POS, ICON_PLUG_WIDTH, STATUSBAR_HEIGHT); + lcd_mono_bitmap(bitmap_icons_7x8[Icon_USBPlug], ICON_PLUG_X_POS, + STATUSBAR_Y_POS, ICON_PLUG_WIDTH, STATUSBAR_HEIGHT); #endif info.redraw_volume = statusbar_icon_volume(info.volume); diff --git a/apps/tree.c b/apps/tree.c index b2d4638..8e1afb8 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -395,9 +395,9 @@ static int showdir(void) int offset=0; if ( line_height > 8 ) offset = (line_height - 8) / 2; - lcd_bitmap(icon, - CURSOR_X * 6 + CURSOR_WIDTH, - MARGIN_Y+(i-start)*line_height + offset, 6, 8); + lcd_mono_bitmap(icon, + CURSOR_X * 6 + CURSOR_WIDTH, + MARGIN_Y+(i-start)*line_height + offset, 6, 8); #else if (icon < 0 ) icon = Unknown; diff --git a/apps/wps-display.c b/apps/wps-display.c index 8c6de43..8ba26e5 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c @@ -115,7 +115,7 @@ static void wps_display_images(void) { lcd_set_drawmode(DRMODE_FG); for (n = 0; n < MAX_IMAGES; n++) { if (img[n].loaded) { - lcd_bitmap(img[n].ptr, img[n].x, img[n].y, img[n].w, img[n].h); + lcd_mono_bitmap(img[n].ptr, img[n].x, img[n].y, img[n].w, img[n].h); } } lcd_set_drawmode(DRMODE_SOLID); |