Changeset 4989

Timestamp:

Apr 17, 2022, 12:30:10 PM (3 years ago)

Author:

Andreas Schnellbacher

Message:

• Cosmetic changes.

File:

• trunk/src/netlabs/macros/mouse.e (modified) (13 diffs)

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

@@ -105 +105 @@
 ; Returns cursor pos. for corresponding mouse pointer pos. of the last
 ; mouse click. (.mousex and .mousey is not the current mouse pos.)
-defproc MouseLineColOff( var MouseLine, var MouseCol, var MouseOff, minline)
+; Syntax: xxx = MouseLineColOff( MouseLine, MouseCol, MouseOff,
+;                                MinLine [, MkType [, Flag]])
+;    MouseLine, MouseCol and MouseOff are returned and must be vars.
+;    MinLine : Specify 0 for copying lines in line mode.
+;    Flag > 0: Returns pos of char the pointer is on, not nearest
+;              intersection. Can get MAXCOL + 1 for GPI-style marking.
+;    xxx     : x-pos of last mouse click, minimal 0, relative to the lower
+;              left corner of the edit window.
+defproc MouseLineColOff( var MouseLine, var MouseCol, var MouseOff, MinLine)
                         -- MIN = 0 for positioning, 1 for marking.
    xxx = Max( .mousex - 0, 0)
-   mx = xxx
+   mx  = xxx
    yyy = .mousey
 
-   -- saying 5.21, below, but not sure if it will work for that.
-   --    it will work for 5.50.
-
-   --call messagenwait("xxx1="xxx "yyy1="yyy);
+   --dprintf( 'xxx1 = 'xxx', yyy1 = 'yyy)
    -- map_point 5 converts the vars xxx, yyy (mouse pointer) and off (empty)
    -- into .line, .col and offset values
    -- Bug of map_point 5: offset is always 0.
-   map_point 5, xxx, yyy, off, comment  -- map screen to line
-   --call messagenwait("doc xxx2="xxx "yyy2="yyy);
-   MouseLine = Min( Max( xxx, minline), .last)
+   -- Map window to line/col/offset
+   map_point 5, xxx, yyy, off, comment
+   --dprintf( 'doc: xxx2 = 'xxx', yyy2 = 'yyy)
+   MouseLine = Min( Max( xxx, MinLine), .last)
    MouseOff  = off
-   -- EVERSION >= 5.50 can go to MAXCOL+1 for GPI-style marking
-   if arg( 6) then  -- Flag we want character we're on, not nearest intersection.
+   -- EVERSION >= 5.50 can go to MAXCOL+1 for GPI-style marking.
+   -- arg( 6) = flag we want character we're on, not nearest intersection.
+   if arg( 6) then
       lne = xxx
       col = yyy
-      map_point 6, lne, col, off, comment  -- map line/col/offset to screen
-      if lne > mx then  -- The intersection selected is to the right of the mouse pointer;
-         yyy = yyy - 1  -- the character clicked on is the one to the left.
-      endif             -- Note:  could get col. 0 this way, but the following takes care of that.
-   endif
-   MouseCol  = Min( Max( yyy, 1), MAXCOL + ( rightstr( arg(5), 1) = 'G' and minline))
+      -- Map line/col/offset to window
+      map_point 6, lne, col, off, comment
+      -- The intersection selected is to the right of the mouse pointer;
+      -- the character clicked on is the one to the left.
+      if lne > mx then
+         yyy = yyy - 1
+      endif
+      -- Note:  Could get col. 0 this way, but the following takes care of that.
+   endif
+   MkType = arg( 5)
+   if (MkType = 'MARKCHARG' | MkType = 'MARKBLOCKG') & MinLine then
+      AddCol = 1
+   else
+      AddCol = 0
+   endif
+   MouseCol = Min( Max( yyy, 1), MAXCOL + AddCol)
    return xxx
 
@@ -157 +174 @@
    -- MouseOff is always 0.
    MinLine = 0
-   call MouseLineColOff( MouseLine, MouseCol, MouseOff, MinLine)
+   xxx = MouseLineColOff( MouseLine, MouseCol, MouseOff, MinLine)
    dprintf( 'MouseLineColOff:')
-   dprintf( '   MouseLine = 'MouseLine', MouseCol = 'MouseCol', MouseOff = 'MouseOff', MinLine = 'MinLine)
+   dprintf( '   MouseLine = 'MouseLine', MouseCol = 'MouseCol', MouseOff = 'MouseOff', MinLine = 'MinLine', xxx = 'xxx)
 
    -- .scrolly is always 0 (bug).
@@ -280 +297 @@
 ; Negative values mean to count from top-right.
 ; If the cursor is off the desktop, its position is limited to the desktop
-; size. That is also dome by WinSetPointerPos.
+; size. That is also done by WinSetPointerPos.
 defproc SetPointerPosXY( pxpos, pypos)
    cxd = NepmdQuerySysInfo( 'CXSCREEN')
@@ -998 +1015 @@
    universal cursoreverywhere
 
+   MkType = ''
+   Flag   = ''
 compile if TOP_OF_FILE_VALID = 'STREAM'
-   ml = MouseLineColOff( MouseLine, MouseCol, MouseOff, stream_mode)
+   MinLine = stream_mode
 compile elseif TOP_OF_FILE_VALID
-   ml = MouseLineColOff( MouseLine, MouseCol, MouseOff, 0, '', 1)
+   MinLine = 0
+   Flag    = 1
 compile else
-   ml = MouseLineColOff( MouseLine, MouseCol, MouseOff, 1)
+   MinLine = 1
 compile endif
+   ml = MouseLineColOff( MouseLine, MouseCol, MouseOff, MinLine, MkType, Flag)
 
    oldsx = .scrollx
@@ -1010 +1031 @@
 
    if stream_mode & ml > .last then
-      endline  -- go to end of last line
+      -- Go to end of last line
+      .last
+      endline
    else
       .col  = MouseCol
@@ -1024 +1047 @@
 
    if not cursoreverywhere then
+      -- Limit cursor to end of line
       LineLen = length( textline( .line))
       if .col > LineLen then
@@ -1052 +1076 @@
 
    if stream_mode & CursorLine > .last then
-      endline  -- go to end of last line
+      -- Go to end of last line
+      .last
+      endline
    else
       .col  = CursorCol
@@ -1138 +1164 @@
       endif
       if FileIsMarked() then
-         sayerror-279  --  sayerror('Text already marked')
+         'SayError -279'  --  sayerror('Text already marked')
          return
       endif
@@ -1340 +1366 @@
       if cua_marking_switch then
          unmark
-         'ClearSharBuff'  -- remove content in EPM shared text buffer
+         -- Remove content in EPM shared text buffer
+         'ClearSharBuff'
          'MH_GoToLastClick'
       else
@@ -1370 +1397 @@
       stream_mode = 0
    endif
-   'MH_GoToLastClick'  -- Won't position cursor after line end in stream mode
+   -- Won't position cursor after line end in stream mode
+   'MH_GoToLastClick'
    MouseCol = .col
    endline
@@ -1432 +1460 @@
       if cua_marking_switch then
          if .line & not fMouseAfterLine then
-;;          call pMark_Word()  -- pMark_Word doesn't include white space; the following does:
+            --call pMark_Word()
+            -- pMark_Word doesn't include white space; the following does:
             call pBegin_Word()
             markchar
             startcol = .col
             tabword
-;           if .col <> length( textline( .line)) then .col = .col - 1; endif
             .col = .col - 1
             markchar
@@ -1443 +1471 @@
          endif
       endif
-      'Copy2SharBuff'  -- copy mark to shared text buffer
+      -- Copy mark to shared text buffer
+      'Copy2SharBuff'
       'MatchFindOnMove'
    endif
@@ -1669 +1698 @@
    universal vepm_pointer
    if verify( arg( 1), '0123456789') then  -- contained a non-numeric character
-      sayerror INVALID_NUMBER__MSG
+      'SayError 'INVALID_NUMBER__MSG
    else
       vepm_pointer = arg( 1)