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/lib | |
| parent | 965d2af61f5035dcf5179b8539785de641a9f015 (diff) | |
| download | rockbox-1392dc2144a4b1810ba5c421f54e05dc1a3a74c7.zip rockbox-1392dc2144a4b1810ba5c421f54e05dc1a3a74c7.tar.gz rockbox-1392dc2144a4b1810ba5c421f54e05dc1a3a74c7.tar.bz2 rockbox-1392dc2144a4b1810ba5c421f54e05dc1a3a74c7.tar.xz | |
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/lib')
| -rw-r--r-- | apps/plugins/lib/SOURCES | 2 | ||||
| -rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 8 | ||||
| -rw-r--r-- | apps/plugins/lib/touchscreen.c | 4 | ||||
| -rw-r--r-- | apps/plugins/lib/touchscreen.h | 6 |
4 files changed, 11 insertions, 9 deletions
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES index 775db05..d21f21a 100644 --- a/apps/plugins/lib/SOURCES +++ b/apps/plugins/lib/SOURCES @@ -39,7 +39,7 @@ bmp_smooth_scale.c #endif pluginlib_actions.c helper.c -#ifdef HAVE_TOUCHPAD +#ifdef HAVE_TOUCHSCREEN touchscreen.c #endif md5.c diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 996e217..a6bf283 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c @@ -67,7 +67,7 @@ const struct button_mapping remote_directions[] = const struct button_mapping generic_directions[] = { -#ifdef HAVE_TOUCHPAD +#ifdef HAVE_TOUCHSCREEN { PLA_UP, BUTTON_TOPMIDDLE, BUTTON_NONE}, { PLA_DOWN, BUTTON_BOTTOMMIDDLE, BUTTON_NONE}, { PLA_LEFT, BUTTON_MIDLEFT, BUTTON_NONE}, @@ -162,7 +162,7 @@ const struct button_mapping generic_directions[] = const struct button_mapping generic_left_right_fire[] = { -#ifdef HAVE_TOUCHPAD +#ifdef HAVE_TOUCHSCREEN { PLA_LEFT, BUTTON_MIDLEFT, BUTTON_NONE}, { PLA_LEFT_REPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_RIGHT, BUTTON_MIDRIGHT, BUTTON_NONE}, @@ -266,7 +266,7 @@ const struct button_mapping generic_left_right_fire[] = /* these were taken from the bubbles plugin, so may need tweaking */ const struct button_mapping generic_actions[] = { -#ifdef HAVE_TOUCHPAD +#ifdef HAVE_TOUCHSCREEN {PLA_QUIT, BUTTON_BOTTOMRIGHT, BUTTON_NONE}, {PLA_START, BUTTON_CENTER, BUTTON_NONE}, {PLA_MENU, BUTTON_TOPLEFT, BUTTON_NONE}, @@ -399,7 +399,7 @@ const struct button_mapping generic_actions[] = const struct button_mapping generic_increase_decrease[] = { -#ifdef HAVE_TOUCHPAD +#ifdef HAVE_TOUCHSCREEN {PLA_INC, BUTTON_TOPMIDDLE, BUTTON_NONE}, {PLA_DEC, BUTTON_BOTTOMMIDDLE, BUTTON_NONE}, {PLA_INC_REPEAT, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE}, diff --git a/apps/plugins/lib/touchscreen.c b/apps/plugins/lib/touchscreen.c index cda2f46..5b75173 100644 --- a/apps/plugins/lib/touchscreen.c +++ b/apps/plugins/lib/touchscreen.c @@ -21,7 +21,7 @@ #include "plugin.h" -#ifdef HAVE_TOUCHPAD +#ifdef HAVE_TOUCHSCREEN #include "touchscreen.h" @@ -132,4 +132,4 @@ struct ts_raster_button_result touchscreen_raster_map_button(struct ts_raster_bu return ret; } -#endif /* HAVE_TOUCHPAD */ +#endif /* HAVE_TOUCHSCREEN */ diff --git a/apps/plugins/lib/touchscreen.h b/apps/plugins/lib/touchscreen.h index 7050db6..cd5251e 100644 --- a/apps/plugins/lib/touchscreen.h +++ b/apps/plugins/lib/touchscreen.h @@ -22,7 +22,9 @@ #ifndef _PLUGIN_LIB_TOUCHSCREEN_H_ #define _PLUGIN_LIB_TOUCHSCREEN_H_ -#ifdef HAVE_TOUCHPAD +#include "plugin.h" + +#ifdef HAVE_TOUCHSCREEN struct ts_mapping { @@ -88,5 +90,5 @@ struct ts_raster_button_result struct ts_raster_button_result touchscreen_raster_map_button(struct ts_raster_button_mapping *map, int x, int y, int button); -#endif /* HAVE_TOUCHPAD */ +#endif /* HAVE_TOUCHSCREEN */ #endif /* _PLUGIN_LIB_TOUCHSCREEN_H_ */ |