diff options
author | Dave Chapman <dave@dchapman.com> | 2005-11-12 16:07:17 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2005-11-12 16:07:17 +0000 |
commit | 64e5239b4c668d7fd7b5372e9d679bc6e041028b (patch) | |
tree | 58bd95e135d132d0d5d6b80be0d7bef2e7f9381b | |
parent | afbd4386ffdd402969cdeeeaa81e664860bb12da (diff) | |
download | rockbox-64e5239b4c668d7fd7b5372e9d679bc6e041028b.tar.gz rockbox-64e5239b4c668d7fd7b5372e9d679bc6e041028b.zip |
iPod: Add placeholder button definitions - these need reviewing when the button usage for the iPod is decided
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7830 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/list.h | 4 | ||||
-rw-r--r-- | apps/gui/select.h | 8 | ||||
-rw-r--r-- | apps/menu.h | 10 | ||||
-rw-r--r-- | apps/plugins/databox/databox.c | 3 | ||||
-rw-r--r-- | apps/recorder/keyboard.c | 11 | ||||
-rw-r--r-- | apps/settings.h | 6 | ||||
-rw-r--r-- | apps/tree.h | 17 | ||||
-rw-r--r-- | apps/wps.h | 21 |
8 files changed, 80 insertions, 0 deletions
diff --git a/apps/gui/list.h b/apps/gui/list.h index 94a172f642..e587942c94 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h | |||
@@ -56,6 +56,10 @@ | |||
56 | #define LIST_NEXT BUTTON_DOWN | 56 | #define LIST_NEXT BUTTON_DOWN |
57 | #define LIST_PREV BUTTON_UP | 57 | #define LIST_PREV BUTTON_UP |
58 | 58 | ||
59 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
60 | #define LIST_NEXT BUTTON_DOWN | ||
61 | #define LIST_PREV BUTTON_UP | ||
62 | |||
59 | #elif CONFIG_KEYPAD == GMINI100_PAD | 63 | #elif CONFIG_KEYPAD == GMINI100_PAD |
60 | #define LIST_NEXT BUTTON_DOWN | 64 | #define LIST_NEXT BUTTON_DOWN |
61 | #define LIST_PREV BUTTON_UP | 65 | #define LIST_PREV BUTTON_UP |
diff --git a/apps/gui/select.h b/apps/gui/select.h index a584b53991..0b67552b00 100644 --- a/apps/gui/select.h +++ b/apps/gui/select.h | |||
@@ -53,6 +53,14 @@ | |||
53 | #define SELECT_CANCEL BUTTON_STOP | 53 | #define SELECT_CANCEL BUTTON_STOP |
54 | #define SELECT_CANCEL2 BUTTON_MENU | 54 | #define SELECT_CANCEL2 BUTTON_MENU |
55 | 55 | ||
56 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
57 | #define SELECT_INC BUTTON_UP | ||
58 | #define SELECT_DEC BUTTON_DOWN | ||
59 | #define SELECT_OK BUTTON_RIGHT | ||
60 | #define SELECT_OK2 BUTTON_LEFT | ||
61 | #define SELECT_CANCEL BUTTON_MENU | ||
62 | #define SELECT_CANCEL2 BUTTON_OFF | ||
63 | |||
56 | #elif CONFIG_KEYPAD == ONDIO_PAD | 64 | #elif CONFIG_KEYPAD == ONDIO_PAD |
57 | #define SELECT_INC BUTTON_UP | 65 | #define SELECT_INC BUTTON_UP |
58 | #define SELECT_DEC BUTTON_DOWN | 66 | #define SELECT_DEC BUTTON_DOWN |
diff --git a/apps/menu.h b/apps/menu.h index c163e35ccc..98cbf9417c 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -68,6 +68,16 @@ | |||
68 | #define MENU_ENTER BUTTON_RIGHT | 68 | #define MENU_ENTER BUTTON_RIGHT |
69 | #define MENU_ENTER2 BUTTON_PLAY | 69 | #define MENU_ENTER2 BUTTON_PLAY |
70 | 70 | ||
71 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
72 | |||
73 | /* TODO: Check menu button assignments */ | ||
74 | |||
75 | #define MENU_NEXT BUTTON_DOWN | ||
76 | #define MENU_PREV BUTTON_UP | ||
77 | #define MENU_EXIT BUTTON_LEFT | ||
78 | #define MENU_EXIT_MENU BUTTON_MENU | ||
79 | #define MENU_ENTER BUTTON_RIGHT | ||
80 | |||
71 | #endif | 81 | #endif |
72 | 82 | ||
73 | struct menu_item { | 83 | struct menu_item { |
diff --git a/apps/plugins/databox/databox.c b/apps/plugins/databox/databox.c index 7663a1ec82..cd51f32a49 100644 --- a/apps/plugins/databox/databox.c +++ b/apps/plugins/databox/databox.c | |||
@@ -29,6 +29,9 @@ | |||
29 | #elif CONFIG_KEYPAD == ONDIO_PAD | 29 | #elif CONFIG_KEYPAD == ONDIO_PAD |
30 | #define DBX_SELECT BUTTON_MENU | 30 | #define DBX_SELECT BUTTON_MENU |
31 | #define DBX_STOP BUTTON_OFF | 31 | #define DBX_STOP BUTTON_OFF |
32 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
33 | #define DBX_SELECT BUTTON_MENU | ||
34 | #define DBX_STOP BUTTON_OFF | ||
32 | #elif CONFIG_KEYPAD == PLAYER_PAD | 35 | #elif CONFIG_KEYPAD == PLAYER_PAD |
33 | #define DBX_SELECT BUTTON_PLAY | 36 | #define DBX_SELECT BUTTON_PLAY |
34 | #define DBX_STOP BUTTON_STOP | 37 | #define DBX_STOP BUTTON_STOP |
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 0b833c85dc..65178a97b4 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -81,6 +81,17 @@ | |||
81 | #define KBD_ABORT BUTTON_OFF | 81 | #define KBD_ABORT BUTTON_OFF |
82 | #define KBD_BACKSPACE (BUTTON_MENU | BUTTON_PLAY) | 82 | #define KBD_BACKSPACE (BUTTON_MENU | BUTTON_PLAY) |
83 | 83 | ||
84 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
85 | |||
86 | /* TODO: Check keyboard.c button mappings - this is a copy of Ondio */ | ||
87 | |||
88 | #define KBD_MODES /* Ondio uses 2 modes, picker and line edit */ | ||
89 | #define KBD_SELECT (BUTTON_MENU | BUTTON_REL) /* backspace in line edit */ | ||
90 | #define KBD_SELECT_PRE BUTTON_MENU | ||
91 | #define KBD_DONE (BUTTON_MENU | BUTTON_REPEAT) | ||
92 | #define KBD_ABORT BUTTON_OFF | ||
93 | |||
94 | |||
84 | #endif | 95 | #endif |
85 | 96 | ||
86 | #if KEYBOARD_PAGES == 1 | 97 | #if KEYBOARD_PAGES == 1 |
diff --git a/apps/settings.h b/apps/settings.h index 152f82cbb2..b58878be61 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -77,6 +77,12 @@ | |||
77 | #define SETTINGS_CANCEL BUTTON_OFF | 77 | #define SETTINGS_CANCEL BUTTON_OFF |
78 | #define SETTINGS_CANCEL2 BUTTON_MENU | 78 | #define SETTINGS_CANCEL2 BUTTON_MENU |
79 | 79 | ||
80 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
81 | #define SETTINGS_INC BUTTON_RIGHT | ||
82 | #define SETTINGS_DEC BUTTON_LEFT | ||
83 | #define SETTINGS_OK BUTTON_PLAY | ||
84 | #define SETTINGS_CANCEL BUTTON_MENU | ||
85 | |||
80 | #endif | 86 | #endif |
81 | 87 | ||
82 | /* data structures */ | 88 | /* data structures */ |
diff --git a/apps/tree.h b/apps/tree.h index ae2cc0bc00..86e95931d1 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -130,6 +130,23 @@ | |||
130 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) | 130 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) |
131 | #define TREE_POWER_BTN BUTTON_ON | 131 | #define TREE_POWER_BTN BUTTON_ON |
132 | 132 | ||
133 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
134 | |||
135 | /* TODO: Check Tree button assignments */ | ||
136 | |||
137 | #define TREE_NEXT BUTTON_DOWN | ||
138 | #define TREE_PREV BUTTON_UP | ||
139 | #define TREE_EXIT BUTTON_LEFT | ||
140 | #define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) | ||
141 | #define TREE_RUN_PRE BUTTON_RIGHT | ||
142 | #define TREE_MENU (BUTTON_MENU | BUTTON_REPEAT) | ||
143 | #define TREE_MENU_PRE BUTTON_MENU | ||
144 | #define TREE_WPS (BUTTON_MENU | BUTTON_REL) | ||
145 | #define TREE_WPS_PRE BUTTON_MENU | ||
146 | #define TREE_CONTEXT (BUTTON_RIGHT | BUTTON_REPEAT) | ||
147 | #define TREE_POWER_BTN BUTTON_OFF | ||
148 | |||
149 | |||
133 | #endif | 150 | #endif |
134 | 151 | ||
135 | struct entry { | 152 | struct entry { |
diff --git a/apps/wps.h b/apps/wps.h index a419c809f0..61b3d002fc 100644 --- a/apps/wps.h +++ b/apps/wps.h | |||
@@ -166,6 +166,27 @@ | |||
166 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) | 166 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) |
167 | #define WPS_ID3 (BUTTON_MENU | BUTTON_ON) | 167 | #define WPS_ID3 (BUTTON_MENU | BUTTON_ON) |
168 | 168 | ||
169 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
170 | |||
171 | /* TODO: Check WPS button assignments */ | ||
172 | |||
173 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) | ||
174 | #define WPS_NEXT_PRE BUTTON_RIGHT | ||
175 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) | ||
176 | #define WPS_PREV_PRE BUTTON_LEFT | ||
177 | #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) | ||
178 | #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) | ||
179 | #define WPS_INCVOL BUTTON_UP | ||
180 | #define WPS_DECVOL BUTTON_DOWN | ||
181 | #define WPS_PAUSE BUTTON_OFF | ||
182 | /* #define WPS_MENU iPod can't have both main menu and context menu in wps */ | ||
183 | #define WPS_BROWSE (BUTTON_MENU | BUTTON_REL) | ||
184 | #define WPS_BROWSE_PRE BUTTON_MENU | ||
185 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) | ||
186 | #define WPS_EXIT (BUTTON_OFF | BUTTON_REPEAT) | ||
187 | #define WPS_CONTEXT (BUTTON_MENU | BUTTON_REPEAT) | ||
188 | |||
189 | |||
169 | #endif | 190 | #endif |
170 | 191 | ||
171 | extern bool keys_locked; | 192 | extern bool keys_locked; |