diff options
author | Tomer Shalev <shalev.tomer@gmail.com> | 2010-02-14 17:32:47 +0000 |
---|---|---|
committer | Tomer Shalev <shalev.tomer@gmail.com> | 2010-02-14 17:32:47 +0000 |
commit | 19a05cb4f9adfed444c3ce7d2cc3fe8fa633fcf2 (patch) | |
tree | 8f484e3611f9004b414bc6662680986d6c4f68fb | |
parent | 7b5875ef5c5ec4b79f2af8469258164b723b0b3b (diff) | |
download | rockbox-19a05cb4f9adfed444c3ce7d2cc3fe8fa633fcf2.tar.gz rockbox-19a05cb4f9adfed444c3ce7d2cc3fe8fa633fcf2.zip |
Touchscreen: Pitch-screen and Quick-screen keymapping changes
- Quick-screen: Allow exit by pressing any corner
- Pitch-screen: Exit by pressing either of the top or bottom left corners
- Pitch-screen: Toggle mode by pressing either of the top or bottom right corners
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24652 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/keymaps/keymap-touchscreen.c | 6 | ||||
-rw-r--r-- | manual/platform/keymap-touchscreen.tex | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index dc554e0e9d..b4e9d97395 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -207,6 +207,10 @@ static const struct button_mapping button_context_quickscreen[] = { | |||
207 | { ACTION_NONE, BUTTON_MIDLEFT, BUTTON_NONE }, | 207 | { ACTION_NONE, BUTTON_MIDLEFT, BUTTON_NONE }, |
208 | 208 | ||
209 | { ACTION_STD_CANCEL, BUTTON_CENTER|BUTTON_REL, BUTTON_NONE }, | 209 | { ACTION_STD_CANCEL, BUTTON_CENTER|BUTTON_REL, BUTTON_NONE }, |
210 | { ACTION_STD_CANCEL, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_NONE }, | ||
211 | { ACTION_STD_CANCEL, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_NONE }, | ||
212 | { ACTION_STD_CANCEL, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_NONE }, | ||
213 | { ACTION_STD_CANCEL, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_NONE }, | ||
210 | { ACTION_QS_TOP, BUTTON_TOPMIDDLE|BUTTON_REL, BUTTON_NONE }, | 214 | { ACTION_QS_TOP, BUTTON_TOPMIDDLE|BUTTON_REL, BUTTON_NONE }, |
211 | { ACTION_QS_TOP, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | 215 | { ACTION_QS_TOP, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, |
212 | { ACTION_QS_DOWN, BUTTON_BOTTOMMIDDLE|BUTTON_REL, BUTTON_NONE }, | 216 | { ACTION_QS_DOWN, BUTTON_BOTTOMMIDDLE|BUTTON_REL, BUTTON_NONE }, |
@@ -228,9 +232,11 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
228 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_NONE }, | 232 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_NONE }, |
229 | { ACTION_PS_NUDGE_RIGHT, BUTTON_MIDRIGHT, BUTTON_NONE }, | 233 | { ACTION_PS_NUDGE_RIGHT, BUTTON_MIDRIGHT, BUTTON_NONE }, |
230 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_NONE }, | 234 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_NONE }, |
235 | { ACTION_PS_TOGGLE_MODE, BUTTON_TOPRIGHT, BUTTON_NONE }, | ||
231 | { ACTION_PS_TOGGLE_MODE, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, | 236 | { ACTION_PS_TOGGLE_MODE, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, |
232 | { ACTION_PS_RESET, BUTTON_CENTER, BUTTON_NONE }, | 237 | { ACTION_PS_RESET, BUTTON_CENTER, BUTTON_NONE }, |
233 | { ACTION_PS_EXIT, BUTTON_TOPLEFT, BUTTON_NONE }, | 238 | { ACTION_PS_EXIT, BUTTON_TOPLEFT, BUTTON_NONE }, |
239 | { ACTION_PS_EXIT, BUTTON_BOTTOMLEFT, BUTTON_NONE }, | ||
234 | { ACTION_PS_SLOWER, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, | 240 | { ACTION_PS_SLOWER, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, |
235 | { ACTION_PS_FASTER, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 241 | { ACTION_PS_FASTER, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
236 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_PITCHSCREEN) | 242 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_PITCHSCREEN) |
diff --git a/manual/platform/keymap-touchscreen.tex b/manual/platform/keymap-touchscreen.tex index 5c21582284..92404d0d67 100644 --- a/manual/platform/keymap-touchscreen.tex +++ b/manual/platform/keymap-touchscreen.tex | |||
@@ -81,7 +81,7 @@ | |||
81 | \newcommand{\TouchActionPsNudgeLeft}{\TouchMidLeft} | 81 | \newcommand{\TouchActionPsNudgeLeft}{\TouchMidLeft} |
82 | \newcommand{\TouchActionPsNudgeRight}{\TouchMidRight} | 82 | \newcommand{\TouchActionPsNudgeRight}{\TouchMidRight} |
83 | \newcommand{\TouchActionPsReset}{\TouchCenter} | 83 | \newcommand{\TouchActionPsReset}{\TouchCenter} |
84 | \newcommand{\TouchActionPsExit}{\TouchTopLeft} | 84 | \newcommand{\TouchActionPsExit}{\TouchBottomLeft} |
85 | \newcommand{\TouchActionPsSlower}{Long \TouchMidLeft} | 85 | \newcommand{\TouchActionPsSlower}{Long \TouchMidLeft} |
86 | \newcommand{\TouchActionPsFaster}{Long \TouchMidRight} | 86 | \newcommand{\TouchActionPsFaster}{Long \TouchMidRight} |
87 | 87 | ||