summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2021-08-23 12:34:25 +0100
committerAidan MacDonald <amachronic@protonmail.com>2021-08-25 23:28:59 +0100
commitcbf1970b563e5fd5ef5b20f7dde47db80343bd30 (patch)
tree953edc17943d5ad8f10b6d52826c6804041c5818
parentdbd051394e530d403573d5a34c737371039c81f3 (diff)
downloadrockbox-cbf1970b56.tar.gz
rockbox-cbf1970b56.zip
Shanling Q1: minor update to keymap
- Enable repeat for prev/next keys - Provide a way to access the context menu using buttons - Update the manual Change-Id: I53a7474cc64f915851175aea0695229c581fd8a6
-rw-r--r--apps/keymaps/keymap-shanlingq1.c4
-rw-r--r--manual/platform/keymap-shanlingq1.tex6
2 files changed, 6 insertions, 4 deletions
diff --git a/apps/keymaps/keymap-shanlingq1.c b/apps/keymaps/keymap-shanlingq1.c
index 2c09a40f4b..cb0e0a44ff 100644
--- a/apps/keymaps/keymap-shanlingq1.c
+++ b/apps/keymaps/keymap-shanlingq1.c
@@ -30,8 +30,11 @@
static const struct button_mapping button_context_standard[] = {
{ACTION_STD_PREV, BUTTON_PREV, BUTTON_NONE},
+ {ACTION_STD_PREVREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE},
{ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE},
+ {ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE},
{ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY},
+ {ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY},
{ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER},
LAST_ITEM_IN_LIST
}; /* button_context_standard */
@@ -77,7 +80,6 @@ const struct button_mapping* target_get_context_mapping(int context)
case CONTEXT_CUSTOM|CONTEXT_TREE:
case CONTEXT_MAINMENU:
case CONTEXT_BOOKMARKSCREEN:
- //return button_context_tree;
case CONTEXT_LIST:
return button_context_list;
case CONTEXT_YESNOSCREEN:
diff --git a/manual/platform/keymap-shanlingq1.tex b/manual/platform/keymap-shanlingq1.tex
index 9476ca8a70..4e426e1604 100644
--- a/manual/platform/keymap-shanlingq1.tex
+++ b/manual/platform/keymap-shanlingq1.tex
@@ -13,7 +13,7 @@
\newcommand{\ActionStdNext}{\ButtonNext{} or \TouchActionStdNext}
\newcommand{\ActionStdNextRepeat}{Long \ButtonNext{} or \TouchActionStdNextRepeat}
\newcommand{\ActionStdCancel}{\ButtonPower{} or \TouchActionStdCancel}
-\newcommand{\ActionStdContext}{\TouchActionStdContext}
+\newcommand{\ActionStdContext}{Long \ButtonPlay{} or \TouchActionStdContext}
\newcommand{\ActionStdQuickScreen}{\TouchActionStdQuickScreen}
\newcommand{\ActionQuickScreenExit}{\TouchActionQuickScreenExit}
\newcommand{\ActionStdMenu}{\TouchActionStdMenu}
@@ -47,7 +47,7 @@
\newcommand{\ActionTreeParentDirectory}{\TouchActionTreeParentDirectory}
%Button actions, YesNo context
-\newcommand{\ActionYesNoAccept}{\TouchActionYesNoAccept}
+\newcommand{\ActionYesNoAccept}{\ButtonPlay}
%Button actions, Virtual Keyboard Context
\newcommand{\ActionKbdLeft}{\TouchActionKbdLeft}
@@ -83,7 +83,7 @@
\newcommand{\PluginDown}{\TouchBottomMiddle}
\newcommand{\PluginLeft}{\TouchMidLeft}
\newcommand{\PluginRight}{\TouchMidRight}
-\newcommand{\PluginCancel}{\ButtonPower or \TouchBottomRight}
+\newcommand{\PluginCancel}{\ButtonPower{} or \TouchBottomRight}
\newcommand{\PluginExit}{\ButtonPower}
\newcommand{\PluginSelect}{\TouchCenter}
\newcommand{\PluginSelectRepeat}{Long \TouchCenter}