diff options
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 775db0587e..d21f21af15 100644 --- a/apps/plugins/lib/SOURCES +++ b/apps/plugins/lib/SOURCES | |||
@@ -39,7 +39,7 @@ bmp_smooth_scale.c | |||
39 | #endif | 39 | #endif |
40 | pluginlib_actions.c | 40 | pluginlib_actions.c |
41 | helper.c | 41 | helper.c |
42 | #ifdef HAVE_TOUCHPAD | 42 | #ifdef HAVE_TOUCHSCREEN |
43 | touchscreen.c | 43 | touchscreen.c |
44 | #endif | 44 | #endif |
45 | md5.c | 45 | md5.c |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 996e2178b4..a6bf28302f 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[] = | |||
67 | 67 | ||
68 | const struct button_mapping generic_directions[] = | 68 | const struct button_mapping generic_directions[] = |
69 | { | 69 | { |
70 | #ifdef HAVE_TOUCHPAD | 70 | #ifdef HAVE_TOUCHSCREEN |
71 | { PLA_UP, BUTTON_TOPMIDDLE, BUTTON_NONE}, | 71 | { PLA_UP, BUTTON_TOPMIDDLE, BUTTON_NONE}, |
72 | { PLA_DOWN, BUTTON_BOTTOMMIDDLE, BUTTON_NONE}, | 72 | { PLA_DOWN, BUTTON_BOTTOMMIDDLE, BUTTON_NONE}, |
73 | { PLA_LEFT, BUTTON_MIDLEFT, BUTTON_NONE}, | 73 | { PLA_LEFT, BUTTON_MIDLEFT, BUTTON_NONE}, |
@@ -162,7 +162,7 @@ const struct button_mapping generic_directions[] = | |||
162 | 162 | ||
163 | const struct button_mapping generic_left_right_fire[] = | 163 | const struct button_mapping generic_left_right_fire[] = |
164 | { | 164 | { |
165 | #ifdef HAVE_TOUCHPAD | 165 | #ifdef HAVE_TOUCHSCREEN |
166 | { PLA_LEFT, BUTTON_MIDLEFT, BUTTON_NONE}, | 166 | { PLA_LEFT, BUTTON_MIDLEFT, BUTTON_NONE}, |
167 | { PLA_LEFT_REPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE}, | 167 | { PLA_LEFT_REPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE}, |
168 | { PLA_RIGHT, BUTTON_MIDRIGHT, BUTTON_NONE}, | 168 | { PLA_RIGHT, BUTTON_MIDRIGHT, BUTTON_NONE}, |
@@ -266,7 +266,7 @@ const struct button_mapping generic_left_right_fire[] = | |||
266 | /* these were taken from the bubbles plugin, so may need tweaking */ | 266 | /* these were taken from the bubbles plugin, so may need tweaking */ |
267 | const struct button_mapping generic_actions[] = | 267 | const struct button_mapping generic_actions[] = |
268 | { | 268 | { |
269 | #ifdef HAVE_TOUCHPAD | 269 | #ifdef HAVE_TOUCHSCREEN |
270 | {PLA_QUIT, BUTTON_BOTTOMRIGHT, BUTTON_NONE}, | 270 | {PLA_QUIT, BUTTON_BOTTOMRIGHT, BUTTON_NONE}, |
271 | {PLA_START, BUTTON_CENTER, BUTTON_NONE}, | 271 | {PLA_START, BUTTON_CENTER, BUTTON_NONE}, |
272 | {PLA_MENU, BUTTON_TOPLEFT, BUTTON_NONE}, | 272 | {PLA_MENU, BUTTON_TOPLEFT, BUTTON_NONE}, |
@@ -399,7 +399,7 @@ const struct button_mapping generic_actions[] = | |||
399 | 399 | ||
400 | const struct button_mapping generic_increase_decrease[] = | 400 | const struct button_mapping generic_increase_decrease[] = |
401 | { | 401 | { |
402 | #ifdef HAVE_TOUCHPAD | 402 | #ifdef HAVE_TOUCHSCREEN |
403 | {PLA_INC, BUTTON_TOPMIDDLE, BUTTON_NONE}, | 403 | {PLA_INC, BUTTON_TOPMIDDLE, BUTTON_NONE}, |
404 | {PLA_DEC, BUTTON_BOTTOMMIDDLE, BUTTON_NONE}, | 404 | {PLA_DEC, BUTTON_BOTTOMMIDDLE, BUTTON_NONE}, |
405 | {PLA_INC_REPEAT, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE}, | 405 | {PLA_INC_REPEAT, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE}, |
diff --git a/apps/plugins/lib/touchscreen.c b/apps/plugins/lib/touchscreen.c index cda2f46f1e..5b7517349a 100644 --- a/apps/plugins/lib/touchscreen.c +++ b/apps/plugins/lib/touchscreen.c | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | 23 | ||
24 | #ifdef HAVE_TOUCHPAD | 24 | #ifdef HAVE_TOUCHSCREEN |
25 | 25 | ||
26 | #include "touchscreen.h" | 26 | #include "touchscreen.h" |
27 | 27 | ||
@@ -132,4 +132,4 @@ struct ts_raster_button_result touchscreen_raster_map_button(struct ts_raster_bu | |||
132 | return ret; | 132 | return ret; |
133 | } | 133 | } |
134 | 134 | ||
135 | #endif /* HAVE_TOUCHPAD */ | 135 | #endif /* HAVE_TOUCHSCREEN */ |
diff --git a/apps/plugins/lib/touchscreen.h b/apps/plugins/lib/touchscreen.h index 7050db669b..cd5251e46f 100644 --- a/apps/plugins/lib/touchscreen.h +++ b/apps/plugins/lib/touchscreen.h | |||
@@ -22,7 +22,9 @@ | |||
22 | #ifndef _PLUGIN_LIB_TOUCHSCREEN_H_ | 22 | #ifndef _PLUGIN_LIB_TOUCHSCREEN_H_ |
23 | #define _PLUGIN_LIB_TOUCHSCREEN_H_ | 23 | #define _PLUGIN_LIB_TOUCHSCREEN_H_ |
24 | 24 | ||
25 | #ifdef HAVE_TOUCHPAD | 25 | #include "plugin.h" |
26 | |||
27 | #ifdef HAVE_TOUCHSCREEN | ||
26 | 28 | ||
27 | struct ts_mapping | 29 | struct ts_mapping |
28 | { | 30 | { |
@@ -88,5 +90,5 @@ struct ts_raster_button_result | |||
88 | 90 | ||
89 | struct ts_raster_button_result touchscreen_raster_map_button(struct ts_raster_button_mapping *map, int x, int y, int button); | 91 | struct ts_raster_button_result touchscreen_raster_map_button(struct ts_raster_button_mapping *map, int x, int y, int button); |
90 | 92 | ||
91 | #endif /* HAVE_TOUCHPAD */ | 93 | #endif /* HAVE_TOUCHSCREEN */ |
92 | #endif /* _PLUGIN_LIB_TOUCHSCREEN_H_ */ | 94 | #endif /* _PLUGIN_LIB_TOUCHSCREEN_H_ */ |