From 19a05cb4f9adfed444c3ce7d2cc3fe8fa633fcf2 Mon Sep 17 00:00:00 2001 From: Tomer Shalev Date: Sun, 14 Feb 2010 17:32:47 +0000 Subject: 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 --- apps/keymaps/keymap-touchscreen.c | 6 ++++++ manual/platform/keymap-touchscreen.tex | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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[] = { { ACTION_NONE, BUTTON_MIDLEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_CENTER|BUTTON_REL, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_NONE }, { ACTION_QS_TOP, BUTTON_TOPMIDDLE|BUTTON_REL, BUTTON_NONE }, { ACTION_QS_TOP, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_QS_DOWN, BUTTON_BOTTOMMIDDLE|BUTTON_REL, BUTTON_NONE }, @@ -228,9 +232,11 @@ static const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_NUDGE_LEFTOFF, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHT, BUTTON_MIDRIGHT, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_NONE }, + { ACTION_PS_TOGGLE_MODE, BUTTON_TOPRIGHT, BUTTON_NONE }, { ACTION_PS_TOGGLE_MODE, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, { ACTION_PS_RESET, BUTTON_CENTER, BUTTON_NONE }, { ACTION_PS_EXIT, BUTTON_TOPLEFT, BUTTON_NONE }, + { ACTION_PS_EXIT, BUTTON_BOTTOMLEFT, BUTTON_NONE }, { ACTION_PS_SLOWER, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_FASTER, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, 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 @@ \newcommand{\TouchActionPsNudgeLeft}{\TouchMidLeft} \newcommand{\TouchActionPsNudgeRight}{\TouchMidRight} \newcommand{\TouchActionPsReset}{\TouchCenter} -\newcommand{\TouchActionPsExit}{\TouchTopLeft} +\newcommand{\TouchActionPsExit}{\TouchBottomLeft} \newcommand{\TouchActionPsSlower}{Long \TouchMidLeft} \newcommand{\TouchActionPsFaster}{Long \TouchMidRight} -- cgit v1.2.3