summaryrefslogtreecommitdiffstats
path: root/apps/plugins/calculator.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-04-10 17:28:26 +0000
committerThomas Martitz <kugel@rockbox.org>2009-04-10 17:28:26 +0000
commite6cbad69745455d0ad23004c609a909a2cdabcf4 (patch)
treef512eab0f41420969f750138b76b46931bf57956 /apps/plugins/calculator.c
parentec797ed62225a5f78f37e9342ac6e183332f795b (diff)
downloadrockbox-e6cbad69745455d0ad23004c609a909a2cdabcf4.tar.gz
rockbox-e6cbad69745455d0ad23004c609a909a2cdabcf4.tar.bz2
rockbox-e6cbad69745455d0ad23004c609a909a2cdabcf4.zip
FS#10075 - FUZE: QUIT Plugin by selecting BUTTON_HOME by Johannes Schwarz. Updates the plugin keymap to use Long Home to exit plugins to be more inline with the core keymap.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20680 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/calculator.c')
-rw-r--r--apps/plugins/calculator.c31
1 files changed, 22 insertions, 9 deletions
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index df9fb9b18b..6414de645c 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -192,27 +192,40 @@ PLUGIN_HEADER
#define CALCULATOR_CALC BUTTON_MENU
#define CALCULATOR_CLEAR BUTTON_A
-#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
- (CONFIG_KEYPAD == SANSA_C200_PAD) || \
- (CONFIG_KEYPAD == SANSA_FUZE_PAD)
+#elif (CONFIG_KEYPAD == SANSA_E200_PAD)
#define CALCULATOR_LEFT BUTTON_LEFT
#define CALCULATOR_RIGHT BUTTON_RIGHT
#define CALCULATOR_UP BUTTON_UP
#define CALCULATOR_DOWN BUTTON_DOWN
-#if defined(HAVE_SCROLLWHEEL)
-/* c200 does not have a scroll wheel */
#define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK
#define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD
-#endif
#define CALCULATOR_QUIT BUTTON_POWER
#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT
#define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL)
#define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT)
-#if (CONFIG_KEYPAD == SANSA_E200_PAD)
#define CALCULATOR_CLEAR BUTTON_REC
+
+#elif (CONFIG_KEYPAD == SANSA_C200_PAD)
+#define CALCULATOR_LEFT BUTTON_LEFT
+#define CALCULATOR_RIGHT BUTTON_RIGHT
+#define CALCULATOR_UP BUTTON_UP
+#define CALCULATOR_DOWN BUTTON_DOWN
+#define CALCULATOR_QUIT BUTTON_POWER
+#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT
+#define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL)
+#define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT)
+
#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
-#define CALCULATOR_CLEAR BUTTON_HOME
-#endif
+#define CALCULATOR_LEFT BUTTON_LEFT
+#define CALCULATOR_RIGHT BUTTON_RIGHT
+#define CALCULATOR_UP BUTTON_UP
+#define CALCULATOR_DOWN BUTTON_DOWN
+#define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK
+#define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD
+#define CALCULATOR_QUIT (BUTTON_HOME|BUTTON_REPEAT)
+#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT
+#define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL)
+#define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT)
#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD)