1 files changed, 30 insertions, 8 deletions

diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index 3e781270ff..117c2b921b 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -247,14 +247,6 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_WEAPON     BUTTON_RC_MENU
 #elif CONFIG_KEYPAD == COWOND2_PAD
 #define DOOMBUTTON_ESC        BUTTON_POWER
-#define DOOMBUTTON_UP         BUTTON_UP
-#define DOOMBUTTON_DOWN       BUTTON_DOWN
-#define DOOMBUTTON_LEFT       BUTTON_LEFT
-#define DOOMBUTTON_RIGHT      BUTTON_RIGHT
-#define DOOMBUTTON_OPEN       BUTTON_PLUS
-#define DOOMBUTTON_SHOOT      BUTTON_SELECT
-#define DOOMBUTTON_ENTER      BUTTON_MENU
-#define DOOMBUTTON_WEAPON     BUTTON_MINUS
 #elif CONFIG_KEYPAD == MROBE100_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
@@ -269,6 +261,36 @@ void I_ShutdownGraphics(void)
 #error Keymap not defined!
 #endif
 
+#ifdef HAVE_TOUCHPAD
+#ifndef DOOMBUTTON_UP
+#define DOOMBUTTON_UP      BUTTON_TOPMIDDLE
+#endif
+#ifndef DOOMBUTTON_DOWN
+#define DOOMBUTTON_DOWN    BUTTON_BOTTOMMIDDLE
+#endif
+#ifndef DOOMBUTTON_LEFT
+#define DOOMBUTTON_LEFT    BUTTON_MIDLEFT
+#endif
+#ifndef DOOMBUTTON_RIGHT
+#define DOOMBUTTON_RIGHT   BUTTON_MIDRIGHT
+#endif
+#ifndef DOOMBUTTON_SHOOT
+#define DOOMBUTTON_SHOOT   BUTTON_CENTER
+#endif
+#ifndef DOOMBUTTON_OPEN
+#define DOOMBUTTON_OPEN    BUTTON_TOPRIGHT
+#endif
+#ifndef DOOMBUTTON_ESC
+#define DOOMBUTTON_ESC     BUTTON_TOPLEFT
+#endif
+#ifndef DOOMBUTTON_ENTER
+#define DOOMBUTTON_ENTER   BUTTON_BOTTOMLEFT
+#endif
+#ifndef DOOMBUTTON_WEAPON
+#define DOOMBUTTON_WEAPON  BUTTON_BOTTOMRIGHT
+#endif
+#endif
+
 #ifdef DOOMBUTTON_SCROLLWHEEL
 /* Scrollwheel events are posted directly and not polled by the button
    driver - synthesize polling */