From 68e69fe95d666397b7f4fb9dbfd8375b370a9f57 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Wed, 25 Apr 2018 14:28:41 +0200
Subject: [PATCH] eeschema: context menu pops up on 2nd click after ESC key was
 pressed twice

other very minor fixes

Fixes: lp:1766830
https://bugs.launchpad.net/kicad/+bug/1766830
---
 eeschema/controle.cpp     | 11 ++++++-----
 eeschema/onrightclick.cpp |  9 +++++----
 eeschema/sch_edit_frame.h |  4 +++-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/eeschema/controle.cpp b/eeschema/controle.cpp
index 81114688d3..95bd3fa712 100644
--- a/eeschema/controle.cpp
+++ b/eeschema/controle.cpp
@@ -51,7 +51,7 @@
 
 SCH_ITEM* SCH_EDIT_FRAME::LocateAndShowItem( const wxPoint& aPosition, const KICAD_T aFilterList[],
                                              int aHotKeyCommandId,
-                                             bool* clarificationMenuCancelled )
+                                             bool* aClarificationMenuCancelled )
 {
     SCH_ITEM*      item;
     LIB_PIN*       Pin     = NULL;
@@ -60,14 +60,15 @@ SCH_ITEM* SCH_EDIT_FRAME::LocateAndShowItem( const wxPoint& aPosition, const KIC
 
     // Check the on grid position first.  There is more likely to be multiple items on
     // grid than off grid.
+    m_canvas->SetAbortRequest( false ); // be sure a old abort request in not pending
     item = LocateItem( gridPosition, aFilterList, aHotKeyCommandId );
 
     // If the user aborted the clarification context menu, don't show it again at the
     // off grid position.
     if( !item && m_canvas->GetAbortRequest() )
     {
-        if( clarificationMenuCancelled )
-            *clarificationMenuCancelled = true;
+        if( aClarificationMenuCancelled )
+            *aClarificationMenuCancelled = true;
 
         m_canvas->SetAbortRequest( false );
         return NULL;
@@ -78,8 +79,8 @@ SCH_ITEM* SCH_EDIT_FRAME::LocateAndShowItem( const wxPoint& aPosition, const KIC
 
     if( !item )
     {
-        if( clarificationMenuCancelled )
-            *clarificationMenuCancelled = m_canvas->GetAbortRequest();
+        if( aClarificationMenuCancelled )
+            *aClarificationMenuCancelled = m_canvas->GetAbortRequest();
 
         m_canvas->SetAbortRequest( false );  // Just in case the user aborted the context menu.
         return NULL;
diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp
index 9dd84df53f..229af99341 100644
--- a/eeschema/onrightclick.cpp
+++ b/eeschema/onrightclick.cpp
@@ -75,9 +75,8 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
     SCH_ITEM*   item = GetScreen()->GetCurItem();
     bool        blockActive = GetScreen()->IsBlockActive();
     wxString    msg;
-    bool        actionCancelled = false;
 
-    // Do not start a block command  on context menu.
+    // Do not start a block command on context menu.
     m_canvas->SetCanStartBlock( -1 );
 
     if( blockActive )
@@ -139,6 +138,7 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
     // Try to locate items at cursor position.
     if( (item == NULL) || (item->GetFlags() == 0) )
     {
+        bool actionCancelled = false;
         item = LocateAndShowItem( aPosition, SCH_COLLECTOR::AllItemsButPins, 0, &actionCancelled );
 
         // If the clarify item selection context menu is aborted, don't show the context menu.
@@ -192,12 +192,13 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
 
     if( item == NULL )
     {
-        if( GetToolId() == ID_NO_TOOL_SELECTED )
-        {
+        if( GetToolId() == ID_NO_TOOL_SELECTED && m_blockItems.GetCount() > 0 )
+       {
             msg = AddHotkeyName( _( "&Paste" ), g_Schematic_Hokeys_Descr, HK_EDIT_PASTE );
             AddMenuItem( PopMenu, wxID_PASTE, msg,
                         _( "Pastes item(s) from the Clipboard" ),
                         KiBitmap( paste_xpm ) );
+            PopMenu->AppendSeparator();
         }
 
         if( m_CurrentSheet->Last() != g_RootSheet )
diff --git a/eeschema/sch_edit_frame.h b/eeschema/sch_edit_frame.h
index af7dadcd3d..5b18484ef3 100644
--- a/eeschema/sch_edit_frame.h
+++ b/eeschema/sch_edit_frame.h
@@ -404,12 +404,14 @@ public:
      * @param aFilterList A list of #KICAD_T types to to filter.
      * @param aHotKeyCommandId A hot key command ID for performing additional tests when
      *                         multiple items are found at \a aPosition.
+     * @param aClarifySelectionMenuCancelled is a pointer to a bool to handle a cancel command
+     * from user when the user cancels the locate menu disambiguation (selection between located items)
      * @return A SCH_ITEM pointer of the item found or NULL if no item found
      */
     SCH_ITEM* LocateAndShowItem( const wxPoint& aPosition,
                                  const KICAD_T aFilterList[] = SCH_COLLECTOR::AllItems,
                                  int aHotKeyCommandId = 0,
-                                 bool* clarifySelectionMenuCancelled = nullptr );
+                                 bool* aClarifySelectionMenuCancelled = nullptr );
 
     /**
      * Check for items at \a aPosition matching the types in \a aFilterList.