Commit FS#9308: differentiate between TOUCHPAD & TOUCHSCREEN

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18338 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 14 insertions, 14 deletions

diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index 5a8bc69..a3f5da9 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,
 }
 
 
-#if defined(HAVE_TOUCHPAD)
+#if defined(HAVE_TOUCHSCREEN)
 /* This needs to be fixed if we ever get more than 1 touchscreen on a target.
  * This also assumes the whole screen is used, which is a bad assumption but
  * fine until customizable lists comes in...
  */
 static bool scrolling=false;
 
-unsigned gui_synclist_do_touchpad(struct gui_synclist * gui_list, struct viewport *parent)
+unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list, struct viewport *parent)
 {
     short x, y;
-    unsigned button = action_get_touchpad_press(&x, &y);
+    unsigned button = action_get_touchscreen_press(&x, &y);
     int line;
     struct screen *display = &screens[SCREEN_MAIN];
     if (button == BUTTON_NONE)
diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c
index 87af8ae..d1ac2a9 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,
     set_drawinfo(display, DRMODE_SOLID, text_color, background_color);
 }
 
-#ifdef HAVE_TOUCHPAD
-static int touchpad_slider(struct rgb_pick *rgb, int *selected_slider)
+#ifdef HAVE_TOUCHSCREEN
+static int touchscreen_slider(struct rgb_pick *rgb, int *selected_slider)
 {
     short     x,y;
     int       text_top,i,x1;
     int       slider_left, slider_width;
-    unsigned  button = action_get_touchpad_press(&x, &y);
+    unsigned  button = action_get_touchscreen_press(&x, &y);
     bool      display_three_rows;
     int       max_label_width;
     struct screen *display = &screens[SCREEN_MAIN];
@@ -426,9 +426,9 @@ bool set_color(struct screen *display, char *title, unsigned *color,
         }
 
         button = get_action(CONTEXT_SETTINGS_COLOURCHOOSER, TIMEOUT_BLOCK);
-#ifdef HAVE_TOUCHPAD
-        if (button == ACTION_TOUCHPAD)
-            button = touchpad_slider(&rgb, &slider);
+#ifdef HAVE_TOUCHSCREEN
+        if (button == ACTION_TOUCHSCREEN)
+            button = touchscreen_slider(&rgb, &slider);
 #endif
 
         switch (button)
diff --git a/apps/gui/list.c b/apps/gui/list.c
index 12ff929..77ec090 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -576,9 +576,9 @@ void gui_synclist_speak_item(struct gui_synclist * lists)
 }
 
 extern intptr_t get_action_data(void);
-#if  defined(HAVE_TOUCHPAD)
+#if  defined(HAVE_TOUCHSCREEN)
 /* this needs to be fixed if we ever get more than 1 touchscreen on a target */
-unsigned gui_synclist_do_touchpad(struct gui_synclist * gui_list, struct viewport *parent);
+unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list, struct viewport *parent);
 #endif
 
 bool gui_synclist_do_button(struct gui_synclist * lists,
@@ -619,9 +619,9 @@ bool gui_synclist_do_button(struct gui_synclist * lists,
     }
 #endif
     
-#if defined(HAVE_TOUCHPAD)
-    if (action == ACTION_TOUCHPAD)
-        action = *actionptr = gui_synclist_do_touchpad(lists, &parent[SCREEN_MAIN]);
+#if defined(HAVE_TOUCHSCREEN)
+    if (action == ACTION_TOUCHSCREEN)
+        action = *actionptr = gui_synclist_do_touchscreen(lists, &parent[SCREEN_MAIN]);
 #endif
 
     switch (wrap)