Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keymap preferneces: improve deadkey handling logic 

* The key down message is not delivered when completing a dead key, so
act on key up instead.
* Pressing a character after a dead key would leave the keymap in "dead
key" mode, and that mode would be exited only by pressing a dead key
again.

Fixes #5734.
This commit is contained in:
Adrien Destugues 2014-11-26 10:35:43 +01:00
parent 1abd97e225
commit 3d01d427ae
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/preferences/keymap/KeyboardLayoutView.cpp
View File

@ -1164,15 +1164,13 @@ KeyboardLayoutView::_HandleDeadKey(uint32 key, int32 modifiers)
bool isEnabled = false; bool isEnabled = false;
int32 deadKey = fKeymap->DeadKey(key, modifiers, &isEnabled); int32 deadKey = fKeymap->DeadKey(key, modifiers, &isEnabled);
if (fDeadKey != deadKey) { if (fDeadKey != deadKey && isEnabled) {
if (isEnabled) { fDeadKey = deadKey;
Invalidate();
fDeadKey = deadKey;
return true;
}
} else if (fDeadKey != 0) {
Invalidate(); Invalidate();
return true;
} else if (fDeadKey != 0) {
fDeadKey = 0; fDeadKey = 0;
Invalidate();
return true; return true;
} }
@ -1196,7 +1194,7 @@ KeyboardLayoutView::_KeyChanged(const BMessage* message)
bool checkSingle = true; bool checkSingle = true;
if (message->what == B_KEY_DOWN || message->what == B_UNMAPPED_KEY_DOWN) { if (message->what == B_KEY_UP || message->what == B_UNMAPPED_KEY_UP) {
if (_HandleDeadKey(key, fModifiers)) if (_HandleDeadKey(key, fModifiers))
checkSingle = false; checkSingle = false;