mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity

begin to support text input

Browse source
This commit is contained in:
Jordan Milne 2013-01-09 11:30:33 -04:00
parent 5fa77da9d4
commit cb01df49c0
3 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -413,6 +413,7 @@ namespace MWInput
}
#endif
*/
MyGUI::InputManager::getInstance().injectKeyPress(MyGUI::KeyCode::Enum(arg.keysym.sym), text);
return true;

25
apps/openmw/mwinput/sdlinputwrapper.cpp
View file

@ -27,8 +27,10 @@ namespace MWInput
MWSDLInputWrapper::~MWSDLInputWrapper()
{
if(mSDLWindow != NULL)
SDL_DestroyWindow(mSDLWindow);
mSDLWindow = NULL;
SDL_StopTextInput();
SDL_Quit();
}
@ -52,6 +54,8 @@ namespace MWInput
if(mSDLWindow == NULL)
return false;
SDL_StartTextInput();
#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
//linux-specific event-handling fixups
SDL_SysWMinfo wm_info;
@ -119,7 +123,7 @@ namespace MWInput
break;
case SDL_KEYDOWN:
mKeyboardListener->keyPressed(evt.key);
_handleKeyPress(evt.key);
break;
case SDL_KEYUP:
mKeyboardListener->keyReleased(evt.key);
@ -228,4 +232,23 @@ namespace MWInput
warpMouse(width / 2, height / 2);
}
}
void MWSDLInputWrapper::_handleKeyPress(SDL_KeyboardEvent &evt)
{
//SDL keyboard events are followed by the actual text those keys would generate
//to account for languages that require multiple keystrokes to produce a key.
//Look for an event immediately following ours, assuming each key produces exactly
//one character.
//TODO: This won't work for multibyte characters, but MyGUI is the only consumer
//of these, does it even support multibyte characters?
SDL_Event text_evts[1];
if(SDL_PeepEvents(text_evts, 1, SDL_GETEVENT, SDL_TEXTINPUT, SDL_TEXTINPUT) != 0)
{
evt.keysym.unicode = text_evts[0].text.text[0];
}
mKeyboardListener->keyPressed(evt);
}
}

2
apps/openmw/mwinput/sdlinputwrapper.hpp
View file

@ -30,6 +30,8 @@ namespace MWInput
bool _handleWarpMotion(const SDL_MouseMotionEvent& evt);
void _wrapMousePointer(const SDL_MouseMotionEvent &evt);
void _handleKeyPress(SDL_KeyboardEvent& evt);
bool _start();
ICS::MWSDLMouseListener* mMouseListener;