Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backspace, tab extension and length calc should work now in chat manager

This commit is contained in:
titiger 2015-10-25 00:06:29 +02:00
parent 964c776dcd
commit 30d72c7b3c
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/glest_game/game/chat_manager.cpp
View File

@ -95,18 +95,15 @@ void ChatManager::keyUp(SDL_KeyboardEvent key) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
bool ChatManager::textInput(std::string text) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] text [%s]\n",__FILE__,__FUNCTION__,__LINE__,text.c_str());
bool ChatManager::textInput(std::string inputText) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] inputText [%s]\n",__FILE__,__FUNCTION__,__LINE__,inputText.c_str());
int maxTextLenAllowed = (customCB != NULL ? this->maxCustomTextLength : maxTextLenght);
if(editEnabled && (int)text.size() < maxTextLenAllowed) {
if(editEnabled && (int)textCharLength.size() < maxTextLenAllowed) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
//space is the first meaningful code
//wchar_t key = extractKeyPressedUnicode(c);
//wchar_t textAppend[] = { key, 0 };
std::wstring widestr = std::wstring(text.begin(), text.end());
const wchar_t *textAppend = widestr.c_str();
appendText(textAppend);
textCharLength.push_back(inputText.length());
this->text +=inputText;
updateAutoCompleteBuffer();
return true;
}
return false;
@ -351,14 +348,15 @@ void ChatManager::keyDown(SDL_KeyboardEvent key) {
void ChatManager::keyPress(SDL_KeyboardEvent c) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] key = [%c] [%d]\n",__FILE__,__FUNCTION__,__LINE__,c.keysym.sym,c.keysym.sym);
int maxTextLenAllowed = (customCB != NULL ? this->maxCustomTextLength : maxTextLenght);
if(editEnabled && (int)text.size() < maxTextLenAllowed) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] key = [%c] [%d]\n",__FILE__,__FUNCTION__,__LINE__,c.keysym.sym,c.keysym.sym);
//space is the first meaningful code
wchar_t key = extractKeyPressedUnicode(c);
wchar_t textAppend[] = { key, 0 };
appendText(textAppend);
}
// no more textinput with keyPress in SDL2!
// int maxTextLenAllowed = (customCB != NULL ? this->maxCustomTextLength : maxTextLenght);
// if(editEnabled && (int)text.size() < maxTextLenAllowed) {
// SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] key = [%c] [%d]\n",__FILE__,__FUNCTION__,__LINE__,c.keysym.sym,c.keysym.sym);
// //space is the first meaningful code
// wchar_t key = extractKeyPressedUnicode(c);
// wchar_t textAppend[] = { key, 0 };
// appendText(textAppend);
// }
}
void ChatManager::switchOnEdit(CustomInputCallbackInterface *customCB,int maxCustomTextLength) {

4
source/glest_game/menu/menu_state_masterserver.cpp
View File

@ -1218,9 +1218,7 @@ void MenuStateMasterserver::keyDown(SDL_KeyboardEvent key) {
ircClient->SendIRCCmdMessage(IRC_CHANNEL, chatManager.getText());
}
}
if(isKeyPressed(SDLK_RETURN,key,false) == true){
chatManager.keyDown(key);
}
chatManager.keyDown(key);
}
if(chatManager.getEditEnabled() == false) {
//if(key == configKeys.getCharKey("ToggleMusic")) {