From 719e77a191f49c6accb777cd0b0a3465355762ff Mon Sep 17 00:00:00 2001
From: fireclawthefox <fireclawthefox@gmail.com>
Date: Wed, 10 Aug 2016 16:46:20 +0200
Subject: [PATCH] Changed button mapping

changed mapping of previous and next (i.e. wiimote's + and - keys) to
the same as the select and start button
---
 panda/src/device/evdevInputDevice.cxx    |  8 ++------
 panda/src/device/linuxJoystickDevice.cxx | 10 ++--------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/panda/src/device/evdevInputDevice.cxx b/panda/src/device/evdevInputDevice.cxx
index 573042c5d2..3edde84935 100644
--- a/panda/src/device/evdevInputDevice.cxx
+++ b/panda/src/device/evdevInputDevice.cxx
@@ -768,20 +768,16 @@ map_button(int code) {
     return GamepadButton::action_2();
 
   case BTN_SELECT:
+  case KEY_PREVIOUS:
     return GamepadButton::back();
 
   case BTN_START:
+  case KEY_NEXT:
     return GamepadButton::start();
 
   case BTN_MODE:
     return GamepadButton::guide();
 
-  case KEY_NEXT:
-    return GamepadButton::next();
-
-  case KEY_PREVIOUS:
-    return GamepadButton::previous();
-
   case BTN_THUMBL:
     return GamepadButton::lstick();
 
diff --git a/panda/src/device/linuxJoystickDevice.cxx b/panda/src/device/linuxJoystickDevice.cxx
index a1abddf3dd..fc2e2ba7b1 100644
--- a/panda/src/device/linuxJoystickDevice.cxx
+++ b/panda/src/device/linuxJoystickDevice.cxx
@@ -172,10 +172,12 @@ open_device() {
         break;
 
       case BTN_SELECT:
+      case KEY_PREVIOUS:
         handle = GamepadButton::back();
         break;
 
       case BTN_START:
+      case KEY_NEXT:
         handle = GamepadButton::start();
         break;
 
@@ -183,14 +185,6 @@ open_device() {
         handle = GamepadButton::guide();
         break;
 
-      case KEY_NEXT:
-        handle = GamepadButton::next();
-        break;
-
-      case KEY_PREVIOUS:
-        handle = GamepadButton::previous();
-        break;
-
       case BTN_THUMBL:
         handle = GamepadButton::lstick();
         break;