diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-06-06 10:27:14 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-06-06 10:27:14 +0000 |
commit | 19ac3453e0ed2b3fe458a0f4aeca4883c53b490e (patch) | |
tree | abd52a5284371b433f6a616d0863776de368179f /uisimulator/buttonmap | |
parent | 60295024681cf2ef4e97359e4243a2f9d3989890 (diff) | |
download | rockbox-19ac3453e0ed2b3fe458a0f4aeca4883c53b490e.tar.gz rockbox-19ac3453e0ed2b3fe458a0f4aeca4883c53b490e.zip |
Fix most reds, I have no idea what's wrong with the gigabeats (yet).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26619 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/buttonmap')
-rw-r--r-- | uisimulator/buttonmap/SOURCES | 2 | ||||
-rw-r--r-- | uisimulator/buttonmap/buttonmap.h | 2 | ||||
-rw-r--r-- | uisimulator/buttonmap/gigabeat-s.c | 4 | ||||
-rw-r--r-- | uisimulator/buttonmap/gigabeat.c | 1 | ||||
-rw-r--r-- | uisimulator/buttonmap/iaudio-m3.c (renamed from uisimulator/buttonmap/iaudo-m3.c) | 0 | ||||
-rw-r--r-- | uisimulator/buttonmap/iriver-h100_h300.c | 22 | ||||
-rw-r--r-- | uisimulator/buttonmap/touchscreen.c | 9 |
7 files changed, 7 insertions, 33 deletions
diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES index 4d99093e7d..06be7450ab 100644 --- a/uisimulator/buttonmap/SOURCES +++ b/uisimulator/buttonmap/SOURCES @@ -59,7 +59,7 @@ onda-vx747.c #elif CONFIG_KEYPAD == ONDAVX777_PAD onda-vx777.c #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD -samsung-yh820_yh925.c +samsung-yh820_yh92x.c #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD pbell-vibe500.c #elif CONFIG_KEYPAD == MPIO_HD200_PAD diff --git a/uisimulator/buttonmap/buttonmap.h b/uisimulator/buttonmap/buttonmap.h index d5b951af9b..2f14cea9c4 100644 --- a/uisimulator/buttonmap/buttonmap.h +++ b/uisimulator/buttonmap/buttonmap.h @@ -36,7 +36,7 @@ int xy2button( int x, int y); int key_to_button(int keyboard_button); #ifdef HAVE_TOUCHSCREEN -int key_to_touch(int keyboard_button); +int key_to_touch(int keyboard_button, unsigned int mouse_coords); #endif #endif /* __BUTTONMAP_H__ */ diff --git a/uisimulator/buttonmap/gigabeat-s.c b/uisimulator/buttonmap/gigabeat-s.c index 98a8489446..5c139c470f 100644 --- a/uisimulator/buttonmap/gigabeat-s.c +++ b/uisimulator/buttonmap/gigabeat-s.c @@ -20,6 +20,10 @@ n/*************************************************************************** ****************************************************************************/ +#include <SDL.h> +#include "button.h" +#include "buttonmap.h" + int key_to_button(int keyboard_button) { int new_btn = BUTTON_NONE; diff --git a/uisimulator/buttonmap/gigabeat.c b/uisimulator/buttonmap/gigabeat.c index 02055cf0b9..84b42a5c8a 100644 --- a/uisimulator/buttonmap/gigabeat.c +++ b/uisimulator/buttonmap/gigabeat.c @@ -19,7 +19,6 @@ n/*************************************************************************** * ****************************************************************************/ - #include <SDL.h> #include "button.h" #include "buttonmap.h" diff --git a/uisimulator/buttonmap/iaudo-m3.c b/uisimulator/buttonmap/iaudio-m3.c index 1ab1392f47..1ab1392f47 100644 --- a/uisimulator/buttonmap/iaudo-m3.c +++ b/uisimulator/buttonmap/iaudio-m3.c diff --git a/uisimulator/buttonmap/iriver-h100_h300.c b/uisimulator/buttonmap/iriver-h100_h300.c index 5e4ad3bafc..e6ca389fc8 100644 --- a/uisimulator/buttonmap/iriver-h100_h300.c +++ b/uisimulator/buttonmap/iriver-h100_h300.c @@ -29,28 +29,6 @@ int key_to_button(int keyboard_button) int new_btn = BUTTON_NONE; switch (keyboard_button) { - case SDLK_t: - if(pressed) - switch(_remote_type) - { - case REMOTETYPE_UNPLUGGED: - _remote_type=REMOTETYPE_H100_LCD; - DEBUGF("Changed remote type to H100\n"); - break; - case REMOTETYPE_H100_LCD: - _remote_type=REMOTETYPE_H300_LCD; - DEBUGF("Changed remote type to H300\n"); - break; - case REMOTETYPE_H300_LCD: - _remote_type=REMOTETYPE_H300_NONLCD; - DEBUGF("Changed remote type to H300 NON-LCD\n"); - break; - case REMOTETYPE_H300_NONLCD: - _remote_type=REMOTETYPE_UNPLUGGED; - DEBUGF("Changed remote type to none\n"); - break; - } - break; case SDLK_KP4: case SDLK_LEFT: new_btn = BUTTON_LEFT; diff --git a/uisimulator/buttonmap/touchscreen.c b/uisimulator/buttonmap/touchscreen.c index 746a6d5f20..90518c7c7e 100644 --- a/uisimulator/buttonmap/touchscreen.c +++ b/uisimulator/buttonmap/touchscreen.c @@ -26,7 +26,7 @@ #include "buttonmap.h" #include "touchscreen.h" -int key_to_touch(int keyboard_button) +int key_to_touch(int keyboard_button, unsigned int mouse_coords) { int new_btn = BUTTON_NONE; switch (keyboard_button) @@ -91,13 +91,6 @@ int key_to_touch(int keyboard_button) case SDLK_l: new_btn = BUTTON_BOTTOMRIGHT; break; - case SDLK_F4: - if(pressed) - { - touchscreen_set_mode(touchscreen_get_mode() == TOUCHSCREEN_POINT ? TOUCHSCREEN_BUTTON : TOUCHSCREEN_POINT); - printf("Touchscreen mode: %s\n", touchscreen_get_mode() == TOUCHSCREEN_POINT ? "TOUCHSCREEN_POINT" : "TOUCHSCREEN_BUTTON"); - } - break; } return new_btn; } |