Changeset 2566

Timestamp:

Dec 30, 2012, 9:37:11 PM (12 years ago)

Author:

Andreas Schnellbacher

Message:

• Renamed FindWord command to FindToken. Added FindWord.
• Added menu item for FindWord.
• Moved mark commands from MOUSE.E to KEYS.E.
• Removed double function for FindMark when no mark exists.
• Changed keys: Alt+W = MarkToken, Alt+Sh+W = MarkWord, Ctrl+W = FindToken, Ctrl+Sh+W = FindWord and Ctrl+Sh+M = FindMark.
• Made 'Using help' menu item work.
• Added comment about bugs of 'xcom l'.

Location:

trunk/src/netlabs/macros

Files:

• keys.e (modified) (4 diffs)
• locate.e (modified) (7 diffs)
• mouse.e (modified) (1 diff)
• newmenu.e (modified) (8 diffs)
• popup.e (modified) (2 diffs)
• stdkeys.e (modified) (2 diffs)

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

@@ -92 +92 @@
    WANT_TAB_INSERTION_TO_SPACE = 0
 compile endif
-
+compile if not defined(WORD_MARK_TYPE)
+   -- Bug using 'BLOCK':
+   -- If a block is copied to the clipboard, a CRLF is appended.
+   -- Sh+Ins will insert this CRLF instead of ignoring it.
+   --WORD_MARK_TYPE = 'BLOCK'  -- changed by aschn
+   WORD_MARK_TYPE = 'CHAR'
+compile endif
 ; ---------------------------------------------------------------------------
 definit
@@ -220 +226 @@
 
 ; ---------------------------------------------------------------------------
-; An accelerator key issues a WM_COMMAND message, that is processed by the
+; An accelerator key issues a WM_COMMAND message, which is processed by the
 ; ProcessCommand command defined in menu.e.
 ; Some other defs where accelerator keys are filtered are:
@@ -359 +365 @@
          Flags = Flags + AF_SHIFT
          lastkeyaccelid = lastkeyaccelid + 1
-         buildacceltable activeaccel, KeyString''\1''Cmd, Flags, Key, lastkeyaccelid
+         buildacceltable activeaccel, KeyString''\1''Cmd, Flags, Key, AccelId
       endif
    endif
@@ -2395 +2401 @@
 ;  call end_shift( startline, startcol, shift_flag, 1)
 
-; Moved def c_f to LOCATE.E
-
-; c_f1 is not definable in EPM.
+; ---------------------------------------------------------------------------
+defc MarkWord
+   -- If arg(1) specified and > 0: Set cursor to pos of pointer.
+   if arg(1) then
+      'MH_gotoposition'
+      unmark
+   endif
+   call pmark_word()
+
+; ---------------------------------------------------------------------------
+defc MarkSentence
+   -- If arg(1) specified and > 0: Set cursor to pos of pointer.
+   if arg(1) then
+      'MH_gotoposition'
+      unmark
+   endif
+   call mark_sentence()
+
+; ---------------------------------------------------------------------------
+defc MarkParagraph
+   -- If arg(1) specified and > 0: Set cursor to pos of pointer.
+   if arg(1) then
+      'MH_gotoposition'
+      unmark
+   endif
+   call mark_paragraph()
+
+; ---------------------------------------------------------------------------
+defc ExtendSentence
+   call mark_through_next_sentence()
+
+; ---------------------------------------------------------------------------
+defc ExtendParagraph
+   call mark_through_next_paragraph()
+
+; ---------------------------------------------------------------------------
+defc MarkToken
+   -- If arg(1) specified and > 0: Set cursor to pos of pointer.
+   if arg(1) then
+      'MH_gotoposition'
+   endif
+;   if marktype() <> '' then
+;      sayerror -279  -- 'Text already marked'
+;      return
+;   endif
+   if find_token( startcol, endcol) then
+      getfileid fid
+compile if WORD_MARK_TYPE = 'CHAR'
+      call pset_mark(.line, .line, startcol, endcol, 'CHAR', fid)
+compile else
+      call pset_mark(.line, .line, startcol, endcol, 'BLOCK', fid)
+compile endif
+      'Copy2SharBuff'  -- Copy mark to shared text buffer
+   endif
+
+; ---------------------------------------------------------------------------
 defc UppercaseWord
    call NextCmdAltersText()

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

@@ -24 +24 @@
 ; display 8  ==> reenables messages from a previous display -8
 ; The rest is documented in epmtech.inf.
+
+; xcom l has some bugs:
+; -  It doesn't move the cursor.
+; -  With option 'r', it also finds the search string at the cursor.
+; -  In replace mode, it moves the cursor, but by the length on the search
+;    string, not by the replace string.
 
 ; ---------------------------------------------------------------------------
@@ -1322 +1328 @@
 
 ; ---------------------------------------------------------------------------
-defc FindMark
-   if not FileIsMarked() then
-     'MarkWord'
-   endif
-   -- Get active mark coordinates and fileid
-   getmark first_line, last_line, first_col, last_col, mark_fileid
-   if last_line <> first_line then
-      last_line = first_line
-      endline
-      last_col = .col
-   endif
-   searchstring = substr( textline( first_line ), first_col, last_col - first_col + 1)
-   if searchstring <> '' then
-      'l '\1''searchstring
-   endif
-
-; ---------------------------------------------------------------------------
 ; Support for Graphical File Comparison
 ; Compares current file with another. File open dialog of GFC will open.
@@ -1382 +1371 @@
 
 ; ---------------------------------------------------------------------------
-; Moved from MOUSE.E
-; Find identifier under cursor -- if arg(1) > 0: -- under pointer.
+defc FindMark
+   if FileIsMarked() then
+      -- Get active mark coordinates and fileid
+      getmark first_line, last_line, first_col, last_col, mark_fileid
+      if last_line <> first_line then
+         -- Take up to one line
+         last_line = first_line
+         endline
+         last_col = .col
+      endif
+      searchstring = substr( textline( first_line ), first_col, last_col - first_col + 1)
+      if searchstring <> '' then
+         'l '\1''searchstring
+      endif
+   endif
+
+; ---------------------------------------------------------------------------
+; Find word under cursor -- if arg(1) > 0: -- under pointer.
 defc FindWord
    -- If arg(1) specified and > 0: Set cursor to pos of pointer.
@@ -1389 +1394 @@
       'MH_gotoposition'
    endif
-   call psave_pos(savedpos)
-   if find_token(startcol, endcol) then
+   lrc = 1
+   startline = .line
+   startcol  = .col
+   call pend_word()
+   lastcol = .col
+   call pbegin_word()
+   firstcol = .col
+   -- Start search after current word
+   .col = lastcol + 1
+   searchstring = substr( textline( startline), firstcol, lastcol - firstcol + 1)
+   if searchstring <> '' then
+      'l '\1''searchstring
+      lrc = rc
+   endif
+   if rc <> 0 then
+      .col = startcol
+   endif
+
+; ---------------------------------------------------------------------------
+; Moved from MOUSE.E
+; Find identifier under cursor -- if arg(1) > 0: -- under pointer.
+defc FindToken
+   -- If arg(1) specified and > 0: Set cursor to pos of pointer.
+   if arg(1) then
+      'MH_gotoposition'
+   endif
+   lrc = 1
+   call psave_pos( savedpos)
+   if find_token( startcol, endcol) then
       -- find_token returns first and last col of the found string. Therefore
       -- search shall start from 1 col behind.
@@ -1403 +1435 @@
       -- rc is the rc from 'xcom locate'.
       -- (rc is a universal var, that doesn't need the universal definition.)
-      'l '\1''substr( textline(.line), startcol, (endcol - startcol) + 1)
+      'l '\1''substr( textline( .line), startcol, (endcol - startcol) + 1)
       lrc = rc
    endif
    --sayerror 'defc findword: lrc = 'lrc
    if lrc <> 0 then  -- if not found
-      call prestore_pos(savedpos)
+      call prestore_pos( savedpos)
    endif
 
 ; ---------------------------------------------------------------------------
 ; Moved from STDPROCS.E
-defproc find_token(var startcol, var endcol)  -- find a token around the cursor.
+defproc find_token( var startcol, var endcol)  -- find a token around the cursor.
    if arg(3)='' then
       token_separators = ' ~`!%^&*()-+=][{}|\:;?/><,''"'\t
@@ -1425 +1457 @@
    endif
    getline line
-   len = length(line)
-   if .col>len | pos(substr(line, .col, 1), ' '\t) then
+   len = length( line)
+   if .col > len | pos( substr( line, .col, 1), ' '\t) then
       return  -- Past end of line, or over whitespace
    endif
-   endcol = verify(line, token_separators, 'M', .col)
+   endcol = verify( line, token_separators, 'M', .col)
    if endcol = .col then  -- On an operator.
       startcol = endcol
-      if wordpos(substr(line, startcol, 2), diads) then
+      if wordpos( substr( line, startcol, 2), diads) then
          endcol = endcol + 1  -- On first character
       elseif .col > 1 then
-         if wordpos(substr(line, endcol-1, 2), diads) then
+         if wordpos( substr( line, endcol-1, 2), diads) then
             startcol = startcol - 1  -- -- On last character
          endif
@@ -1446 +1478 @@
       endcol = len
    endif
-   startcol = verify(reverse(line), token_separators, 'M', len - .col + 1)
+   startcol = verify( reverse( line), token_separators, 'M', len - .col + 1)
    if startcol then
       startcol = len - startcol + 2

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

@@ -543 +543 @@
    call register_mousehandler( 1, 'CANCELDRAG', ' ')
    refresh
-
-; ---------------------------------------------------------------------------
-defc markword
-   -- If arg(1) specified and > 0: Set cursor to pos of pointer.
-   if arg(1) then
-      'MH_gotoposition'
-      unmark
-   endif
-   call pmark_word()
-
-; ---------------------------------------------------------------------------
-defc marksentence
-   -- If arg(1) specified and > 0: Set cursor to pos of pointer.
-   if arg(1) then
-      'MH_gotoposition'
-      unmark
-   endif
-   call mark_sentence()
-
-; ---------------------------------------------------------------------------
-defc markparagraph
-   -- If arg(1) specified and > 0: Set cursor to pos of pointer.
-   if arg(1) then
-      'MH_gotoposition'
-      unmark
-   endif
-   call mark_paragraph()
-
-; ---------------------------------------------------------------------------
-defc extendsentence
-   call mark_through_next_sentence()
-
-; ---------------------------------------------------------------------------
-defc extendparagraph
-   call mark_through_next_paragraph()
-
-; ---------------------------------------------------------------------------
-defc marktoken
-   -- If arg(1) specified and > 0: Set cursor to pos of pointer.
-   if arg(1) then
-      'MH_gotoposition'
-   endif
-;   if marktype() <> '' then
-;      sayerror -279  -- 'Text already marked'
-;      return
-;   endif
-   if find_token( startcol, endcol) then
-      getfileid fid
-compile if WORD_MARK_TYPE = 'CHAR'
-      call pset_mark(.line, .line, startcol, endcol, 'CHAR', fid)
-compile else
-      call pset_mark(.line, .line, startcol, endcol, 'BLOCK', fid)
-compile endif
-      'Copy2SharBuff'       /* Copy mark to shared text buffer */
-   endif
-
-; Moved defc findword to LOCATE.E
 
 ; ---------------------------------------------------------------------------

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

@@ -1066 +1066 @@
                                    \1'Create a line mark between two cursor positions',
                                    MIS_TEXT, 0
+   i = i + 1; call SetAVar( 'mid_marktoken', i);
+   buildmenuitem menuname, mid, i, 'Mark ~identifier'MenuAccelString( 'MarkToken'),                      -- Mark identifier
+                                   'MarkToken' ||
+                                   \1'Mark identifier (C-style word) under cursor',
+                                   MIS_TEXT, 0
    i = i + 1; call SetAVar( 'mid_markword', i);
    buildmenuitem menuname, mid, i, 'Mark ~word'MenuAccelString( 'MarkWord'),                             -- Mark word
                                    'MarkWord' ||
                                    \1'Mark word under cursor',
-                                   MIS_TEXT, 0
-   i = i + 1; call SetAVar( 'mid_marktoken', i);
-   buildmenuitem menuname, mid, i, 'Mark ~identifier'MenuAccelString( 'MarkToken'),                      -- Mark identifier
-                                   'MarkToken' ||
-                                   \1'Mark identifier (C-style word) under cursor',
                                    MIS_TEXT, 0
    i = i + 1;
@@ -1648 +1648 @@
                                    MIS_SEPARATOR, 0
    i = i + 1;
-   buildmenuitem menuname, mid, i, 'Find ~indentifier'MenuAccelString( 'FindWord'),                -- Find identifier
+   buildmenuitem menuname, mid, i, 'Find ~indentifier'MenuAccelString( 'FindToken'),               -- Find identifier
+                                   'FindToken' ||
+                                   \1'Find identifier (C-style word) under cursor',
+                                   MIS_TEXT, 0
+   i = i + 1;
+   buildmenuitem menuname, mid, i, 'Find ~word'MenuAccelString( 'FindWord'),                       -- Find word
                                    'FindWord' ||
-                                   \1'Find identifier (C-style word) under cursor',
+                                   \1'Find word under cursor',
                                    MIS_TEXT, 0
    i = i + 1; call SetAVar( 'mid_findmark', i);
-   buildmenuitem menuname, mid, i, 'Find ~mark/word'MenuAccelString( 'FindMark'),                  -- Find mark
+   buildmenuitem menuname, mid, i, 'Find ~mark'MenuAccelString( 'FindMark'),                       -- Find mark
                                    'FindMark' ||
                                    \1'Find marked string else word under cursor',
@@ -2687 +2692 @@
 
    i = i + 1; call SetAVar( 'mid_directories', i);
-   buildmenuitem menuname, mid, i, 'Director~ies',                                                 -- Directories >
+   buildmenuitem menuname, mid, i, 'Director~ies',                                                 -- Directories  >
                                    '',
                                    MIS_TEXT + MIS_SUBMENU, 0
@@ -3069 +3074 @@
                                    MIS_TEXT, 0
    i = i + 1;
-   buildmenuitem menuname, mid, i, 'Commandline current ~line'MenuAccelString( 'CommandDlgLine'),  -- Commandline current line
+   buildmenuitem menuname, mid, i, 'Command line current ~line'MenuAccelString( 'CommandDlgLine'),  -- Command line current line
                                    'CommandDlgLine' ||
-                                   \1'Open line under cursor in commandline window',
+                                   \1'Open line under cursor in command dialog',
                                    MIS_TEXT, 0
    i = i + 1;
@@ -3122 +3127 @@
    i = i + 1;
    buildmenuitem menuname, mid, i, HELP_HELP_MENU__MSG,                                            -- Using help
-                                   'helpmenu 64027' ||
+                                   'helpmenu 0'/*64027*/ ||
                                    HELP_HELP_MENUP__MSG,
                                    0, mpfrom2short(HP_HELP_HELP, 0)
@@ -3494 +3499 @@
 ;   SetMenuAttribute( GetAVar('mid_toggledirection'),  MIA_DISABLED, c <> '')               -- Toggle direction OK if not blank
    on = FileIsMarked()
-   if on then
-      SetMenuText( GetAVar('mid_findmark'), 'Find ~mark')
-   else
-      SetMenuText( GetAVar('mid_findmark'), 'Find ~word')
-   endif
+   SetMenuAttribute( GetAVar('mid_findmark'), MIA_DISABLED, on)
    -- Menu for CUA keys doesn't have a Backward item
    if GetKeyDef() = '-none-' then
@@ -5059 +5060 @@
       new = args
       if new = '' then
-         'ma'  -- Open commandline with current .margins value
+         'ma'  -- Open command line with current .margins value
          return
       endif
@@ -5068 +5069 @@
       if new = '' then
          old = NepmdQueryConfigValue( nepmd_hini, KeyPath)
-         'commandline set_ReflowMargins' old  -- Open commandline with current value
+         'commandline set_ReflowMargins' old  -- Open command line with current value
          return
       endif

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

@@ -152 +152 @@
 ;compile endif
 
-
 defc MH_popup
    universal activemenu
@@ -383 +382 @@
       ch = substr( textline(.line), .col, 1)
       gray_if_space = 16384*( ch = ' ' | not .line)
-      buildmenuitem menuname, 80, 8000, MARK_WORD_MENU__MSG''MenuAccelString( 'MarkWord'),
+      buildmenuitem menuname, 80, 8000, MARK_TOKEN_MENU__MSG''MenuAccelString( 'MarkToken'),
+                                        'MarkToken'MARK_TOKEN_MENUP__MSG,
+                                        0, mpfrom2short(HP_POPUP_MARKTOKEN, gray_if_space)
+      buildmenuitem menuname, 80, 8001, MARK_WORD_MENU__MSG''MenuAccelString( 'MarkWord'),
                                         'MarkWord'MARK_WORD_MENUP__MSG,
                                         0, mpfrom2short(HP_POPUP_MARKWORD, gray_if_space)
-      buildmenuitem menuname, 80, 8001, MARK_TOKEN_MENU__MSG''MenuAccelString( 'MarkToken'),
-                                        'MarkToken'MARK_TOKEN_MENUP__MSG,
-                                        0, mpfrom2short(HP_POPUP_MARKTOKEN, gray_if_space)
-      buildmenuitem menuname, 80, 8002, FIND_TOKEN_MENU__MSG''MenuAccelString( 'FindWord'),
-                                        'FindWord'FIND_TOKEN_MENUP__MSG,
+      buildmenuitem menuname, 80, 8002, FIND_TOKEN_MENU__MSG''MenuAccelString( 'FindToken'),
+                                        'FindToken'FIND_TOKEN_MENUP__MSG,
                                         0, mpfrom2short(HP_POPUP_FINDTOKEN, gray_if_space)
       buildmenuitem menuname, 80, 8010, \0,

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

@@ -62 +62 @@
 DefKey( 'a_l'          , 'MarkLine'        )    -- Start/end line mark
 DefKey( 'a_z'          , 'MarkChar'        )    -- Start/end char mark
-DefKey( 'a_w'          , 'MarkWord'        )    -- Mark current word
-;DefKey( 'c_w'          , 'MarkToken'       )    -- Mark current word, separators according to C syntax
-DefKey( 'a_s_w'        , 'MarkToken'       )    -- Mark current word, separators according to C syntax
+DefKey( 'a_w'          , 'MarkToken'       )    -- Mark current word, separators according to C syntax
+DefKey( 'a_s_w'        , 'MarkWord'        )    -- Mark current word
 DefKey( 'a_u'          , 'UnMark'          )    -- Unmark all
 DefKey( 'c_\'          , 'UnMark'          )    -- Unmark all
@@ -117 +116 @@
 DefKey( 'c_v'          , 'RepeatFindAllFiles'   )  -- Repeat find in all files of the ring
 DefKey( 'c_-'          , 'ToggleSearchDirection')  -- Toggle search direction
-DefKey( 'c_w'          , 'FindWord'        )    -- Find current word, separators according to C syntax
+DefKey( 'c_w'          , 'FindToken'       )    -- Find current word, separators according to C syntax
+DefKey( 'c_s_w'        , 'FindWord'        )    -- Find current word
+DefKey( 'c_s_m'        , 'FindMark'        )    -- Find mark
 DefKey( 'c_s_d'        , 'FindDef'         )    -- Find definition for current word