Menu
▾
▴
[aedGUI-cvs] aedGUI/src aedFont.cpp,1.16,1.17 aedTextBox.cpp,1.36,1.37
|
From: Rodrigo H. <kw...@us...> - 2004-05-22 19:28:17
|
Update of /cvsroot/aedgui/aedGUI/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21721/src Modified Files: aedFont.cpp aedTextBox.cpp Log Message: Fixed crashing bug when selecting text, changed Selected text rendering code Index: aedTextBox.cpp =================================================================== RCS file: /cvsroot/aedgui/aedGUI/src/aedTextBox.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** aedTextBox.cpp 21 May 2004 13:48:30 -0000 1.36 --- aedTextBox.cpp 22 May 2004 19:28:08 -0000 1.37 *************** *** 166,169 **** --- 166,186 ---- m_ShowCaret = true; } + if((event.mod & KMOD_SHIFT)) + { + if (!m_Selecting) + { + m_Selecting = true; + setSelection(m_CaretPos + 1, m_CaretPos); + } + else + { + setSelectionEnd(m_CaretPos); + } + } + else + { + m_Selecting = false; + setSelection(0, 0); + } processed = true; break; *************** *** 179,182 **** --- 196,216 ---- m_ShowCaret = true; } + if((event.mod & KMOD_SHIFT)) + { + if (!m_Selecting) + { + m_Selecting = true; + setSelection(m_CaretPos - 1, m_CaretPos); + } + else + { + setSelectionEnd(m_CaretPos); + } + } + else + { + m_Selecting = false; + setSelection(0, 0); + } processed = true; break; *************** *** 187,190 **** --- 221,241 ---- /* Fall through */ case SDLK_HOME: + if((event.mod & KMOD_SHIFT)) + { + if (!m_Selecting) + { + m_Selecting = true; + setSelection(m_CaretPos, 0); + } + else + { + setSelectionEnd(0); + } + } + else + { + m_Selecting = false; + setSelection(0, 0); + } m_CaretPos = 0; processed = true; *************** *** 196,199 **** --- 247,267 ---- /* Fall through */ case SDLK_END: + if((event.mod & KMOD_SHIFT)) + { + if (!m_Selecting) + { + m_Selecting = true; + setSelection(m_CaretPos, int (m_Caption.size())); + } + else + { + setSelectionEnd(int (m_Caption.size())); + } + } + else + { + m_Selecting = false; + setSelection(0, 0); + } m_CaretPos = int (m_Caption.size()); processed = true; *************** *** 217,220 **** --- 285,289 ---- m_Caption.erase(m_Caption.begin() + m_CaretPos); } + m_Selecting = false; processed = true; break; *************** *** 236,239 **** --- 305,309 ---- m_Caption.erase(m_Caption.begin() + m_CaretPos); } + m_Selecting = false; processed = true; break; *************** *** 246,249 **** --- 316,320 ---- m_CaretPos = 0; setSelection(0, 0); + m_Selecting = false; processed = true; break; *************** *** 275,278 **** --- 346,350 ---- setSelection(0, 0); } + m_Selecting = false; processed = true; break; *************** *** 298,301 **** --- 370,374 ---- } } + m_Selecting = false; processed = true; break; *************** *** 305,309 **** } ! if(!processed && isprint(key)) { if(SelectStart != SelectEnd) --- 378,383 ---- } ! //if(!processed && isprint(key)) ! if(!processed && key) { if(SelectStart != SelectEnd) *************** *** 313,316 **** --- 387,391 ---- m_CaretPos = SelectStart; setSelection(0, 0); + m_Selecting = false; } // FIXME: This doesn't handle wide characters *************** *** 329,333 **** aedTextBox::render(void) { ! //SDL_Surface *s1 = NULL; SDL_Rect src = { 0, 0, 0, 0 --- 404,408 ---- aedTextBox::render(void) { ! //SDL_Surface *s1 = NULL; SDL_Rect src = { 0, 0, 0, 0 *************** *** 336,340 **** 0, 0, m_Surface->w, m_Surface->h }; ! std::string temp1, temp2, pass; Uint16 width1, height1, width2, height2; --- 411,415 ---- 0, 0, m_Surface->w, m_Surface->h }; ! std::string temp1, temp2, pass, selected; Uint16 width1, height1, width2, height2; *************** *** 369,417 **** thisColor.setA(this->getAlphaValue()); - //s1 = m_Font->renderTextBlended(m_Caption.c_str(), thisColor); - - if(m_SelectionStart != m_SelectionEnd) - { - Uint16 SelectionStartX, SelectionWidth; - Uint16 SelectionBoxHeight; - - Uint32 SelectStart = m_SelectionStart; - Uint32 SelectEnd = m_SelectionEnd; - - if(SelectStart > SelectEnd) - std::swap(SelectStart, SelectEnd); - - std::string BeforeSelection(m_Caption.substr(0, SelectStart)); - std::string SelectedText(m_Caption. - substr(SelectStart, SelectEnd - SelectStart)); - - m_Font->getTextSize(BeforeSelection.c_str(), &SelectionStartX, - &SelectionBoxHeight); - m_Font->getTextSize(SelectedText.c_str(), &SelectionWidth, - &SelectionBoxHeight); - - aedColor SelectColor(0, 0, 200, 255); // TODO: This needs to come from the theme - - void* screenORrect = NULL; - aedRect rect; - if(pApp->usesOpenGL()) - { - rect = getRealPos(); - screenORrect = ▭ - } - else - { - //screenORrect = s1; - } - - //SLOCK(s1); // TODO: What should selected text look like? - int x2 = SelectionStartX + SelectionWidth - 1; - - if(x2 >= width1) - x2 = width1 - 1; - DrawRect(screenORrect, SelectionStartX, 0, x2, SelectionBoxHeight - 1, - SelectColor); - //SUNLOCK(s1); - } dest.x += cPad + 1; --- 444,447 ---- *************** *** 454,459 **** m_Caption.c_str(), thisColor); ! //SDL_BlitSurface(s1, &src, m_Surface, &dest); ! //SDL_FreeSurface(s1); } --- 484,504 ---- m_Caption.c_str(), thisColor); ! if(m_SelectionStart != m_SelectionEnd) ! { ! Uint32 SelectStart = m_SelectionStart; ! Uint32 SelectEnd = m_SelectionEnd; ! aedColor SelectedColor = m_BGColor;//(0, 0, 200, 255); ! aedColor InvertedthisColor = thisColor; ! InvertedthisColor.invertRGB(); ! SelectedColor.invertRGB(); ! if(SelectStart > SelectEnd) ! std::swap(SelectStart, SelectEnd); ! selected = m_Caption.substr(SelectStart, SelectEnd - SelectStart); ! m_Font->renderTextShaded(m_Surface, ! dest.x+m_Font->getCharXOffset(m_Caption.c_str(),SelectStart), ! dest.y, ! selected.c_str(), ! InvertedthisColor,SelectedColor); ! } } Index: aedFont.cpp =================================================================== RCS file: /cvsroot/aedgui/aedGUI/src/aedFont.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** aedFont.cpp 21 May 2004 13:48:30 -0000 1.16 --- aedFont.cpp 22 May 2004 19:28:08 -0000 1.17 *************** *** 303,306 **** --- 303,321 ---- } + int aedFont::getCharXOffset(const char *str,int index) + { + int nTextLenght = strlen(str); + if (nTextLenght<index) return -1; + int xoffset = 0; + for(int i=0;i<nTextLenght;++i) + { + if (i==index) return xoffset; + xoffset+=charVector[str[i]-charoffset].advance; + }; + return -1; // this should not happen but prevents the event in which + // it could happen plus avoids a warning about not all paths + // of execution returning a value in MSVC + }; + void aedFont::generateFontVector() |