i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* adjusted _HandleInputMethodChanged() to not blindly insert the string that

Browse Source 
has been given via the inline input method, but to feed the individual
  UTF8-characters it contains to KeyDown() - this way special keys like
  B_BACKSPACE and cursor keys will be handled correctly instead of producing
  a "unknown char rectangle"


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30764 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2009-05-15 10:05:05 +00:00
parent c75b5c6c68
commit b62daa4867
1 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/TextView.cpp
+42 -12
View File
@@ -5250,22 +5250,52 @@ BTextView::_HandleInputMethodChanged(BMessage *message)
clauseCount++;
}
int32 selectionStart = 0;
int32 selectionEnd = 0;
message->FindInt32("be:selection", 0, &selectionStart);
message->FindInt32("be:selection", 1, &selectionEnd);
if (confirmed) {
_Refresh(fSelStart, fSelEnd, true, true);
_ShowCaret();
fInline->SetSelectionOffset(selectionStart);
fInline->SetSelectionLength(selectionEnd - selectionStart);
// now we need to feed ourselves the individual characters as if the
// user would have pressed them now - this lets KeyDown() pick out all
// the special characters like B_BACKSPACE, cursor keys and the like:
const char* currPos = string;
const char* prevPos = currPos;
while (*currPos != '\0') {
if ((*currPos & 0xC0) == 0xC0) {
// found the start of an UTF-8 char, we collect while it lasts
++currPos;
while ((*currPos & 0xC0) == 0x80)
++currPos;
} else if ((*currPos & 0xC0) == 0x80) {
// illegal: character starts with utf-8 intermediate byte, skip it
prevPos = ++currPos;
} else {
// single byte character/code, just feed that
++currPos;
}
KeyDown(prevPos, currPos - prevPos);
prevPos = currPos;
}
const int32 inlineOffset = fInline->Offset();
InsertText(string, stringLen, fSelStart, NULL);
fSelStart += stringLen;
fClickOffset = fSelEnd = fSelStart;
_Refresh(fSelStart, fSelEnd, true, true);
} else {
// temporarily show transient state of inline input
int32 selectionStart = 0;
int32 selectionEnd = 0;
message->FindInt32("be:selection", 0, &selectionStart);
message->FindInt32("be:selection", 1, &selectionEnd);
_Refresh(inlineOffset, fSelEnd, true, true);
fInline->SetSelectionOffset(selectionStart);
fInline->SetSelectionLength(selectionEnd - selectionStart);
const int32 inlineOffset = fInline->Offset();
InsertText(string, stringLen, fSelStart, NULL);
fSelStart += stringLen;
fClickOffset = fSelEnd = fSelStart;
_Refresh(inlineOffset, fSelEnd, true, true);
_ShowCaret();
}
_ShowCaret();
}