summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Scarratt <mmmm@rockbox.org>2006-12-18 16:57:48 +0000
committerMartin Scarratt <mmmm@rockbox.org>2006-12-18 16:57:48 +0000
commit8ab6ac7739d5bcca0a3f3239e6f7722df2dc37ea (patch)
treea2ce1fc250404fae00fb281d786741838463e1d2
parent342c50f26b470991326418a90a6ab02cb564ee07 (diff)
downloadrockbox-8ab6ac7739d5bcca0a3f3239e6f7722df2dc37ea.tar.gz
rockbox-8ab6ac7739d5bcca0a3f3239e6f7722df2dc37ea.zip
Enable morse mode in the virtual keyboard for Ipods. Keymap changes in VK: Play(instead of long select) - accept & exit, Long menu - toggle morse mode.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11803 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-ipod.c9
-rw-r--r--apps/recorder/keyboard.c1
2 files changed, 6 insertions, 4 deletions
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 8ca0c56831..a6fd289cd2 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -155,14 +155,15 @@ static const struct button_mapping button_context_keyboard[] = {
155 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 155 { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
156 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, 156 { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
157 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 157 { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
158 { ACTION_KBD_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, 158 { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE },
159 { ACTION_KBD_DONE, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, 159 { ACTION_KBD_DONE, BUTTON_PLAY, BUTTON_NONE },
160 { ACTION_KBD_ABORT, BUTTON_MENU, BUTTON_NONE }, 160 { ACTION_KBD_ABORT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
161 { ACTION_KBD_UP, BUTTON_SCROLL_BACK, BUTTON_NONE }, 161 { ACTION_KBD_UP, BUTTON_SCROLL_BACK, BUTTON_NONE },
162 { ACTION_KBD_UP, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, 162 { ACTION_KBD_UP, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
163 { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE }, 163 { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE },
164 { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, 164 { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
165 165 { ACTION_KBD_MORSE_INPUT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
166 { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
166 LAST_ITEM_IN_LIST 167 LAST_ITEM_IN_LIST
167}; /* button_context_keyboard */ 168}; /* button_context_keyboard */
168 169
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index 7dcec7c8cc..58bc179b64 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -54,6 +54,7 @@
54 54
55#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) 55#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
56#define KBD_MODES /* iPod uses 2 modes, picker and line edit */ 56#define KBD_MODES /* iPod uses 2 modes, picker and line edit */
57#define KBD_MORSE_INPUT
57 58
58#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD 59#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
59#define KBD_MODES /* iFP7xx uses 2 modes, picker and line edit */ 60#define KBD_MODES /* iFP7xx uses 2 modes, picker and line edit */