From 6b49b8ab47e4dcbd363a3ae281b55026c2b5759a Mon Sep 17 00:00:00 2001
From: Jordan Milne <jordan.milne@saynotolinux.com>
Date: Tue, 8 Jan 2013 22:14:30 -0400
Subject: [PATCH] MyGUI doesn't care for SDL's mouse button ordering, send it
 what it expects

---
 apps/openmw/mwinput/inputmanagerimp.cpp | 16 ++++++++++++++--
 apps/openmw/mwinput/inputmanagerimp.hpp |  6 ++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 9524381fb..f13eb9daf 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -450,7 +450,7 @@ namespace MWInput
     {
         mInputCtrl->mousePressed (arg, id);
 
-        MyGUI::InputManager::getInstance().injectMousePress(mMouseX, mMouseY, MyGUI::MouseButton::Enum(id));
+        MyGUI::InputManager::getInstance().injectMousePress(mMouseX, mMouseY, sdlButtonToMyGUI(id));
 
         if (MyGUI::InputManager::getInstance ().getMouseFocusWidget () != 0)
         {
@@ -468,7 +468,7 @@ namespace MWInput
     {
         mInputCtrl->mouseReleased (arg, id);
 
-        MyGUI::InputManager::getInstance().injectMouseRelease(mMouseX, mMouseY, MyGUI::MouseButton::Enum(id));
+        MyGUI::InputManager::getInstance().injectMouseRelease(mMouseX, mMouseY, sdlButtonToMyGUI(id));
 
         return true;
     }
@@ -905,4 +905,16 @@ namespace MWInput
     {
         loadKeyDefaults(true);
     }
+
+    MyGUI::MouseButton InputManager::sdlButtonToMyGUI(Uint8 button)
+    {
+        //The right button is the second button, according to MyGUI
+        if(button == SDL_BUTTON_RIGHT)
+            button = SDL_BUTTON_MIDDLE;
+        else if(button == SDL_BUTTON_MIDDLE)
+            button = SDL_BUTTON_RIGHT;
+
+        //MyGUI's buttons are 0 indexed
+        return MyGUI::MouseButton::Enum(button - 1);
+    }
 }
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index 3677f9070..df6ce3c43 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -36,6 +36,11 @@ namespace ICS
     class InputControlSystem;
 }
 
+namespace MyGUI
+{
+    class MouseButton;
+}
+
 #include <extern/oics/ICSChannelListener.h>
 #include <extern/oics/ICSInputControlSystem.h>
 #include <extern/oics/OISCompat.h>
@@ -149,6 +154,7 @@ namespace MWInput
 
     private:
         void adjustMouseRegion(int width, int height);
+        MyGUI::MouseButton sdlButtonToMyGUI(Uint8 button);
 
         void resetIdleTime();
         void updateIdleTime(float dt);