haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't map low-order keyCodes unless they really are Ctrl-Letter codes. 

Fixes: lp:1803730
* https://bugs.launchpad.net/kicad/+bug/1803730
This commit is contained in:
Jeff Young 2018-11-19 11:24:14 +00:00
parent 2ee2d9014a
commit bd85421daa
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/tool/tool_dispatcher.cpp
View File

@ -312,6 +312,7 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
bool motion = false, buttonEvents = false; bool motion = false, buttonEvents = false;
OPT<TOOL_EVENT> evt; OPT<TOOL_EVENT> evt;
int key = 0; // key = 0 if the event is not a key event int key = 0; // key = 0 if the event is not a key event
int unicode = 0;
bool keyIsSpecial = false; // True if the key is a special key code bool keyIsSpecial = false; // True if the key is a special key code
int type = aEvent.GetEventType(); int type = aEvent.GetEventType();
@ -369,6 +370,7 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
wxKeyEvent* ke = static_cast<wxKeyEvent*>( &aEvent ); wxKeyEvent* ke = static_cast<wxKeyEvent*>( &aEvent );
key = ke->GetKeyCode(); key = ke->GetKeyCode();
keyIsSpecial = isKeySpecialCode( key ); keyIsSpecial = isKeySpecialCode( key );
unicode = ke->GetUnicodeKey();
wxLogTrace( kicadTraceKeyEvent, "TOOL_DISPATCHER::DispatchWxEvent %s", dump( *ke ) ); wxLogTrace( kicadTraceKeyEvent, "TOOL_DISPATCHER::DispatchWxEvent %s", dump( *ke ) );
@ -395,7 +397,7 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
// char events for ASCII letters in this case carry codes corresponding to the ASCII // char events for ASCII letters in this case carry codes corresponding to the ASCII
// value of Ctrl-Latter, i.e. 1 for Ctrl-A, 2 for Ctrl-B and so on until 26 for Ctrl-Z. // value of Ctrl-Latter, i.e. 1 for Ctrl-A, 2 for Ctrl-B and so on until 26 for Ctrl-Z.
// They are remapped here to be more easy to handle in code // They are remapped here to be more easy to handle in code
if( key >= WXK_CONTROL_A && key <= WXK_CONTROL_Z ) if( unicode >= 'A' && unicode <= 'Z' && key >= WXK_CONTROL_A && key <= WXK_CONTROL_Z )
key += 'A' - 1; key += 'A' - 1;
} }