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

Revert broken hotkey fix. 

The hotkey fix committed in 53b1ec81 broke non-us keyboards.  Change the
hotkey help hotkey from '?' to Ctrl+F1 to prevent the hotkey list dialog
from being shown when placing a bus wire junction in Eeschema and when
changing the track posture in Pcbnew.  This is still broken in the GAL
framework.
This commit is contained in:
Wayne Stambaugh 2018-04-14 08:23:48 -04:00
parent 2a419156e0
commit a1acec5f13
4 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/draw_panel.cpp
View File

@ -1430,13 +1430,6 @@ void EDA_DRAW_PANEL::OnKeyEvent( wxKeyEvent& event )
if( event.ShiftDown() && ( keyIsLetter || localkey > 256 ) ) if( event.ShiftDown() && ( keyIsLetter || localkey > 256 ) )
localkey |= GR_KB_SHIFT; localkey |= GR_KB_SHIFT;
// For some reason on windows with US keyboards, the /? key always returns the '/' key code
// where as the <,, .>, ;:, '", [{, ]}, and \| keys return the shifted character key code.
#if defined( __WXMSW__ )
if( event.ShiftDown() && localkey == '/' )
localkey = '?';
#endif
if( event.ControlDown() ) if( event.ControlDown() )
localkey |= GR_KB_CTRL; localkey |= GR_KB_CTRL;

42
common/tool/tool_dispatcher.cpp
View File

@ -249,11 +249,11 @@ bool TOOL_DISPATCHER::handleMouseButton( wxEvent& aEvent, int aIndex, bool aMoti
// Helper function to know if a special key ( see key list ) should be captured // Helper function to know if a special key ( see key list ) should be captured
// or if the event can be skipped // or if the event can be skipped
// on Linux, the event must be passed to the GUI if they are not used by Kicad, // on Linux, the event must be passed to the GUI if they are not used by KiCad,
// especially the wxEVENT_CHAR_HOOK, if it is not handled // especially the wxEVENT_CHAR_HOOK, if it is not handled
// unfortunately, m_toolMgr->ProcessEvent( const TOOL_EVENT& aEvent) // unfortunately, m_toolMgr->ProcessEvent( const TOOL_EVENT& aEvent)
// does not return info about that. So the event is filtered before passed to // does not return info about that. So the event is filtered before passed to
// the GUI. These key codes are known to be used in pcbnew to move the cursor // the GUI. These key codes are known to be used in Pcbnew to move the cursor
// or change active layer, and have a default action (moving scrollbar button) if // or change active layer, and have a default action (moving scrollbar button) if
// the event is skipped // the event is skipped
bool isKeySpecialCode( int aKeyCode ) bool isKeySpecialCode( int aKeyCode )
@ -277,6 +277,7 @@ bool isKeySpecialCode( int aKeyCode )
return isInList; return isInList;
} }
/* aHelper class that convert some special key codes to an equivalent. /* aHelper class that convert some special key codes to an equivalent.
* WXK_NUMPAD_UP to WXK_UP, * WXK_NUMPAD_UP to WXK_UP,
* WXK_NUMPAD_DOWN to WXK_DOWN, * WXK_NUMPAD_DOWN to WXK_DOWN,
@ -285,7 +286,7 @@ bool isKeySpecialCode( int aKeyCode )
* WXK_NUMPAD_PAGEUP, * WXK_NUMPAD_PAGEUP,
* WXK_NUMPAD_PAGEDOWN * WXK_NUMPAD_PAGEDOWN
* note: * note:
* wxEVT_CHAR_HOOK does this conversion when it is skipped by fireing a wxEVT_CHAR * wxEVT_CHAR_HOOK does this conversion when it is skipped by firing a wxEVT_CHAR
* with this converted code, but we do not skip these key events because they also * with this converted code, but we do not skip these key events because they also
* have default action (scroll the panel) * have default action (scroll the panel)
*/ */
@ -332,7 +333,7 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
type == wxEVT_MIDDLE_DOWN || type == wxEVT_MIDDLE_UP || type == wxEVT_MIDDLE_DOWN || type == wxEVT_MIDDLE_UP ||
type == wxEVT_RIGHT_DOWN || type == wxEVT_RIGHT_UP || type == wxEVT_RIGHT_DOWN || type == wxEVT_RIGHT_UP ||
type == wxEVT_LEFT_DCLICK || type == wxEVT_MIDDLE_DCLICK || type == wxEVT_RIGHT_DCLICK || type == wxEVT_LEFT_DCLICK || type == wxEVT_MIDDLE_DCLICK || type == wxEVT_RIGHT_DCLICK ||
// Event issued whem mouse retains position in screen coordinates, // Event issued when mouse retains position in screen coordinates,
// but changes in world coordinates (e.g. autopanning) // but changes in world coordinates (e.g. autopanning)
type == KIGFX::WX_VIEW_CONTROLS::EVT_REFRESH_MOUSE ) type == KIGFX::WX_VIEW_CONTROLS::EVT_REFRESH_MOUSE )
{ {
@ -369,6 +370,8 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
key = ke->GetKeyCode(); key = ke->GetKeyCode();
keyIsSpecial = isKeySpecialCode( key ); keyIsSpecial = isKeySpecialCode( key );
wxLogTrace( kicadTraceKeyEvent, "TOOL_DISPATCHER::DispatchWxEvent %s", dump( *ke ) );
// if the key event must be skipped, skip it here if the event is a wxEVT_CHAR_HOOK // if the key event must be skipped, skip it here if the event is a wxEVT_CHAR_HOOK
// and do nothing. // and do nothing.
// a wxEVT_CHAR will be fired by wxWidgets later for this key. // a wxEVT_CHAR will be fired by wxWidgets later for this key.
@ -376,26 +379,15 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
{ {
if( !keyIsSpecial ) if( !keyIsSpecial )
{ {
wxLogTrace( kicadTraceKeyEvent,
"TOOL_DISPATCHER::DispatchWxEvent wxEVT_CHAR_HOOK %s",
dump( *ke ) );
aEvent.Skip(); aEvent.Skip();
return; return;
} }
else else
key = translateSpecialCode( key ); key = translateSpecialCode( key );
} }
else
{
wxLogTrace( kicadTraceKeyEvent,
"TOOL_DISPATCHER::DispatchWxEvent wxEVT_CHAR %s",
dump( *ke ) );
}
int mods = decodeModifiers( ke ); int mods = decodeModifiers( ke );
// wxLogMessage( "key %d evt type %d", key, type );
if( mods & MD_CTRL ) if( mods & MD_CTRL )
{ {
// wxWidgets maps key codes related to Ctrl+letter handled by CHAR_EVT // wxWidgets maps key codes related to Ctrl+letter handled by CHAR_EVT
@ -407,15 +399,7 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
key += 'A' - 1; key += 'A' - 1;
} }
// For some reason on windows with US keyboards, the /? key always returns the '/' key if( key == WXK_ESCAPE ) // ESC is the special key for canceling tools
// code where as the <,, .>, ;:, '", [{, ]}, and \| keys return the shifted character
// key code.
#if defined( __WXMSW__ )
if( ( mods & MD_SHIFT ) && ( key == '?' ) )
mods &= ~MD_SHIFT;
#endif
if( key == WXK_ESCAPE ) // ESC is the special key for cancelling tools
evt = TOOL_EVENT( TC_COMMAND, TA_CANCEL_TOOL ); evt = TOOL_EVENT( TC_COMMAND, TA_CANCEL_TOOL );
else else
evt = TOOL_EVENT( TC_KEYBOARD, TA_KEY_PRESSED, key | mods ); evt = TOOL_EVENT( TC_KEYBOARD, TA_KEY_PRESSED, key | mods );
@ -425,18 +409,18 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
m_toolMgr->ProcessEvent( *evt ); m_toolMgr->ProcessEvent( *evt );
// pass the event to the GUI, it might still be interested in it // pass the event to the GUI, it might still be interested in it
// Note wxEVT_CHAR_HOOK event is already skipped for special keys not used by kicad // Note wxEVT_CHAR_HOOK event is already skipped for special keys not used by KiCad
// and wxEVT_LEFT_DOWN must be always Skipped. // and wxEVT_LEFT_DOWN must be always Skipped.
// //
// On OS X, key events are always meant to be caught. An uncaught key event is assumed // On OS X, key events are always meant to be caught. An uncaught key event is assumed
// to be a user input error by OS X (as they are pressing keys in a context where nothing // to be a user input error by OS X (as they are pressing keys in a context where nothing
// is there to catch the event). This annoyingly makes OS X beep and/or flash the screen // is there to catch the event). This annoyingly makes OS X beep and/or flash the screen
// in pcbnew and the footprint editor any time a hotkey is used. The correct procedure is // in Pcbnew and the footprint editor any time a hotkey is used. The correct procedure is
// to NOT pass wxEVT_CHAR events to the GUI under OS X. // to NOT pass wxEVT_CHAR events to the GUI under OS X.
// //
// On Windows, avoid to call wxEvent::Skip for special keys because some keys (ARROWS, PAGE_UP, PAGE_DOWN // On Windows, avoid to call wxEvent::Skip for special keys because some keys (ARROWS,
// have predefined actions (like move thumbtrack cursor), and we do not want these // PAGE_UP, PAGE_DOWN have predefined actions (like move thumbtrack cursor), and we do
// actions executed (most are handled by Kicad) // not want these actions executed (most are handled by KiCad)
if( !evt || type == wxEVT_LEFT_DOWN ) if( !evt || type == wxEVT_LEFT_DOWN )
aEvent.Skip(); aEvent.Skip();

2
eeschema/hotkeys.cpp
View File

@ -115,7 +115,7 @@ static EDA_HOTKEY HkZoomOut( _HKI( "Zoom Out" ), HK_ZOOM_OUT, WXK_F2, ID_KEY_ZOO
static EDA_HOTKEY HkZoomOut( _HKI( "Zoom Out" ), HK_ZOOM_OUT, GR_KB_CTRL + '-', ID_KEY_ZOOM_OUT ); static EDA_HOTKEY HkZoomOut( _HKI( "Zoom Out" ), HK_ZOOM_OUT, GR_KB_CTRL + '-', ID_KEY_ZOOM_OUT );
#endif #endif
static EDA_HOTKEY HkHelp( _HKI( "Help (this window)" ), HK_HELP, '?' ); static EDA_HOTKEY HkHelp( _HKI( "Help (this window)" ), HK_HELP, GR_KB_CTRL + WXK_F1 );
static EDA_HOTKEY HkResetLocalCoord( _HKI( "Reset Local Coordinates" ), HK_RESET_LOCAL_COORD, ' ' ); static EDA_HOTKEY HkResetLocalCoord( _HKI( "Reset Local Coordinates" ), HK_RESET_LOCAL_COORD, ' ' );
static EDA_HOTKEY HkLeaveSheet( _HKI( "Leave Sheet" ), HK_LEAVE_SHEET, GR_KB_ALT + WXK_BACK, static EDA_HOTKEY HkLeaveSheet( _HKI( "Leave Sheet" ), HK_LEAVE_SHEET, GR_KB_ALT + WXK_BACK,
ID_POPUP_SCH_LEAVE_SHEET ); ID_POPUP_SCH_LEAVE_SHEET );

2
pcbnew/hotkeys.cpp
View File

@ -198,7 +198,7 @@ static EDA_HOTKEY HkZoomSelection( _HKI( "Zoom to Selection" ), HK_ZOOM_SELECTIO
static EDA_HOTKEY Hk3DViewer( _HKI( "3D Viewer" ), HK_3D_VIEWER, GR_KB_ALT + '3' ); static EDA_HOTKEY Hk3DViewer( _HKI( "3D Viewer" ), HK_3D_VIEWER, GR_KB_ALT + '3' );
static EDA_HOTKEY HkHelp( _HKI( "Help (this window)" ), HK_HELP, '?' ); static EDA_HOTKEY HkHelp( _HKI( "Help (this window)" ), HK_HELP, GR_KB_CTRL + WXK_F1 );
static EDA_HOTKEY HkSwitchTrackWidthToNext( _HKI( "Switch Track Width To Next" ), static EDA_HOTKEY HkSwitchTrackWidthToNext( _HKI( "Switch Track Width To Next" ),
HK_SWITCH_TRACK_WIDTH_TO_NEXT, 'W' ); HK_SWITCH_TRACK_WIDTH_TO_NEXT, 'W' );