summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Wardell <rockbox@barrywardell.net>2006-12-01 19:28:39 +0000
committerBarry Wardell <rockbox@barrywardell.net>2006-12-01 19:28:39 +0000
commitf214b91387c7a2003e8f6479dd04ae9ad1e424a1 (patch)
treee2b2c11b0049afb1bb755bd96c14a59c1085003d
parentc4a87312f0861e6c4c7cc0b0f7ed054570275763 (diff)
downloadrockbox-f214b91387c7a2003e8f6479dd04ae9ad1e424a1.tar.gz
rockbox-f214b91387c7a2003e8f6479dd04ae9ad1e424a1.zip
Improved Sansa keymap. Based on version provided by Pavel Gnelitsa.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11640 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-e200.c202
1 files changed, 110 insertions, 92 deletions
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index 1c90e46592..a1e4b82384 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -15,8 +15,7 @@
15 * KIND, either express or implied. 15 * KIND, either express or implied.
16 * 16 *
17 ****************************************************************************/ 17 ****************************************************************************/
18 18/* Button Code Definitions for Sandisk e200 target */
19/* Button Code Definitions for iriver H10 target */
20 19
21#include "config.h" 20#include "config.h"
22#include "action.h" 21#include "action.h"
@@ -32,51 +31,53 @@
32 * Insert LAST_ITEM_IN_LIST at the end of each mapping 31 * Insert LAST_ITEM_IN_LIST at the end of each mapping
33 */ 32 */
34const struct button_mapping button_context_standard[] = { 33const struct button_mapping button_context_standard[] = {
35 { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, 34 { ACTION_STD_PREV, BUTTON_SCROLL_UP|BUTTON_REL, BUTTON_NONE },
36 { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 35 { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
37 { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 36 { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN|BUTTON_REL, BUTTON_NONE },
38 { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 37 { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
39 38
40 { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, 39 { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
41 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, 40
42 { ACTION_STD_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 41 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
43 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 42 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
44 { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 43 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
45 44
46 /* TODO: this is a bit of a hack so that we can exit some debug screens 45 { ACTION_STD_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
47 * (audio, tagcache, dircache, hwinfo, stack, ports). They don't like it 46 { ACTION_STD_CONTEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
48 * when ACTION_STD_CANCEL has anything other than BUTTON_NONE for prereq.
49 */
50 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_RIGHT, BUTTON_NONE },
51 47
52 LAST_ITEM_IN_LIST 48 LAST_ITEM_IN_LIST
53}; /* button_context_standard */ 49}; /* button_context_standard */
54 50
55const struct button_mapping button_context_wps[] = { 51const struct button_mapping button_context_wps[] = {
56 { ACTION_WPS_PLAY, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, 52 { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
57 { ACTION_WPS_STOP, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, 53 { ACTION_WPS_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
58 { ACTION_WPS_SKIPPREV, BUTTON_UP|BUTTON_REL, BUTTON_UP}, 54
59 { ACTION_WPS_SEEKBACK, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 55 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
60 { ACTION_WPS_STOPSEEK, BUTTON_UP|BUTTON_REL, BUTTON_UP|BUTTON_REPEAT }, 56 { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
61 { ACTION_WPS_SKIPNEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, 57 { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT },
62 { ACTION_WPS_SEEKFWD, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 58
63 { ACTION_WPS_STOPSEEK, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN|BUTTON_REPEAT }, 59 { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
60 { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
61 { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
64 62
65 { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_POWER|BUTTON_DOWN, BUTTON_POWER }, 63 { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_POWER|BUTTON_RIGHT, BUTTON_POWER },
66 { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, 64 { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER },
67 { ACTION_WPSAB_RESET, BUTTON_POWER|BUTTON_SELECT, BUTTON_POWER }, 65 { ACTION_WPSAB_RESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER },
68 66
69 { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 67 { ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN, BUTTON_NONE },
70 { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE }, 68 { ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
71 { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP, BUTTON_NONE }, 69 { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_UP, BUTTON_NONE },
72 { ACTION_WPS_VOLUP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 70 { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
73 71
74 { ACTION_WPS_BROWSE, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 72 { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
75 { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, 73
76 { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, 74 { ACTION_WPS_CONTEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
75 { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
76
77 { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, 77 { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
78 { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_LEFT, BUTTON_SELECT }, 78
79 { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_SELECT }, 79 { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT },
80 { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT },
80 81
81 LAST_ITEM_IN_LIST 82 LAST_ITEM_IN_LIST
82}; /* button_context_wps */ 83}; /* button_context_wps */
@@ -86,97 +87,104 @@ const struct button_mapping button_context_settings[] = {
86 { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 87 { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
87 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 88 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE },
88 { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 89 { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
90
89 { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, 91 { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE },
90 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 92 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
91 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 93 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
92 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 94 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
93 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, 95 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE },
94 96
95 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 97 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
96}; /* button_context_settings */ 98}; /* button_context_settings */
97 99
98const struct button_mapping button_context_list[] = { 100const struct button_mapping button_context_list[] = {
99 { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_UP }, 101 { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_UP, BUTTON_REC },
100 { ACTION_LISTTREE_PGDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, 102 { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_DOWN, BUTTON_REC },
101 103
102 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 104 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
103}; /* button_context_list */ 105}; /* button_context_list */
104 106
105const struct button_mapping button_context_tree[] = { 107const struct button_mapping button_context_tree[] = {
106 { ACTION_TREE_WPS, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, 108 { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP },
107 { ACTION_TREE_STOP, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, 109 { ACTION_TREE_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
108 110
109 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), 111 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
110}; /* button_context_tree */ 112}; /* button_context_tree */
111 113
112const struct button_mapping button_context_listtree_scroll_without_combo[] = { 114const struct button_mapping button_context_listtree_scroll_without_combo[] = {
113 { ACTION_TREE_ROOT_INIT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, 115 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
114 { ACTION_TREE_PGLEFT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 116 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
115 { ACTION_TREE_PGRIGHT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 117 { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
118 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
119 { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT },
120 { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE },
121 { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
122 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
123 { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
124
116 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 125 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
117}; /* button_context_listtree_scroll_without_combo */ 126}; /* button_context_listtree_scroll_without_combo */
118 127
119const struct button_mapping button_context_listtree_scroll_with_combo[] = { 128const struct button_mapping button_context_listtree_scroll_with_combo[] = {
120 { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, 129 { ACTION_TREE_ROOT_INIT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
121 { ACTION_LISTTREE_PGDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, 130 { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC },
122 { ACTION_TREE_PGLEFT, BUTTON_UP|BUTTON_SELECT, BUTTON_SELECT }, 131 { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
123 { ACTION_TREE_PGLEFT, BUTTON_UP|BUTTON_REL, BUTTON_UP|BUTTON_SELECT }, 132 { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_REC },
124 { ACTION_TREE_PGLEFT, BUTTON_UP|BUTTON_SELECT, BUTTON_UP|BUTTON_REL }, 133 { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE },
125 { ACTION_TREE_ROOT_INIT, BUTTON_UP|BUTTON_SELECT|BUTTON_REPEAT, BUTTON_UP|BUTTON_SELECT }, 134
126 { ACTION_TREE_PGLEFT, BUTTON_UP|BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE },
127 { ACTION_TREE_PGRIGHT, BUTTON_DOWN|BUTTON_SELECT, BUTTON_SELECT },
128 { ACTION_TREE_PGRIGHT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN|BUTTON_SELECT },
129 { ACTION_TREE_PGRIGHT, BUTTON_DOWN|BUTTON_SELECT, BUTTON_DOWN|BUTTON_REL },
130 { ACTION_TREE_PGRIGHT, BUTTON_DOWN|BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE },
131 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), 135 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
132}; /* button_context_listtree_scroll_with_combo */ 136}; /* button_context_listtree_scroll_with_combo */
133 137
134const struct button_mapping button_context_yesno[] = { 138const struct button_mapping button_context_yesno[] = {
135 { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, 139 { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
140
136 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 141 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
137}; /* button_context_settings_yesno */ 142}; /* button_context_settings_yesno */
138 143
139const struct button_mapping button_context_quickscreen[] = { 144const struct button_mapping button_context_quickscreen[] = {
140 { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP, BUTTON_NONE }, 145 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
141 { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 146 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
142 { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 147 { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
143 { ACTION_QS_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 148 { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
144 { ACTION_QS_LEFT, BUTTON_UP, BUTTON_NONE }, 149 { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
145 { ACTION_QS_LEFT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 150 { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
146 { ACTION_QS_RIGHT, BUTTON_DOWN, BUTTON_NONE }, 151 { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
147 { ACTION_QS_RIGHT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 152 { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
153 { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
148 154
149 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 155 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
150}; /* button_context_quickscreen */ 156}; /* button_context_quickscreen */
151 157
152const struct button_mapping button_context_settings_right_is_inc[] = { 158const struct button_mapping button_context_settings_right_is_inc[] = {
153 { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, 159 { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP|BUTTON_REL, BUTTON_NONE },
154 { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 160 { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
155 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 161 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_DOWN|BUTTON_REL, BUTTON_NONE },
156 { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE }, 162 { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE },
157 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, 163
158 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 164 { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
159 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 165 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
160 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 166 { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
161 { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, 167 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
162 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, 168 { ACTION_NONE, BUTTON_SELECT, BUTTON_NONE },
163 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, 169 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
164 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, 170 { ACTION_NONE, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
171 { ACTION_NONE, BUTTON_POWER, BUTTON_NONE },
172 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
165 173
166 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 174 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
167}; /* button_context_settings_right_is_inc */ 175}; /* button_context_settings_right_is_inc */
168 176
169const struct button_mapping button_context_pitchscreen[] = { 177const struct button_mapping button_context_pitchscreen[] = {
170 { ACTION_PS_INC_SMALL, BUTTON_SCROLL_UP, BUTTON_NONE }, 178 { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE },
171 { ACTION_PS_INC_BIG, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 179 { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
172 { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 180 { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE },
173 { ACTION_PS_DEC_BIG, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 181 { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
174 { ACTION_PS_NUDGE_LEFT, BUTTON_UP, BUTTON_NONE }, 182 { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE },
175 { ACTION_PS_NUDGE_LEFTOFF, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, 183 { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
176 { ACTION_PS_NUDGE_RIGHT, BUTTON_DOWN, BUTTON_NONE }, 184 { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
177 { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, 185 { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE },
178 { ACTION_PS_RESET, BUTTON_SELECT, BUTTON_NONE }, 186 { ACTION_PS_RESET, BUTTON_SELECT, BUTTON_NONE },
179 { ACTION_PS_EXIT, BUTTON_LEFT, BUTTON_NONE }, 187 { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE },
180 188
181 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 189 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
182}; /* button_context_pitchscreen */ 190}; /* button_context_pitchscreen */
@@ -186,21 +194,31 @@ const struct button_mapping button_context_keyboard[] = {
186 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 194 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
187 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 195 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
188 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 196 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
189 { ACTION_KBD_SELECT, BUTTON_UP|BUTTON_REL, BUTTON_UP }, 197
190 { ACTION_KBD_DONE, BUTTON_SELECT, BUTTON_NONE }, 198 { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE },
191 { ACTION_KBD_ABORT, BUTTON_DOWN, BUTTON_NONE }, 199 { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
200 { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE },
201 { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
202
192 { ACTION_KBD_UP, BUTTON_SCROLL_UP, BUTTON_NONE }, 203 { ACTION_KBD_UP, BUTTON_SCROLL_UP, BUTTON_NONE },
193 { ACTION_KBD_UP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, 204 { ACTION_KBD_UP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
194 { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, 205 { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE },
195 { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 206 { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
207 { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC },
208 { ACTION_KBD_BACKSPACE, BUTTON_DOWN, BUTTON_NONE },
209 { ACTION_KBD_BACKSPACE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
210 { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE },
211 { ACTION_KBD_DONE, BUTTON_UP, BUTTON_NONE },
212 { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE },
196 213
197 LAST_ITEM_IN_LIST 214 LAST_ITEM_IN_LIST
198}; /* button_context_keyboard */ 215}; /* button_context_keyboard */
199 216
200const struct button_mapping button_context_bmark[] = { 217const struct button_mapping button_context_bmark[] = {
201 { ACTION_BMS_DELETE, BUTTON_UP, BUTTON_NONE }, 218 { ACTION_BMS_DELETE, BUTTON_UP, BUTTON_NONE },
202 { ACTION_BMS_SELECT, BUTTON_RIGHT, BUTTON_NONE }, 219 { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
203 { ACTION_BMS_EXIT, BUTTON_LEFT, BUTTON_NONE }, 220 { ACTION_BMS_EXIT, BUTTON_POWER, BUTTON_NONE },
221
204 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 222 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
205}; /* button_context_bmark */ 223}; /* button_context_bmark */
206 224