diff options
Diffstat (limited to 'apps/plugins/sudoku.c')
-rw-r--r-- | apps/plugins/sudoku.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/apps/plugins/sudoku.c b/apps/plugins/sudoku.c index 3c6d9538ca..a161b08466 100644 --- a/apps/plugins/sudoku.c +++ b/apps/plugins/sudoku.c | |||
@@ -68,12 +68,16 @@ Example ".ss" file, and one with a saved state: | |||
68 | /* variable button definitions */ | 68 | /* variable button definitions */ |
69 | #if CONFIG_KEYPAD == RECORDER_PAD | 69 | #if CONFIG_KEYPAD == RECORDER_PAD |
70 | #define SUDOKU_BUTTON_QUIT BUTTON_OFF | 70 | #define SUDOKU_BUTTON_QUIT BUTTON_OFF |
71 | #define SUDOKU_BUTTON_UP BUTTON_UP | ||
72 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | ||
71 | #define SUDOKU_BUTTON_TOGGLE BUTTON_PLAY | 73 | #define SUDOKU_BUTTON_TOGGLE BUTTON_PLAY |
72 | #define SUDOKU_BUTTON_MENU BUTTON_F1 | 74 | #define SUDOKU_BUTTON_MENU BUTTON_F1 |
73 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_F2 | 75 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_F2 |
74 | 76 | ||
75 | #elif CONFIG_KEYPAD == ONDIO_PAD | 77 | #elif CONFIG_KEYPAD == ONDIO_PAD |
76 | #define SUDOKU_BUTTON_QUIT BUTTON_OFF | 78 | #define SUDOKU_BUTTON_QUIT BUTTON_OFF |
79 | #define SUDOKU_BUTTON_UP BUTTON_UP | ||
80 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | ||
77 | #define SUDOKU_BUTTON_ALTTOGGLE (BUTTON_MENU | BUTTON_DOWN) | 81 | #define SUDOKU_BUTTON_ALTTOGGLE (BUTTON_MENU | BUTTON_DOWN) |
78 | #define SUDOKU_BUTTON_TOGGLE_PRE BUTTON_MENU | 82 | #define SUDOKU_BUTTON_TOGGLE_PRE BUTTON_MENU |
79 | #define SUDOKU_BUTTON_TOGGLE (BUTTON_MENU | BUTTON_REL) | 83 | #define SUDOKU_BUTTON_TOGGLE (BUTTON_MENU | BUTTON_REL) |
@@ -84,11 +88,23 @@ Example ".ss" file, and one with a saved state: | |||
84 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 88 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
85 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 89 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
86 | #define SUDOKU_BUTTON_QUIT BUTTON_OFF | 90 | #define SUDOKU_BUTTON_QUIT BUTTON_OFF |
91 | #define SUDOKU_BUTTON_UP BUTTON_UP | ||
92 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | ||
87 | #define SUDOKU_BUTTON_ALTTOGGLE BUTTON_ON | 93 | #define SUDOKU_BUTTON_ALTTOGGLE BUTTON_ON |
88 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT | 94 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT |
89 | #define SUDOKU_BUTTON_MENU BUTTON_MODE | 95 | #define SUDOKU_BUTTON_MENU BUTTON_MODE |
90 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC | 96 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC |
91 | 97 | ||
98 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
99 | |||
100 | #define SUDOKU_BUTTON_QUIT (BUTTON_SELECT | BUTTON_MENU) | ||
101 | #define SUDOKU_BUTTON_UP BUTTON_SCROLL_BACK | ||
102 | #define SUDOKU_BUTTON_DOWN BUTTON_SCROLL_FWD | ||
103 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT | ||
104 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | ||
105 | #define SUDOKU_BUTTON_POSSIBLE (BUTTON_SELECT | BUTTON_LEFT) | ||
106 | |||
107 | |||
92 | #elif | 108 | #elif |
93 | #error SUDOKU: Unsupported keypad | 109 | #error SUDOKU: Unsupported keypad |
94 | #endif | 110 | #endif |
@@ -2195,8 +2211,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
2195 | break; | 2211 | break; |
2196 | 2212 | ||
2197 | /* move cursor up */ | 2213 | /* move cursor up */ |
2198 | case BUTTON_UP: | 2214 | case SUDOKU_BUTTON_UP: |
2199 | case (BUTTON_UP | BUTTON_REPEAT): | 2215 | case (SUDOKU_BUTTON_UP | BUTTON_REPEAT): |
2200 | if (state.y==0) { | 2216 | if (state.y==0) { |
2201 | move_cursor(&state,state.x,8); | 2217 | move_cursor(&state,state.x,8); |
2202 | } else { | 2218 | } else { |
@@ -2205,8 +2221,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
2205 | break; | 2221 | break; |
2206 | 2222 | ||
2207 | /* move cursor down */ | 2223 | /* move cursor down */ |
2208 | case BUTTON_DOWN: | 2224 | case SUDOKU_BUTTON_DOWN: |
2209 | case (BUTTON_DOWN | BUTTON_REPEAT): | 2225 | case (SUDOKU_BUTTON_DOWN | BUTTON_REPEAT): |
2210 | if (state.y==8) { | 2226 | if (state.y==8) { |
2211 | move_cursor(&state,state.x,0); | 2227 | move_cursor(&state,state.x,0); |
2212 | } else { | 2228 | } else { |