summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-04-15 10:35:11 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-04-15 10:35:11 +0000
commit5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553 (patch)
tree0bf60b83aad534757330162ad4f683f142955ccb /firmware/export
parent50851794a6bdd585ce70ecb430b1f798fb90936b (diff)
downloadrockbox-5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553.zip
rockbox-5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553.tar.gz
rockbox-5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553.tar.bz2
rockbox-5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553.tar.xz
Setup the touchpads to have two modes - stylus and button - and set them in button mode by default.
in button mode the touchpad is split into a 3x3 grid for 9 seperate buttons which can be used by the action system like real buttons. Unify the keymap file for the touchpads in button mode. the target keymap file only needs to worry about real buttons. (As these ports mature each screen will need to be fixed seperatly to be able to use stylus mode (the lists can already but don't change mode just yet.) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17114 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/button.h19
-rw-r--r--firmware/export/config-cowond2.h1
2 files changed, 20 insertions, 0 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 95da7ad..6decf6e 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -64,4 +64,23 @@ int button_apply_acceleration(const unsigned int data);
#define BUTTON_REPEAT 0x04000000
#define BUTTON_TOUCHPAD 0x08000000
+#ifdef HAVE_TOUCHPAD
+#if !defined(BUTTON_TOPLEFT) || !defined(BUTTON_TOPMIDDLE) \
+ || !defined(BUTTON_TOPRIGHT) || !defined(BUTTON_MIDLEFT) \
+ || !defined(BUTTON_CENTER) || !defined(BUTTON_MIDRIGHT) \
+ || !defined(BUTTON_BOTTOMLEFT) || !defined(BUTTON_BOTTOMMIDDLE) \
+ || !defined(BUTTON_BOTTOMRIGHT)
+#error Touchpad button mode BUTTON_* defines not set up correctly
+#endif
+enum touchpad_mode {
+ TOUCHPAD_POINT = 0, /* touchpad returns pixel co-ords */
+ TOUCHPAD_BUTTON, /* touchpad returns BUTTON_* area codes
+ actual pixel value will still be accessable
+ from button_get_data */
+};
+/* maybe define the number of buttons in button-target.h ? */
+void touchpad_set_mode(enum touchpad_mode mode);
+enum touchpad_mode touchpad_get_mode(void);
+#endif
+
#endif /* _BUTTON_H_ */
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h
index 9380de5..d3b23b2 100644
--- a/firmware/export/config-cowond2.h
+++ b/firmware/export/config-cowond2.h
@@ -56,6 +56,7 @@
/* define this to indicate your device's keypad */
#define CONFIG_KEYPAD COWOND2_PAD
+#define HAVE_TOUCHPAD
/* define this if you have a real-time clock */
//#define CONFIG_RTC RTC_TCC780X