6 files changed, 31 insertions, 5 deletions

diff --git a/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c
index 74b8d649b3..4f2a2775bf 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c
+++ b/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c
@@ -66,7 +66,7 @@ void button_init_device(void)
 
     bottomright.px_x = LCD_WIDTH;
     bottomright.px_y = LCD_HEIGHT;
-    
+
     imx233_touchscreen_init();
     imx233_touchscreen_enable(true);
 
@@ -104,6 +104,11 @@ static int touch_to_pixels(int *val_x, int *val_y)
     return (x<<16)|y;
 }
 
+void touchscreen_enable_device(bool en)
+{
+    imx233_touchscreen_enable(en);
+}
+
 static int touchscreen_read_device(int *data)
 {
     int x, y;
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
index afabdd3bc3..05c4da8540 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c
@@ -28,6 +28,7 @@
 #include "string.h"
 #include "usb.h"
 #include "power-imx233.h"
+#include "touchpad.h"
 
 #ifndef BOOTLOADER
 
@@ -274,7 +275,7 @@ static void do_interrupt(void)
     imx233_pinctrl_setup_irq(0, 27, true, true, false, &rmi_attn_cb, 0);
 }
 
-void touchdev_enable(bool en)
+void touchpad_enable_device(bool en)
 {
     t_enable = en;
     queue_post(&rmi_queue, RMI_SET_SLEEP_MODE, en ? RMI_SLEEP_MODE_LOW_POWER : RMI_SLEEP_MODE_SENSOR_SLEEP);
@@ -433,5 +434,5 @@ int button_read_device(void)
         default: 
             break;
     }
-    return res | touchpad_read_device();
+    return res | touchpad_filter(touchpad_read_device());
 }
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h
index 1c94b76cdc..ce5ffe464a 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 bool button_debug_screen(void);
 void touchpad_set_sensitivity(int level);
-void touchdev_enable(bool en);
+void touchpad_enable_device(bool en);
 
 /* Main unit's buttons */
 #define BUTTON_POWER                0x00000001
@@ -47,6 +47,10 @@ void touchdev_enable(bool en);
                      BUTTON_PLAYPAUSE|BUTTON_BACK| \
                      BUTTON_BOTTOMRIGHT|BUTTON_BOTTOMLEFT)
 
+#define BUTTON_TOUCHPAD (BUTTON_LEFT|BUTTON_UP|BUTTON_RIGHT|BUTTON_DOWN| \
+                         BUTTON_SELECT|BUTTON_PLAYPAUSE|BUTTON_BACK| \
+                         BUTTON_BOTTOMRIGHT|BUTTON_BOTTOMLEFT)
+
 /* Software power-off */
 #define POWEROFF_BUTTON BUTTON_POWER
 #define POWEROFF_COUNT 10
diff --git a/firmware/target/hosted/android/button-android.c b/firmware/target/hosted/android/button-android.c
index ee8b32d704..b4f3d1bd90 100644
--- a/firmware/target/hosted/android/button-android.c
+++ b/firmware/target/hosted/android/button-android.c
@@ -129,6 +129,11 @@ void button_init_device(void)
     set_rockbox_ready();
 }
 
+void touchscreen_enable_device(bool en)
+{
+    (void)en; /* FIXME: do something smart */
+}
+
 int button_read_device(int *data)
 {
     int btn = last_btns;
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 4bd4b8de64..f69c0a509b 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -393,10 +393,14 @@ static void button_event(int key, bool pressed)
 #endif
     default:
 #ifdef HAVE_TOUCHSCREEN
-        new_btn = key_to_touch(key, mouse_coords);
+        if(touchscreen_is_enabled())
+            new_btn = key_to_touch(key, mouse_coords);
         if (!new_btn)
 #endif
             new_btn = key_to_button(key);
+#ifdef HAVE_TOUCHPAD
+        new_btn = touchpad_filter(new_btn);
+#endif
         break;
     }
     /* Call to make up for scrollwheel target implementation.  This is
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
index e6f0cd9cc3..d06cb28f40 100644
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
@@ -300,3 +300,10 @@ void adc_close(void)
     sleep(20);
     __cpm_stop_sadc();
 }
+
+#ifndef HAS_BUTTON_HOLD
+void touchscreen_enable_device(bool en)
+{
+    (void)en; /* FIXME: do something smart */
+}
+#endif