diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-07-11 00:22:27 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-07-11 00:22:27 +0000 |
commit | 74d79cb92b5916eaedb7284b1b4ff47b06ffa08a (patch) | |
tree | 1c0e5315cf1b85f592822f210ef9990b42460cb4 | |
parent | 1bc67c81b60539576c0073e8acd2ffa7d43ac882 (diff) | |
download | rockbox-74d79cb92b5916eaedb7284b1b4ff47b06ffa08a.tar.gz rockbox-74d79cb92b5916eaedb7284b1b4ff47b06ffa08a.zip |
FS#10421 - clip keymap updates.
Major changes:
- try to minimise combos
- home is goto menu just about everywhere (and goto previous from the main menu)
- home+select is goto wps
- long home is quickscreen
- removed referneces to the rec screen... we can argue about that when recording is implemented
in the wps:
- down = id3 screen
- long down = pitch screen
lists:
- select+up/down is page up/down.... home+right isnt a valid combo, nor is home+up :<
- home in quickscreen is exit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21770 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/keymaps/keymap-clip.c | 61 |
1 files changed, 35 insertions, 26 deletions
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c index 002cc3c36f..592e0b4a9a 100644 --- a/apps/keymaps/keymap-clip.c +++ b/apps/keymaps/keymap-clip.c | |||
@@ -40,14 +40,13 @@ static const struct button_mapping button_context_standard[] = { | |||
40 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 40 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
41 | 41 | ||
42 | { ACTION_STD_MENU, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, | 42 | { ACTION_STD_MENU, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, |
43 | { ACTION_STD_REC, BUTTON_HOME|BUTTON_REPEAT, BUTTON_NONE }, | 43 | { ACTION_STD_QUICKSCREEN, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, |
44 | 44 | ||
45 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 45 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
46 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 46 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, |
47 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 47 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
48 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 48 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
49 | 49 | ||
50 | { ACTION_STD_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | ||
51 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 50 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
52 | 51 | ||
53 | LAST_ITEM_IN_LIST | 52 | LAST_ITEM_IN_LIST |
@@ -75,39 +74,39 @@ static const struct button_mapping button_context_wps[] = { | |||
75 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 74 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, |
76 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 75 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
77 | 76 | ||
78 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 77 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
78 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
79 | |||
80 | { ACTION_WPS_QUICKSCREEN, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, | ||
81 | { ACTION_WPS_MENU, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, | ||
79 | 82 | ||
80 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 83 | { ACTION_WPS_PITCHSCREEN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, |
81 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 84 | { ACTION_WPS_ID3SCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, |
82 | |||
83 | { ACTION_WPS_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | ||
84 | { ACTION_WPS_REC, BUTTON_HOME|BUTTON_REPEAT, BUTTON_NONE }, | ||
85 | |||
86 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, | ||
87 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, | ||
88 | 85 | ||
89 | LAST_ITEM_IN_LIST | 86 | LAST_ITEM_IN_LIST |
90 | }; /* button_context_wps */ | 87 | }; /* button_context_wps */ |
91 | 88 | ||
92 | static const struct button_mapping button_context_settings[] = { | 89 | static const struct button_mapping button_context_settings[] = { |
93 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 90 | { ACTION_STD_OK, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, |
94 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | 91 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
95 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 92 | { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, |
96 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | 93 | |
97 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 94 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, |
98 | 95 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | |
99 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | 96 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, |
100 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 97 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
101 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | 98 | |
102 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 99 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, |
103 | { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, | 100 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
101 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | ||
102 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
104 | 103 | ||
105 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 104 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
106 | }; /* button_context_settings */ | 105 | }; /* button_context_settings */ |
107 | 106 | ||
108 | static const struct button_mapping button_context_list[] = { | 107 | static const struct button_mapping button_context_list[] = { |
109 | { ACTION_LISTTREE_PGUP, BUTTON_HOME|BUTTON_LEFT, BUTTON_HOME }, | 108 | { ACTION_LISTTREE_PGUP, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, |
110 | { ACTION_LISTTREE_PGDOWN, BUTTON_HOME|BUTTON_RIGHT, BUTTON_HOME }, | 109 | { ACTION_LISTTREE_PGDOWN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, |
111 | 110 | ||
112 | #ifdef HAVE_VOLUME_IN_LIST | 111 | #ifdef HAVE_VOLUME_IN_LIST |
113 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 112 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -115,11 +114,17 @@ static const struct button_mapping button_context_list[] = { | |||
115 | 114 | ||
116 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 115 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, |
117 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 116 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
117 | #else | ||
118 | { ACTION_LISTTREE_PGUP, BUTTON_VOL_UP, BUTTON_NONE }, | ||
119 | { ACTION_LISTTREE_PGUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
120 | { ACTION_LISTTREE_PGDOWN, BUTTON_VOL_DOWN|BUTTON_DOWN, BUTTON_NONE }, | ||
121 | { ACTION_LISTTREE_PGDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
118 | #endif | 122 | #endif |
119 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 123 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
120 | }; /* button_context_list */ | 124 | }; /* button_context_list */ |
121 | 125 | ||
122 | static const struct button_mapping button_context_tree[] = { | 126 | static const struct button_mapping button_context_tree[] = { |
127 | { ACTION_TREE_WPS, BUTTON_HOME|BUTTON_SELECT, BUTTON_HOME }, | ||
123 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 128 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
124 | 129 | ||
125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 130 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
@@ -156,8 +161,8 @@ static const struct button_mapping button_context_yesno[] = { | |||
156 | }; /* button_context_settings_yesno */ | 161 | }; /* button_context_settings_yesno */ |
157 | 162 | ||
158 | static const struct button_mapping button_context_quickscreen[] = { | 163 | static const struct button_mapping button_context_quickscreen[] = { |
159 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | ||
160 | { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, | 164 | { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, |
165 | { ACTION_STD_CANCEL, BUTTON_HOME, BUTTON_NONE }, | ||
161 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, | 166 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, |
162 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 167 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
163 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, | 168 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, |
@@ -190,7 +195,7 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
190 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 195 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
191 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 196 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
192 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | 197 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, |
193 | { ACTION_PS_TOGGLE_MODE, BUTTON_HOME, BUTTON_NONE }, | 198 | { ACTION_PS_TOGGLE_MODE, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, |
194 | { ACTION_PS_RESET, BUTTON_SELECT, BUTTON_NONE }, | 199 | { ACTION_PS_RESET, BUTTON_SELECT, BUTTON_NONE }, |
195 | { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, | 200 | { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, |
196 | { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 201 | { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -198,6 +203,7 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
198 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 203 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
199 | }; /* button_context_pitchscreen */ | 204 | }; /* button_context_pitchscreen */ |
200 | 205 | ||
206 | #if 0 | ||
201 | /** Recording Screen **/ | 207 | /** Recording Screen **/ |
202 | static const struct button_mapping button_context_recscreen[] = { | 208 | static const struct button_mapping button_context_recscreen[] = { |
203 | { ACTION_REC_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | 209 | { ACTION_REC_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
@@ -215,6 +221,7 @@ static const struct button_mapping button_context_recscreen[] = { | |||
215 | { ACTION_NONE, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | 221 | { ACTION_NONE, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, |
216 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 222 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
217 | }; /* button_context_recscreen */ | 223 | }; /* button_context_recscreen */ |
224 | #endif | ||
218 | 225 | ||
219 | /** FM Radio Screen **/ | 226 | /** FM Radio Screen **/ |
220 | static const struct button_mapping button_context_radio[] = { | 227 | static const struct button_mapping button_context_radio[] = { |
@@ -323,8 +330,10 @@ const struct button_mapping* get_context_mapping(int context) | |||
323 | return button_context_quickscreen; | 330 | return button_context_quickscreen; |
324 | case CONTEXT_PITCHSCREEN: | 331 | case CONTEXT_PITCHSCREEN: |
325 | return button_context_pitchscreen; | 332 | return button_context_pitchscreen; |
333 | #if 0 | ||
326 | case CONTEXT_RECSCREEN: | 334 | case CONTEXT_RECSCREEN: |
327 | return button_context_recscreen; | 335 | return button_context_recscreen; |
336 | #endif | ||
328 | case CONTEXT_KEYBOARD: | 337 | case CONTEXT_KEYBOARD: |
329 | return button_context_keyboard; | 338 | return button_context_keyboard; |
330 | #ifdef HAVE_USBSTACK | 339 | #ifdef HAVE_USBSTACK |