diff options
author | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2015-07-20 01:50:26 +0200 |
---|---|---|
committer | Gerrit Rockbox <gerrit@rockbox.org> | 2015-11-15 23:46:39 +0100 |
commit | a507bb283782ee3adb1fc9ba0c6f094108ef558c (patch) | |
tree | acae6cf04f8e34172375061b6fbdc11b6ffb84cb /apps/keymaps | |
parent | a8758c953d50fb020b245d5739c41de113638b49 (diff) | |
download | rockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.tar.gz rockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.zip |
YH8xx,YH9xx: Keymap improvement
The main "innovation" in this patch are two "virtual buttons"
for the record switch on YH92x targets. When the switch state
changes, a single BUTTON_REC_SW_ON or .._OFF button event will
be generated. Thus keymap code can react on switching, but
not on the actual state of the switch.
Wherever sensible, the following user scheme is applied:
- use PLAY as confirm button
- use REW button or Long REW to exit
- use REC (YH820) or FFWD (YH92X) as modifier key for button combos
Change-Id: Ic8d1db9cc6869daed8dda98990dfdf7f6fd5d5a1
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-yh8xx_yh9xx.c | 209 |
1 files changed, 141 insertions, 68 deletions
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c index 16b29e5115..c8bf9d771d 100644 --- a/apps/keymaps/keymap-yh8xx_yh9xx.c +++ b/apps/keymaps/keymap-yh8xx_yh9xx.c | |||
@@ -40,15 +40,15 @@ | |||
40 | 40 | ||
41 | CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) | 41 | CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) |
42 | CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens | 42 | CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens |
43 | i.e where up/down is inc/dec | 43 | i.e where l/r is inc/dec |
44 | CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec | 44 | CONTEXT_SETTINGS = l/r is prev/next, up/down is inc/dec |
45 | 45 | ||
46 | */ | 46 | */ |
47 | 47 | ||
48 | 48 | ||
49 | static const struct button_mapping button_context_standard[] = { | 49 | static const struct button_mapping button_context_standard[] = { |
50 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 50 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
51 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 51 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
52 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 52 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
53 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | 53 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, |
54 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 54 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -59,8 +59,12 @@ static const struct button_mapping button_context_standard[] = { | |||
59 | { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, | 59 | { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, |
60 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, | 60 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, |
61 | { ACTION_STD_MENU, BUTTON_LEFT|BUTTON_UP|BUTTON_REPEAT, | 61 | { ACTION_STD_MENU, BUTTON_LEFT|BUTTON_UP|BUTTON_REPEAT, |
62 | BUTTON_LEFT|BUTTON_UP|BUTTON_REPEAT }, | 62 | BUTTON_LEFT|BUTTON_UP }, |
63 | #ifdef SAMSUNG_YH820 | ||
63 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | 64 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, |
65 | #else | ||
66 | { ACTION_STD_REC, BUTTON_REC_SW_ON, BUTTON_NONE }, | ||
67 | #endif | ||
64 | 68 | ||
65 | LAST_ITEM_IN_LIST | 69 | LAST_ITEM_IN_LIST |
66 | }; /* button_context_standard */ | 70 | }; /* button_context_standard */ |
@@ -74,34 +78,50 @@ static const struct button_mapping button_context_wps[] = { | |||
74 | { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | 78 | { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW }, |
75 | { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 79 | { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
76 | { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, | 80 | { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, |
81 | #ifdef SAMSUNG_YH820 | ||
82 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_REC|BUTTON_FFWD, BUTTON_NONE }, | ||
83 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_REC|BUTTON_REW, BUTTON_NONE }, | ||
84 | { ACTION_WPS_ABRESET, BUTTON_REC|BUTTON_PLAY, BUTTON_NONE }, | ||
85 | #else | ||
77 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, | 86 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, |
78 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, | 87 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, |
79 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, | 88 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, |
89 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_DOWN, BUTTON_PLAY }, | ||
90 | #endif | ||
80 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 91 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
81 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 92 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, |
82 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 93 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
83 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 94 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
84 | { ACTION_WPS_BROWSE, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | 95 | { ACTION_WPS_BROWSE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
85 | /* these match context_standard */ | 96 | /* these match context_standard */ |
86 | { ACTION_WPS_MENU, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 97 | { ACTION_WPS_MENU, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
87 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 98 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
88 | /* kludge: pressing 2 directional buttons is easy on this target */ | 99 | /* kludge: pressing 2 directional buttons is easy on this target */ |
89 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, | 100 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, |
90 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, | 101 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, |
102 | #ifdef SAMSUNG_YH820 | ||
91 | { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 103 | { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
104 | #else | ||
105 | { ACTION_WPS_HOTKEY, BUTTON_RIGHT|BUTTON_DOWN|BUTTON_REPEAT, | ||
106 | BUTTON_RIGHT|BUTTON_DOWN|BUTTON_REPEAT }, | ||
107 | { ACTION_WPS_REC, BUTTON_REC_SW_ON, BUTTON_NONE }, | ||
108 | #endif | ||
92 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 109 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
93 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | ||
94 | 110 | ||
95 | LAST_ITEM_IN_LIST | 111 | LAST_ITEM_IN_LIST |
96 | }; /* button_context_wps */ | 112 | }; /* button_context_wps */ |
97 | 113 | ||
98 | static const struct button_mapping button_context_list[] = { | 114 | static const struct button_mapping button_context_list[] = { |
99 | #ifdef SAMSUNG_YH820 | 115 | #ifdef SAMSUNG_YH820 |
100 | { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_UP, BUTTON_NONE }, | 116 | { ACTION_LISTTREE_PGUP, BUTTON_REW, BUTTON_NONE }, |
101 | { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_DOWN, BUTTON_NONE }, | 117 | { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
118 | { ACTION_LISTTREE_PGDOWN, BUTTON_FFWD, BUTTON_NONE }, | ||
119 | { ACTION_LISTTREE_PGDOWN, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
102 | #else | 120 | #else |
103 | { ACTION_LISTTREE_PGUP, BUTTON_FFWD, BUTTON_NONE }, | 121 | { ACTION_LISTTREE_PGUP, BUTTON_FFWD, BUTTON_NONE }, |
122 | { ACTION_LISTTREE_PGUP, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
104 | { ACTION_LISTTREE_PGDOWN, BUTTON_REW, BUTTON_NONE }, | 123 | { ACTION_LISTTREE_PGDOWN, BUTTON_REW, BUTTON_NONE }, |
124 | { ACTION_LISTTREE_PGDOWN, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
105 | #endif | 125 | #endif |
106 | 126 | ||
107 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 127 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
@@ -110,94 +130,115 @@ static const struct button_mapping button_context_list[] = { | |||
110 | static const struct button_mapping button_context_tree[] = { | 130 | static const struct button_mapping button_context_tree[] = { |
111 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 131 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
112 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 132 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
133 | #ifdef SAMSUNG_YH820 | ||
113 | { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 134 | { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
135 | #else | ||
136 | { ACTION_TREE_HOTKEY, BUTTON_RIGHT|BUTTON_DOWN|BUTTON_REPEAT, | ||
137 | BUTTON_RIGHT|BUTTON_DOWN|BUTTON_REPEAT }, | ||
138 | #endif | ||
114 | 139 | ||
115 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 140 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
116 | }; /* button_context_tree */ | 141 | }; /* button_context_tree */ |
117 | 142 | ||
118 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { | 143 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { |
119 | { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, | 144 | { ACTION_TREE_PGLEFT, BUTTON_FFWD|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
120 | { ACTION_TREE_ROOT_INIT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_REC|BUTTON_LEFT }, | 145 | /* Note: we omit ACTION_TREE_ROOT_INIT to keep "left" the sole cancel button */ |
121 | { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE }, | 146 | { ACTION_TREE_PGRIGHT, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_NONE }, |
122 | { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, | 147 | { ACTION_TREE_PGRIGHT, BUTTON_FFWD|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, |
123 | { ACTION_TREE_PGRIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, | 148 | #ifdef SAMSUNG_YH820 |
149 | { ACTION_LISTTREE_PGUP, BUTTON_REW, BUTTON_NONE }, | ||
150 | { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
151 | { ACTION_LISTTREE_PGDOWN, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | ||
152 | { ACTION_LISTTREE_PGDOWN, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_FFWD|BUTTON_REPEAT }, | ||
153 | #else | ||
154 | { ACTION_LISTTREE_PGUP, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | ||
155 | { ACTION_LISTTREE_PGUP, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_FFWD|BUTTON_REPEAT }, | ||
156 | { ACTION_LISTTREE_PGDOWN, BUTTON_REW, BUTTON_NONE }, | ||
157 | { ACTION_LISTTREE_PGDOWN, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
158 | #endif | ||
124 | 159 | ||
125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE) | 160 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE) |
126 | }; | 161 | }; /* button_context_listtree_scroll_with_combo */ |
127 | 162 | ||
128 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { | 163 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { |
129 | { ACTION_TREE_ROOT_INIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, | ||
130 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 164 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
131 | { ACTION_TREE_PGRIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | 165 | { ACTION_TREE_PGRIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, |
166 | /* Note: we omit ACTION_TREE_ROOT_INIT to keep "left" the sole cancel button */ | ||
167 | #ifdef SAMSUNG_YH820 | ||
168 | { ACTION_LISTTREE_PGUP, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | ||
169 | { ACTION_LISTTREE_PGDOWN, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | ||
170 | #else | ||
171 | { ACTION_LISTTREE_PGUP, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | ||
172 | { ACTION_LISTTREE_PGDOWN, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | ||
173 | #endif | ||
174 | /* keep button combos for use with CONTEXT_TREE keymaps */ | ||
175 | /* this is to permit pgup/down repeats */ | ||
176 | { ACTION_LISTTREE_PGUP, BUTTON_FFWD|BUTTON_UP, BUTTON_NONE }, | ||
177 | { ACTION_LISTTREE_PGUP, BUTTON_FFWD|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
178 | { ACTION_LISTTREE_PGDOWN, BUTTON_FFWD|BUTTON_DOWN, BUTTON_NONE }, | ||
179 | { ACTION_LISTTREE_PGDOWN, BUTTON_FFWD|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
132 | 180 | ||
133 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE) | 181 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE) |
134 | }; | 182 | }; /* button_context_listtree_scroll_without_combo */ |
135 | 183 | ||
136 | static const struct button_mapping button_context_settings[] = { | 184 | static const struct button_mapping button_context_settings[] = { |
137 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | 185 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, |
138 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 186 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
139 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | 187 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, |
140 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 188 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
141 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 189 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, |
142 | { ACTION_STD_PREV, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | ||
143 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 190 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
144 | { ACTION_STD_NEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | 191 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, |
145 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 192 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
146 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, | 193 | { ACTION_STD_OK, BUTTON_PLAY, BUTTON_NONE }, |
194 | { ACTION_STD_CANCEL, BUTTON_REW, BUTTON_NONE }, | ||
147 | 195 | ||
148 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 196 | LAST_ITEM_IN_LIST |
149 | }; /* button_context_settings */ | 197 | }; /* button_context_settings */ |
150 | 198 | ||
151 | static const struct button_mapping button_context_settings_right_is_inc[] = { | 199 | static const struct button_mapping button_context_settings_right_is_inc[] = { |
152 | { ACTION_NONE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
153 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 200 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
154 | { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 201 | { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
155 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 202 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
156 | { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 203 | { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
157 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, | 204 | { ACTION_SETTINGS_RESET, BUTTON_REW|BUTTON_REL, BUTTON_REW }, |
205 | |||
158 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | 206 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, |
159 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 207 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
160 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | 208 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
161 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 209 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
162 | 210 | ||
163 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 211 | { ACTION_STD_OK, BUTTON_PLAY, BUTTON_NONE }, |
164 | }; /* button_context_settingsgraphical */ | 212 | { ACTION_STD_CANCEL, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
213 | |||
214 | LAST_ITEM_IN_LIST | ||
215 | }; /* button_context_settings_right_is_inc */ | ||
165 | 216 | ||
166 | static const struct button_mapping button_context_yesno[] = { | 217 | static const struct button_mapping button_context_yesno[] = { |
167 | { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, | 218 | { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, |
168 | 219 | ||
169 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 220 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
170 | }; /* button_context_settings_yesno */ | 221 | }; /* button_context_settings_yesno */ |
171 | 222 | ||
172 | static const struct button_mapping button_context_colorchooser[] = { | ||
173 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | ||
174 | |||
175 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS) | ||
176 | }; /* button_context_settings_colorchooser */ | ||
177 | 223 | ||
178 | static const struct button_mapping button_context_eq[] = { | 224 | static const struct button_mapping button_context_eq[] = { |
225 | /* Naming scheme for EQ is misleading: "OK" switches between gain/freq/Q */ | ||
179 | { ACTION_STD_OK, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | 226 | { ACTION_STD_OK, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, |
180 | { ACTION_STD_CANCEL, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | 227 | /* "CANCEL" means "leave menu and keep settings", so it's "OK" from the user's view */ |
228 | { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, | ||
229 | /* de facto there is no CANCEL, so deactivate the correspondent keymaps */ | ||
230 | { ACTION_NONE, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
181 | 231 | ||
182 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS) | 232 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS) |
183 | }; /* button_context_settings_context_eq */ | 233 | }; /* button_context_eq */ |
184 | 234 | ||
185 | static const struct button_mapping button_context_bmark[] = { | 235 | static const struct button_mapping button_context_bmark[] = { |
186 | { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 236 | { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
187 | 237 | ||
188 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 238 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE) |
189 | }; /* button_context_settings_bmark */ | 239 | }; /* button_context_bmark */ |
190 | |||
191 | static const struct button_mapping button_context_time[] = { | ||
192 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | ||
193 | { ACTION_STD_CANCEL, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | ||
194 | |||
195 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | ||
196 | }; /* button_context_settings_bmark */ | ||
197 | 240 | ||
198 | static const struct button_mapping button_context_quickscreen[] = { | 241 | static const struct button_mapping button_context_quickscreen[] = { |
199 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | ||
200 | { ACTION_NONE, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REL,BUTTON_NONE }, | ||
201 | { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | 242 | { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
202 | { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 243 | { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
203 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | 244 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, |
@@ -207,9 +248,9 @@ static const struct button_mapping button_context_quickscreen[] = { | |||
207 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 248 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
208 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 249 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
209 | { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, | 250 | { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, |
210 | { ACTION_STD_CANCEL, BUTTON_FFWD, BUTTON_NONE }, | 251 | { ACTION_STD_CANCEL, BUTTON_REW, BUTTON_NONE }, |
211 | 252 | ||
212 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 253 | LAST_ITEM_IN_LIST |
213 | }; /* button_context_quickscreen */ | 254 | }; /* button_context_quickscreen */ |
214 | 255 | ||
215 | static const struct button_mapping button_context_pitchscreen[] = { | 256 | static const struct button_mapping button_context_pitchscreen[] = { |
@@ -228,18 +269,23 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
228 | { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, | 269 | { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, |
229 | 270 | ||
230 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 271 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
231 | }; /* button_context_pitchcreen */ | 272 | }; /* button_context_pitchscreen */ |
232 | 273 | ||
233 | static const struct button_mapping button_context_recscreen[] = { | 274 | static const struct button_mapping button_context_recscreen[] = { |
234 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, | 275 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
235 | { ACTION_REC_NEWFILE, BUTTON_FFWD|BUTTON_REL, BUTTON_NONE }, | 276 | { ACTION_REC_NEWFILE, BUTTON_FFWD|BUTTON_REL, BUTTON_NONE }, |
236 | { ACTION_STD_MENU, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, | 277 | { ACTION_STD_CANCEL, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, |
237 | { ACTION_STD_CANCEL, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, | 278 | { ACTION_STD_MENU, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, |
279 | #ifdef SAMSUNG_YH820 | ||
238 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, | 280 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, |
281 | #else | ||
282 | { ACTION_STD_CANCEL, BUTTON_REC_SW_OFF, BUTTON_NONE }, | ||
283 | #endif | ||
239 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 284 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
240 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 285 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
241 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 286 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
242 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 287 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
288 | { ACTION_NONE, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | ||
243 | 289 | ||
244 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 290 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
245 | }; /* button_context_recscreen */ | 291 | }; /* button_context_recscreen */ |
@@ -253,22 +299,30 @@ static const struct button_mapping button_context_keyboard[] = { | |||
253 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 299 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
254 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 300 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
255 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 301 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
256 | { ACTION_KBD_CURSOR_LEFT, BUTTON_FFWD|BUTTON_LEFT, BUTTON_NONE }, | 302 | #ifdef SAMSUNG_YH820 |
257 | { ACTION_KBD_CURSOR_LEFT, BUTTON_FFWD|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 303 | { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, |
258 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_NONE }, | 304 | { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
259 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, | 305 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, |
306 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, | ||
307 | #endif | ||
260 | { ACTION_KBD_SELECT, BUTTON_PLAY, BUTTON_NONE }, | 308 | { ACTION_KBD_SELECT, BUTTON_PLAY, BUTTON_NONE }, |
261 | { ACTION_KBD_DONE, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | 309 | { ACTION_KBD_PAGE_FLIP, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, |
262 | { ACTION_KBD_ABORT, BUTTON_FFWD|BUTTON_REW, BUTTON_NONE }, | 310 | { ACTION_KBD_DONE, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, |
263 | { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, | 311 | { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REL, BUTTON_REW }, |
264 | { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | 312 | { ACTION_KBD_ABORT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
265 | { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 313 | #ifdef SAMSUNG_YH820 |
266 | { ACTION_KBD_MORSE_INPUT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD|BUTTON_REPEAT }, | 314 | { ACTION_KBD_MORSE_INPUT, BUTTON_FFWD|BUTTON_REC, BUTTON_NONE }, |
315 | { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
316 | #else | ||
317 | { ACTION_KBD_MORSE_INPUT, BUTTON_REC_SW_ON, BUTTON_NONE }, | ||
318 | { ACTION_KBD_MORSE_INPUT, BUTTON_REC_SW_OFF, BUTTON_NONE }, | ||
319 | #endif | ||
267 | { ACTION_KBD_MORSE_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, | 320 | { ACTION_KBD_MORSE_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
268 | 321 | ||
269 | LAST_ITEM_IN_LIST | 322 | LAST_ITEM_IN_LIST |
270 | }; /* button_context_keyboard */ | 323 | }; /* button_context_keyboard */ |
271 | 324 | ||
325 | |||
272 | #if CONFIG_TUNER | 326 | #if CONFIG_TUNER |
273 | static const struct button_mapping button_context_radio[] = { | 327 | static const struct button_mapping button_context_radio[] = { |
274 | { ACTION_FM_MENU, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 328 | { ACTION_FM_MENU, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
@@ -292,10 +346,17 @@ static const struct button_mapping button_context_radio[] = { | |||
292 | 346 | ||
293 | #ifdef USB_ENABLE_HID | 347 | #ifdef USB_ENABLE_HID |
294 | static const struct button_mapping button_context_usb_hid[] = { | 348 | static const struct button_mapping button_context_usb_hid[] = { |
349 | #ifdef SAMSUNG_YH820 | ||
295 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_REC|BUTTON_FFWD|BUTTON_REL, BUTTON_REC|BUTTON_FFWD }, | 350 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_REC|BUTTON_FFWD|BUTTON_REL, BUTTON_REC|BUTTON_FFWD }, |
296 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_REC|BUTTON_FFWD|BUTTON_REPEAT,BUTTON_REC|BUTTON_FFWD }, | 351 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_REC|BUTTON_FFWD|BUTTON_REPEAT,BUTTON_REC|BUTTON_FFWD }, |
297 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_REC|BUTTON_REW|BUTTON_REL, BUTTON_REC|BUTTON_REW }, | 352 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_REC|BUTTON_REW|BUTTON_REL, BUTTON_REC|BUTTON_REW }, |
298 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_REC|BUTTON_REW|BUTTON_REPEAT, BUTTON_REC|BUTTON_REW }, | 353 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_REC|BUTTON_REW|BUTTON_REPEAT, BUTTON_REC|BUTTON_REW }, |
354 | #else | ||
355 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_NONE }, | ||
356 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_FFWD|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
357 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_FFWD|BUTTON_LEFT, BUTTON_NONE }, | ||
358 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_FFWD|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
359 | #endif | ||
299 | 360 | ||
300 | LAST_ITEM_IN_LIST | 361 | LAST_ITEM_IN_LIST |
301 | }; /* button_context_usb_hid */ | 362 | }; /* button_context_usb_hid */ |
@@ -315,8 +376,8 @@ static const struct button_mapping button_context_usb_hid_mode_multimedia[] = { | |||
315 | }; /* button_context_usb_hid_mode_multimedia */ | 376 | }; /* button_context_usb_hid_mode_multimedia */ |
316 | 377 | ||
317 | static const struct button_mapping button_context_usb_hid_mode_presentation[] = { | 378 | static const struct button_mapping button_context_usb_hid_mode_presentation[] = { |
318 | { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START, BUTTON_PLAY|BUTTON_REL, BUTTON_RIGHT }, | 379 | { ACTION_USB_HID_PRESENTATION_SLIDESHOW_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
319 | { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 380 | { ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
320 | { ACTION_USB_HID_PRESENTATION_SLIDE_PREV, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | 381 | { ACTION_USB_HID_PRESENTATION_SLIDE_PREV, BUTTON_REW|BUTTON_REL, BUTTON_REW }, |
321 | { ACTION_USB_HID_PRESENTATION_SLIDE_NEXT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | 382 | { ACTION_USB_HID_PRESENTATION_SLIDE_NEXT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, |
322 | { ACTION_USB_HID_PRESENTATION_SLIDE_FIRST, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, | 383 | { ACTION_USB_HID_PRESENTATION_SLIDE_FIRST, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, |
@@ -348,7 +409,12 @@ static const struct button_mapping button_context_usb_hid_mode_browser[] = { | |||
348 | { ACTION_USB_HID_BROWSER_TAB_CLOSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 409 | { ACTION_USB_HID_BROWSER_TAB_CLOSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
349 | { ACTION_USB_HID_BROWSER_HISTORY_BACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, | 410 | { ACTION_USB_HID_BROWSER_HISTORY_BACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, |
350 | { ACTION_USB_HID_BROWSER_HISTORY_FORWARD, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_FFWD }, | 411 | { ACTION_USB_HID_BROWSER_HISTORY_FORWARD, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_FFWD }, |
412 | #ifdef SAMSUNG_YH820 | ||
351 | { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 413 | { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
414 | #else | ||
415 | { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_REC_SW_ON, BUTTON_NONE }, | ||
416 | { ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN, BUTTON_REC_SW_OFF, BUTTON_NONE }, | ||
417 | #endif | ||
352 | 418 | ||
353 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | 419 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) |
354 | }; /* button_context_usb_hid_mode_browser */ | 420 | }; /* button_context_usb_hid_mode_browser */ |
@@ -363,6 +429,7 @@ static const struct button_mapping button_context_usb_hid_mode_mouse[] = { | |||
363 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 429 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
364 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 430 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
365 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 431 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
432 | #ifdef SAMSUNG_YH820 | ||
366 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_REW, BUTTON_NONE }, | 433 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_REW, BUTTON_NONE }, |
367 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, | 434 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, |
368 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_FFWD, BUTTON_NONE }, | 435 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_FFWD, BUTTON_NONE }, |
@@ -371,6 +438,16 @@ static const struct button_mapping button_context_usb_hid_mode_mouse[] = { | |||
371 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_REC|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 438 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_REC|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
372 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_REC|BUTTON_DOWN, BUTTON_NONE }, | 439 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_REC|BUTTON_DOWN, BUTTON_NONE }, |
373 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_REC|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 440 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_REC|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
441 | #else | ||
442 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_FFWD, BUTTON_NONE }, | ||
443 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_FFWD|BUTTON_REL, BUTTON_NONE }, | ||
444 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_REW, BUTTON_NONE }, | ||
445 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, | ||
446 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_PLAY|BUTTON_UP, BUTTON_NONE }, | ||
447 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_UP, BUTTON_PLAY|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
448 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_PLAY|BUTTON_DOWN, BUTTON_NONE }, | ||
449 | { ACTION_USB_HID_MOUSE_WHEEL_SCROLL_DOWN, BUTTON_PLAY|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
450 | #endif | ||
374 | 451 | ||
375 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | 452 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) |
376 | }; /* button_context_usb_hid_mode_mouse */ | 453 | }; /* button_context_usb_hid_mode_mouse */ |
@@ -397,20 +474,16 @@ const struct button_mapping* get_context_mapping(int context) | |||
397 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 474 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
398 | return button_context_tree; | 475 | return button_context_tree; |
399 | 476 | ||
477 | case CONTEXT_SETTINGS_TIME: | ||
400 | case CONTEXT_SETTINGS: | 478 | case CONTEXT_SETTINGS: |
401 | return button_context_settings; | 479 | return button_context_settings; |
402 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: | 480 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: |
403 | case CONTEXT_SETTINGS_RECTRIGGER: | 481 | case CONTEXT_SETTINGS_RECTRIGGER: |
404 | return button_context_settings_right_is_inc; | ||
405 | |||
406 | case CONTEXT_SETTINGS_COLOURCHOOSER: | 482 | case CONTEXT_SETTINGS_COLOURCHOOSER: |
407 | return button_context_colorchooser; | 483 | return button_context_settings_right_is_inc; |
408 | case CONTEXT_SETTINGS_EQ: | 484 | case CONTEXT_SETTINGS_EQ: |
409 | return button_context_eq; | 485 | return button_context_eq; |
410 | 486 | ||
411 | case CONTEXT_SETTINGS_TIME: | ||
412 | return button_context_time; | ||
413 | |||
414 | case CONTEXT_YESNOSCREEN: | 487 | case CONTEXT_YESNOSCREEN: |
415 | return button_context_yesno; | 488 | return button_context_yesno; |
416 | case CONTEXT_BOOKMARKSCREEN: | 489 | case CONTEXT_BOOKMARKSCREEN: |