2 files changed, 42 insertions, 13 deletions

diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index 791149c86c..49156c2f11 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -103,16 +103,32 @@
 #define ZX_MENU         BUTTON_RC_REC
 
 #elif CONFIG_KEYPAD == COWOND2_PAD
-#define ZX_UP           BUTTON_UP
-#define ZX_DOWN         BUTTON_DOWN
-#define ZX_LEFT         BUTTON_LEFT
-#define ZX_RIGHT        BUTTON_RIGHT
-#define ZX_SELECT       BUTTON_SELECT
-#define ZX_MENU         BUTTON_MENU
+#define ZX_MENU         (BUTTON_MENU|BUTTON_REL)
 
 #else
 #error Keymap not defined!
 
 #endif
 
+#ifdef HAVE_TOUCHPAD
+#ifndef ZX_UP
+#define ZX_UP           BUTTON_TOPMIDDLE
+#endif
+#ifndef ZX_DOWN
+#define ZX_DOWN         BUTTON_BOTTOMMIDDLE
+#endif
+#ifndef ZX_LEFT
+#define ZX_LEFT         BUTTON_MIDLEFT
+#endif
+#ifndef ZX_RIGHT
+#define ZX_RIGHT        BUTTON_MIDRIGHT
+#endif
+#ifndef ZX_SELECT
+#define ZX_SELECT       BUTTON_CENTER
+#endif
+#ifndef ZX_MENU
+#define ZX_MENU         (BUTTON_TOPLEFT|BUTTON_REL)
+#endif
+#endif
+
 #endif
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index f1de0a051c..33d44512a7 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -124,17 +124,30 @@
 
 #elif CONFIG_KEYPAD == COWOND2_PAD
 
-/* TODO: Check keyboard mappings */
-
-#define KBD_SELECT BUTTON_SELECT
 #define KBD_ABORT BUTTON_POWER
-#define KBD_LEFT BUTTON_LEFT
-#define KBD_RIGHT BUTTON_RIGHT
-#define KBD_UP BUTTON_UP
-#define KBD_DOWN BUTTON_DOWN
 
 #endif
 
+#ifdef HAVE_TOUCHPAD
+#ifndef KBD_SELECT
+#define KBD_SELECT BUTTON_CENTER
+#endif
+#ifndef KBD_ABORT
+#define KBD_ABORT  BUTTON_TOPLEFT
+#endif
+#ifndef KBD_LEFT
+#define KBD_LEFT   BUTTON_MIDLEFT
+#endif
+#ifndef KBD_RIGHT
+#define KBD_RIGHT  BUTTON_MIDRIGHT
+#endif
+#ifndef KBD_UP
+#define KBD_UP     BUTTON_TOPMIDDLE
+#endif
+#ifndef KBD_DOWN
+#define KBD_DOWN   BUTTON_BOTTOMMIDDLE
+#endif
+#endif
 
 struct keyboard_parameters {
     const unsigned char* default_kbd;