Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Shortcut monitor handles raw keyboard events now to get untranslated key codes

Browse Source
This commit is contained in:
Simon Rozman 2016-04-04 14:22:33 +02:00
parent 31869a9094
commit 06dae56c66
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ZRCola/zrcolakeyhndlr.cpp
View File

@ -52,7 +52,7 @@ wxZRColaKeyHandler::wxZRColaKeyHandler() : wxEvtHandler()
bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event) bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
{ {
if (event.GetEventType() == wxEVT_CHAR) { if (event.GetEventType() == wxEVT_KEY_DOWN) {
// The character event occured. // The character event occured.
ZRCola::keyseq_db::indexKey::size_type start, end; ZRCola::keyseq_db::indexKey::size_type start, end;
bool found; bool found;
@ -61,7 +61,7 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
// Parse key event and save it at the end of the key sequence. // Parse key event and save it at the end of the key sequence.
wxKeyEvent &e = (wxKeyEvent&)event; wxKeyEvent &e = (wxKeyEvent&)event;
ZRCola::keyseq_db::keyseq::key_t key; ZRCola::keyseq_db::keyseq::key_t key;
key.key = wxToupper(e.m_uniChar); key.key = e.GetKeyCode(); //wxToupper(e.m_uniChar);
key.modifiers = key.modifiers =
(e.ShiftDown() ? ZRCola::keyseq_db::keyseq::SHIFT : 0) | (e.ShiftDown() ? ZRCola::keyseq_db::keyseq::SHIFT : 0) |
(e.ControlDown() ? ZRCola::keyseq_db::keyseq::CTRL : 0) | (e.ControlDown() ? ZRCola::keyseq_db::keyseq::CTRL : 0) |
@ -95,8 +95,8 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
ZRCola::keyseq_db::keyseq::CompareSequence(m_seq.data(), m_seq.size(), m_ks_db.idxKey[start].seq, std::min<unsigned __int16>(m_ks_db.idxKey[start].seq_len, m_seq.size())) == 0) ZRCola::keyseq_db::keyseq::CompareSequence(m_seq.data(), m_seq.size(), m_ks_db.idxKey[start].seq, std::min<unsigned __int16>(m_ks_db.idxKey[start].seq_len, m_seq.size())) == 0)
{ {
// The sequence is a partial match. Continue watching. // The sequence is a partial match. Continue watching.
event.StopPropagation(); //event.StopPropagation();
return true; //return true;
} else { } else {
// The key sequence has no future chance to match. Start all over again. // The key sequence has no future chance to match. Start all over again.
m_seq.clear(); m_seq.clear();