Changeset 3442

Timestamp:

Feb 4, 2019, 10:27:01 PM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• Fixed unmarking of Copy2Clip.
• Cosmetic changes.

File:

• trunk/src/netlabs/macros/clipbrd.e (modified) (27 diffs)

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

@@ -132 +132 @@
       stop
    endif
-   call psave_pos( save_pos)
-   call GetBuffCommon( bufhndl, NO_MARK_NO_BUFF__MSG, arg(1))
+   call pSave_Pos( savepos)
+   call GetBuffCommon( bufhndl, NO_MARK_NO_BUFF__MSG, arg( 1))
    call buffer( FREEBUF, bufhndl)
-   call prestore_pos( save_pos)
+   call pRestore_Pos( savepos)
 
 ; ---------------------------------------------------------------------------
@@ -150 +150 @@
 ; If arg specified, copy that instead of the marked text.
 defc Copy2Clip
-   if length( arg(1)) > 0 then
+   if length( arg( 1)) > 0 then
 /*
-      PointerToBuffer = put_in_buffer( arg(1))
+      PointerToBuffer = Put_In_Buffer( arg( 1))
       if not PointerToBuffer then
          return 1
       endif
-      call windowmessage( 0, getpminfo(EPMINFO_EDITCLIENT),
+      call windowmessage( 0, getpminfo( EPMINFO_EDITCLIENT),
                           5441,               -- EPM_EDIT_CLIPBOARDCOPY
                           PointerToBuffer,
@@ -162 +162 @@
 */
       getfileid curfid
-      call psave_mark(save_mark)
+      call pSave_Mark( savemark)
 
       -- Create a temp. file
@@ -190 +190 @@
       -- Restore current file and mark
       activatefile curfid
-      call prestore_mark(savemark)
+      call pRestore_Mark(savemark)
 
    else
-      call checkmark()                          /* Make sure there's a mark. */
+      call CheckMark()                          /* Make sure there's a mark. */
 
       'Copy2SharBuff'   -- Recopy the marked area to the shared buffer,
@@ -229 +229 @@
       call windowmessage( 0, getpminfo( EPMINFO_EDITCLIENT),
                           5441,               -- EPM_EDIT_CLIPBOARDCOPY
-                          mpfrom2short( bufhndl, 0),
+                          MpFrom2Short( bufhndl, 0),
                           1)
    endif
@@ -237 +237 @@
 ; message to free the buffer.
 defc ProcessClipboardCopy
-   result = arg(1)
+   result = arg( 1)
    if result then      -- If non-zero, free the buffer.
       call buffer( FREEBUF, itoa( substr( atol(result), 3, 2), 10))  -- pass just the selector
@@ -250 +250 @@
 ; Copy marked text into the PM clipboard, then delete the mark.
 defc Cut
-   'copy2clip'
+   'Copy2Clip'
    if not RC then
       getmark firstline, lastline, firstcol, lastcol, markfileid
@@ -258 +258 @@
       endif
       call NextCmdAltersText()
-      call pdelete_mark()
+      call pDelete_Mark()
    endif
 
@@ -316 +316 @@
    endif
 
-   if mark = 67 | mark = 66 then  -- asc('C') | asc('B')
+   if mark = 67 | mark = 66 then  -- asc( 'C') | asc( 'B')
       -- Char or block mark
 compile if REFLOW_AFTER_PASTE
@@ -323 +323 @@
       start_col = .col + 1
 compile endif
-      poke result, 8, chr( 68 - mark)  -- 'C'->1; 'B'->2; mark as a character or block buffer
+      poke result, 8, chr( 68 - mark)  -- 'C' -> 1; 'B' -> 2; mark as a character or block buffer
       if mark = 67 & cua_marking_switch & marktype()  -- if char mark and CUA
       then
@@ -329 +329 @@
          getfileid cur_fid
          if mark_fid = cur_fid then
-            call pbegin_mark()
-            call pdelete_mark()         -- Paste clip replaces previous mark in CUA mode
+            call pBegin_Mark()
+            call pDelete_Mark()         -- Paste clip replaces previous mark in CUA mode
          else
             unmark
@@ -338 +338 @@
       endif
 
-      call psave_mark( savemark)        -- Save the user's mark
-      call GetBuffCommon( result, NOTHING_TO_PASTE__MSG, chr(mark))
-      call prestore_mark( savemark)     -- Restore the user's mark
+      call pSave_Mark( savemark)        -- Save the user's mark
+      call GetBuffCommon( result, NOTHING_TO_PASTE__MSG, chr( mark))
+      call pRestore_Mark( savemark)     -- Restore the user's mark
    else
       -- Line mark
@@ -385 +385 @@
   compile elseif REFLOW_AFTER_PASTE = 'PROMPT_IF_WIDE'
       refresh
-      if MBID_YES = winmessagebox( 'Reflow after paste',  -- title
+      if MBID_YES = WinMessageBox( 'Reflow after paste',  -- title
                                    WIDE_PASTE__MSG,
                                    MB_YESNO + MB_QUERY + MB_DEFBUTTON2 + MB_MOVEABLE)
@@ -399 +399 @@
       endif
 
-      call psave_mark( savemark)        -- Save the user's mark
+      call pSave_Mark( savemark)        -- Save the user's mark
       to_end = .last - .line            -- Remember how far from end, because # lines
                                         -- from start will change as we reflow.
@@ -422 +422 @@
          mark_line
          cur_line = .line
-         call pfind_blank_line()
+         call pFind_Blank_Line()
          if .line <> cur_line then      -- Stop at line before next blank line
             up
@@ -458 +458 @@
       endif
 
-      call prestore_mark( savemark)     -- Restore the user's mark
+      call pRestore_Mark( savemark)     -- Restore the user's mark
 
    enddo  -- once
@@ -517 +517 @@
    endif
    if not DMbuf_handle then
-      DMbuf_handle = buffer( CREATEBUF, EPMDMBUFFER, min( size, MAXBUFSIZE), 1)
+      DMbuf_handle = buffer( CREATEBUF, EPMDMBUFFER, Min( size, MAXBUFSIZE), 1)
    endif
    if not DMbuf_handle then
-      messageNwait( CAN_NOT_OPEN__MSG EPMDMBUFFER '-' ERROR_NUMBER__MSG RC)
+      MessageNWait( CAN_NOT_OPEN__MSG EPMDMBUFFER '-' ERROR_NUMBER__MSG RC)
       return
    endif
@@ -547 +547 @@
       return
    endif
-   call psave_mark( savemark)                              -- Save the user's mark
+   call pSave_Mark( savemark)                              -- Save the user's mark
    call GetBuffCommon( DMbuf_handle, NO_TEXT_RECOVERED__MSG)  -- (This marks what's recovered)
-   call prestore_mark( savemark)                           -- Restore the user's mark
+   call pRestore_Mark( savemark)                           -- Restore the user's mark
 
 
@@ -558 +558 @@
    markt = buffer( MARKTYPEBUF, bufhndl)
    getfileid activefid                      -- get current files file id
-   if not markt & arg(3) <> 'O' then        -- MARKT = 0 ==> line mark (simple case)
+   if not markt & arg( 3) <> 'O' then       -- MARKT = 0 ==> line mark (simple case)
       noflines = buffer( GETBUF, bufhndl)   -- Retrieve data from shared EPM buf
       if noflines then
-         call pset_mark( .line + 1,.line + noflines, 1, MAXCOL, 'LINE', activefid)
+         call pSet_Mark( .line + 1,.line + noflines, 1, MAXCOL, 'LINE', activefid)
          '+'noflines
-         call verify_buffer_size( bufhndl, noflines)
+         call Verify_Buffer_Size( bufhndl, noflines)
       else
          sayerror errormsg
@@ -587 +587 @@
 ;  sayerror 'orig_lines='orig_lines 'noflines='noflines 'markt='markt '.last='.last 'textline(.last)="'textline(.last)'"'
    if (not orig_lines | orig_lines = noflines - 1) &
-      markt = 2 & textline(.last) == '' then  -- Block mark?  Get rid of extra blank line
+      markt = 2 & textline( .last) == '' then  -- Block mark?  Get rid of extra blank line
       noflines = noflines - 1
       deleteline .last
@@ -597 +597 @@
       markblock                         -- block mark first character
       noflines + 1                      -- advance down to last line
-      if arg(3) = 'B' then              -- Block-marking from clipboard;
+      if arg( 3) = 'B' then             -- Block-marking from clipboard;
          .col = longestline()           -- move cursor to end of longest line
       else                              -- Was originally a block; width is OK.
@@ -604 +604 @@
       markblock                         -- complete block mark
    elseif markt = 1 | markt = 3 then    -- Mark type is Character(G)
-      split_start = activefid.col + length(textline(2)) > MAXCOL
+      split_start = activefid.col + length(textline( 2)) > MAXCOL
       split_end = cur_line_len - activefid.col + length_last > MAXCOL
       setmark 2, .last, 1, length_last + 1, 3, tmpfileid  -- 3 = CHARG mark
@@ -617 +617 @@
    rc = 0                               -- clear return code before copy
    if arg(3) = 'O' then
-      call pcommon_adjust_overlay( 'O')   -- copy mark
+      call pCommon_Adjust_Overlay( 'O')   -- copy mark
    else
       if split_end then
@@ -627 +627 @@
          begin_line
       endif
-      call pcopy_mark()                 -- copy mark
+      call pCopy_Mark()                 -- copy mark
    endif
    if rc then                           -- Test for memory too full for copy_mark.
@@ -638 +638 @@
    'xcom q'                             -- quit it
    activatefile activefid               -- activate destination file
-   call pend_mark()
+   call pEnd_Mark()
    if length_last then  -- Move right by 'executekey right', to handle stream mode.
       save_CUA = CUA_marking_switch
       CUA_marking_switch = 0
       -- Turn off CUA marking, so moving right won't unmark.
-      'togglecontrol 25 0'
+      'ToggleControl 25 0'
       executekey right           -- This is all we really want to do...
       CUA_marking_switch = save_CUA
-      'togglecontrol 25' CUA_marking_switch
-   endif
-   call verify_buffer_size( bufhndl, noflines)
-
-; ---------------------------------------------------------------------------
-defproc verify_buffer_size( bufhndl, noflines)
+      'ToggleControl 25' CUA_marking_switch
+   endif
+   call Verify_Buffer_Size( bufhndl, noflines)
+
+; ---------------------------------------------------------------------------
+defproc Verify_Buffer_Size( bufhndl, noflines)
    orig_lines = ltoa( peek( bufhndl, 28, 4), 10)
    if orig_lines <> noflines & orig_lines then  -- If 0, assume never set.
@@ -660 +660 @@
 
 ; ---------------------------------------------------------------------------
-defc clipview =
-   if not clipcheck(format) then
+defc clipview
+   if not ClipCheck( format) then
       sayerror CLIPBOARD_ERROR__MSG
       return
@@ -683 +683 @@
 ; ---------------------------------------------------------------------------
 ; Doesn't work!
-defproc clipcheck( var format)  -- Returns error code; if OK, sets FORMAT
-   hab = gethwndc(0)                        -- get EPM's anchorblock
+defproc ClipCheck( var format)  -- Returns error code; if OK, sets FORMAT
+   hab = GethWndC( 0)                       -- get EPM's anchorblock
    format = \0\0\0\0                        -- (reserve four bytes)
    rc = dynalink32( 'PMWIN',                -- call PM function to
                     '#807',                 -- look at the data in the cb
                     hab              ||     -- anchor block
-                    atol(1)          ||     -- data format ( TEXT )
-                    address(format), 4)
+                    atol( 1)         ||     -- data format ( TEXT )
+                    address( format), 4)
    --format = ltoa( format, 10)             -- Convert format to ASCII
    format = 1024