diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-08-23 09:46:38 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-08-23 09:46:38 +0000 |
commit | 1392dc2144a4b1810ba5c421f54e05dc1a3a74c7 (patch) | |
tree | 7f7f7d6dd6ce00e8146896456549441d4e8153d7 /apps/action.h | |
parent | 965d2af61f5035dcf5179b8539785de641a9f015 (diff) | |
download | rockbox-1392dc2144a4b1810ba5c421f54e05dc1a3a74c7.tar.gz rockbox-1392dc2144a4b1810ba5c421f54e05dc1a3a74c7.zip |
Commit FS#9308: differentiate between TOUCHPAD & TOUCHSCREEN
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18338 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/action.h')
-rw-r--r-- | apps/action.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/action.h b/apps/action.h index 94bf732ab6..743e1470dc 100644 --- a/apps/action.h +++ b/apps/action.h | |||
@@ -82,8 +82,8 @@ enum { | |||
82 | ACTION_NONE = BUTTON_NONE, | 82 | ACTION_NONE = BUTTON_NONE, |
83 | ACTION_UNKNOWN, | 83 | ACTION_UNKNOWN, |
84 | ACTION_REDRAW, /* returned if keys are locked and we splash()'ed */ | 84 | ACTION_REDRAW, /* returned if keys are locked and we splash()'ed */ |
85 | ACTION_TOUCHPAD, | 85 | ACTION_TOUCHSCREEN, |
86 | ACTION_TOUCHPAD_MODE, /* toggle the touchpad mode */ | 86 | ACTION_TOUCHSCREEN_MODE, /* toggle the touchscreen mode */ |
87 | 87 | ||
88 | /* standard actions, use these first */ | 88 | /* standard actions, use these first */ |
89 | ACTION_STD_PREV, | 89 | ACTION_STD_PREV, |
@@ -265,13 +265,13 @@ int get_action_statuscode(int *button); | |||
265 | BUTTON_NONE or flagged with SYS_EVENT */ | 265 | BUTTON_NONE or flagged with SYS_EVENT */ |
266 | intptr_t get_action_data(void); | 266 | intptr_t get_action_data(void); |
267 | 267 | ||
268 | #ifdef HAVE_TOUCHPAD | 268 | #ifdef HAVE_TOUCHSCREEN |
269 | /* return BUTTON_NONE on error | 269 | /* return BUTTON_NONE on error |
270 | BUTTON_REPEAT if repeated press | 270 | BUTTON_REPEAT if repeated press |
271 | BUTTON_REL if its a short press | 271 | BUTTON_REL if its a short press |
272 | BUTTON_TOUCHPAD otherwise | 272 | BUTTON_TOUCHSCREEN otherwise |
273 | */ | 273 | */ |
274 | int action_get_touchpad_press(short *x, short *y); | 274 | int action_get_touchscreen_press(short *x, short *y); |
275 | #endif | 275 | #endif |
276 | 276 | ||
277 | #endif /* __ACTION_H__ */ | 277 | #endif /* __ACTION_H__ */ |