Changeset 2384 for trunk/src/netlabs/macros/popup.e

Timestamp:

Jun 23, 2009, 3:58:15 AM (16 years ago)

Author:

Andreas Schnellbacher

Message:

• Fixed Sh+F10 to not use the pos. of the previous mouse click.

File:

• trunk/src/netlabs/macros/popup.e (modified) (5 diffs)

trunk/src/netlabs/macros/popup.e ¶

@@ -5 +5 @@
 * Copyright (c) Netlabs EPM Distribution Project 2004
 *
-* $Id: popup.e,v 1.10 2009-06-23 00:53:58 aschn Exp $
+* $Id: popup.e,v 1.11 2009-06-23 01:58:15 aschn Exp $
 *
 * ===========================================================================
@@ -161 +161 @@
    activemenu = menuname
 
-compile if 0
-   call psave_pos( savedpos)
-compile endif
+   fNoMove = (translate( strip( arg(1))) = 'NOCURSORMOVE')
 
    deletemenu menuname, 0, 0, 0
-   'BuildPopupMenu' menuname
+   'BuildPopupMenu' menuname fNoMove
    showmenu menuname, 1
-
-compile if 0
-   -- Disadvantage: scrolls window if cursor is off the edit window
-   call prestore_pos( savedpos)
-compile endif
 
    -- Cascade menu now replaced by inline menu items, because it doesnot work:
@@ -185 +178 @@
    universal LEXAM_is_available
 compile endif
-   menuname = arg(1)
+   parse arg menuname fNoMove
    if menuname = '' then
       menuname = 'popup1'
    endif
+
+   fNoMove = (strip( arg(2)) = 1)
+
    mt = leftstr( marktype(), 1)
    fInMark = mouse_in_mark()  -- Save in a variable so user's include file can test.
@@ -260 +256 @@
 
    elseif mt <> ' ' then  -- Build Outside-Mark pop-up --------------------------------------------------------------------------------
-      'MH_gotoposition'
+      if not fNoMove then
+         'MH_gotoposition'
+      endif
       buildmenuitem menuname, 80, 8000, COPY_MARK_MENU__MSG\9'Alt+C',     'DUPMARK C'COPY_MARK_MENUP__MSG, 0, mpfrom2short(HP_EDIT_COPYMARK, 0)
       buildmenuitem menuname, 80, 8001, MOVE_MARK_MENU__MSG\9'Alt+M',     'DUPMARK M'MOVE_MARK_MENUP__MSG, 0, mpfrom2short(HP_EDIT_MOVE, 0)
@@ -269 +267 @@
 
    else  -- Build No-mark pop-up ------------------------------------------------------------------------------------------------------
-      'MH_gotoposition'
+      if not fNoMove then
+         'MH_gotoposition'
+      endif
       ch = substr( textline(.line), .col, 1)
       gray_if_space = 16384*( ch = ' ' | not .line)