TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1416 from Areloch/SDL_Inputs_Fixup

Browse source 
SDL Textbox bleedthrough inputs fix
This commit is contained in:
Areloch 2015-09-27 16:41:48 -05:00
commit 7da2d6d9d2
3 changed files with 31 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Engine/source/windowManager/sdl/sdlWindow.cpp
View file

@ -484,12 +484,6 @@ void PlatformWindowSDL::_triggerKeyNotify(const SDL_Event& evt)
keyEvent.trigger(getWindowId(), torqueModifiers, inputAction, torqueKey); keyEvent.trigger(getWindowId(), torqueModifiers, inputAction, torqueKey);
//Con::printf("Key %d : %d", tKey.sym, inputAction); //Con::printf("Key %d : %d", tKey.sym, inputAction);
} }
// stop SDL_TEXTINPUT event when unwanted
if( inputAction == IA_MAKE && getKeyboardTranslation() && shouldNotTranslate( torqueModifiers, torqueKey ) )
SDL_StopTextInput();
else
SDL_StartTextInput();
} }
void PlatformWindowSDL::_triggerTextNotify(const SDL_Event& evt) void PlatformWindowSDL::_triggerTextNotify(const SDL_Event& evt)
@ -606,3 +600,12 @@ const UTF16 *PlatformWindowSDL::getCurtainWindowClassName()
static String str("CurtainWindowClassName"); static String str("CurtainWindowClassName");
return str.utf16(); return str.utf16();
} }
void PlatformWindowSDL::setKeyboardTranslation(const bool enabled)
{
mEnableKeyboardTranslation = enabled;
if (mEnableKeyboardTranslation)
SDL_StartTextInput();
else
SDL_StopTextInput();
}

3
Engine/source/windowManager/sdl/sdlWindow.h
View file

@ -160,6 +160,9 @@ public:
virtual bool isMouseLocked() const { return mMouseLocked; }; virtual bool isMouseLocked() const { return mMouseLocked; };
virtual bool shouldLockMouse() const { return mShouldLockMouse; }; virtual bool shouldLockMouse() const { return mShouldLockMouse; };
/// Set if relevant keypress events should be translated into character input events.
virtual void setKeyboardTranslation(const bool enabled);
virtual WindowId getWindowId(); virtual WindowId getWindowId();
SDL_Window* getSDLWindow() const { return mWindowHandle; } SDL_Window* getSDLWindow() const { return mWindowHandle; }

33
Engine/source/windowManager/windowInputGenerator.cpp
View file

@ -82,27 +82,32 @@ WindowInputGenerator::~WindowInputGenerator()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void WindowInputGenerator::generateInputEvent( InputEventInfo &inputEvent ) void WindowInputGenerator::generateInputEvent( InputEventInfo &inputEvent )
{ {
if( !mInputController || !mFocused ) if (!mInputController || !mFocused)
return; return;
if (inputEvent.action == SI_MAKE && inputEvent.deviceType == KeyboardDeviceType) if (inputEvent.action == SI_MAKE && inputEvent.deviceType == KeyboardDeviceType)
{ {
for( int i = 0; i < mAcceleratorMap.size(); ++i ) for (int i = 0; i < mAcceleratorMap.size(); ++i)
{ {
const AccKeyMap &acc = mAcceleratorMap[i]; const AccKeyMap &acc = mAcceleratorMap[i];
if( acc.modifier & inputEvent.modifier && acc.keyCode == inputEvent.objInst ) if (!mWindow->getKeyboardTranslation() &&
{ (acc.modifier & inputEvent.modifier || (acc.modifier == 0 && inputEvent.modifier == 0))
Con::evaluatef(acc.cmd); && acc.keyCode == inputEvent.objInst)
return; {
} Con::evaluatef(acc.cmd);
} return;
} }
}
}
// Give the ActionMap first shot. // Give the ActionMap first shot.
if (ActionMap::handleEventGlobal(&inputEvent)) if (ActionMap::handleEventGlobal(&inputEvent))
return; return;
if( mInputController->processInputEvent( inputEvent ) ) if (mInputController->processInputEvent(inputEvent))
return;
if (mWindow->getKeyboardTranslation())
return; return;
// If we get here we failed to process it with anything prior... so let // If we get here we failed to process it with anything prior... so let