From fcb7d61762370be67223f9a14df96d968228aa88 Mon Sep 17 00:00:00 2001 From: Rob Purchase Date: Sun, 22 Jun 2008 19:19:48 +0000 Subject: A basic seek/skip WPS keymap for touchscreen targets. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17755 a1c6a512-1295-4272-9138-f99709370657 --- apps/keymaps/keymap-cowond2.c | 17 ++++++++++++----- apps/keymaps/keymap-touchpad.c | 9 +++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) (limited to 'apps/keymaps') diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c index 8dbc299527..3afee098d9 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 7b60a80ed1..a6a4baad66 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 */ -- cgit v1.2.3