diff options
Diffstat (limited to 'apps/plugins')
-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 | |||
44 | flipit.c | 44 | flipit.c |
45 | 45 | ||
46 | #ifdef HAVE_LCD_BITMAP /* Not for the Player */ | 46 | #ifdef HAVE_LCD_BITMAP /* Not for the Player */ |
47 | matrix.c | ||
47 | maze.c | 48 | maze.c |
48 | mazezam.c | 49 | mazezam.c |
49 | text_editor.c | 50 | text_editor.c |
@@ -111,7 +112,6 @@ fireworks.c | |||
111 | xobox.c | 112 | xobox.c |
112 | spacerocks.c | 113 | spacerocks.c |
113 | #if LCD_DEPTH >= 16 | 114 | #if LCD_DEPTH >= 16 |
114 | matrix.c | ||
115 | rockpaint.c | 115 | rockpaint.c |
116 | #endif | 116 | #endif |
117 | 117 | ||
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 | |||
411 | 411 | ||
412 | /* Star */ | 412 | /* Star */ |
413 | #ifdef HAVE_LCD_COLOR | 413 | #ifdef HAVE_LCD_COLOR |
414 | /* matrix */ | ||
415 | matrix_bold.bmp | ||
416 | matrix_normal.bmp | ||
417 | #if LCD_WIDTH >= 320 && LCD_HEIGHT >= 188 | 414 | #if LCD_WIDTH >= 320 && LCD_HEIGHT >= 188 |
418 | star_tiles.20x20.bmp | 415 | star_tiles.20x20.bmp |
419 | #elif LCD_WIDTH >= 240 && LCD_HEIGHT >= 143 | 416 | #elif LCD_WIDTH >= 240 && LCD_HEIGHT >= 143 |
@@ -507,4 +504,10 @@ superdom_boarditems.240x320x16.bmp | |||
507 | #endif | 504 | #endif |
508 | #endif | 505 | #endif |
509 | 506 | ||
507 | #if LCD_DEPTH > 1 | ||
508 | /* matrix */ | ||
509 | matrix_bold.bmp | ||
510 | matrix_normal.bmp | ||
511 | #endif | ||
512 | |||
510 | #endif /* HAVE_LCD_BITMAP */ | 513 | #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[]; | |||
47 | #define LEFTMARGIN (LCD_WIDTH-(COLS*COL_W))/2 | 47 | #define LEFTMARGIN (LCD_WIDTH-(COLS*COL_W))/2 |
48 | #define TOPMARGIN (LCD_HEIGHT-(ROWS*COL_H))/2 | 48 | #define TOPMARGIN (LCD_HEIGHT-(ROWS*COL_H))/2 |
49 | 49 | ||
50 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) | 50 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
51 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | ||
52 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
51 | #define MATRIX_EXIT BUTTON_MENU | 53 | #define MATRIX_EXIT BUTTON_MENU |
52 | #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT | 54 | #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT |
53 | #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT | 55 | #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT |
54 | #define MATRIX_PAUSE BUTTON_PLAY | 56 | #define MATRIX_PAUSE BUTTON_PLAY |
55 | #elif (CONFIG_KEYPAD == IRIVER_H300_PAD) | 57 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
58 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
56 | #define MATRIX_EXIT BUTTON_OFF | 59 | #define MATRIX_EXIT BUTTON_OFF |
57 | #define MATRIX_SLEEP_MORE BUTTON_UP | 60 | #define MATRIX_SLEEP_MORE BUTTON_UP |
58 | #define MATRIX_SLEEP_LESS BUTTON_DOWN | 61 | #define MATRIX_SLEEP_LESS BUTTON_DOWN |