diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-04-15 10:35:11 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-04-15 10:35:11 +0000 |
commit | 5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553 (patch) | |
tree | 0bf60b83aad534757330162ad4f683f142955ccb /firmware/export | |
parent | 50851794a6bdd585ce70ecb430b1f798fb90936b (diff) | |
download | rockbox-5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553.tar.gz rockbox-5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553.zip |
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.h | 19 | ||||
-rw-r--r-- | firmware/export/config-cowond2.h | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h index 95da7adc42..6decf6ec69 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -64,4 +64,23 @@ int button_apply_acceleration(const unsigned int data); | |||
64 | #define BUTTON_REPEAT 0x04000000 | 64 | #define BUTTON_REPEAT 0x04000000 |
65 | #define BUTTON_TOUCHPAD 0x08000000 | 65 | #define BUTTON_TOUCHPAD 0x08000000 |
66 | 66 | ||
67 | #ifdef HAVE_TOUCHPAD | ||
68 | #if !defined(BUTTON_TOPLEFT) || !defined(BUTTON_TOPMIDDLE) \ | ||
69 | || !defined(BUTTON_TOPRIGHT) || !defined(BUTTON_MIDLEFT) \ | ||
70 | || !defined(BUTTON_CENTER) || !defined(BUTTON_MIDRIGHT) \ | ||
71 | || !defined(BUTTON_BOTTOMLEFT) || !defined(BUTTON_BOTTOMMIDDLE) \ | ||
72 | || !defined(BUTTON_BOTTOMRIGHT) | ||
73 | #error Touchpad button mode BUTTON_* defines not set up correctly | ||
74 | #endif | ||
75 | enum touchpad_mode { | ||
76 | TOUCHPAD_POINT = 0, /* touchpad returns pixel co-ords */ | ||
77 | TOUCHPAD_BUTTON, /* touchpad returns BUTTON_* area codes | ||
78 | actual pixel value will still be accessable | ||
79 | from button_get_data */ | ||
80 | }; | ||
81 | /* maybe define the number of buttons in button-target.h ? */ | ||
82 | void touchpad_set_mode(enum touchpad_mode mode); | ||
83 | enum touchpad_mode touchpad_get_mode(void); | ||
84 | #endif | ||
85 | |||
67 | #endif /* _BUTTON_H_ */ | 86 | #endif /* _BUTTON_H_ */ |
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h index 9380de57ef..d3b23b225d 100644 --- a/firmware/export/config-cowond2.h +++ b/firmware/export/config-cowond2.h | |||
@@ -56,6 +56,7 @@ | |||
56 | 56 | ||
57 | /* define this to indicate your device's keypad */ | 57 | /* define this to indicate your device's keypad */ |
58 | #define CONFIG_KEYPAD COWOND2_PAD | 58 | #define CONFIG_KEYPAD COWOND2_PAD |
59 | #define HAVE_TOUCHPAD | ||
59 | 60 | ||
60 | /* define this if you have a real-time clock */ | 61 | /* define this if you have a real-time clock */ |
61 | //#define CONFIG_RTC RTC_TCC780X | 62 | //#define CONFIG_RTC RTC_TCC780X |