diff options
Diffstat (limited to 'uisimulator/sdl')
-rw-r--r-- | uisimulator/sdl/button.c | 42 |
1 files changed, 35 insertions, 7 deletions
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index 52646220e7..4fd276ac97 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c | |||
@@ -313,33 +313,51 @@ void button_event(int key, bool pressed) | |||
313 | 313 | ||
314 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 314 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
315 | case SDLK_KP4: | 315 | case SDLK_KP4: |
316 | case SDLK_LEFT: | ||
317 | new_btn = BUTTON_LEFT; | 316 | new_btn = BUTTON_LEFT; |
318 | break; | 317 | break; |
318 | case SDLK_LEFT: | ||
319 | new_btn = BUTTON_RC_REW; | ||
320 | break; | ||
319 | case SDLK_KP6: | 321 | case SDLK_KP6: |
320 | case SDLK_RIGHT: | ||
321 | new_btn = BUTTON_RIGHT; | 322 | new_btn = BUTTON_RIGHT; |
322 | break; | 323 | break; |
324 | case SDLK_RIGHT: | ||
325 | new_btn = BUTTON_RC_FF; | ||
326 | break; | ||
323 | case SDLK_KP8: | 327 | case SDLK_KP8: |
324 | case SDLK_UP: | ||
325 | new_btn = BUTTON_VOL_UP; | 328 | new_btn = BUTTON_VOL_UP; |
326 | break; | 329 | break; |
330 | case SDLK_UP: | ||
331 | new_btn = BUTTON_RC_VOL_UP; | ||
332 | break; | ||
327 | case SDLK_KP2: | 333 | case SDLK_KP2: |
328 | case SDLK_DOWN: | ||
329 | new_btn = BUTTON_VOL_DOWN; | 334 | new_btn = BUTTON_VOL_DOWN; |
330 | break; | 335 | break; |
336 | case SDLK_DOWN: | ||
337 | new_btn = BUTTON_RC_VOL_DOWN; | ||
338 | break; | ||
331 | case SDLK_KP_PERIOD: | 339 | case SDLK_KP_PERIOD: |
332 | case SDLK_INSERT: | ||
333 | new_btn = BUTTON_MODE; | 340 | new_btn = BUTTON_MODE; |
334 | break; | 341 | break; |
342 | case SDLK_INSERT: | ||
343 | new_btn = BUTTON_RC_MODE; | ||
344 | break; | ||
335 | case SDLK_KP_DIVIDE: | 345 | case SDLK_KP_DIVIDE: |
336 | case SDLK_F1: | ||
337 | new_btn = BUTTON_REC; | 346 | new_btn = BUTTON_REC; |
338 | break; | 347 | break; |
348 | case SDLK_F1: | ||
349 | new_btn = BUTTON_RC_REC; | ||
350 | break; | ||
339 | case SDLK_KP5: | 351 | case SDLK_KP5: |
340 | case SDLK_SPACE: | ||
341 | new_btn = BUTTON_PLAY; | 352 | new_btn = BUTTON_PLAY; |
342 | break; | 353 | break; |
354 | case SDLK_SPACE: | ||
355 | new_btn = BUTTON_RC_PLAY; | ||
356 | break; | ||
357 | case SDLK_KP_ENTER: | ||
358 | case SDLK_RETURN: | ||
359 | new_btn = BUTTON_RC_MENU; | ||
360 | break; | ||
343 | 361 | ||
344 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | 362 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) \ |
345 | || (CONFIG_KEYPAD == IPOD_4G_PAD) | 363 | || (CONFIG_KEYPAD == IPOD_4G_PAD) |
@@ -1572,8 +1590,18 @@ struct button_map bm[] = { | |||
1572 | { SDLK_KP4, 257, 201, 26, "Left" }, | 1590 | { SDLK_KP4, 257, 201, 26, "Left" }, |
1573 | { SDLK_KP8, 338, 31, 27, "Up" }, | 1591 | { SDLK_KP8, 338, 31, 27, "Up" }, |
1574 | { SDLK_KP2, 339, 92, 23, "Down" }, | 1592 | { SDLK_KP2, 339, 92, 23, "Down" }, |
1593 | { SDLK_KP_PERIOD, 336, 50, 23, "Mode" }, | ||
1575 | { SDLK_KP_DIVIDE, 336, 147, 23, "Rec" }, | 1594 | { SDLK_KP_DIVIDE, 336, 147, 23, "Rec" }, |
1576 | { SDLK_h, 336, 212, 30, "Hold" }, | 1595 | { SDLK_h, 336, 212, 30, "Hold" }, |
1596 | /* remote */ | ||
1597 | { SDLK_SPACE, 115, 308, 20, "RC Play" }, | ||
1598 | { SDLK_RIGHT, 85, 308, 20, "RC Rew" }, | ||
1599 | { SDLK_LEFT, 143, 308, 20, "RC FF" }, | ||
1600 | { SDLK_UP, 143, 498, 20, "RC Up" }, | ||
1601 | { SDLK_DOWN, 85, 498, 20, "RC Down" }, | ||
1602 | { SDLK_INSERT, 212, 308, 30, "RC Mode" }, | ||
1603 | { SDLK_F1, 275, 308, 25, "RC Rec" }, | ||
1604 | { SDLK_KP_ENTER, 115, 498, 20, "RC Menu" }, | ||
1577 | { 0, 0, 0, 0, "None" } | 1605 | { 0, 0, 0, 0, "None" } |
1578 | }; | 1606 | }; |
1579 | #elif defined (IAUDIO_M5) | 1607 | #elif defined (IAUDIO_M5) |