diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/bitmap/list.c | 6 | ||||
-rw-r--r-- | apps/gui/color_picker.c | 12 | ||||
-rw-r--r-- | apps/gui/list.c | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c index 5a8bc69450..a3f5da92ea 100644 --- a/apps/gui/bitmap/list.c +++ b/apps/gui/bitmap/list.c | |||
@@ -285,17 +285,17 @@ void list_draw(struct screen *display, struct viewport *parent, | |||
285 | } | 285 | } |
286 | 286 | ||
287 | 287 | ||
288 | #if defined(HAVE_TOUCHPAD) | 288 | #if defined(HAVE_TOUCHSCREEN) |
289 | /* This needs to be fixed if we ever get more than 1 touchscreen on a target. | 289 | /* This needs to be fixed if we ever get more than 1 touchscreen on a target. |
290 | * This also assumes the whole screen is used, which is a bad assumption but | 290 | * This also assumes the whole screen is used, which is a bad assumption but |
291 | * fine until customizable lists comes in... | 291 | * fine until customizable lists comes in... |
292 | */ | 292 | */ |
293 | static bool scrolling=false; | 293 | static bool scrolling=false; |
294 | 294 | ||
295 | unsigned gui_synclist_do_touchpad(struct gui_synclist * gui_list, struct viewport *parent) | 295 | unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list, struct viewport *parent) |
296 | { | 296 | { |
297 | short x, y; | 297 | short x, y; |
298 | unsigned button = action_get_touchpad_press(&x, &y); | 298 | unsigned button = action_get_touchscreen_press(&x, &y); |
299 | int line; | 299 | int line; |
300 | struct screen *display = &screens[SCREEN_MAIN]; | 300 | struct screen *display = &screens[SCREEN_MAIN]; |
301 | if (button == BUTTON_NONE) | 301 | if (button == BUTTON_NONE) |
diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c index 87af8ae3ed..d1ac2a9103 100644 --- a/apps/gui/color_picker.c +++ b/apps/gui/color_picker.c | |||
@@ -330,13 +330,13 @@ static void draw_screen(struct screen *display, char *title, | |||
330 | set_drawinfo(display, DRMODE_SOLID, text_color, background_color); | 330 | set_drawinfo(display, DRMODE_SOLID, text_color, background_color); |
331 | } | 331 | } |
332 | 332 | ||
333 | #ifdef HAVE_TOUCHPAD | 333 | #ifdef HAVE_TOUCHSCREEN |
334 | static int touchpad_slider(struct rgb_pick *rgb, int *selected_slider) | 334 | static int touchscreen_slider(struct rgb_pick *rgb, int *selected_slider) |
335 | { | 335 | { |
336 | short x,y; | 336 | short x,y; |
337 | int text_top,i,x1; | 337 | int text_top,i,x1; |
338 | int slider_left, slider_width; | 338 | int slider_left, slider_width; |
339 | unsigned button = action_get_touchpad_press(&x, &y); | 339 | unsigned button = action_get_touchscreen_press(&x, &y); |
340 | bool display_three_rows; | 340 | bool display_three_rows; |
341 | int max_label_width; | 341 | int max_label_width; |
342 | struct screen *display = &screens[SCREEN_MAIN]; | 342 | struct screen *display = &screens[SCREEN_MAIN]; |
@@ -426,9 +426,9 @@ bool set_color(struct screen *display, char *title, unsigned *color, | |||
426 | } | 426 | } |
427 | 427 | ||
428 | button = get_action(CONTEXT_SETTINGS_COLOURCHOOSER, TIMEOUT_BLOCK); | 428 | button = get_action(CONTEXT_SETTINGS_COLOURCHOOSER, TIMEOUT_BLOCK); |
429 | #ifdef HAVE_TOUCHPAD | 429 | #ifdef HAVE_TOUCHSCREEN |
430 | if (button == ACTION_TOUCHPAD) | 430 | if (button == ACTION_TOUCHSCREEN) |
431 | button = touchpad_slider(&rgb, &slider); | 431 | button = touchscreen_slider(&rgb, &slider); |
432 | #endif | 432 | #endif |
433 | 433 | ||
434 | switch (button) | 434 | switch (button) |
diff --git a/apps/gui/list.c b/apps/gui/list.c index 12ff929e8a..77ec090b04 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -576,9 +576,9 @@ void gui_synclist_speak_item(struct gui_synclist * lists) | |||
576 | } | 576 | } |
577 | 577 | ||
578 | extern intptr_t get_action_data(void); | 578 | extern intptr_t get_action_data(void); |
579 | #if defined(HAVE_TOUCHPAD) | 579 | #if defined(HAVE_TOUCHSCREEN) |
580 | /* this needs to be fixed if we ever get more than 1 touchscreen on a target */ | 580 | /* this needs to be fixed if we ever get more than 1 touchscreen on a target */ |
581 | unsigned gui_synclist_do_touchpad(struct gui_synclist * gui_list, struct viewport *parent); | 581 | unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list, struct viewport *parent); |
582 | #endif | 582 | #endif |
583 | 583 | ||
584 | bool gui_synclist_do_button(struct gui_synclist * lists, | 584 | bool gui_synclist_do_button(struct gui_synclist * lists, |
@@ -619,9 +619,9 @@ bool gui_synclist_do_button(struct gui_synclist * lists, | |||
619 | } | 619 | } |
620 | #endif | 620 | #endif |
621 | 621 | ||
622 | #if defined(HAVE_TOUCHPAD) | 622 | #if defined(HAVE_TOUCHSCREEN) |
623 | if (action == ACTION_TOUCHPAD) | 623 | if (action == ACTION_TOUCHSCREEN) |
624 | action = *actionptr = gui_synclist_do_touchpad(lists, &parent[SCREEN_MAIN]); | 624 | action = *actionptr = gui_synclist_do_touchscreen(lists, &parent[SCREEN_MAIN]); |
625 | #endif | 625 | #endif |
626 | 626 | ||
627 | switch (wrap) | 627 | switch (wrap) |