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/plugins/pong.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/plugins/pong.c')
-rw-r--r-- | apps/plugins/pong.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 60d704337f..27721fcfab 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -155,7 +155,7 @@ PLUGIN_HEADER | |||
155 | #error No keymap defined! | 155 | #error No keymap defined! |
156 | #endif | 156 | #endif |
157 | 157 | ||
158 | #ifdef HAVE_TOUCHPAD | 158 | #ifdef HAVE_TOUCHSCREEN |
159 | #ifndef PONG_QUIT | 159 | #ifndef PONG_QUIT |
160 | #define PONG_QUIT BUTTON_TOPMIDDLE | 160 | #define PONG_QUIT BUTTON_TOPMIDDLE |
161 | #endif | 161 | #endif |
@@ -398,7 +398,7 @@ int keys(struct pong *p) | |||
398 | #endif | 398 | #endif |
399 | 399 | ||
400 | /* number of ticks this function will loop reading keys */ | 400 | /* number of ticks this function will loop reading keys */ |
401 | #ifndef HAVE_TOUCHPAD | 401 | #ifndef HAVE_TOUCHSCREEN |
402 | int time = 4; | 402 | int time = 4; |
403 | #else | 403 | #else |
404 | int time = 1; | 404 | int time = 1; |
@@ -409,9 +409,9 @@ int keys(struct pong *p) | |||
409 | while(end > *rb->current_tick) { | 409 | while(end > *rb->current_tick) { |
410 | key = rb->button_get_w_tmo(end - *rb->current_tick); | 410 | key = rb->button_get_w_tmo(end - *rb->current_tick); |
411 | 411 | ||
412 | #ifdef HAVE_TOUCHPAD | 412 | #ifdef HAVE_TOUCHSCREEN |
413 | short touch_x, touch_y; | 413 | short touch_x, touch_y; |
414 | if(key & BUTTON_TOUCHPAD) | 414 | if(key & BUTTON_TOUCHSCREEN) |
415 | { | 415 | { |
416 | touch_x = rb->button_get_data() >> 16; | 416 | touch_x = rb->button_get_data() >> 16; |
417 | touch_y = rb->button_get_data() & 0xFFFF; | 417 | touch_y = rb->button_get_data() & 0xFFFF; |