hrev48379 adds 2 changesets to branch 'master' old head: c278afdec1198a6e2d369ac6c8fbd9785543de5e new head: 3d01d427aea8c849257197f23564aca7030bf606 overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=3d01d42+%5Ec278afd ---------------------------------------------------------------------------- 1abd97e: Add SerialConnect to DeskBar menu. It works well enough now. 3d01d42: 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. [ Adrien Destugues <pulkomandy@xxxxxxxxx> ] ---------------------------------------------------------------------------- 2 files changed, 7 insertions(+), 9 deletions(-) build/jam/images/definitions/regular | 2 +- src/preferences/keymap/KeyboardLayoutView.cpp | 14 ++++++-------- ############################################################################ Commit: 1abd97e2253aace04acaecf259ef12c704495c7c URL: http://cgit.haiku-os.org/haiku/commit/?id=1abd97e Author: Adrien Destugues <pulkomandy@xxxxxxxxx> Date: Wed Nov 26 09:12:44 2014 UTC Add SerialConnect to DeskBar menu. It works well enough now. ---------------------------------------------------------------------------- diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular index 971e142..c00feeb 100644 --- a/build/jam/images/definitions/regular +++ b/build/jam/images/definitions/regular @@ -33,7 +33,7 @@ DESKBAR_APPLICATIONS += Icon-O-Matic Installer Magnify Mail MediaConverter MediaPlayer MidiPlayer People PoorMan - SoundRecorder + SerialConnect SoundRecorder TV ; ############################################################################ Revision: hrev48379 Commit: 3d01d427aea8c849257197f23564aca7030bf606 URL: http://cgit.haiku-os.org/haiku/commit/?id=3d01d42 Author: Adrien Destugues <pulkomandy@xxxxxxxxx> Date: Wed Nov 26 09:35:43 2014 UTC Ticket: https://dev.haiku-os.org/ticket/5734 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. ---------------------------------------------------------------------------- diff --git a/src/preferences/keymap/KeyboardLayoutView.cpp b/src/preferences/keymap/KeyboardLayoutView.cpp index 64f2a58..7586bcf 100644 --- a/src/preferences/keymap/KeyboardLayoutView.cpp +++ b/src/preferences/keymap/KeyboardLayoutView.cpp @@ -1164,15 +1164,13 @@ KeyboardLayoutView::_HandleDeadKey(uint32 key, int32 modifiers) bool isEnabled = false; int32 deadKey = fKeymap->DeadKey(key, modifiers, &isEnabled); - if (fDeadKey != deadKey) { - if (isEnabled) { - Invalidate(); - fDeadKey = deadKey; - return true; - } - } else if (fDeadKey != 0) { + if (fDeadKey != deadKey && isEnabled) { + fDeadKey = deadKey; Invalidate(); + return true; + } else if (fDeadKey != 0) { fDeadKey = 0; + Invalidate(); return true; } @@ -1196,7 +1194,7 @@ KeyboardLayoutView::_KeyChanged(const BMessage* message) 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)) checkSingle = false;