Changeset 3220

Timestamp:

Oct 25, 2018, 10:14:30 PM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• Fill: Changed to allow for multiple chars and added option to fill left-aligned, with padded spaces.
• Moved FillMark as a synonym for Fill to STDCMDS.E.

Location:

trunk/src/netlabs/macros

Files:

• keys.e (modified) (1 diff)
• stdcmds.e (modified) (1 diff)

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

@@ -2697 +2697 @@
    endif
 
-defc FillMark  -- accepts key from macro
-   key = arg(1)
-   call NextCmdAltersText()
-   call checkmark()
-   call pfill_mark( key)
-
 ; ---------------------------------------------------------------------------
 ; This is a callback command used by drag & drop of a marked area.

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

@@ -244 +244 @@
    endif
 
-;  EPM's replacement for Alt-F.  "FILL <character>".
-defc fill
-   call checkmark()
+; ---------------------------------------------------------------------------
+; Changed to allow for multiple chars and added option to fill left-aligned,
+; with padded spaces.
+defc Fill, FillMark
+   fTiled = 1
+
+   Title = FILL__MSG
+   Buttons = '/~Tiled/~Left-Aligned/Cancel'
+   OldEntry = ''
+   DefaultButton = 1
+   HelpId = 0
+   Title = leftstr( Title, 50)'.'  -- Add spaces to fit the text in titlebar
+   HelpId = 0
+   Text = 'Enter a fill string:'
+   ret = entrybox( Title,
+                   Buttons,
+                   OldEntry,
+                   '',
+                   255,     -- Length
+                   atoi( DefaultButton) || atoi( HelpId) || gethwndc( APP_HANDLE) ||
+                   Text\0)
+
+   parse value ret with Button 2 NewValue \0
+   if Button = \3 | NewValue = '' then  -- Cancel
+      return
+   elseif Button = \1 then  -- Tiled
+      fTiled = 1
+   elseif Button = \2 then  -- Left-aligned
+      fTiled = 0
+   endif
+
    call NextCmdAltersText()
-   call pfill_mark( arg(1))
-
+
+   getmark firstline, lastline, firstcol, lastcol, fid
+   mt = marktype()
+
+   do l = firstline to lastline
+      getline ThisLine, l
+
+      if mt = 'CHAR' then
+         if lastcol = 0 then
+            lastline = lastline - 1
+         endif
+         TmpLine = translate( ThisLine, ' ', \9)
+         if l = firstline then
+            startlinecol = firstcol
+         else
+            startlinecol = 1
+         endif
+         if l = lastline & lastcol <> 0 then
+            endlinecol = lastcol
+         else
+            endlinecol = length( strip( TmpLine, 't'))
+         endif
+      else
+         endlinecol = lastcol
+         startlinecol = firstcol
+      endif
+
+      FillLen = endlinecol - startlinecol + 1
+      if fTiled then
+         -- Tiled
+         FillChars = ''
+         i = 0
+         do forever
+            i = i + 1
+            FillChars = FillChars''NewValue
+            if length( FillChars) >= FillLen then
+               leave
+            endif
+         enddo
+         FillChars = leftstr( FillChars, FillLen)
+      else
+         -- Left-aligned, padded with spaces
+         FillChars = NewValue
+         FillChars = leftstr( FillChars, FillLen)
+      endif
+
+      FirstPart = substr( ThisLine, 1, startlinecol - 1)
+      LastPart  = substr( ThisLine, endlinecol + 1)
+      ReplLine = FirstPart''FillChars''LastPart
+      replaceline ReplLine, l
+   enddo
+
+; ---------------------------------------------------------------------------
 defc flow
    parse arg l r p .