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.c | |
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.c')
-rw-r--r-- | apps/action.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/action.c b/apps/action.c index b1dd98df08..5ceeeb896f 100644 --- a/apps/action.c +++ b/apps/action.c | |||
@@ -39,7 +39,7 @@ static intptr_t last_data = 0; | |||
39 | static int last_action = ACTION_NONE; | 39 | static int last_action = ACTION_NONE; |
40 | static bool repeated = false; | 40 | static bool repeated = false; |
41 | 41 | ||
42 | #ifdef HAVE_TOUCHPAD | 42 | #ifdef HAVE_TOUCHSCREEN |
43 | static bool short_press = false; | 43 | static bool short_press = false; |
44 | #endif | 44 | #endif |
45 | 45 | ||
@@ -145,12 +145,12 @@ static int get_action_worker(int context, int timeout, | |||
145 | return ACTION_NONE; /* "safest" return value */ | 145 | return ACTION_NONE; /* "safest" return value */ |
146 | } | 146 | } |
147 | last_context = context; | 147 | last_context = context; |
148 | #ifdef HAVE_TOUCHPAD | 148 | #ifdef HAVE_TOUCHSCREEN |
149 | if (button & BUTTON_TOUCHPAD) | 149 | if (button & BUTTON_TOUCHSCREEN) |
150 | { | 150 | { |
151 | repeated = false; | 151 | repeated = false; |
152 | short_press = false; | 152 | short_press = false; |
153 | if (last_button & BUTTON_TOUCHPAD) | 153 | if (last_button & BUTTON_TOUCHSCREEN) |
154 | { | 154 | { |
155 | if ((button & BUTTON_REL) && | 155 | if ((button & BUTTON_REL) && |
156 | ((last_button & BUTTON_REPEAT)==0)) | 156 | ((last_button & BUTTON_REPEAT)==0)) |
@@ -161,7 +161,7 @@ static int get_action_worker(int context, int timeout, | |||
161 | repeated = true; | 161 | repeated = true; |
162 | } | 162 | } |
163 | last_button = button; | 163 | last_button = button; |
164 | return ACTION_TOUCHPAD; | 164 | return ACTION_TOUCHSCREEN; |
165 | } | 165 | } |
166 | #endif | 166 | #endif |
167 | #ifndef HAS_BUTTON_HOLD | 167 | #ifndef HAS_BUTTON_HOLD |
@@ -282,18 +282,18 @@ int get_action_statuscode(int *button) | |||
282 | return ret; | 282 | return ret; |
283 | } | 283 | } |
284 | 284 | ||
285 | #ifdef HAVE_TOUCHPAD | 285 | #ifdef HAVE_TOUCHSCREEN |
286 | /* return BUTTON_NONE on error | 286 | /* return BUTTON_NONE on error |
287 | * BUTTON_REPEAT if repeated press | 287 | * BUTTON_REPEAT if repeated press |
288 | * BUTTON_REPEAT|BUTTON_REL if release after repeated press | 288 | * BUTTON_REPEAT|BUTTON_REL if release after repeated press |
289 | * BUTTON_REL if its a short press = release after press | 289 | * BUTTON_REL if its a short press = release after press |
290 | * BUTTON_TOUCHPAD if press | 290 | * BUTTON_TOUCHSCREEN if press |
291 | */ | 291 | */ |
292 | int action_get_touchpad_press(short *x, short *y) | 292 | int action_get_touchscreen_press(short *x, short *y) |
293 | { | 293 | { |
294 | static int last_data = 0; | 294 | static int last_data = 0; |
295 | int data; | 295 | int data; |
296 | if ((last_button & BUTTON_TOUCHPAD) == 0) | 296 | if ((last_button & BUTTON_TOUCHSCREEN) == 0) |
297 | return BUTTON_NONE; | 297 | return BUTTON_NONE; |
298 | data = button_get_data(); | 298 | data = button_get_data(); |
299 | if (last_button & BUTTON_REL) | 299 | if (last_button & BUTTON_REL) |
@@ -314,6 +314,6 @@ int action_get_touchpad_press(short *x, short *y) | |||
314 | /* This is to return a BUTTON_REL after a BUTTON_REPEAT. */ | 314 | /* This is to return a BUTTON_REL after a BUTTON_REPEAT. */ |
315 | if (last_button & BUTTON_REL) | 315 | if (last_button & BUTTON_REL) |
316 | return BUTTON_REPEAT|BUTTON_REL; | 316 | return BUTTON_REPEAT|BUTTON_REL; |
317 | return BUTTON_TOUCHPAD; | 317 | return BUTTON_TOUCHSCREEN; |
318 | } | 318 | } |
319 | #endif | 319 | #endif |