diff options
| author | Jonas Häggqvist <rasher@rasher.dk> | 2007-11-27 01:28:00 +0000 |
|---|---|---|
| committer | Jonas Häggqvist <rasher@rasher.dk> | 2007-11-27 01:28:00 +0000 |
| commit | a8f900384b8491c68fba3a31ad413492fd78eb6f (patch) | |
| tree | 54f0f449f01d8ed4df9ded0aa32a1bd5ce5950a0 /apps | |
| parent | 4fb825eed983c6fb3d76b3efbc61014f69969a87 (diff) | |
On second thoughts, let's compile Matrix for all non-mono bitmap displays.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15829 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/plugins/SOURCES | 2 | ||||
| -rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 9 | ||||
| -rw-r--r-- | apps/plugins/matrix.c | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 7852328df0..609afb2b97 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES @@ -44,6 +44,7 @@ disktidy.c flipit.c #ifdef HAVE_LCD_BITMAP /* Not for the Player */ +matrix.c maze.c mazezam.c text_editor.c @@ -111,7 +112,6 @@ fireworks.c xobox.c spacerocks.c #if LCD_DEPTH >= 16 -matrix.c rockpaint.c #endif diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 467ff1df76..654845f2bb 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -411,9 +411,6 @@ solitaire_suitsi.13x52x1.bmp /* Star */ #ifdef HAVE_LCD_COLOR -/* matrix */ -matrix_bold.bmp -matrix_normal.bmp #if LCD_WIDTH >= 320 && LCD_HEIGHT >= 188 star_tiles.20x20.bmp #elif LCD_WIDTH >= 240 && LCD_HEIGHT >= 143 @@ -507,4 +504,10 @@ superdom_boarditems.240x320x16.bmp #endif #endif +#if LCD_DEPTH > 1 +/* matrix */ +matrix_bold.bmp +matrix_normal.bmp +#endif + #endif /* HAVE_LCD_BITMAP */ diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index 4253b5dd0c..08341c2e05 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c @@ -47,12 +47,15 @@ extern const fb_data matrix_normal[]; #define LEFTMARGIN (LCD_WIDTH-(COLS*COL_W))/2 #define TOPMARGIN (LCD_HEIGHT-(ROWS*COL_H))/2 -#if (CONFIG_KEYPAD == IPOD_4G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define MATRIX_EXIT BUTTON_MENU #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT #define MATRIX_PAUSE BUTTON_PLAY -#elif (CONFIG_KEYPAD == IRIVER_H300_PAD) +#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ + (CONFIG_KEYPAD == IRIVER_H300_PAD) #define MATRIX_EXIT BUTTON_OFF #define MATRIX_SLEEP_MORE BUTTON_UP #define MATRIX_SLEEP_LESS BUTTON_DOWN |