From fc36c0e22a5e9eb7741a9e01242001ba6901bba5 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Tue, 15 Aug 2006 13:23:10 +0000 Subject: Added quickscreen keys for x5 and ipod git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10587 a1c6a512-1295-4272-9138-f99709370657 --- apps/keymaps/keymap-ipod.c | 15 ++++++++++++++- apps/keymaps/keymap-x5.c | 17 ++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 3b4c4c7a2d..4faf40d0d4 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c @@ -23,7 +23,6 @@ #include "button.h" #include "settings.h" - /* * The format of the list is as follows * { Action Code, Button code, Prereq button code } @@ -118,6 +117,18 @@ struct button_mapping button_context_bmark[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), }; /* button_context_settings_bmark */ +struct button_mapping button_context_quickscreen[] = { + { ACTION_QS_DOWN, BUTTON_PLAY, BUTTON_NONE }, + { ACTION_QS_DOWN, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, + { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, + { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, + { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, + { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, + { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, + + LAST_ITEM_IN_LIST +}; /* button_context_quickscreen */ + /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ struct button_mapping* get_context_mapping(int context) { @@ -145,6 +156,8 @@ struct button_mapping* get_context_mapping(int context) return button_context_yesno; case CONTEXT_BOOKMARKSCREEN: return button_context_bmark; + case CONTEXT_QUICKSCREEN: + return button_context_quickscreen; default: return button_context_standard; } diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index 33c1946e6c..666ce7819a 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c @@ -110,6 +110,20 @@ struct button_mapping button_context_yesno[] = { LAST_ITEM_IN_LIST }; /* button_context_settings_yesno */ +struct button_mapping button_context_quickscreen[] = { + { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, + { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, + { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, + { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, + { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, + { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, + { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, + { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, + { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, + + LAST_ITEM_IN_LIST +}; /* button_context_quickscreen */ + struct button_mapping* get_context_mapping( int context ) { switch( context ) @@ -132,7 +146,8 @@ struct button_mapping* get_context_mapping( int context ) /* else fall through to CUSTOM|1 */ case CONTEXT_CUSTOM|1: return button_context_tree; - + case CONTEXT_QUICKSCREEN: + return button_context_quickscreen; case CONTEXT_LIST: case CONTEXT_MAINMENU: default: -- cgit v1.2.3