diff options
| -rw-r--r-- | firmware/target/hosted/sdl/app/button-application.c | 1 | ||||
| -rw-r--r-- | firmware/target/hosted/sdl/key_to_touch-sdl.c | 8 | ||||
| -rw-r--r-- | uisimulator/buttonmap/gigabeat.c | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/firmware/target/hosted/sdl/app/button-application.c b/firmware/target/hosted/sdl/app/button-application.c index 3f31933..2ad09dc 100644 --- a/firmware/target/hosted/sdl/app/button-application.c +++ b/firmware/target/hosted/sdl/app/button-application.c @@ -34,6 +34,7 @@ int key_to_button(int keyboard_key) new_btn = BUTTON_TOPLEFT; break; case SDLK_KP8: + case SDLK_UP: new_btn = BUTTON_TOPMIDDLE; break; case SDLK_KP9: diff --git a/firmware/target/hosted/sdl/key_to_touch-sdl.c b/firmware/target/hosted/sdl/key_to_touch-sdl.c index a63df18..d56d06b 100644 --- a/firmware/target/hosted/sdl/key_to_touch-sdl.c +++ b/firmware/target/hosted/sdl/key_to_touch-sdl.c @@ -51,21 +51,23 @@ int key_to_touch(int keyboard_button, unsigned int mouse_coords) } } break; -#ifndef CONFIG_PLATFORM +#ifndef APPLICATION case SDLK_KP7: case SDLK_7: + case SDLK_HOME: new_btn = BUTTON_TOPLEFT; break; case SDLK_KP8: case SDLK_8: case SDLK_UP: #ifdef HAVE_SCROLLWHEEL - case SDL_BUTTON_WHEELDOWN: + case SDL_BUTTON_WHEELUP: #endif new_btn = BUTTON_TOPMIDDLE; break; case SDLK_KP9: case SDLK_9: + case SDLK_PAGEUP: new_btn = BUTTON_TOPRIGHT; break; case SDLK_KP4: @@ -85,6 +87,7 @@ int key_to_touch(int keyboard_button, unsigned int mouse_coords) break; case SDLK_KP1: case SDLK_j: + case SDLK_END: new_btn = BUTTON_BOTTOMLEFT; break; case SDLK_KP2: @@ -97,6 +100,7 @@ int key_to_touch(int keyboard_button, unsigned int mouse_coords) break; case SDLK_KP3: case SDLK_l: + case SDLK_PAGEDOWN: new_btn = BUTTON_BOTTOMRIGHT; break; #endif diff --git a/uisimulator/buttonmap/gigabeat.c b/uisimulator/buttonmap/gigabeat.c index 540b9f6..5f14665 100644 --- a/uisimulator/buttonmap/gigabeat.c +++ b/uisimulator/buttonmap/gigabeat.c @@ -46,8 +46,6 @@ int key_to_button(int keyboard_button) break; case SDLK_KP_PLUS: case SDLK_F8: - new_btn = BUTTON_POWER; - break; case SDLK_ESCAPE: new_btn = BUTTON_POWER; break; @@ -65,9 +63,11 @@ int key_to_button(int keyboard_button) new_btn = BUTTON_MENU; break; case SDLK_KP9: + case SDLK_PAGEUP: new_btn = BUTTON_VOL_UP; break; case SDLK_KP3: + case SDLK_PAGEDOWN: new_btn = BUTTON_VOL_DOWN; break; } |