Make Eeschema cursors update without waiting for mouse movement.

common/draw_panel_gal.cpp

@@ -464,7 +464,11 @@ bool EDA_DRAW_PANEL_GAL::SwitchBackend( GAL_TYPE aGalType )
     wxWindow* galWindow = dynamic_cast<wxWindow*>( new_gal );
 
     if( galWindow )
-        galWindow->Connect( wxEVT_SET_CURSOR, wxSetCursorEventHandler( EDA_DRAW_PANEL_GAL::onSetCursor ), NULL, this );
+    {
+        galWindow->Connect( wxEVT_SET_CURSOR,
+                            wxSetCursorEventHandler( EDA_DRAW_PANEL_GAL::onSetCursor ), NULL,
+                            this );
+    }
 
     delete m_gal;
     m_gal = new_gal;
@@ -581,9 +585,7 @@ void EDA_DRAW_PANEL_GAL::onShowTimer( wxTimerEvent& aEvent )
 void EDA_DRAW_PANEL_GAL::SetCurrentCursor( KICURSOR cursor )
 {
     if( m_currentKiCursor == cursor )
-    {
         return;
-    }
 
     m_currentCursor = CURSOR_STORE::GetCursor( cursor );
     m_currentKiCursor = cursor;

eeschema/sch_base_frame.cpp

@@ -88,6 +88,20 @@ SCH_BASE_FRAME::SCH_BASE_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aWindo
     m_defaults( &m_base_frame_defaults )
 {
     createCanvas();
+
+    Bind( wxEVT_IDLE,
+            [this]( wxIdleEvent& aEvent )
+            {
+                // Handle cursor adjustments.  While we can get motion and key events through
+                // wxWidgets, we can't get modifier-key-up events.
+                if( m_toolManager )
+                {
+                    EE_SELECTION_TOOL* selTool = m_toolManager->GetTool<EE_SELECTION_TOOL>();
+
+                    if( selTool )
+                        selTool->OnIdle( aEvent );
+                }
+            } );
 }
 
 

eeschema/tools/ee_selection_tool.cpp

@@ -557,28 +557,20 @@ int EE_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
         {
             if( displayWireCursor )
             {
-                m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::LINE_WIRE_ADD );
+                m_nonModifiedCursor = KICURSOR::LINE_WIRE_ADD;
             }
             else if( rolloverItem != niluuid )
             {
-                m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::HAND );
+                m_nonModifiedCursor = KICURSOR::HAND;
             }
-            else if( !modifier_enabled && !m_selection.Empty()
-                     && !m_frame->GetDragSelects() && evt->HasPosition()
+            else if( !m_selection.Empty() && !m_frame->GetDragSelects() && evt->HasPosition()
                      && selectionContains( evt->Position() ) ) //move/drag option prediction
             {
-                m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::MOVING );
+                m_nonModifiedCursor = KICURSOR::MOVING;
             }
             else
             {
-                if( m_additive )
-                    m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::ADD );
-                else if( m_subtractive )
-                    m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::SUBTRACT );
-                else if( m_exclusive_or )
-                    m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::XOR );
-                else
-                    m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::ARROW );
+                m_nonModifiedCursor = KICURSOR::ARROW;
             }
         }
     }
@@ -590,6 +582,33 @@ int EE_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
 }
 
 
+void EE_SELECTION_TOOL::OnIdle( wxIdleEvent& aEvent )
+{
+    if( m_frame->ToolStackIsEmpty() )
+    {
+        wxMouseState keyboardState = wxGetMouseState();
+
+        m_subtractive = m_additive = m_exclusive_or = false;
+
+        if( keyboardState.ShiftDown() && keyboardState.ControlDown() )
+            m_subtractive = true;
+        else if( keyboardState.ShiftDown() )
+            m_additive = true;
+        else if( keyboardState.ControlDown() )
+            m_exclusive_or = true;
+
+        if( m_additive )
+            m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::ADD );
+        else if( m_subtractive )
+            m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::SUBTRACT );
+        else if( m_exclusive_or )
+            m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::XOR );
+        else
+            m_frame->GetCanvas()->SetCurrentCursor( m_nonModifiedCursor );
+    }
+}
+
+
 EE_SELECTION& EE_SELECTION_TOOL::GetSelection()
 {
     return m_selection;

eeschema/tools/ee_selection_tool.h

@@ -31,6 +31,7 @@
 #include <tools/ee_selection.h>
 #include <ee_collectors.h>
 #include <sch_component.h>
+#include <cursors.h>
 
 class SCH_BASE_FRAME;
 class SCH_ITEM;
@@ -71,6 +72,8 @@ public:
      */
     int Main( const TOOL_EVENT& aEvent );
 
+    void OnIdle( wxIdleEvent& aEvent );
+
     /**
      * Function GetSelection()
      *
@@ -280,11 +283,15 @@ private:
     SCH_BASE_FRAME* m_frame;             // Pointer to the parent frame
     EE_SELECTION    m_selection;         // Current state of selection
 
-    bool m_additive;             // Items should be added to selection (instead of replacing)
-    bool m_subtractive;          // Items should be removed from selection
+    bool            m_additive;          // Items should be added to sel (instead of replacing)
+    bool            m_subtractive;       // Items should be removed from sel
     bool            m_exclusive_or;      // Items' selection state should be toggled
     bool            m_multiple;          // Multiple selection mode is active
-    bool m_skip_heuristics;      // Heuristics are not allowed when choosing item under cursor
+    bool            m_skip_heuristics;   // Show disambuguation menu for all items under the
+                                         // cursor rather than trying to narrow them down first
+                                         // using heuristics
+
+    KICURSOR        m_nonModifiedCursor; // Cursor in the absence of shift/ctrl/alt
 
     bool            m_isSymbolEditor;    // True when the symbol editor is the parent frame
     bool            m_isLibView;         // True when libview is the parent frame