summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Purchase <shotofadds@rockbox.org>2008-06-22 19:19:48 +0000
committerRob Purchase <shotofadds@rockbox.org>2008-06-22 19:19:48 +0000
commitfcb7d61762370be67223f9a14df96d968228aa88 (patch)
tree480779cf7deacbd1cb958b097c6926d4023683da
parente62aa9e1567f0e220b5444e2ca62196b034c5954 (diff)
downloadrockbox-fcb7d61762370be67223f9a14df96d968228aa88.zip
rockbox-fcb7d61762370be67223f9a14df96d968228aa88.tar.gz
rockbox-fcb7d61762370be67223f9a14df96d968228aa88.tar.bz2
rockbox-fcb7d61762370be67223f9a14df96d968228aa88.tar.xz
A basic seek/skip WPS keymap for touchscreen targets.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17755 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-cowond2.c17
-rw-r--r--apps/keymaps/keymap-touchpad.c9
2 files changed, 21 insertions, 5 deletions
diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c
index 8dbc299..3afee09 100644
--- a/apps/keymaps/keymap-cowond2.c
+++ b/apps/keymaps/keymap-cowond2.c
@@ -42,11 +42,14 @@ static const struct button_mapping button_context_standard[] = {
{ ACTION_STD_NEXT, BUTTON_PLUS, BUTTON_NONE },
{ ACTION_STD_NEXTREPEAT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_STD_OK, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
- { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_OK, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
+ { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
+ { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
+
// { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_CONTEXT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
+
+
LAST_ITEM_IN_LIST
}; /* button_context_standard */
@@ -55,9 +58,13 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_VOLDOWN, BUTTON_MINUS, BUTTON_NONE },
{ ACTION_WPS_VOLDOWN, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_WPS_VOLUP, BUTTON_PLUS, BUTTON_NONE },
- { ACTION_WPS_VOLUP, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_WPS_VOLUP, BUTTON_PLUS, BUTTON_NONE },
+ { ACTION_WPS_VOLUP, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
+ { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
+
+ { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
+
LAST_ITEM_IN_LIST
}; /* button_context_wps */
diff --git a/apps/keymaps/keymap-touchpad.c b/apps/keymaps/keymap-touchpad.c
index 7b60a80..a6a4baa 100644
--- a/apps/keymaps/keymap-touchpad.c
+++ b/apps/keymaps/keymap-touchpad.c
@@ -67,6 +67,15 @@ static const struct button_mapping button_context_standard[] = {
}; /* button_context_standard */
static const struct button_mapping button_context_wps[] = {
+
+ { ACTION_WPS_SKIPNEXT, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT },
+ { ACTION_WPS_SKIPPREV, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT },
+
+ { ACTION_WPS_SEEKBACK, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_WPS_SEEKFWD, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_WPS_STOPSEEK, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT|BUTTON_REPEAT },
+ { ACTION_WPS_STOPSEEK, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT|BUTTON_REPEAT },
+
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_WPS)
}; /* button_context_wps */