diff options
-rw-r--r-- | apps/plugins/fractals/fractal.c | 7 | ||||
-rw-r--r-- | apps/plugins/fractals/fractal.h | 422 |
2 files changed, 215 insertions, 214 deletions
diff --git a/apps/plugins/fractals/fractal.c b/apps/plugins/fractals/fractal.c index 7543963ded..5023b2c450 100644 --- a/apps/plugins/fractals/fractal.c +++ b/apps/plugins/fractals/fractal.c | |||
@@ -80,6 +80,13 @@ static int button_yield(void *ctx) | |||
80 | (FRACTAL_ZOOM_OUT_PRE != FRACTAL_ZOOM_IN_PRE) | 80 | (FRACTAL_ZOOM_OUT_PRE != FRACTAL_ZOOM_IN_PRE) |
81 | case FRACTAL_ZOOM_OUT_PRE: | 81 | case FRACTAL_ZOOM_OUT_PRE: |
82 | #endif | 82 | #endif |
83 | #ifdef FRACTAL_PRECISION_INC_PRE | ||
84 | case FRACTAL_PRECISION_INC_PRE: | ||
85 | #endif | ||
86 | #if defined(FRACTAL_PRECISION_DEC_PRE) && \ | ||
87 | (FRACTAL_PRECISION_DEC_PRE != FRACTAL_PRECISION_INC_PRE) | ||
88 | case FRACTAL_PRECISION_DEC_PRE: | ||
89 | #endif | ||
83 | return 1; | 90 | return 1; |
84 | default: | 91 | default: |
85 | *button = BUTTON_NONE; | 92 | *button = BUTTON_NONE; |
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index 3f15db852a..6c0af2298a 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h | |||
@@ -27,71 +27,71 @@ | |||
27 | 27 | ||
28 | /* variable button definitions */ | 28 | /* variable button definitions */ |
29 | #if CONFIG_KEYPAD == RECORDER_PAD | 29 | #if CONFIG_KEYPAD == RECORDER_PAD |
30 | #define FRACTAL_QUIT BUTTON_OFF | 30 | #define FRACTAL_QUIT BUTTON_OFF |
31 | #define FRACTAL_UP BUTTON_UP | 31 | #define FRACTAL_UP BUTTON_UP |
32 | #define FRACTAL_DOWN BUTTON_DOWN | 32 | #define FRACTAL_DOWN BUTTON_DOWN |
33 | #define FRACTAL_LEFT BUTTON_LEFT | 33 | #define FRACTAL_LEFT BUTTON_LEFT |
34 | #define FRACTAL_RIGHT BUTTON_RIGHT | 34 | #define FRACTAL_RIGHT BUTTON_RIGHT |
35 | #define FRACTAL_ZOOM_IN BUTTON_PLAY | 35 | #define FRACTAL_ZOOM_IN BUTTON_PLAY |
36 | #define FRACTAL_ZOOM_OUT BUTTON_ON | 36 | #define FRACTAL_ZOOM_OUT BUTTON_ON |
37 | #define FRACTAL_PRECISION_INC BUTTON_F2 | 37 | #define FRACTAL_PRECISION_INC BUTTON_F2 |
38 | #define FRACTAL_PRECISION_DEC BUTTON_F1 | 38 | #define FRACTAL_PRECISION_DEC BUTTON_F1 |
39 | #define FRACTAL_RESET BUTTON_F3 | 39 | #define FRACTAL_RESET BUTTON_F3 |
40 | 40 | ||
41 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | 41 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD |
42 | #define FRACTAL_QUIT BUTTON_OFF | 42 | #define FRACTAL_QUIT BUTTON_OFF |
43 | #define FRACTAL_UP BUTTON_UP | 43 | #define FRACTAL_UP BUTTON_UP |
44 | #define FRACTAL_DOWN BUTTON_DOWN | 44 | #define FRACTAL_DOWN BUTTON_DOWN |
45 | #define FRACTAL_LEFT BUTTON_LEFT | 45 | #define FRACTAL_LEFT BUTTON_LEFT |
46 | #define FRACTAL_RIGHT BUTTON_RIGHT | 46 | #define FRACTAL_RIGHT BUTTON_RIGHT |
47 | #define FRACTAL_ZOOM_IN BUTTON_SELECT | 47 | #define FRACTAL_ZOOM_IN BUTTON_SELECT |
48 | #define FRACTAL_ZOOM_OUT BUTTON_ON | 48 | #define FRACTAL_ZOOM_OUT BUTTON_ON |
49 | #define FRACTAL_PRECISION_INC BUTTON_F2 | 49 | #define FRACTAL_PRECISION_INC BUTTON_F2 |
50 | #define FRACTAL_PRECISION_DEC BUTTON_F1 | 50 | #define FRACTAL_PRECISION_DEC BUTTON_F1 |
51 | #define FRACTAL_RESET BUTTON_F3 | 51 | #define FRACTAL_RESET BUTTON_F3 |
52 | 52 | ||
53 | #elif CONFIG_KEYPAD == ONDIO_PAD | 53 | #elif CONFIG_KEYPAD == ONDIO_PAD |
54 | #define FRACTAL_QUIT BUTTON_OFF | 54 | #define FRACTAL_QUIT BUTTON_OFF |
55 | #define FRACTAL_UP BUTTON_UP | 55 | #define FRACTAL_UP BUTTON_UP |
56 | #define FRACTAL_DOWN BUTTON_DOWN | 56 | #define FRACTAL_DOWN BUTTON_DOWN |
57 | #define FRACTAL_LEFT BUTTON_LEFT | 57 | #define FRACTAL_LEFT BUTTON_LEFT |
58 | #define FRACTAL_RIGHT BUTTON_RIGHT | 58 | #define FRACTAL_RIGHT BUTTON_RIGHT |
59 | #define FRACTAL_ZOOM_IN_PRE BUTTON_MENU | 59 | #define FRACTAL_ZOOM_IN_PRE BUTTON_MENU |
60 | #define FRACTAL_ZOOM_IN (BUTTON_MENU | BUTTON_REL) | 60 | #define FRACTAL_ZOOM_IN (BUTTON_MENU | BUTTON_REL) |
61 | #define FRACTAL_ZOOM_IN2 (BUTTON_MENU | BUTTON_UP) | 61 | #define FRACTAL_ZOOM_IN2 (BUTTON_MENU | BUTTON_UP) |
62 | #define FRACTAL_ZOOM_OUT (BUTTON_MENU | BUTTON_DOWN) | 62 | #define FRACTAL_ZOOM_OUT (BUTTON_MENU | BUTTON_DOWN) |
63 | #define FRACTAL_PRECISION_INC (BUTTON_MENU | BUTTON_RIGHT) | 63 | #define FRACTAL_PRECISION_INC (BUTTON_MENU | BUTTON_RIGHT) |
64 | #define FRACTAL_PRECISION_DEC (BUTTON_MENU | BUTTON_LEFT) | 64 | #define FRACTAL_PRECISION_DEC (BUTTON_MENU | BUTTON_LEFT) |
65 | #define FRACTAL_RESET (BUTTON_MENU | BUTTON_OFF) | 65 | #define FRACTAL_RESET (BUTTON_MENU | BUTTON_OFF) |
66 | 66 | ||
67 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 67 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
68 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 68 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
69 | #define FRACTAL_QUIT BUTTON_OFF | 69 | #define FRACTAL_QUIT BUTTON_OFF |
70 | #define FRACTAL_UP BUTTON_UP | 70 | #define FRACTAL_UP BUTTON_UP |
71 | #define FRACTAL_DOWN BUTTON_DOWN | 71 | #define FRACTAL_DOWN BUTTON_DOWN |
72 | #define FRACTAL_LEFT BUTTON_LEFT | 72 | #define FRACTAL_LEFT BUTTON_LEFT |
73 | #define FRACTAL_RIGHT BUTTON_RIGHT | 73 | #define FRACTAL_RIGHT BUTTON_RIGHT |
74 | #define FRACTAL_ZOOM_IN BUTTON_SELECT | 74 | #define FRACTAL_ZOOM_IN BUTTON_SELECT |
75 | #define FRACTAL_ZOOM_OUT BUTTON_MODE | 75 | #define FRACTAL_ZOOM_OUT BUTTON_MODE |
76 | #define FRACTAL_PRECISION_INC (BUTTON_ON | BUTTON_RIGHT) | 76 | #define FRACTAL_PRECISION_INC (BUTTON_ON | BUTTON_RIGHT) |
77 | #define FRACTAL_PRECISION_DEC (BUTTON_ON | BUTTON_LEFT) | 77 | #define FRACTAL_PRECISION_DEC (BUTTON_ON | BUTTON_LEFT) |
78 | #define FRACTAL_RESET BUTTON_REC | 78 | #define FRACTAL_RESET BUTTON_REC |
79 | 79 | ||
80 | #define FRACTAL_RC_QUIT BUTTON_RC_STOP | 80 | #define FRACTAL_RC_QUIT BUTTON_RC_STOP |
81 | 81 | ||
82 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 82 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
83 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 83 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
84 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 84 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
85 | #define FRACTAL_QUIT (BUTTON_SELECT | BUTTON_MENU) | 85 | #define FRACTAL_QUIT (BUTTON_SELECT | BUTTON_MENU) |
86 | #define FRACTAL_UP BUTTON_MENU | 86 | #define FRACTAL_UP BUTTON_MENU |
87 | #define FRACTAL_DOWN BUTTON_PLAY | 87 | #define FRACTAL_DOWN BUTTON_PLAY |
88 | #define FRACTAL_LEFT BUTTON_LEFT | 88 | #define FRACTAL_LEFT BUTTON_LEFT |
89 | #define FRACTAL_RIGHT BUTTON_RIGHT | 89 | #define FRACTAL_RIGHT BUTTON_RIGHT |
90 | #define FRACTAL_ZOOM_IN BUTTON_SCROLL_FWD | 90 | #define FRACTAL_ZOOM_IN BUTTON_SCROLL_FWD |
91 | #define FRACTAL_ZOOM_OUT BUTTON_SCROLL_BACK | 91 | #define FRACTAL_ZOOM_OUT BUTTON_SCROLL_BACK |
92 | #define FRACTAL_PRECISION_INC (BUTTON_SELECT | BUTTON_RIGHT) | 92 | #define FRACTAL_PRECISION_INC (BUTTON_SELECT | BUTTON_RIGHT) |
93 | #define FRACTAL_PRECISION_DEC (BUTTON_SELECT | BUTTON_LEFT) | 93 | #define FRACTAL_PRECISION_DEC (BUTTON_SELECT | BUTTON_LEFT) |
94 | #define FRACTAL_RESET (BUTTON_SELECT | BUTTON_PLAY) | 94 | #define FRACTAL_RESET (BUTTON_SELECT | BUTTON_PLAY) |
95 | 95 | ||
96 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 96 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
97 | #define FRACTAL_QUIT BUTTON_POWER | 97 | #define FRACTAL_QUIT BUTTON_POWER |
@@ -104,138 +104,138 @@ | |||
104 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_SELECT | 104 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_SELECT |
105 | #define FRACTAL_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) | 105 | #define FRACTAL_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) |
106 | #define FRACTAL_PRECISION_INC_PRE BUTTON_PLAY | 106 | #define FRACTAL_PRECISION_INC_PRE BUTTON_PLAY |
107 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_REL) | 107 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_REL) |
108 | #define FRACTAL_PRECISION_DEC_PRE BUTTON_PLAY | 108 | #define FRACTAL_PRECISION_DEC_PRE BUTTON_PLAY |
109 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_REPEAT) | 109 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_REPEAT) |
110 | #define FRACTAL_RESET BUTTON_REC | 110 | #define FRACTAL_RESET BUTTON_REC |
111 | 111 | ||
112 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 112 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
113 | #define FRACTAL_QUIT BUTTON_POWER | 113 | #define FRACTAL_QUIT BUTTON_POWER |
114 | #define FRACTAL_UP BUTTON_UP | 114 | #define FRACTAL_UP BUTTON_UP |
115 | #define FRACTAL_DOWN BUTTON_DOWN | 115 | #define FRACTAL_DOWN BUTTON_DOWN |
116 | #define FRACTAL_LEFT BUTTON_LEFT | 116 | #define FRACTAL_LEFT BUTTON_LEFT |
117 | #define FRACTAL_RIGHT BUTTON_RIGHT | 117 | #define FRACTAL_RIGHT BUTTON_RIGHT |
118 | #define FRACTAL_ZOOM_IN_PRE BUTTON_SELECT | 118 | #define FRACTAL_ZOOM_IN_PRE BUTTON_SELECT |
119 | #define FRACTAL_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) | 119 | #define FRACTAL_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) |
120 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_SELECT | 120 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_SELECT |
121 | #define FRACTAL_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) | 121 | #define FRACTAL_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) |
122 | #define FRACTAL_PRECISION_INC BUTTON_VOL_UP | 122 | #define FRACTAL_PRECISION_INC BUTTON_VOL_UP |
123 | #define FRACTAL_PRECISION_DEC BUTTON_VOL_DOWN | 123 | #define FRACTAL_PRECISION_DEC BUTTON_VOL_DOWN |
124 | #define FRACTAL_RESET BUTTON_A | 124 | #define FRACTAL_RESET BUTTON_A |
125 | 125 | ||
126 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 126 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
127 | #define FRACTAL_QUIT BUTTON_POWER | 127 | #define FRACTAL_QUIT BUTTON_POWER |
128 | #define FRACTAL_UP BUTTON_UP | 128 | #define FRACTAL_UP BUTTON_UP |
129 | #define FRACTAL_DOWN BUTTON_DOWN | 129 | #define FRACTAL_DOWN BUTTON_DOWN |
130 | #define FRACTAL_LEFT BUTTON_LEFT | 130 | #define FRACTAL_LEFT BUTTON_LEFT |
131 | #define FRACTAL_RIGHT BUTTON_RIGHT | 131 | #define FRACTAL_RIGHT BUTTON_RIGHT |
132 | #define FRACTAL_ZOOM_IN BUTTON_SCROLL_FWD | 132 | #define FRACTAL_ZOOM_IN BUTTON_SCROLL_FWD |
133 | #define FRACTAL_ZOOM_OUT BUTTON_SCROLL_BACK | 133 | #define FRACTAL_ZOOM_OUT BUTTON_SCROLL_BACK |
134 | #define FRACTAL_PRECISION_INC (BUTTON_SELECT | BUTTON_RIGHT) | 134 | #define FRACTAL_PRECISION_INC (BUTTON_SELECT | BUTTON_RIGHT) |
135 | #define FRACTAL_PRECISION_DEC (BUTTON_SELECT | BUTTON_LEFT) | 135 | #define FRACTAL_PRECISION_DEC (BUTTON_SELECT | BUTTON_LEFT) |
136 | #define FRACTAL_RESET BUTTON_REC | 136 | #define FRACTAL_RESET BUTTON_REC |
137 | 137 | ||
138 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 138 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
139 | #define FRACTAL_QUIT (BUTTON_HOME|BUTTON_REPEAT) | 139 | #define FRACTAL_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
140 | #define FRACTAL_UP BUTTON_UP | 140 | #define FRACTAL_UP BUTTON_UP |
141 | #define FRACTAL_DOWN BUTTON_DOWN | 141 | #define FRACTAL_DOWN BUTTON_DOWN |
142 | #define FRACTAL_LEFT BUTTON_LEFT | 142 | #define FRACTAL_LEFT BUTTON_LEFT |
143 | #define FRACTAL_RIGHT BUTTON_RIGHT | 143 | #define FRACTAL_RIGHT BUTTON_RIGHT |
144 | #define FRACTAL_ZOOM_IN BUTTON_SCROLL_FWD | 144 | #define FRACTAL_ZOOM_IN BUTTON_SCROLL_FWD |
145 | #define FRACTAL_ZOOM_OUT BUTTON_SCROLL_BACK | 145 | #define FRACTAL_ZOOM_OUT BUTTON_SCROLL_BACK |
146 | #define FRACTAL_PRECISION_INC (BUTTON_SELECT | BUTTON_RIGHT) | 146 | #define FRACTAL_PRECISION_INC (BUTTON_SELECT | BUTTON_RIGHT) |
147 | #define FRACTAL_PRECISION_DEC (BUTTON_SELECT | BUTTON_LEFT) | 147 | #define FRACTAL_PRECISION_DEC (BUTTON_SELECT | BUTTON_LEFT) |
148 | #define FRACTAL_RESET (BUTTON_SELECT | BUTTON_REPEAT) | 148 | #define FRACTAL_RESET (BUTTON_SELECT | BUTTON_REPEAT) |
149 | 149 | ||
150 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 150 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
151 | #define FRACTAL_QUIT BUTTON_POWER | 151 | #define FRACTAL_QUIT BUTTON_POWER |
152 | #define FRACTAL_UP BUTTON_UP | 152 | #define FRACTAL_UP BUTTON_UP |
153 | #define FRACTAL_DOWN BUTTON_DOWN | 153 | #define FRACTAL_DOWN BUTTON_DOWN |
154 | #define FRACTAL_LEFT BUTTON_LEFT | 154 | #define FRACTAL_LEFT BUTTON_LEFT |
155 | #define FRACTAL_RIGHT BUTTON_RIGHT | 155 | #define FRACTAL_RIGHT BUTTON_RIGHT |
156 | #define FRACTAL_ZOOM_IN BUTTON_VOL_UP | 156 | #define FRACTAL_ZOOM_IN BUTTON_VOL_UP |
157 | #define FRACTAL_ZOOM_OUT BUTTON_VOL_DOWN | 157 | #define FRACTAL_ZOOM_OUT BUTTON_VOL_DOWN |
158 | #define FRACTAL_PRECISION_INC (BUTTON_SELECT | BUTTON_RIGHT) | 158 | #define FRACTAL_PRECISION_INC (BUTTON_SELECT | BUTTON_RIGHT) |
159 | #define FRACTAL_PRECISION_DEC (BUTTON_SELECT | BUTTON_LEFT) | 159 | #define FRACTAL_PRECISION_DEC (BUTTON_SELECT | BUTTON_LEFT) |
160 | #define FRACTAL_RESET BUTTON_REC | 160 | #define FRACTAL_RESET BUTTON_REC |
161 | 161 | ||
162 | #elif CONFIG_KEYPAD == SANSA_CLIP_PAD | 162 | #elif CONFIG_KEYPAD == SANSA_CLIP_PAD |
163 | #define FRACTAL_QUIT BUTTON_POWER | 163 | #define FRACTAL_QUIT BUTTON_POWER |
164 | #define FRACTAL_UP BUTTON_UP | 164 | #define FRACTAL_UP BUTTON_UP |
165 | #define FRACTAL_DOWN BUTTON_DOWN | 165 | #define FRACTAL_DOWN BUTTON_DOWN |
166 | #define FRACTAL_LEFT BUTTON_LEFT | 166 | #define FRACTAL_LEFT BUTTON_LEFT |
167 | #define FRACTAL_RIGHT BUTTON_RIGHT | 167 | #define FRACTAL_RIGHT BUTTON_RIGHT |
168 | #define FRACTAL_ZOOM_IN BUTTON_VOL_UP | 168 | #define FRACTAL_ZOOM_IN BUTTON_VOL_UP |
169 | #define FRACTAL_ZOOM_OUT BUTTON_VOL_DOWN | 169 | #define FRACTAL_ZOOM_OUT BUTTON_VOL_DOWN |
170 | #define FRACTAL_PRECISION_INC (BUTTON_SELECT | BUTTON_RIGHT) | 170 | #define FRACTAL_PRECISION_INC (BUTTON_SELECT | BUTTON_RIGHT) |
171 | #define FRACTAL_PRECISION_DEC (BUTTON_SELECT | BUTTON_LEFT) | 171 | #define FRACTAL_PRECISION_DEC (BUTTON_SELECT | BUTTON_LEFT) |
172 | #define FRACTAL_RESET BUTTON_HOME | 172 | #define FRACTAL_RESET BUTTON_HOME |
173 | 173 | ||
174 | #elif CONFIG_KEYPAD == SANSA_M200_PAD | 174 | #elif CONFIG_KEYPAD == SANSA_M200_PAD |
175 | #define FRACTAL_QUIT BUTTON_POWER | 175 | #define FRACTAL_QUIT BUTTON_POWER |
176 | #define FRACTAL_UP BUTTON_UP | 176 | #define FRACTAL_UP BUTTON_UP |
177 | #define FRACTAL_DOWN BUTTON_DOWN | 177 | #define FRACTAL_DOWN BUTTON_DOWN |
178 | #define FRACTAL_LEFT BUTTON_LEFT | 178 | #define FRACTAL_LEFT BUTTON_LEFT |
179 | #define FRACTAL_RIGHT BUTTON_RIGHT | 179 | #define FRACTAL_RIGHT BUTTON_RIGHT |
180 | #define FRACTAL_ZOOM_IN BUTTON_VOL_UP | 180 | #define FRACTAL_ZOOM_IN BUTTON_VOL_UP |
181 | #define FRACTAL_ZOOM_OUT BUTTON_VOL_DOWN | 181 | #define FRACTAL_ZOOM_OUT BUTTON_VOL_DOWN |
182 | #define FRACTAL_PRECISION_INC (BUTTON_SELECT | BUTTON_RIGHT) | 182 | #define FRACTAL_PRECISION_INC (BUTTON_SELECT | BUTTON_RIGHT) |
183 | #define FRACTAL_PRECISION_DEC (BUTTON_SELECT | BUTTON_LEFT) | 183 | #define FRACTAL_PRECISION_DEC (BUTTON_SELECT | BUTTON_LEFT) |
184 | #define FRACTAL_RESET (BUTTON_SELECT | BUTTON_UP) | 184 | #define FRACTAL_RESET (BUTTON_SELECT | BUTTON_UP) |
185 | 185 | ||
186 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 186 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
187 | #define FRACTAL_QUIT BUTTON_POWER | 187 | #define FRACTAL_QUIT BUTTON_POWER |
188 | #define FRACTAL_UP BUTTON_SCROLL_UP | 188 | #define FRACTAL_UP BUTTON_SCROLL_UP |
189 | #define FRACTAL_DOWN BUTTON_SCROLL_DOWN | 189 | #define FRACTAL_DOWN BUTTON_SCROLL_DOWN |
190 | #define FRACTAL_LEFT BUTTON_LEFT | 190 | #define FRACTAL_LEFT BUTTON_LEFT |
191 | #define FRACTAL_RIGHT BUTTON_RIGHT | 191 | #define FRACTAL_RIGHT BUTTON_RIGHT |
192 | #define FRACTAL_ZOOM_IN_PRE BUTTON_PLAY | 192 | #define FRACTAL_ZOOM_IN_PRE BUTTON_PLAY |
193 | #define FRACTAL_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) | 193 | #define FRACTAL_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) |
194 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_PLAY | 194 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_PLAY |
195 | #define FRACTAL_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT) | 195 | #define FRACTAL_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT) |
196 | #define FRACTAL_PRECISION_INC BUTTON_FF | 196 | #define FRACTAL_PRECISION_INC BUTTON_FF |
197 | #define FRACTAL_PRECISION_DEC BUTTON_REW | 197 | #define FRACTAL_PRECISION_DEC BUTTON_REW |
198 | #define FRACTAL_RESET (BUTTON_PLAY | BUTTON_REW) | 198 | #define FRACTAL_RESET (BUTTON_PLAY | BUTTON_REW) |
199 | 199 | ||
200 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 200 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
201 | #define FRACTAL_QUIT BUTTON_EQ | 201 | #define FRACTAL_QUIT BUTTON_EQ |
202 | #define FRACTAL_UP BUTTON_UP | 202 | #define FRACTAL_UP BUTTON_UP |
203 | #define FRACTAL_DOWN BUTTON_DOWN | 203 | #define FRACTAL_DOWN BUTTON_DOWN |
204 | #define FRACTAL_LEFT BUTTON_LEFT | 204 | #define FRACTAL_LEFT BUTTON_LEFT |
205 | #define FRACTAL_RIGHT BUTTON_RIGHT | 205 | #define FRACTAL_RIGHT BUTTON_RIGHT |
206 | #define FRACTAL_ZOOM_IN_PRE BUTTON_SELECT | 206 | #define FRACTAL_ZOOM_IN_PRE BUTTON_SELECT |
207 | #define FRACTAL_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) | 207 | #define FRACTAL_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) |
208 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_SELECT | 208 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_SELECT |
209 | #define FRACTAL_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) | 209 | #define FRACTAL_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) |
210 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_RIGHT) | 210 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_RIGHT) |
211 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_LEFT) | 211 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_LEFT) |
212 | #define FRACTAL_RESET BUTTON_MODE | 212 | #define FRACTAL_RESET BUTTON_MODE |
213 | 213 | ||
214 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | 214 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD |
215 | #define FRACTAL_QUIT BUTTON_BACK | 215 | #define FRACTAL_QUIT BUTTON_BACK |
216 | #define FRACTAL_UP BUTTON_UP | 216 | #define FRACTAL_UP BUTTON_UP |
217 | #define FRACTAL_DOWN BUTTON_DOWN | 217 | #define FRACTAL_DOWN BUTTON_DOWN |
218 | #define FRACTAL_LEFT BUTTON_LEFT | 218 | #define FRACTAL_LEFT BUTTON_LEFT |
219 | #define FRACTAL_RIGHT BUTTON_RIGHT | 219 | #define FRACTAL_RIGHT BUTTON_RIGHT |
220 | #define FRACTAL_ZOOM_IN BUTTON_VOL_UP | 220 | #define FRACTAL_ZOOM_IN BUTTON_VOL_UP |
221 | #define FRACTAL_ZOOM_OUT BUTTON_VOL_DOWN | 221 | #define FRACTAL_ZOOM_OUT BUTTON_VOL_DOWN |
222 | #define FRACTAL_PRECISION_INC BUTTON_PREV | 222 | #define FRACTAL_PRECISION_INC BUTTON_PREV |
223 | #define FRACTAL_PRECISION_DEC BUTTON_NEXT | 223 | #define FRACTAL_PRECISION_DEC BUTTON_NEXT |
224 | #define FRACTAL_RESET BUTTON_MENU | 224 | #define FRACTAL_RESET BUTTON_MENU |
225 | 225 | ||
226 | #elif CONFIG_KEYPAD == MROBE100_PAD | 226 | #elif CONFIG_KEYPAD == MROBE100_PAD |
227 | #define FRACTAL_QUIT BUTTON_POWER | 227 | #define FRACTAL_QUIT BUTTON_POWER |
228 | #define FRACTAL_UP BUTTON_UP | 228 | #define FRACTAL_UP BUTTON_UP |
229 | #define FRACTAL_DOWN BUTTON_DOWN | 229 | #define FRACTAL_DOWN BUTTON_DOWN |
230 | #define FRACTAL_LEFT BUTTON_LEFT | 230 | #define FRACTAL_LEFT BUTTON_LEFT |
231 | #define FRACTAL_RIGHT BUTTON_RIGHT | 231 | #define FRACTAL_RIGHT BUTTON_RIGHT |
232 | #define FRACTAL_ZOOM_IN_PRE BUTTON_SELECT | 232 | #define FRACTAL_ZOOM_IN_PRE BUTTON_SELECT |
233 | #define FRACTAL_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) | 233 | #define FRACTAL_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) |
234 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_SELECT | 234 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_SELECT |
235 | #define FRACTAL_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) | 235 | #define FRACTAL_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) |
236 | #define FRACTAL_PRECISION_INC BUTTON_MENU | 236 | #define FRACTAL_PRECISION_INC BUTTON_MENU |
237 | #define FRACTAL_PRECISION_DEC BUTTON_PLAY | 237 | #define FRACTAL_PRECISION_DEC BUTTON_PLAY |
238 | #define FRACTAL_RESET BUTTON_DISPLAY | 238 | #define FRACTAL_RESET BUTTON_DISPLAY |
239 | 239 | ||
240 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 240 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
241 | #define FRACTAL_QUIT BUTTON_RC_REC | 241 | #define FRACTAL_QUIT BUTTON_RC_REC |
@@ -248,69 +248,67 @@ | |||
248 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_RC_PLAY | 248 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_RC_PLAY |
249 | #define FRACTAL_ZOOM_OUT (BUTTON_RC_PLAY | BUTTON_REPEAT) | 249 | #define FRACTAL_ZOOM_OUT (BUTTON_RC_PLAY | BUTTON_REPEAT) |
250 | #define FRACTAL_PRECISION_INC_PRE BUTTON_RC_MODE | 250 | #define FRACTAL_PRECISION_INC_PRE BUTTON_RC_MODE |
251 | #define FRACTAL_PRECISION_INC (BUTTON_RC_MODE|BUTTON_REL) | 251 | #define FRACTAL_PRECISION_INC (BUTTON_RC_MODE|BUTTON_REL) |
252 | #define FRACTAL_PRECISION_DEC_PRE BUTTON_RC_MODE | 252 | #define FRACTAL_PRECISION_DEC_PRE BUTTON_RC_MODE |
253 | #define FRACTAL_PRECISION_DEC (BUTTON_RC_MODE|BUTTON_REPEAT) | 253 | #define FRACTAL_PRECISION_DEC (BUTTON_RC_MODE|BUTTON_REPEAT) |
254 | #define FRACTAL_RESET BUTTON_RC_MENU | 254 | #define FRACTAL_RESET BUTTON_RC_MENU |
255 | 255 | ||
256 | #elif CONFIG_KEYPAD == COWON_D2_PAD | 256 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
257 | #define FRACTAL_QUIT BUTTON_POWER | 257 | #define FRACTAL_QUIT BUTTON_POWER |
258 | 258 | ||
259 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 259 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
260 | #define FRACTAL_QUIT BUTTON_BACK | 260 | #define FRACTAL_QUIT BUTTON_BACK |
261 | #define FRACTAL_UP BUTTON_UP | 261 | #define FRACTAL_UP BUTTON_UP |
262 | #define FRACTAL_DOWN BUTTON_DOWN | 262 | #define FRACTAL_DOWN BUTTON_DOWN |
263 | #define FRACTAL_LEFT BUTTON_LEFT | 263 | #define FRACTAL_LEFT BUTTON_LEFT |
264 | #define FRACTAL_RIGHT BUTTON_RIGHT | 264 | #define FRACTAL_RIGHT BUTTON_RIGHT |
265 | #define FRACTAL_ZOOM_IN BUTTON_PLAY | 265 | #define FRACTAL_ZOOM_IN BUTTON_PLAY |
266 | #define FRACTAL_ZOOM_OUT BUTTON_MENU | 266 | #define FRACTAL_ZOOM_OUT BUTTON_MENU |
267 | #define FRACTAL_PRECISION_INC (BUTTON_UP | BUTTON_CUSTOM) | 267 | #define FRACTAL_PRECISION_INC (BUTTON_UP | BUTTON_CUSTOM) |
268 | #define FRACTAL_PRECISION_DEC (BUTTON_DOWN | BUTTON_CUSTOM) | 268 | #define FRACTAL_PRECISION_DEC (BUTTON_DOWN | BUTTON_CUSTOM) |
269 | #define FRACTAL_RESET BUTTON_SELECT | 269 | #define FRACTAL_RESET BUTTON_SELECT |
270 | 270 | ||
271 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD | 271 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD |
272 | #define FRACTAL_QUIT BUTTON_POWER | 272 | #define FRACTAL_QUIT BUTTON_POWER |
273 | #define FRACTAL_UP BUTTON_UP | 273 | #define FRACTAL_UP BUTTON_UP |
274 | #define FRACTAL_DOWN BUTTON_DOWN | 274 | #define FRACTAL_DOWN BUTTON_DOWN |
275 | #define FRACTAL_LEFT BUTTON_LEFT | 275 | #define FRACTAL_LEFT BUTTON_LEFT |
276 | #define FRACTAL_RIGHT BUTTON_RIGHT | 276 | #define FRACTAL_RIGHT BUTTON_RIGHT |
277 | #define FRACTAL_ZOOM_IN BUTTON_VIEW | 277 | #define FRACTAL_ZOOM_IN BUTTON_VIEW |
278 | #define FRACTAL_ZOOM_OUT BUTTON_PLAYLIST | 278 | #define FRACTAL_ZOOM_OUT BUTTON_PLAYLIST |
279 | #define FRACTAL_PRECISION_INC BUTTON_VOL_UP | 279 | #define FRACTAL_PRECISION_INC BUTTON_VOL_UP |
280 | #define FRACTAL_PRECISION_DEC BUTTON_VOL_DOWN | 280 | #define FRACTAL_PRECISION_DEC BUTTON_VOL_DOWN |
281 | #define FRACTAL_RESET BUTTON_MENU | 281 | #define FRACTAL_RESET BUTTON_MENU |
282 | 282 | ||
283 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 283 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
284 | #define FRACTAL_QUIT BUTTON_POWER | 284 | #define FRACTAL_QUIT BUTTON_POWER |
285 | #define FRACTAL_UP BUTTON_UP | 285 | #define FRACTAL_UP BUTTON_UP |
286 | #define FRACTAL_DOWN BUTTON_DOWN | 286 | #define FRACTAL_DOWN BUTTON_DOWN |
287 | #define FRACTAL_LEFT BUTTON_PREV | 287 | #define FRACTAL_LEFT BUTTON_PREV |
288 | #define FRACTAL_RIGHT BUTTON_NEXT | 288 | #define FRACTAL_RIGHT BUTTON_NEXT |
289 | #define FRACTAL_ZOOM_IN BUTTON_RIGHT | 289 | #define FRACTAL_ZOOM_IN BUTTON_RIGHT |
290 | #define FRACTAL_ZOOM_OUT BUTTON_LEFT | 290 | #define FRACTAL_ZOOM_OUT BUTTON_LEFT |
291 | #define FRACTAL_PRECISION_INC BUTTON_VOL_UP | 291 | #define FRACTAL_PRECISION_INC BUTTON_VOL_UP |
292 | #define FRACTAL_PRECISION_DEC BUTTON_VOL_DOWN | 292 | #define FRACTAL_PRECISION_DEC BUTTON_VOL_DOWN |
293 | #define FRACTAL_RESET BUTTON_MENU | 293 | #define FRACTAL_RESET BUTTON_MENU |
294 | 294 | ||
295 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD | 295 | #elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD |
296 | #define FRACTAL_QUIT BUTTON_POWER | 296 | #define FRACTAL_QUIT BUTTON_POWER |
297 | 297 | ||
298 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 298 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
299 | #define FRACTAL_QUIT BUTTON_POWER | 299 | #define FRACTAL_QUIT BUTTON_POWER |
300 | 300 | ||
301 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 301 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD |
302 | #define FRACTAL_QUIT BUTTON_REC | 302 | #define FRACTAL_QUIT BUTTON_REC |
303 | #define FRACTAL_UP BUTTON_UP | 303 | #define FRACTAL_UP BUTTON_UP |
304 | #define FRACTAL_DOWN BUTTON_DOWN | 304 | #define FRACTAL_DOWN BUTTON_DOWN |
305 | #define FRACTAL_LEFT BUTTON_LEFT | 305 | #define FRACTAL_LEFT BUTTON_LEFT |
306 | #define FRACTAL_RIGHT BUTTON_RIGHT | 306 | #define FRACTAL_RIGHT BUTTON_RIGHT |
307 | #define FRACTAL_ZOOM_IN_PRE (BUTTON_FFWD | BUTTON_UP) | 307 | #define FRACTAL_ZOOM_IN BUTTON_FFWD |
308 | #define FRACTAL_ZOOM_IN (BUTTON_REW | BUTTON_UP) | 308 | #define FRACTAL_ZOOM_OUT BUTTON_REW |
309 | #define FRACTAL_ZOOM_OUT_PRE (BUTTON_FFWD | BUTTON_DOWN) | 309 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_UP) |
310 | #define FRACTAL_ZOOM_OUT (BUTTON_REW | BUTTON_DOWN) | 310 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_DOWN) |
311 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_UP) | 311 | #define FRACTAL_RESET (BUTTON_PLAY | BUTTON_RIGHT) |
312 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_DOWN) | ||
313 | #define FRACTAL_RESET (BUTTON_PLAY | BUTTON_RIGHT) | ||
314 | 312 | ||
315 | #else | 313 | #else |
316 | #error No keymap defined! | 314 | #error No keymap defined! |
@@ -318,28 +316,24 @@ | |||
318 | 316 | ||
319 | #ifdef HAVE_TOUCHSCREEN | 317 | #ifdef HAVE_TOUCHSCREEN |
320 | #ifndef FRACTAL_UP | 318 | #ifndef FRACTAL_UP |
321 | #define FRACTAL_UP BUTTON_TOPMIDDLE | 319 | #define FRACTAL_UP BUTTON_TOPMIDDLE |
322 | #endif | 320 | #endif |
323 | #ifndef FRACTAL_DOWN | 321 | #ifndef FRACTAL_DOWN |
324 | #define FRACTAL_DOWN BUTTON_BOTTOMMIDDLE | 322 | #define FRACTAL_DOWN BUTTON_BOTTOMMIDDLE |
325 | #endif | 323 | #endif |
326 | #ifndef FRACTAL_LEFT | 324 | #ifndef FRACTAL_LEFT |
327 | #define FRACTAL_LEFT BUTTON_MIDLEFT | 325 | #define FRACTAL_LEFT BUTTON_MIDLEFT |
328 | #endif | 326 | #endif |
329 | #ifndef FRACTAL_RIGHT | 327 | #ifndef FRACTAL_RIGHT |
330 | #define FRACTAL_RIGHT BUTTON_MIDRIGHT | 328 | #define FRACTAL_RIGHT BUTTON_MIDRIGHT |
331 | #endif | ||
332 | #ifndef FRACTAL_ZOOM_IN_PRE | ||
333 | #define FRACTAL_ZOOM_IN_PRE BUTTON_TOPRIGHT | ||
334 | #endif | 329 | #endif |
335 | #ifndef FRACTAL_ZOOM_IN | 330 | #ifndef FRACTAL_ZOOM_IN |
336 | #define FRACTAL_ZOOM_IN (BUTTON_TOPRIGHT | BUTTON_REL) | 331 | #define FRACTAL_ZOOM_IN_PRE BUTTON_TOPRIGHT |
337 | #endif | 332 | #define FRACTAL_ZOOM_IN (BUTTON_TOPRIGHT | BUTTON_REL) |
338 | #ifndef FRACTAL_ZOOM_OUT_PRE | ||
339 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_TOPLEFT | ||
340 | #endif | 333 | #endif |
341 | #ifndef FRACTAL_ZOOM_OUT | 334 | #ifndef FRACTAL_ZOOM_OUT |
342 | #define FRACTAL_ZOOM_OUT (BUTTON_TOPLEFT | BUTTON_REL) | 335 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_TOPLEFT |
336 | #define FRACTAL_ZOOM_OUT (BUTTON_TOPLEFT | BUTTON_REL) | ||
343 | #endif | 337 | #endif |
344 | #ifndef FRACTAL_PRECISION_INC | 338 | #ifndef FRACTAL_PRECISION_INC |
345 | #define FRACTAL_PRECISION_INC BUTTON_BOTTOMRIGHT | 339 | #define FRACTAL_PRECISION_INC BUTTON_BOTTOMRIGHT |
@@ -348,7 +342,7 @@ | |||
348 | #define FRACTAL_PRECISION_DEC BUTTON_BOTTOMLEFT | 342 | #define FRACTAL_PRECISION_DEC BUTTON_BOTTOMLEFT |
349 | #endif | 343 | #endif |
350 | #ifndef FRACTAL_RESET | 344 | #ifndef FRACTAL_RESET |
351 | #define FRACTAL_RESET BUTTON_CENTER | 345 | #define FRACTAL_RESET BUTTON_CENTER |
352 | #endif | 346 | #endif |
353 | #endif | 347 | #endif |
354 | 348 | ||