From 9f7579b5b8d8ee807976698b48c6f59c71b8d50f Mon Sep 17 00:00:00 2001 From: Tomer Shalev Date: Tue, 15 Dec 2009 18:56:06 +0000 Subject: [PATCH] Cowon D2: Revise some keymaps git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24007 a1c6a512-1295-4272-9138-f99709370657 --- apps/keymaps/keymap-cowond2.c | 6 ++++-- apps/keymaps/keymap-touchscreen.c | 13 ++++++------ manual/platform/keymap-cowond2.tex | 28 ++++++++++++++------------ manual/platform/keymap-touchscreen.tex | 24 ++++++++++++---------- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c index 8067fe47d0..37d622210a 100644 --- a/apps/keymaps/keymap-cowond2.c +++ b/apps/keymaps/keymap-cowond2.c @@ -72,8 +72,10 @@ static const struct button_mapping button_context_list[] = { static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_PLUS|BUTTON_MENU, BUTTON_PLUS }, - { ACTION_TREE_WPS, BUTTON_PLUS|BUTTON_MENU, BUTTON_PLUS|BUTTON_REPEAT }, - { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, + { ACTION_TREE_WPS, BUTTON_PLUS|BUTTON_MENU, BUTTON_PLUS|BUTTON_REPEAT }, + { ACTION_TREE_STOP, BUTTON_MINUS|BUTTON_POWER, BUTTON_MINUS }, + { ACTION_TREE_STOP, BUTTON_MINUS|BUTTON_POWER, BUTTON_MINUS|BUTTON_REPEAT }, + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index 359045761b..a2547d074d 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c @@ -62,7 +62,7 @@ static const struct button_mapping button_context_standard[] = { { ACTION_STD_CANCEL, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_MENU, BUTTON_TOPLEFT, BUTTON_NONE }, - { ACTION_STD_QUICKSCREEN, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_QUICKSCREEN, BUTTON_BOTTOMLEFT, BUTTON_NONE }, { ACTION_STD_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, { ACTION_STD_CONTEXT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_MIDRIGHT }, @@ -91,8 +91,8 @@ static const struct button_mapping button_context_wps[] = { { ACTION_WPS_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, { ACTION_WPS_MENU, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_TOPLEFT }, - { ACTION_WPS_QUICKSCREEN, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT }, - { ACTION_WPS_VIEW_PLAYLIST, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT }, + { ACTION_WPS_QUICKSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT }, + { ACTION_WPS_VIEW_PLAYLIST, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT }, { ACTION_WPS_REC, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_BOTTOMRIGHT }, { ACTION_WPS_PITCHSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT }, { ACTION_WPS_ID3SCREEN, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, @@ -121,16 +121,17 @@ static const struct button_mapping button_context_list[] = { static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, + { ACTION_TREE_STOP, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_TREE) }; /* button_context_tree */ static const struct button_mapping button_context_listtree_scroll_with_combo[] = { - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_TREE), + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; static const struct button_mapping button_context_listtree_scroll_without_combo[] = { - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_TREE), + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), }; static const struct button_mapping button_context_settings[] = { @@ -182,7 +183,7 @@ static const struct button_mapping button_context_eq[] = { /* Bookmark Screen */ static const struct button_mapping button_context_bmark[] = { - { ACTION_BMS_DELETE, BUTTON_BOTTOMLEFT, BUTTON_NONE }, + { ACTION_BMS_DELETE, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_BOOKMARKSCREEN), }; /* button_context_bmark */ diff --git a/manual/platform/keymap-cowond2.tex b/manual/platform/keymap-cowond2.tex index 106956891d..cc8edb80dd 100644 --- a/manual/platform/keymap-cowond2.tex +++ b/manual/platform/keymap-cowond2.tex @@ -14,18 +14,18 @@ \newcommand{\ActionStdCancel}{\ButtonPower{} or \TouchActionStdCancel} \newcommand{\ActionStdContext}{Long \ButtonMenu{} or \TouchActionStdContext} \newcommand{\ActionStdQuickScreen}{\TouchActionStdQuickScreen} -\newcommand{\ActionQuickScreenExit}{\TouchActionQuickScreenExit} +\newcommand{\ActionQuickScreenExit}{\ButtonPower{} or \ButtonMenu{} or \TouchActionQuickScreenExit} \newcommand{\ActionStdMenu}{\TouchActionStdMenu} -\newcommand{\ActionStdOk}{\TouchActionStdOk} -\newcommand{\ActionStdRec}{\TouchActionStdRec} -\newcommand{\ActionStdUsbCharge}{\TouchActionStdUsbCharge} +\newcommand{\ActionStdOk}{\ButtonMenu{} or \TouchActionStdOk} +%\newcommand{\ActionStdRec}{\TouchActionStdRec} +%\newcommand{\ActionStdUsbCharge}{\TouchActionStdUsbCharge} %Button actions, wps context \newcommand{\ActionWpsPlay}{\TouchActionWpsPlay} \newcommand{\ActionWpsSkipNext}{\TouchActionWpsSkipNext} +\newcommand{\ActionWpsSeekFwd}{\TouchActionWpsSeekFwd} \newcommand{\ActionWpsSkipPrev}{\TouchActionWpsSkipPrev} \newcommand{\ActionWpsSeekBack}{\TouchActionWpsSeekBack} -\newcommand{\ActionWpsSeekFwd}{\TouchActionWpsSeekFwd} \newcommand{\ActionWpsStop}{\TouchActionWpsStop} \newcommand{\ActionWpsVolDown}{\ButtonMinus{} or \TouchActionWpsVolDown} @@ -43,17 +43,17 @@ \newcommand{\ActionWpsAbReset}{\TouchActionWpsAbReset} %Button actions, tree context -\newcommand{\ActionTreeWps}{\ButtonPlus} -\newcommand{\ActionTreeStop}{} -\newcommand{\ActionTreeEnter}{} -\newcommand{\ActionTreeParentDirectory}{} +\newcommand{\ActionTreeWps}{\ButtonPlus{}+\ButtonMenu{} or \TouchActionTreeWps} +\newcommand{\ActionTreeStop}{\ButtonMinus{}+\ButtonPower{} or \TouchActionTreeStop} +\newcommand{\ActionTreeEnter}{\ButtonMenu{} or \TouchActionTreeEnter} +\newcommand{\ActionTreeParentDirectory}{\TouchActionTreeParentDirectory} %Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonMenu} +\newcommand{\ActionYesNoAccept}{\ButtonMenu{} or \TouchActionYesNoAccept} %Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonPlus} -\newcommand{\ActionSettingDec}{\ButtonMinus} +\newcommand{\ActionSettingInc}{\TouchActionSettingInc{} or \ButtonPlus} +\newcommand{\ActionSettingDec}{\TouchActionSettingDec{} or \ButtonMinus} %Button actions, Virtual Keyboard Context \newcommand{\ActionKbdLeft}{\TouchActionKbdLeft} @@ -78,12 +78,14 @@ \newcommand{\ActionPsNudgeRight}{\TouchActionPsNudgeRight} \newcommand{\ActionPsReset}{\TouchActionPsReset} \newcommand{\ActionPsExit}{\ButtonPower{} or \TouchActionPsExit} +\newcommand{\ActionPsSlower}{\TouchActionPsSlower} +\newcommand{\ActionPsFaster}{\TouchActionPsFaster} %Button actions, FM radio context \newcommand{\ActionFMPreset}{Long \ButtonMenu{} or \TouchActionFMPreset} \newcommand{\ActionFMMenu}{\ButtonMenu{} or \TouchActionFMMenu} \newcommand{\ActionFMMode}{\TouchActionFMMode} -\newcommand{\ActionFMStop}{\ButtonPower} +\newcommand{\ActionFMStop}{\TouchActionFMStop{} or \ButtonPower} \newcommand{\ActionFMExit}{\TouchActionFMExit} \newcommand{\ActionFMPlay}{\TouchActionFMPlay} \newcommand{\ActionFMSettingsInc}{\ActionSettingInc} diff --git a/manual/platform/keymap-touchscreen.tex b/manual/platform/keymap-touchscreen.tex index b1075383b6..332febb555 100644 --- a/manual/platform/keymap-touchscreen.tex +++ b/manual/platform/keymap-touchscreen.tex @@ -17,8 +17,8 @@ \newcommand{\TouchActionStdNextRepeat}{Long \TouchBottomMiddle} \newcommand{\TouchActionStdCancel}{\TouchMidLeft} \newcommand{\TouchActionStdContext}{Long \TouchCenter{} or Long \TouchMidRight} -\newcommand{\TouchActionStdQuickScreen}{Long \TouchTopLeft} -\newcommand{\TouchActionQuickScreenExit}{} +\newcommand{\TouchActionStdQuickScreen}{\TouchBottomLeft} +\newcommand{\TouchActionQuickScreenExit}{\TouchActionStdQuickScreen{} or \TouchCenter} \newcommand{\TouchActionStdMenu}{\TouchTopLeft} \newcommand{\TouchActionStdOk}{\TouchCenter{} or \TouchMidRight} \newcommand{\TouchActionStdRec}{} @@ -35,7 +35,7 @@ \newcommand{\TouchActionWpsVolDown}{\TouchBottomMiddle} \newcommand{\TouchActionWpsVolUp}{\TouchTopMiddle} -\newcommand{\TouchActionWpsQuickScreen}{Long \TouchTopLeft} +\newcommand{\TouchActionWpsQuickScreen}{\TouchBottomLeft} \newcommand{\TouchActionWpsMenu}{\TouchTopLeft} \newcommand{\TouchActionWpsContext}{Long \TouchCenter} \newcommand{\TouchActionWpsBrowse}{\TouchCenter} @@ -48,9 +48,9 @@ %Button actions, tree context \newcommand{\TouchActionTreeWps}{\TouchTopRight} -\newcommand{\TouchActionTreeStop}{} -\newcommand{\TouchActionTreeEnter}{} -\newcommand{\TouchActionTreeParentDirectory}{} +\newcommand{\TouchActionTreeStop}{\TouchBottomRight} +\newcommand{\TouchActionTreeEnter}{\TouchCenter{} or \TouchMidRight} +\newcommand{\TouchActionTreeParentDirectory}{\TouchMidLeft} %Button actions, YesNo context \newcommand{\TouchActionYesNoAccept}{\TouchTopRight} @@ -82,6 +82,8 @@ \newcommand{\TouchActionPsNudgeRight}{\TouchMidRight} \newcommand{\TouchActionPsReset}{\TouchCenter} \newcommand{\TouchActionPsExit}{\TouchTopLeft} +\newcommand{\TouchActionPsSlower}{Long \TouchMidLeft} +\newcommand{\TouchActionPsFaster}{Long \TouchMidRight} %Button actions, Recording screen context \newcommand{\TouchActionRecPause}{} @@ -100,11 +102,11 @@ \newcommand{\TouchActionFMStop}{\TouchBottomRight} \newcommand{\TouchActionFMExit}{\TouchTopLeft} \newcommand{\TouchActionFMPlay}{\TouchTopRight} -\newcommand{\TouchActionFMSettingsInc}{} -\newcommand{\TouchActionFMSettingsDec}{} -\newcommand{\TouchActionFMPrev}{\TouchActionRecSettingsInc} -\newcommand{\TouchActionFMNext}{\TouchActionRecSettingsDec} +\newcommand{\TouchActionFMSettingsInc}{\TouchActionSettingInc} +\newcommand{\TouchActionFMSettingsDec}{\TouchActionSettingDec} +\newcommand{\TouchActionFMPrev}{\TouchMidLeft} +\newcommand{\TouchActionFMNext}{\TouchMidRight} %Button actions, Bookmark screen context -\newcommand{\TouchActionBmDelete}{\TouchBottomLeft} +\newcommand{\TouchActionBmDelete}{\TouchBottomRight}