From cd131e7f867fbc0c9a8d28259960dab40a23f248 Mon Sep 17 00:00:00 2001
From: Fil Krynicki <filipkrynicki@gmail.com>
Date: Sat, 31 May 2014 19:51:21 -0400
Subject: [PATCH] 1196/1217 fix

Fixes an issue where inputs could be processed by both GUI and
gameplay systems. An enabled/disable has been added to OIS
channels, and OpenMW now disables player gameplay hotkeys when
a GUI element has focus. GUI hotkeys are left enabled.
---
 apps/openmw/mwinput/inputmanagerimp.cpp | 19 ++++++++++++++++++-
 apps/openmw/mwinput/inputmanagerimp.hpp |  2 ++
 extern/oics/ICSChannel.cpp              | 13 +++++++++++--
 extern/oics/ICSChannel.h                |  6 +++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 344da5be1a..73399ee788 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -160,6 +160,20 @@ namespace MWInput
         delete mInputManager;
     }
 
+    void InputManager::setPlayerControlsEnabled(bool enabled)
+    {
+        int nPlayerChannels = 15;
+        int playerChannels[] = {A_Activate, A_AutoMove, A_AlwaysRun, A_ToggleWeapon,
+                                A_ToggleSpell, A_Rest, A_QuickKey1, A_QuickKey2,
+                                A_QuickKey3, A_QuickKey4, A_QuickKey5, A_QuickKey6,
+                                A_QuickKey7, A_QuickKey8, A_QuickKey9, A_QuickKey10};
+
+        for(int i = 0; i < nPlayerChannels; i++) {
+            int pc = playerChannels[i];
+            mInputBinder->getChannel(pc)->setEnabled(enabled);
+        }
+    }
+
     void InputManager::channelChanged(ICS::Channel* channel, float currentValue, float previousValue)
     {
         if (mDragDrop)
@@ -511,7 +525,10 @@ namespace MWInput
         OIS::KeyCode kc = mInputManager->sdl2OISKeyCode(arg.keysym.sym);
 
         if (kc != OIS::KC_UNASSIGNED)
-            MyGUI::InputManager::getInstance().injectKeyPress(MyGUI::KeyCode::Enum(kc), 0);
+        {
+            bool guiFocus = MyGUI::InputManager::getInstance().injectKeyPress(MyGUI::KeyCode::Enum(kc), 0);
+            setPlayerControlsEnabled(!guiFocus);
+        }
         mInputBinder->keyPressed (arg);
     }
 
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index 537c3a1827..dbd13e793c 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -172,6 +172,8 @@ namespace MWInput
         void resetIdleTime();
         void updateIdleTime(float dt);
 
+        void setPlayerControlsEnabled(bool enabled);
+
     private:
         void toggleMainMenu();
         void toggleSpell();
diff --git a/extern/oics/ICSChannel.cpp b/extern/oics/ICSChannel.cpp
index 703f2207c9..268615c920 100644
--- a/extern/oics/ICSChannel.cpp
+++ b/extern/oics/ICSChannel.cpp
@@ -38,6 +38,7 @@ namespace ICS
             , mValue(initialValue)
 			, mSymmetricAt(symmetricAt)
 			, mBezierStep(bezierStep)
+            , mEnabled(true)
     { 
 		mBezierMidPoint.x = bezierMidPointX;
 		mBezierMidPoint.y = bezierMidPointY;
@@ -45,6 +46,11 @@ namespace ICS
 		setBezierFunction(bezierMidPointY, bezierMidPointX, symmetricAt, bezierStep);
 	} 
 
+    void Channel::setEnabled(bool enabled)
+    {
+        mEnabled = enabled;
+    }
+
 	float Channel::getValue()
 	{
 		if(mValue == 0 || mValue == 1)
@@ -124,7 +130,10 @@ namespace ICS
 
 	void Channel::update()
 	{
-		if(this->getControlsCount() == 1)
+        if(!mEnabled)
+            return;
+
+        if(this->getControlsCount() == 1)
 		{
 			ControlChannelBinderItem ccBinderItem = mAttachedControls.back();
 			float diff = ccBinderItem.control->getValue() - ccBinderItem.control->getInitialValue();
@@ -255,4 +264,4 @@ namespace ICS
 			t += 1.0f / ((endX-startX)/step);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/extern/oics/ICSChannel.h b/extern/oics/ICSChannel.h
index 5ec6cd575b..3da53369c3 100644
--- a/extern/oics/ICSChannel.h
+++ b/extern/oics/ICSChannel.h
@@ -89,6 +89,8 @@ namespace ICS
 
 		IntervalList& getIntervals(){ return mIntervals; };
 
+        void setEnabled(bool enabled);
+
     protected:
 
         int mNumber;
@@ -112,7 +114,9 @@ namespace ICS
 		std::vector<ControlChannelBinderItem> mAttachedControls;
 
         std::list<ChannelListener* > mListeners;
-	    void notifyListeners(float previousValue);
+        void notifyListeners(float previousValue);
+
+        bool mEnabled;
 
 	};