3 files changed, 71 insertions, 0 deletions

diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index c165e8f566..1cc95428ab 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -672,3 +672,15 @@ int button_apply_acceleration(const unsigned int data)
     return delta;
 }
 #endif /* HAVE_WHEEL_ACCELERATION */
+
+#if (defined(HAVE_TOUCHPAD) || defined(HAVE_TOUCHSCREEN)) && !defined(HAS_BUTTON_HOLD)
+void button_enable_touch(bool en)
+{
+#ifdef HAVE_TOUCHPAD
+    touchpad_enable(en);
+#endif
+#ifdef HAVE_TOUCHSCREEN
+    touchscreen_enable(en);
+#endif
+}
+#endif
diff --git a/firmware/drivers/touchpad.c b/firmware/drivers/touchpad.c
new file mode 100644
index 0000000000..1d78ee1c3e
--- /dev/null
+++ b/firmware/drivers/touchpad.c
@@ -0,0 +1,43 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2013 by Jean-Louis Biasini
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include <stdbool.h>
+#include "button.h"
+#include "touchpad.h"
+#include "button-target.h"
+
+static bool touch_enabled = true;
+
+void touchpad_enable(bool en)
+{
+    if(en != touch_enabled)
+    {
+        touch_enabled = en;
+        touchpad_enable_device(en);
+    }
+}
+
+int touchpad_filter(int button)
+{
+    if(!touch_enabled)
+        button &= ~BUTTON_TOUCHPAD;
+    return button;
+}
diff --git a/firmware/drivers/touchscreen.c b/firmware/drivers/touchscreen.c
index 823c2e7a92..8ce2400ca2 100644
--- a/firmware/drivers/touchscreen.c
+++ b/firmware/drivers/touchscreen.c
@@ -31,6 +31,7 @@
 #define BUTTON_MARGIN_X (int)(LCD_WIDTH * 0.03)
 #define BUTTON_MARGIN_Y (int)(LCD_HEIGHT * 0.03)
 
+static bool touch_enabled = true;
 static enum touchscreen_mode current_mode = TOUCHSCREEN_POINT;
 static const int touchscreen_buttons[3][3] =
 {
@@ -121,6 +122,8 @@ static void map_pixels(int *x, int *y)
 /* TODO: add jitter (and others) filter */
 int touchscreen_to_pixels(int x, int y, int *data)
 {
+    if(!touch_enabled)
+        return 0;
     x &= 0xFFFF;
     y &= 0xFFFF;
 
@@ -169,6 +172,19 @@ enum touchscreen_mode touchscreen_get_mode(void)
     return current_mode;
 }
 
+void touchscreen_enable(bool en)
+{
+    if(en != touch_enabled)
+    {
+        touch_enabled = en;
+        touchscreen_enable_device(en);
+    }
+}
+
+bool touchscreen_is_enabled(void)
+{
+    return touch_enabled;
+}
 
 #if ((CONFIG_PLATFORM & PLATFORM_ANDROID) == 0)
 /* android has an API for this */