Changeset 3434

Timestamp:

Jan 29, 2019, 7:18:48 PM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• Renamed select hooks and commands to filesloaded and fileswitched.
• Cosmetic changes.

Location:

trunk/src/netlabs/macros

Files:

• config.e (modified) (58 diffs)
• edit.e (modified) (33 diffs)
• epmshell.e (modified) (1 diff)
• file.e (modified) (28 diffs)
• filelist.e (modified) (29 diffs)
• groups.e (modified) (20 diffs)
• hooks.e (modified) (40 diffs)
• infoline.e (modified) (15 diffs)
• load.e (modified) (7 diffs)
• locate.e (modified) (1 diff)
• main.e (modified) (18 diffs)
• mode.e (modified) (15 diffs)
• modeexec.e (modified) (1 diff)
• recompile.e (modified) (17 diffs)
• select.e (modified) (8 diffs)
• wrap.e (modified) (1 diff)

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

@@ -30 +30 @@
 ; following commands (among others):
 ;
-;    initconfig      Read values from ini and change configuration of
+;    InitConfig      Read values from ini and change configuration of
 ;                    current EPM window. This overwrites values previously
 ;                    initialized to values of consts, if their ini entries
 ;                    are present. Called by defmain.
 ;
-;    renderconfig    Send values to config dialog, either
+;    RendeCconfig    Send values to config dialog, either
 ;                    -  default values defined by consts or
 ;                    -  values read from ini or
@@ -41 +41 @@
 ;                    Called by configdlg at its startup.
 ;
-;    setconfig       Change configuration of current EPM window according
+;    SetConfig       Change configuration of current EPM window according
 ;                    to the changes by the user. Called by configdlg at its
 ;                    closing.
@@ -161 +161 @@
 ; Provide some consts, for the case a user really wants to change this:
 const
-compile if not defined(CONFIGDLG_START_WITH_CURRENT_FILE_SETTINGS)
+compile if not defined( CONFIGDLG_START_WITH_CURRENT_FILE_SETTINGS)
    -- 0 => start with settings from EPM.INI
    CONFIGDLG_START_WITH_CURRENT_FILE_SETTINGS = 0     -- previous standard would have been 1
 compile endif
-compile if not defined(CONFIGDLG_CHANGE_FILE_SETTINGS)
+compile if not defined( CONFIGDLG_CHANGE_FILE_SETTINGS)
    CONFIGDLG_CHANGE_FILE_SETTINGS = 'REFRESHDEFAULT'  -- previous standard would have been 1
 compile endif
-compile if not defined(CONFIGDLG_ASK_REFLOW)
+compile if not defined( CONFIGDLG_ASK_REFLOW)
    CONFIGDLG_ASK_REFLOW = 0                           -- previous standard would have been 1
 compile endif
@@ -192 +192 @@
 compile endif
 
-   args = arg(1)
+   args = arg( 1)
    wp = wordpos( 'SYS', upcase( args))  -- SYS not used by EPM. Used by Epm class?
    if wp then
@@ -206 +206 @@
    omit = omit +  32  -- omit Keys page (outdated)
    --omit = 512
-   if isnum( args) then
+   if IsNum( args) then
       omit = args
    endif
@@ -222 +222 @@
    --  512: without page 10  Toolbar
 
-   call windowmessage( 0, getpminfo(APP_HANDLE),
+   call windowmessage( 0, getpminfo( APP_HANDLE),
                        msgid,
                        omit,           -- 0 = Omit no pages
@@ -259 +259 @@
 ÀÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ
 */
-defc renderconfig
+defc RenderConfig
    universal vdefault_tabs
    universal vdefault_margins
@@ -311 +311 @@
 ;      if not fsend_default then      -- 0: Use values from .ini file
 ;         newcmd = queryprofile( app_hini, appname, INI_OPTFLAGS)
-;         if words(newcmd) >= 14 then
+;         if words( newcmd) >= 14 then
 ;            -- OPTFLAGS:   14
-;            tempstr = word(newcmd, 14)
+;            tempstr = word( newcmd, 14)
 ;         endif
 ;      elseif fsend_default = 2 then  -- 2: Use current values
@@ -324 +324 @@
          tempstr = .margins
       else                         -- 0|1: Use values from .ini file or default values
-         tempstr = checkini( fsend_default, INI_MARGINS, DEFAULT_MARGINS)
-      endif
-      call send_config_data( hndle, tempstr, 1, 5301)
+         tempstr = CheckIni( fsend_default, INI_MARGINS, DEFAULT_MARGINS)
+      endif
+      call Send_Config_Data( hndle, tempstr, 1, 5301)
 
    elseif page = 3 then  ----------------- Page 3 is colors -----------
@@ -347 +347 @@
       endif
       parse value tempstr with ttextcolor tmarkcolor tstatuscolor tmessagecolor .
-      call send_config_data( hndle, ttextcolor, 4, help_panel)
-      call send_config_data( hndle, tmarkcolor, 5, help_panel)
-      call send_config_data( hndle, tstatuscolor, 6, help_panel)
-      call send_config_data( hndle, tmessagecolor, 7, help_panel)
+      call Send_Config_Data( hndle, ttextcolor, 4, help_panel)
+      call Send_Config_Data( hndle, tmarkcolor, 5, help_panel)
+      call Send_Config_Data( hndle, tstatuscolor, 6, help_panel)
+      call Send_Config_Data( hndle, tmessagecolor, 7, help_panel)
 
    elseif page = 4 then  ----------------- Page 4 is paths ------------
@@ -389 +389 @@
          tempstr = .autosave
       else                           -- 0|1: Use values from .ini file or default values
-         tempstr = checkini( fsend_default, INI_AUTOSAVE, DEFAULT_AUTOSAVE)
-      endif
-      call send_config_data( hndle, tempstr, 2, help_panel)
+         tempstr = CheckIni( fsend_default, INI_AUTOSAVE, DEFAULT_AUTOSAVE)
+      endif
+      call Send_Config_Data( hndle, tempstr, 2, help_panel)
       --call send_config_data( hndle, checkini( fsend_default, INI_AUTOSPATH, vAUTOSAVE_PATH, AUTOSAVE_PATH), 9, help_panel)
-      call send_config_data( hndle, strip( GetBackupDir(), 't', '\')'\', 9, help_panel)
+      call Send_Config_Data( hndle, strip( GetBackupDir(), 't', '\')'\', 9, help_panel)
 
    elseif page = 6 then  ----------------- Page 6 is fonts ------------
                          ----------------- Text
       fontid = word( default_font 0 .font, fsend_default + 1)
-      call send_config_data( hndle, queryfont( fontid)'.'trunc( .textcolor // 16)'.'.textcolor % 16, 24, help_panel)
+      call Send_Config_Data( hndle, queryfont( fontid)'.'Trunc( .textcolor // 16)'.'.textcolor % 16, 24, help_panel)
                          ----------------- Status
       -- All fonts are saved now as psize'.'facename['.'attr], like OS/2 font specs
@@ -405 +405 @@
          tempstr = QueryConfigKey( KeyPath)
       elseif fsend_default = 1 then  -- 1: Use default values
-         tempstr = queryfont(0)
+         tempstr = queryfont( 0)
       else                           -- 2: Use current values
          tempstr = statfont
       endif
       tempstr = ConvertToEFont( tempstr)
-      call send_config_data( hndle, tempstr'.'trunc( vstatuscolor // 16)'.'vstatuscolor % 16, 25, help_panel)
+      call Send_Config_Data( hndle, tempstr'.'Trunc( vstatuscolor // 16)'.'vstatuscolor % 16, 25, help_panel)
                          ----------------- Message
       if not fsend_default then      -- 0: Use values from .ini file
@@ -416 +416 @@
          tempstr = QueryConfigKey( KeyPath)
       elseif fsend_default = 1 then  -- 1: Use default values
-         tempstr = queryfont(0)
+         tempstr = queryfont( 0)
       else                           -- 2: Use current values
          tempstr = msgfont
       endif
       tempstr = ConvertToEFont( tempstr)
-      call send_config_data( hndle, tempstr'.'trunc( vmessagecolor // 16)'.'vmessagecolor % 16, 26, help_panel)
+      call Send_Config_Data( hndle, tempstr'.'Trunc( vmessagecolor // 16)'.'vmessagecolor % 16, 26, help_panel)
 
    elseif page = 7 then  ----------------- Page 7 is enter keys -------
@@ -454 +454 @@
 ;         tempstr = ek || ek || c_ek || ek || ek || ek || c_ek || ek
 ;      else                           -- 0|2: Use values from .ini file or current values
-;         tempstr = chr(enterkey) || chr(a_enterkey) || chr(c_enterkey) || chr(s_enterkey) || chr(padenterkey) || chr(a_padenterkey) || chr(c_padenterkey) || chr(s_padenterkey)
+;         tempstr = chr( enterkey) || chr( a_enterkey) || chr( c_enterkey) || chr( s_enterkey) || chr( padenterkey) || chr( a_padenterkey) || chr( c_padenterkey) || chr( s_padenterkey)
 ;      endif
-;      call send_config_data(hndle, tempstr, 14, help_panel)
+;      call send_config_data( hndle, tempstr, 14, help_panel)
 
    elseif page = 8 then  ----------------- Page 8 is Frame controls ---
@@ -468 +468 @@
          endif
       elseif fsend_default = 2 then  -- 2: Use current values
-         tempstr = queryframecontrol(1) || queryframecontrol(2) || queryframecontrol(16) ||
-                   queryframecontrol(8) || queryframecontrol(32) || bitmap_present || queryframecontrol(8192)
-      endif
-      call send_config_data( hndle, tempstr, 15, help_panel)
-      call send_config_data( hndle, checkini( fsend_default, INI_BITMAP, bm_filename, ''), 16, help_panel)
+         tempstr = QueryFrameControl( 1) || QueryFrameControl( 2) || QueryFrameControl( 16) ||
+                   QueryFrameControl( 8) || QueryFrameControl( 32) || bitmap_present || QueryFrameControl( 8192)
+      endif
+      call Send_Config_Data( hndle, tempstr, 15, help_panel)
+      call Send_Config_Data( hndle, CheckIni( fsend_default, INI_BITMAP, bm_filename, ''), 16, help_panel)
 
    elseif page = 9 then  ----------------- Page 9 is Misc. ------------
@@ -506 +506 @@
                    (vEPM_POINTER = 2) || (cursordimensions = '-128.3 -128.-64') || cua_menu_accel
       endif
-      call send_config_data( hndle, tempstr, 18, help_panel)
+      call Send_Config_Data( hndle, tempstr, 18, help_panel)
 
    elseif page = 12 then  ---------------- Page 12 is Toolbar config --
@@ -518 +518 @@
          tempstr = \1'120'\1'32'\1'32'\1'9.WarpSans'\1'16777216'\1'16777216'\1  -- internal default if no entry in EPM.INI
       endif
-      call send_config_data( hndle, tempstr, 22, help_panel)
+      call Send_Config_Data( hndle, tempstr, 22, help_panel)
 
    elseif page = 13 then  ---------------- Page 13 is Toolbar name & on/off
@@ -536 +536 @@
          endif
       endif
-      call send_config_data( hndle, send_toolbar, 20, help_panel)
-      call send_config_data( hndle, queryframecontrol(EFRAMEF_TOOLBAR), 21, help_panel)
+      call Send_Config_Data( hndle, send_toolbar, 20, help_panel)
+      call Send_Config_Data( hndle, QueryFrameControl( EFRAMEF_TOOLBAR), 21, help_panel)
       -- The list of toolbars and all the button actions on this page are not configurable
       -- with E commands.
@@ -544 +544 @@
 
 ; ---------------------------------------------------------------------------
-defproc send_config_data( hndle, strng, i, help_panel)
+defproc Send_Config_Data( hndle, strng, i, help_panel)
    strng = strng\0          -- null terminate (asciiz)
    call windowmessage( 1, hndle,
                        32,               -- WM_COMMAND - 0x0020
-                       mpfrom2short( help_panel, i),
-                       ltoa( offset(strng) || selector(strng), 10))
+                       MpFrom2Short( help_panel, i),
+                       ltoa( offset( strng) || selector( strng), 10))
 
 ; ---------------------------------------------------------------------------
@@ -571 +571 @@
    if fsend_default then
       if fsend_default = 1 & arg() > 3 then
-         return arg(4)
+         return arg( 4)
       endif
       return defaultdata
@@ -587 +587 @@
    universal appname, app_hini
    if arg() >= 3 then
-      perm = arg(3)
+      perm = arg( 3)
    else
       perm = 1
@@ -629 +629 @@
    ChangeFileSettings = CONFIGDLG_CHANGE_FILE_SETTINGS  -- standard was 1
    AskReflow          = CONFIGDLG_ASK_REFLOW
-   --dprintf( 'SETCONFIG', arg(1))
-
-   parse value arg(1) with configid perm newcmd
+   --dprintf( 'SETCONFIG', arg( 1))
+
+   parse value arg( 1) with configid perm newcmd
 
    if     configid = 1 then
@@ -645 +645 @@
          'RingRefreshSetting DEFAULT SetMargins 'newcmd   -- the ring with default settings
       endif
-      vdefault_margins = setini( INI_MARGINS, newcmd, perm)
+      vdefault_margins = SetIni( INI_MARGINS, newcmd, perm)
       'RefreshInfoLine MARGINS'
 
    elseif configid = 2 then
-      .autosave = setini( INI_AUTOSAVE, newcmd, perm)
+      .autosave = SetIni( INI_AUTOSAVE, newcmd, perm)
       vdefault_autosave = newcmd
 
@@ -656 +656 @@
          if .tabs <> newcmd then
             .tabs = newcmd
-            'postme refreshinfoline TABS'
+            'PostMe RefreshInfoLine TABS'
          endif
       elseif ChangeFileSettings = 'REFRESHDEFAULT' then   -- change setting of all files in
          'RingRefreshSetting DEFAULT SetTabs 'newcmd      -- the ring with default settings
       endif
-      vdefault_tabs = setini( INI_TABS, newcmd, perm)
+      vdefault_tabs = SetIni( INI_TABS, newcmd, perm)
       'RefreshInfoLine TABS'
 
@@ -704 +704 @@
    elseif configid = 15 then
       parse value newcmd with statflg 2 msgflg 3 hscrollflg 4 vscrollflg 5 extraflg 6 new_bitmap 7 drop_style 8
-      'toggleframe 1' statflg
-      'toggleframe 2' msgflg
-      'toggleframe 8' vscrollflg
-      'toggleframe 16' hscrollflg
-      'toggleframe 32' extraflg
-      'toggleframe 8192' drop_style
+      'ToggleFrame 1' statflg
+      'ToggleFrame 2' msgflg
+      'ToggleFrame 8' vscrollflg
+      'ToggleFrame 16' hscrollflg
+      'ToggleFrame 32' extraflg
+      'ToggleFrame 8192' drop_style
 
       if bitmap_present <> new_bitmap then
-         'toggle_bitmap'
+         'Toggle_Bitmap'
          if bitmap_present then
             bm_filename = ''  -- Will be reset; want to ensure it's reloaded.
@@ -724 +724 @@
             -- OPTFLAGS:                    5  6    8  9  10 11 12 13 14   16
             call setprofile( app_hini, appname, INI_OPTFLAGS,
-               queryframecontrol(1)    || ' ' ||
-               queryframecontrol(2)    || ' ' ||
-               queryframecontrol(8)    || ' ' ||
-               queryframecontrol(16)   || ' ' ||
-               w1                      || ' ' ||
-               w2                      || ' ' ||
-               queryframecontrol(32)   || ' ' ||
-               w3                      || ' ' ||
-               w4                      || ' ' ||
-               w5                      || ' ' ||
-               w6                      || ' ' ||
-               w7                      || ' ' ||
-               w8                      || ' ' ||
-               w9                      || ' ' ||
-               bitmap_present          || ' ' ||
-               w10                     || ' ' ||
-               queryframecontrol(8192) || ' ' ||
+               QueryFrameControl( 1)    || ' ' ||
+               QueryFrameControl( 2)    || ' ' ||
+               QueryFrameControl( 8)    || ' ' ||
+               QueryFrameControl( 16)   || ' ' ||
+               w1                       || ' ' ||
+               w2                       || ' ' ||
+               QueryFrameControl( 32)   || ' ' ||
+               w3                       || ' ' ||
+               w4                       || ' ' ||
+               w5                       || ' ' ||
+               w6                       || ' ' ||
+               w7                       || ' ' ||
+               w8                       || ' ' ||
+               w9                       || ' ' ||
+               bitmap_present           || ' ' ||
+               w10                      || ' ' ||
+               QueryFrameControl( 8192) || ' ' ||
                rest)
          else
@@ -751 +751 @@
          if bitmap_present then
             if bm_filename = '' then  -- Need to turn off & back on to get default bitmap
-               'toggle_bitmap'
-               'toggle_bitmap'
+               'Toggle_Bitmap'
+               'Toggle_Bitmap'
             else
-               'load_dt_bitmap' newcmd
+               'Load_Dt_Bitmap' newcmd
             endif
          endif
@@ -769 +769 @@
       mouse_setpointer vepm_pointer
 
-compile if not defined(my_CURSORDIMENSIONS)
-      'cursor_style' (cursor_shape + 1)
+compile if not defined( my_CURSORDIMENSIONS)
+      'Cursor_Style' (cursor_shape + 1)
 compile endif
 
       if markflg <> cua_marking_switch then
-         'CUA_mark_toggle'
-         'postme RefreshInfoline MARKINGMODE' -- postme required? CUA_mark_toggle sets infoline already!
+         'CUA_Mark_Toggle'
+         'PostMe RefreshInfoline MARKINGMODE' -- postme required? CUA_mark_toggle sets infoline already!
       endif
 
       if streamflg <> default_stream_mode then
          if ChangeFileSettings = 1 then                      -- change current file's setting
-            'stream_toggle'  -- old definition
+            'Stream_Toggle'  -- old definition
             stream_mode = streamflg
-            'postme RefreshInfoline STREAMMODE'
+            'PostMe RefreshInfoline STREAMMODE'
          elseif ChangeFileSettings = 'REFRESHDEFAULT' then
-            next = GetAVar(fid'.streammode')  -- query file setting
+            next = GetAVar( fid'.streammode')  -- query file setting
             if next = 'DEFAULT' | next = '' then  -- unset if tabkey was not changed by any modeexecute
-               'stream_toggle'
+               'Stream_Toggle'
                stream_mode = streamflg
-               'postme RefreshInfoLine STREAMMODE'
+               'PostMe RefreshInfoLine STREAMMODE'
             endif
          endif
@@ -803 +803 @@
 
       if cua_menu_accel <> menu_accel then
-         'accel_toggle'
+         'Accel_Toggle'
       endif
 
@@ -842 +842 @@
 ;         elseif ChangeFileSettings = 'REFRESHDEFAULT' then
 ;            getfileid fid
-;            next = GetAVar(fid'.tabkey')  -- query file setting
+;            next = GetAVar( fid'.tabkey')  -- query file setting
 ;            if next = 'DEFAULT' | next = '' then  -- unset if tabkey was not changed by any modeexecute
 ;               tab_key = on
@@ -869 +869 @@
          endif
       elseif newcmd <> toolbar_loaded then
-         call windowmessage( 0, getpminfo(EPMINFO_EDITFRAME),
+         call windowmessage( 0, getpminfo( EPMINFO_EDITFRAME),
                              5916,
-                             app_hini, put_in_buffer(newcmd))
+                             app_hini, Put_In_Buffer( newcmd))
          toolbar_loaded = newcmd
       endif
@@ -881 +881 @@
 
    elseif configid = 21 then
-      if newcmd <> queryframecontrol(EFRAMEF_TOOLBAR) then
+      if newcmd <> QueryFrameControl( EFRAMEF_TOOLBAR) then
          'toggleframe' EFRAMEF_TOOLBAR newcmd
       endif
@@ -897 +897 @@
 
    elseif configid = 22 then
-      call windowmessage( 0, getpminfo(EPMINFO_EDITFRAME),
+      call windowmessage( 0, getpminfo( EPMINFO_EDITFRAME),
                           5921,
-                          put_in_buffer(newcmd), 0)
+                          Put_In_Buffer( newcmd), 0)
 compile if 0
       parse value newcmd with \1 style \1 cx \1 cy \1 font \1 color \1 itemcolor \1
@@ -923 +923 @@
 ;         'SaveColor'
 ;      endif
-      --dprintf('setconfig', 'configid = 0')
+      --dprintf( 'setconfig', 'configid = 0')
 ; In standard EPM the font was always saved:
 ;       call setprofile( app_hini, appname, INI_STUFF,
@@ -951 +951 @@
    universal cua_marking_switch
    universal menu_prompt
-compile if (HOST_SUPPORT = 'EMUL' | HOST_SUPPORT = 'E3EMUL') and not defined(my_SAVEPATH)
+compile if (HOST_SUPPORT = 'EMUL' | HOST_SUPPORT = 'E3EMUL') and not defined( my_SAVEPATH)
    universal savepath
 compile endif
@@ -1043 +1043 @@
    if streamflg <> '' then
       if streamflg <> default_stream_mode then
-         if isadefc('toggle_default_stream') then
+         if isadefc( 'toggle_default_stream') then
             'toggle_default_stream'  -- requires newmenu
          else
@@ -1080 +1080 @@
       -- Just set the universal var here
       vepm_pointer = 1 + pointer_style
-      -- The pointer is set now by ProcessAfterLoad2
+      -- The pointer is set now by ProcessPostFilesLoaded
       --mouse_setpointer vepm_pointer
    endif
-compile if not defined(my_CURSORDIMENSIONS)
+compile if not defined( my_CURSORDIMENSIONS)
    if cursor_shape <> '' then
       'cursor_style' (cursor_shape + 1)
    endif
-compile endif -- not defined(my_CURSORDIMENSIONS)
+compile endif -- not defined( my_CURSORDIMENSIONS)
 
    -- Maybe correct ini entry, returned value not used
@@ -1097 +1097 @@
 
 ; Moved from MENUACEL.E (file deleted now, formerly included by definit)
-compile if defined(my_STACK_CMDS)
+compile if defined( my_STACK_CMDS)
    stack_cmds = my_STACK_CMDS
 compile else
@@ -1109 +1109 @@
 
 compile if CHECK_FOR_LEXAM
-   LEXAM_is_available = (lexam(-1) <> '')
+   LEXAM_is_available = (lexam( -1) <> '')
 compile endif  -- CHECK_FOR_LEXAM
 
@@ -1199 +1199 @@
    vstatuscolor         = ColorNameToNum( QueryConfigKey( KeyPath'\Status',         BLACK+LIGHT_GRAYB))
    vmodifiedstatuscolor = ColorNameToNum( QueryConfigKey( KeyPath'\ModifiedStatus', MAGENTA+LIGHT_GRAYB))
-   call windowmessage( 0,  getpminfo(EPMINFO_EDITCLIENT),  -- post
+   call windowmessage( 0,  getpminfo( EPMINFO_EDITCLIENT),  -- post
                        5497,      -- EPM_EDIT_SETDTCOLOR
                        vdesktopcolor,
@@ -1251 +1251 @@
    universal cua_menu_accel
    universal cua_marking_switch
-   --dprintf( 'SaveOptions', 'arg(1) = ['arg(1)']')
+   --dprintf( 'SaveOptions', 'arg( 1) = ['arg( 1)']')
 
   -- Save values in key EPM -> OPTFLAGS
    call setprofile( app_hini, appname, INI_OPTFLAGS,
-                    queryframecontrol(1)               || ' ' ||  --  1 Status line
-                    queryframecontrol(2)               || ' ' ||  --  2 Message line
-                    queryframecontrol(8)               || ' ' ||  --  3 Vertical scrollbar
-                    queryframecontrol(16)              || ' ' ||  --  4 Horizontal scrollbar
-                    queryframecontrol(64)              || ' ' ||  --  5 File icon (unused in EPM 6)
-                    queryframecontrol(4)               || ' ' ||  --  6 Rotate buttons
-                    queryframecontrol(32)              || ' ' ||  --  7 Info at top
-                    cua_marking_switch                 || ' ' ||  --  8 CUA marking
-                    menu_prompt                        || ' ' ||  --  9 Menu item hints
-                    stream_mode                        || ' ' ||  -- 10 Stream mode
-                    show_longnames                     || ' ' ||  -- 11 Show .LONGNAME in titletext
-                    rexx_profile                       || ' ' ||  -- 12 REXX profile
-                    escape_key                         || ' ' ||  -- 13 Esc opens commandline
-                    0                                  || ' ' ||  -- 14 Tabkey
-                    bitmap_present                     || ' ' ||  -- 15 Background bitmap
-                    queryframecontrol(EFRAMEF_TOOLBAR) || ' ' ||  -- 16 Toolbar
-                    queryframecontrol(8192)            || ' ' ||  -- 17 Drop style (0 = edit, 1 = import)
-                    optflag_extrastuff)                           -- 18 ?
-
-   if arg(1) = 'OptOnly' then  -- don't process the following
+                    QueryFrameControl( 1)               || ' ' ||  --  1 Status line
+                    QueryFrameControl( 2)               || ' ' ||  --  2 Message line
+                    QueryFrameControl( 8)               || ' ' ||  --  3 Vertical scrollbar
+                    QueryFrameControl( 16)              || ' ' ||  --  4 Horizontal scrollbar
+                    QueryFrameControl( 64)              || ' ' ||  --  5 File icon (unused in EPM 6)
+                    QueryFrameControl( 4)               || ' ' ||  --  6 Rotate buttons
+                    QueryFrameControl( 32)              || ' ' ||  --  7 Info at top
+                    cua_marking_switch                  || ' ' ||  --  8 CUA marking
+                    menu_prompt                         || ' ' ||  --  9 Menu item hints
+                    stream_mode                         || ' ' ||  -- 10 Stream mode
+                    show_longnames                      || ' ' ||  -- 11 Show .LONGNAME in titletext
+                    rexx_profile                        || ' ' ||  -- 12 REXX profile
+                    escape_key                          || ' ' ||  -- 13 Esc opens commandline
+                    0                                   || ' ' ||  -- 14 Tabkey
+                    bitmap_present                      || ' ' ||  -- 15 Background bitmap
+                    QueryFrameControl( EFRAMEF_TOOLBAR) || ' ' ||  -- 16 Toolbar
+                    QueryFrameControl( 8192)            || ' ' ||  -- 17 Drop style (0 = edit, 1 = import)
+                    optflag_extrastuff)                            -- 18 ?
+
+   if arg( 1) = 'OptOnly' then  -- don't process the following
       return
    endif
@@ -1284 +1284 @@
       call setprofile( app_hini, appname, INI_BITMAP,   bm_filename)
    endif
-   call windowmessage( 0, getpminfo(APP_HANDLE),
+   call windowmessage( 0, getpminfo( APP_HANDLE),
                        62, 0, 0)               -- x'003E' = WM_SAVEAPPLICATION
 
@@ -1306 +1306 @@
    universal statfont
    universal default_font
-   --dprintf( 'SaveFont', 'arg(1) = ['arg(1)']')
-   -- arg(1) = 'EDIT' | 'MSG' | 'STAT'
+   --dprintf( 'SaveFont', 'arg( 1) = ['arg( 1)']')
+   -- arg( 1) = 'EDIT' | 'MSG' | 'STAT'
 
    KeyList = 'Text Message Status'
    -- Font specs have spaces. Therefore they are separated with \1
-   ValList = ConvertToOs2Font( queryfont(.font))''\1''msgfont''\1''statfont''\1
-   args = upcase( arg(1))
+   ValList = ConvertToOs2Font( queryfont( .font))''\1''msgfont''\1''statfont''\1
+   args = upcase( arg( 1))
 
    -- Replace EDIT, MSG, STAT
@@ -1376 +1376 @@
    universal vstatuscolor
    universal vmodifiedstatuscolor
-   --dprintf( 'SAVECOLOR', 'arg(1) = ['arg(1)']')
+   --dprintf( 'SAVECOLOR', 'arg( 1) = ['arg( 1)']')
 
    IgnoreList = 'EDIT MSG STAT'
    KeyList = 'Text Mark Background Message Status ModifiedStatus'
    ValList = .textcolor .markcolor vdesktopcolor vmessagecolor vstatuscolor vmodifiedstatuscolor
-   args = upcase( arg(1))
+   args = upcase( arg( 1))
 
    -- Ignore EDIT, MSG, STAT (and unknown words), since they are not precise enough
@@ -1427 +1427 @@
 */
 defc SaveWindowSize
-   --dprintf( 'SaveWindowSize', 'arg(1) = ['arg(1)']')
-   call windowmessage( 0, getpminfo(APP_HANDLE),
+   --dprintf( 'SaveWindowSize', 'arg( 1) = ['arg( 1)']')
+   call windowmessage( 0, getpminfo( APP_HANDLE),
                        62,                     -- x'003E' = WM_SAVEAPPLICATION
                        0, 0)
@@ -1435 +1435 @@
 defc DefaultMargins
    universal app_hini
-   universal vDEFAULT_MARGINS
+   universal vdefault_margins
    -- if executed with an arg
-   arg1 = arg(1)
+   arg1 = arg( 1)
    if arg1 <> '' then
       parse value arg1 with leftm rightm parm
@@ -1450 +1450 @@
       -- change setting of all files in the ring with default settings
       'RingRefreshSetting DEFAULT SetMargins 'NewMargins
-      vDEFAULT_MARGINS = NewMargins
+      vdefault_margins = NewMargins
       call setprofile( app_hini, 'EPM', INI_MARGINS, NewMargins)
       'RefreshInfoLine MARGINS'
@@ -1462 +1462 @@
    Text    = 'Enter leftma rightma parma (default: 1 1599 1):'
    IniValue = queryprofile( app_hini, 'EPM', INI_MARGINS)
-   IniValue = strip(IniValue)
+   IniValue = strip( IniValue)
    DefaultButton = 1
-   parse value entrybox( Title,
+   parse value EntryBox( Title,
                          '/~Set/~Reset/'CANCEL__MSG,  -- max. 4 buttons
                          IniValue,
                          '',
                          260,
-                         atoi(DefaultButton)  ||
-                         atoi(0000)           ||  -- help id
-                         gethwndc(APP_HANDLE) ||
+                         atoi( DefaultButton)  ||
+                         atoi( 0000)           ||  -- help id
+                         GethWndC( APP_HANDLE) ||
                          Text) with Button 2 NewValue \0
-   NewValue = strip(NewValue)
+   NewValue = strip( NewValue)
    if Button = \1 then
       'DefaultMargins' NewValue
@@ -1487 +1487 @@
 defc DefaultTabs
    universal app_hini
-   universal vDEFAULT_TABS
+   universal vdefault_tabs
    -- if executed with a num as arg
-   arg1 = arg(1)
-   if arg1 <> '' & isnum( arg1) then
+   arg1 = arg( 1)
+   if arg1 <> '' & IsNum( arg1) then
       NewTabs = arg1
       -- change setting of all files in the ring with default settings
@@ -1508 +1508 @@
    IniValue = strip( IniValue)
    DefaultButton = 1
-   parse value entrybox( Title,
+   parse value EntryBox( Title,
                          '/~Set/~Reset/'CANCEL__MSG,  -- max. 4 buttons
                          IniValue,
@@ -1515 +1515 @@
                          atoi( DefaultButton)  ||
                          atoi( 0000)           ||  -- help id
-                         gethwndc( APP_HANDLE) ||
+                         GethWndC( APP_HANDLE) ||
                          Text) with Button 2 NewValue \0
    NewValue = strip( NewValue)
@@ -1531 +1531 @@
 ; ---------------------------------------------------------------------------
 defproc GetHighlight
-   on = (windowmessage( 1, getpminfo(EPMINFO_EDITFRAME),
+   on = (windowmessage( 1, getpminfo( EPMINFO_EDITFRAME),
                         5505,          -- EPM_EDIT_KW_QUERYPARSE
                         0,
@@ -1588 +1588 @@
 
    -- Compare with previous KeyPath to avoid inifinite recursion
-   LastKeyPath = arg(2)
+   LastKeyPath = arg( 2)
    if KeyPath = LastKeyPath then
       rc = 13  -- ERROR_INVALID_DATA
@@ -1652 +1652 @@
 
    -- Compare with previous KeyPath to avoid inifinite recursion
-   LastKeyPath = arg(3)
+   LastKeyPath = arg( 3)
    if OldKeyPath = LastKeyPath then
       rc = 13  -- ERROR_INVALID_DATA
@@ -1804 +1804 @@
 
    -- Compare with previous KeyPath to avoid inifinite recursion
-   LastKeyPath = arg(2)
+   LastKeyPath = arg( 2)
    if KeyPath = LastKeyPath then
       rc = 13  -- ERROR_INVALID_DATA
@@ -1891 +1891 @@
 
 defc ImportUserConfig
-   UserConfigFile = arg(1)
+   UserConfigFile = arg( 1)
    if UserConfigFile = '' then
       'SelectUserConfig'
@@ -1917 +1917 @@
 
    KeyPath = AddOptionalPrefix( KeyPath, '\NEPMD')
-   default_value = arg(2)
+   default_value = arg( 2)
    next = NepmdQueryConfigValue( nepmd_hini, KeyPath)
    if not rc & next <> '' then
@@ -1962 +1962 @@
 ; ---------------------------------------------------------------------------
 defproc QueryModeKey( Mode, Key)
-   default_value = arg(3)
+   default_value = arg( 3)
    PathPrefix = '\NEPMD\Var\Mode'
    KeyPath = PathPrefix'\'Mode'\'Key

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

@@ -76 +76 @@
 defproc PreLoadFile( FileSpec, Options)
    universal filestoload
-   universal filestoloadmax  -- still used for 'xcom e' and afterload
+   universal filestoloadmax  -- still used for 'xcom e' and ProcessFilesLoaded
    if filestoload = '' then
       filestoload = 0
@@ -132 +132 @@
       -- GetMode doesn't work here, because it tries to write the fid'.mode'
       -- array var. At this time the file is not loaded, so the fileid is not set.
-      -- But calling NepmdQueryDefaultMode(Filename) would work.
+      -- But calling NepmdQueryDefaultMode( Filename) would work.
       -- We should better determine the mode here, save it in a array var with the
       -- .filename as identifier, and replace the identifier with the fileid later
@@ -300 +300 @@
       endif
 
-      Codepage = upcase(Codepage)
+      Codepage = upcase( Codepage)
       if Codepage = 'CP1004' then
          Codepage = 'latin-1'
@@ -379 +379 @@
 ; ---------------------------------------------------------------------------
 ;compile if LINK_HOST_SUPPORT & (HOST_SUPPORT='EMUL' | HOST_SUPPORT='E3EMUL')
-; compile if not defined(MVS)
+; compile if not defined( MVS)
 ;    MVS = 0
 ; compile endif
-; compile if not defined(E3MVS)
+; compile if not defined( E3MVS)
 ;    E3MVS = 0
 ; compile endif
-; compile if not defined(HOST_LT_REQUIRED)
+; compile if not defined( HOST_LT_REQUIRED)
 ;    HOST_LT_REQUIRED = 0
 ; compile endif
@@ -498 +498 @@
 defc e, ed, Edit, epm
    universal default_edit_options
-   universal CurEditCmd
+   universal cureditcmd
    universal firstloadedfid  -- first file for this edit cmd, set here
    universal firstinringfid  -- first file in the ring, set by defmain
@@ -515 +515 @@
       -- Set current edit cmd to let other commands differ between several ways
       -- of file loading.
-      -- Other commands, that execute 'Edit', can set this universal var before
-      -- and then it will not be overwritten by 'Edit'. Afterload will reset it.
+      -- Other commands that execute 'Edit', can set this universal var before
+      -- and then it will not be overwritten by 'Edit'. ProcessFilesLoaded
+      -- will reset it.
       -- This is currently used for RestorePos and RingSavePos.
-      if CurEditCmd = '' then
-         CurEditCmd = 'EDIT'
+      if cureditcmd = '' then
+         cureditcmd = 'EDIT'
       endif
 
@@ -545 +546 @@
       error_reading = ''
       error_opening = ''
-      --  bad_paths     --> Non-existing path specified.
-      --  truncated     --> File contained lines longer than 255 characters.
-      --  access_denied --> If user tried to edit a subdirectory.
-      --  invalid_drive --> No such drive letter
-      --  error_reading --> Bad disk(ette).
-      --  error_opening --> Path contained invalid name.
+      --  bad_paths     --> non-existing path specified
+      --  truncated     --> file contained lines longer than 255 characters (EPM 5 only)
+      --  access_denied --> if user tried to edit a subdirectory
+      --  invalid_drive --> no such drive letter
+      --  error_reading --> bad disk(ette)
+      --  error_opening --> path contained invalid name
 
       fParseCmd = 1
@@ -569 +570 @@
 
          if ch = "'" & fParseCmd then
-            parse value rest with (ch) cmd (ch) rest
+            parse value rest with (ch) Cmd (ch) rest
             do while substr( rest, 1, 1) = ch & pos( ch, rest, 2)
                parse value rest with (ch) p (ch) rest
-               cmd = cmd''ch''p
+               Cmd = Cmd''ch''p
             enddo
-            CurEditCmd = cmd  -- set universal var to determine later in LOAD.E if pos shall be restored from EA
-            cmd
+            CurEditCmd = Cmd  -- set universal var to determine later in LOAD.E if pos shall be restored from EA
+            Cmd
 
          elseif ch = '/' then       -- Option
@@ -642 +643 @@
 
 ; Todo: rewrite that horrible message stuff:
-            if rc = -3 then        -- sayerror('Path not found')
+            if rc = -3 then        -- sayerror( 'Path not found')
                bad_paths = bad_paths', 'FileSpec
-            elseif rc = -2 then    -- sayerror('File not found')
+            elseif rc = -2 then    -- sayerror( 'File not found')
                not_found = not_found', 'FileSpec
-            elseif rc = -282 then  -- sayerror('New file')
+            elseif rc = -282 then  -- sayerror( 'New file')
                new_files = new_files', 'FileSpec
                new_files_loaded = new_files_loaded + 1
-            elseif rc = -278 then  --sayerror('Lines truncated') <-- never happens for EPM 6
+            elseif rc = -278 then  --sayerror( 'Lines truncated') <-- never happens for EPM 6
                getfileid truncid
-               do i = 1 to filesinring(1)  -- Provide an upper limit; prevent looping forever
-                  if .modify then leave; endif  -- Need to do this if wildcards were specified.
+               do i = 1 to filesinring( 1)  -- Provide an upper limit; prevent looping forever
+                  if .modify then   -- Need to do this if wildcards were specified.
+                     leave
+                  endif
                   nextfile
                enddo
                truncated = truncated', '.filename
                .modify = 0
-            elseif rc = -5 then  -- sayerror('Access denied')
+            elseif rc = -5 then  -- sayerror( 'Access denied')
                access_denied = access_denied', 'FileSpec
-            elseif rc = -15 then  -- sayerror('Invalid drive')
+            elseif rc = -15 then  -- sayerror( 'Invalid drive')
                invalid_drive = invalid_drive', 'FileSpec
-            elseif rc = -286 then  -- sayerror('Error reading file')
+            elseif rc = -286 then  -- sayerror( 'Error reading file')
                error_reading = error_reading', 'FileSpec
-            elseif rc = -284 then  -- sayerror('Error opening file')
+            elseif rc = -284 then  -- sayerror( 'Error opening file')
                error_opening = error_opening', 'FileSpec
             endif  -- rc=-3
             --if first_file_loaded = '' then  -- useless: forever empty at this point
-               if rc <> -3   &  -- sayerror('Path not found')
-                  rc <> -2   &  -- sayerror('File not found')
-                  rc <> -5   &  -- sayerror('Access denied')
-                  rc <> -15     -- sayerror('Invalid drive')
+               if rc <> -3   &  -- sayerror( 'Path not found')
+                  rc <> -2   &  -- sayerror( 'File not found')
+                  rc <> -5   &  -- sayerror( 'Access denied')
+                  rc <> -15     -- sayerror( 'Invalid drive')
                   then
                   -- If rc = 0, then set first_file_loaded:
@@ -681 +684 @@
 
       if files_loaded > 1 then  -- If only one file, leave E3's message
-         if new_files_loaded > 1 then p = 'New files:'; else p = 'New file:'; endif
+         if new_files_loaded > 1 then
+            p = 'New files:'
+         else
+            p = 'New file:'
+         endif
          multiple_errors = (new_files || bad_paths || not_found || truncated ||
                             access_denied || error_reading || error_opening ||
@@ -692 +699 @@
                             error_reading || error_opening || invalid_drive)
 
-         if new_files then sayerror NEW_FILE__MSG substr(new_files,2); endif
-         if not_found then sayerror FILE_NOT_FOUND__MSG':' substr(not_found,2); endif
+         if new_files then
+            sayerror NEW_FILE__MSG substr( new_files, 2)
+         endif
+         if not_found then
+            sayerror FILE_NOT_FOUND__MSG':' substr( not_found, 2)
+         endif
       else
          multiple_errors = 0
       endif
-      if bad_paths then sayerror BAD_PATH__MSG':' substr(bad_paths,2); endif
-      if truncated then sayerror LINES_TRUNCATED__MSG':' substr(truncated,2); endif
-      if access_denied then sayerror ACCESS_DENIED__MSG':' substr(access_denied,2); endif
-      if invalid_drive then sayerror INVALID_DRIVE__MSG':' substr(invalid_drive,2); endif
-      if error_reading then sayerror ERROR_READING__MSG':' substr(error_reading,2); endif  -- __MSGs were
-      if error_opening then sayerror ERROR_OPENING__MSG':' substr(error_opening,2); endif  -- exchanged
+      if bad_paths then
+         sayerror BAD_PATH__MSG':' substr( bad_paths, 2)
+      endif
+      if truncated then
+         sayerror LINES_TRUNCATED__MSG':' substr( truncated, 2)
+      endif
+      if access_denied then
+         sayerror ACCESS_DENIED__MSG':' substr( access_denied, 2)
+      endif
+      if invalid_drive then
+         sayerror INVALID_DRIVE__MSG':' substr( invalid_drive, 2)
+      endif
+      if error_reading then
+         sayerror ERROR_READING__MSG':' substr( error_reading, 2)
+      endif
+      if error_opening then
+         sayerror ERROR_OPENING__MSG':' substr( error_opening, 2)
+      endif
+
       if multiple_errors then
-         messageNwait( MULTIPLE_ERRORS__MSG)
+         MessageNWait( MULTIPLE_ERRORS__MSG)
       endif
 
@@ -711 +735 @@
       if first_file_loaded <> '' then
 
-         -- activatefile is now executed in ProcessAfterLoad with postme.
+         -- activatefile is now executed in ProcessFilesLoaded with postme.
          -- This finally works properly. With activatefile here the ring would get messed.
          --activatefile first_file_loaded
-         -- Set fid for ProcessAfterLoad:
+         -- Set fid for ProcessFilesLoaded:
          firstloadedfid = first_file_loaded
 
@@ -723 +747 @@
       endif
 
-      if upcase( CurEditCmd) <> 'RESTORERING' then
+      if upcase( cureditcmd) <> 'RESTORERING' then
          'AtStartup AddToHistory EDIT' args
       endif
@@ -738 +762 @@
 defc o, Open
    fname = strip( arg( 1))                  -- Remove excess spaces
-   call parse_filename( fname, .filename)   -- Resolve '=', if any
+   call Parse_Filename( fname, .filename)   -- Resolve '=', if any
 
    call windowmessage( 0, getpminfo( APP_HANDLE),
                        5386,                   -- EPM_EDIT_NEWFILE
-                       put_in_buffer( fname),
+                       Put_In_Buffer( fname),
                        1)                      -- Tell EPM to free the buffer.
 
@@ -759 +783 @@
    parse arg Filename Pathname Rest
    if Pathname = '' | Pathname = '.' then
-      if filetype( Filename) = 'CMD' then
+      if FileType( Filename) = 'CMD' then
          PathnameList = 'PATH'
       else
@@ -769 +793 @@
    do w = 1 to words( PathnameList)
       Pathname = word( PathnameList, w)
-      call parse_filename( Filename,
+      call Parse_Filename( Filename,
                            substr( .filename, lastpos( '\', .filename) + 1))
       findfile Newfile, Filename, Pathname  -- find Filename in Pathname env var
@@ -784 +808 @@
 ; ---------------------------------------------------------------------------
 defc op, OPath, OpenPath
-   "Open 'ep "arg(1)"'"
+   "Open 'ep "arg( 1)"'"
 
 ; ---------------------------------------------------------------------------
@@ -816 +840 @@
       epmdir = directory()
 
-      call psave_pos( savedpos)
+      call pSave_Pos( savedpos)
       getsearch oldsearch
       -- search (reverse) in command shell buffer for the prompt and
@@ -827 +851 @@
          call ShellParsePromptLine( CurDir, Cmd)
       endif
-      ShellCmd = 'shell'
+      ShellCmd = 'Shell'
       if CurDir <> '' then
          ShellCmd = ShellCmd 'cdd' CurDir
       endif
       setsearch oldsearch
-      call prestore_pos( savedpos)
+      call pRestore_Pos( savedpos)
 
       fn = "'mc +cd "epmdir"+"shellcmd"'"
@@ -858 +882 @@
    endif
 
-   postmc = ''
+   PostMcArg = ''
    if fn <> '' then
-      call psave_pos( savedpos)
+      call pSave_Pos( savedpos)
       -- add arg for 'mc'
-      postmc = postmc';restorepos 'savedpos
+      PostMcArg = ';RestorePos 'savedpos
    endif
    -- Valid EPM commandline options are always regnized, even when they
@@ -868 +892 @@
    if GetMode() = 'BIN' then
       -- prepend 'binedit'
-      fn = "'binedit "fn"'"
-   endif
-   if postmc > '' then
-      "Open" fn "'postme mc "postmc"'"
+      fn = "'BinEdit "fn"'"
+   endif
+   if PostMcArg > '' then
+      "Open" fn "'PostMe mc "PostMcArg"'"
    else
       'Open' fn
@@ -893 +917 @@
    'HookAdd loadonce matchtab off'
    'HookAdd loadonce mode bin noea'
-   'e /t /64 /bin "'arg(1)'"'    -- options should go before filename                    <-- Todo: parse options and filename
+   'e /t /64 /bin "'arg( 1)'"'    -- options should go before filename                    <-- Todo: parse options and filename
                                  -- /64 doesn't work if run from a program object.
    'postme AvoidSaveOptions /e /s /t /o /l'
@@ -950 +974 @@
 
 ; ---------------------------------------------------------------------------
-; Finds EPM macro files <basename>.e in Dir of arg(1) and EPMMACROPATH.
+; Finds EPM macro files <basename>.e in Dir of arg( 1) and EPMMACROPATH.
 ; Opens listbox to select one file if multiple found.
-; <basename> is parsed from arg(1), so arg(1) may have any extension.
+; <basename> is parsed from arg( 1), so arg( 1) may have any extension.
 ; For association with *.ex (type: EX file) and *.e:
 ;    Program object:
@@ -1256 +1280 @@
 ;      Works now with temp files (starting with '.') as well.
 ;      Always returns 0.
-defproc parse_filename( var filename)
+defproc Parse_Filename( var filename)
 
    sourcefile = strip( arg( 2))
@@ -1275 +1299 @@
          parse value rest with "'"wrd"'" rest
          -- parse wrd again without the quotes (wrd may contain multiple wrds)
-         call parse_filename( wrd, sourcefile)
+         call Parse_Filename( wrd, sourcefile)
          resolved = resolved" '"wrd"'"
       elseif leftstr( rest, 1) = '"' then
@@ -1281 +1305 @@
          parse value rest with '"'wrd'"' rest
          -- wrd is ready to resolve '='
-         call parse_filename2( wrd, sourcefile)
+         call Parse_Filename2( wrd, sourcefile)
          resolved = resolved' "'wrd'"'
       else
@@ -1287 +1311 @@
          parse value rest with wrd rest
          -- wrd is ready to resolve '='
-         call parse_filename2( wrd, sourcefile)
+         call Parse_Filename2( wrd, sourcefile)
          resolved = resolved' 'wrd
       endif
@@ -1297 +1321 @@
 ; ---------------------------------------------------------------------------
 ; Resolve '=', '%' and ?: in a single word or word with spaces
-defproc parse_filename2( var wrd, sourcefile)
+defproc Parse_Filename2( var wrd, sourcefile)
 
    -- Parse sourcefile
@@ -1374 +1398 @@
 
    -- Get specified dir
-   StartDir = arg(2)
+   StartDir = arg( 2)
 
    -- Translate '/' to '\' if local masks specified
@@ -1456 +1480 @@
 ; Wrong: [Does *not* assume all options are specified before filenames.]
 ; Options must be specified before filename.
-defproc parse_leading_options( var rest, var options)
+defproc Parse_Leading_Options( var rest, var options)
    options = ''
    loop
@@ -1474 +1498 @@
 ; path or the fileid, which will be replaced by the corresponding part of the
 ; previous file (initially, the current filename).
-defproc parse_file_n_opts( argstr)
+defproc Parse_File_N_Opts( argstr)
    prev_filename = .filename
    output = ''
@@ -1486 +1510 @@
       endif
       if substr( filename, 1, 1) <> '/' then
-         call parse_filename( filename, prev_filename)
+         call Parse_Filename( filename, prev_filename)
          prev_filename = filename
       endif
@@ -1497 +1521 @@
 ; source file is modified.
 ; We can just execute 'get' to achieve the same result.
-defc insert_text_file
+defc Insert_Text_File
    'get 'arg( 1)
 

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

@@ -113 +113 @@
 ; Process that at defselect rather than at defload to save file loading time.
 definit
-   'HookAdd select MaybeStartShell'
+   'HookAdd fileswitched MaybeStartShell'
 
 ; ---------------------------------------------------------------------------

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

@@ -139 +139 @@
                          0,
                          240,
-                         -- atoi(1) || atoi(0) || gethwndc(APP_HANDLE) ||
-                         atoi(1) || atoi(0) || atol(0) ||
+                         -- atoi( 1) || atoi( 0) || gethwndc( APP_HANDLE) ||
+                         atoi( 1) || atoi( 0) || atol( 0) ||
                          RENAME_PROMPT__MSG '<' directory() '>') with button 2 name \0
    if button = \1 & name <> '' then
@@ -272 +272 @@
 ; call Save( <filename>, 1)          used by SaveAs
 defc s, Save
-   call Save( arg(1))
+   call Save( arg( 1))
 
 defproc Save
@@ -279 +279 @@
    universal unnamedfilename
    fNameChanged = 0
-   SpecifiedName = arg(1)
+   SpecifiedName = arg( 1)
    Name = SpecifiedName
    call Parse_Leading_Options( Name, Options)  -- gets and sets Name and Options
@@ -534 +534 @@
       --'postme SaveAskRecompile' Name
 
-      'HookExecute aftersave'
-      'HookExecuteOnce aftersaveonce'
+      'HookExecute postsave'
+      'HookExecuteOnce postsaveonce'
 
       if upcase( Name) = upcase( Get_Env( 'NEPMD_USERDIR')'\bin\alias.cfg') then
@@ -623 +623 @@
    AvoidOptions = lowcase( GetAVar( fid'.avoidsaveoptions'))
    if AvoidOptions > '' then
-      options = lowcase(options)
+      options = lowcase( options)
       -- Replace option /u with /l /ne in AvoidOptions
       if wordpos( '/u', AvoidOptions) then
@@ -720 +720 @@
    if not rc then
       sayerror 0  -- delete message
-      call delete_ea('.LONGNAME')
+      call delete_ea( '.LONGNAME')
       'Add_Ea .LONGNAME' LongName
       NepmdWriteStringEa( ShortName, '.LONGNAME', LongName)
@@ -850 +850 @@
    universal InfolineRefresh
    InfolineRefresh = 0
-   's 'arg(1)
+   's 'arg( 1)
    if not rc then
       .modify = 0          -- If saved to a different file, turn modify off
@@ -873 +873 @@
          leave
       else
-         rc = -5  -- sayerror('Access denied')
+         rc = -5  -- sayerror( 'Access denied')
          leave
       endif
@@ -937 +937 @@
       Name = leftstr( FileName, 255, \0)
    endif
-   fAskIfExists = (arg(3) <> 0)  -- optional 3rd arg, 0: no EXIST_OVERLAY__MSG, used by def f2 if SMARTSAVE
+   fAskIfExists = (arg( 3) <> 0)  -- optional 3rd arg, 0: no EXIST_OVERLAY__MSG, used by def f2 if SMARTSAVE
 
    rc = dynalink32( ERES2_DLL,                -- library name
@@ -958 +958 @@
    parse value Type with Type \0
    if Name = '' then
-      rc = -275  -- sayerror('Missing filename')
+      rc = -275  -- sayerror( 'Missing filename')
       return
    endif
@@ -1020 +1020 @@
    if upcase( arg( 1)) = 'EDIT' then
       style = 1  -- EDIT
-   elseif upcase(arg(1)) = 'GET' then
+   elseif upcase( arg( 1)) = 'GET' then
       style = 2  -- GET
    else
@@ -1093 +1093 @@
    endif
 
-   call windowmessage( 0, getpminfo(APP_HANDLE),
+   call windowmessage( 0, getpminfo( APP_HANDLE),
                        5126,               -- EPM_POPOPENDLG
                        ring_enabled,
@@ -1106 +1106 @@
 ; directory() as a command without the message stuff
 defc ChangeDir
-   next = directory( arg(1))
+   next = directory( arg( 1))
 
 ; ---------------------------------------------------------------------------
@@ -1118 +1118 @@
 ;    EDIT.E: defc OpenBinDlg
 defc FileDlg
-   if getpminfo(EPMINFO_EDITFRAME) then
+   if getpminfo( EPMINFO_EDITFRAME) then
       handle = EPMINFO_EDITFRAME
    else                   -- If frame handle is 0, use edit client instead
@@ -1163 +1163 @@
    fileDlg = overlay( filemask, fileDlg, 53)  -- Provide a starting path
                                               -- and a filetype filter.
-   -- Owner = Desktop: replace gethwndc(handle) with atol(1)
+   -- Owner = Desktop: replace gethwndc( handle) with atol( 1)
    result = dynalink32( 'PMCTLS', 'WINFILEDLG',
                         atol( 1) ||
@@ -1209 +1209 @@
 ; Can be used to toggle the lock state
 defc lock_on_modify
-   if wordpos( upcase(arg(1)), '0 OFF') then
+   if wordpos( upcase( arg( 1)), '0 OFF') then
       on = 0
    else
@@ -1230 +1230 @@
    if arg( 1) <> '' then
       'e 'arg( 1)
-      if rc & rc <> -282 then  --sayerror('New file')
+      if rc & rc <> -282 then  --sayerror( 'New file')
          return 1
       endif
@@ -1238 +1238 @@
       -- sayerror '"'.filename'" is readonly -- not locked'
    else
-      if Exist(.filename) then  -- added check for exist to disable 0 byte files created by lock
+      if Exist( .filename) then  -- added check for exist to disable 0 byte files created by lock
          rc = Lock( 'W')  -- deny Write
       endif
@@ -1244 +1244 @@
 
 ; ---------------------------------------------------------------------------
-; Syntax: call lock([<deny_mode>])
+; Syntax: call lock( [<deny_mode>])
 ;         <deny_mode> = 'W' or 'RW', default is 'RW'
 /*
@@ -1306 +1306 @@
          return result
       else
-         --messageNwait('DOSOPEN' ERROR__MSG result NOT_LOCKED__MSG)
+         --messageNwait( 'DOSOPEN' ERROR__MSG result NOT_LOCKED__MSG)
          return result
       endif
@@ -1422 +1422 @@
    if rc then  -- file doesn't exist
       --sayerror 'Attributes for "'Filename'" can''t be obtained, rc = 'rc
-   elseif length(attr) = 5 then
+   elseif length( attr) = 5 then
       readonly = (substr( attr, 5, 1) = 'R')
    endif
@@ -1462 +1462 @@
 ; ---------------------------------------------------------------------------
 ; Restore cursor position from EPM.POS EA
-; Only restore pos if doscmdline/CurEditCmd doesn't position the cursor itself.
-; CurEditCmd is set by defc e,ed,edit,epm in EDIT.E or defc recomp in RECOMP.E.
+; Only restore pos if doscmdline/CurEditCmd doesn't position the cursor
+; itself. CurEditCmd is set by defc e, ed, edit, epm in EDIT.E or defc recomp
+; in RECOMP.E.
 ; 1) PMSEEK uses the <filename> 'L <string_to_search>' syntax.
 ; 2) defc Recompile in src\gui\recompile\recomp.e
@@ -1632 +1633 @@
    Title = 'Enter new work directory'
    Text  = CUR_DIR_IS__MSG CurDir
-   Text  = Text''copies( ' ', Max( 100 - length(Text), 0))
+   Text  = Text''copies( ' ', Max( 100 - length( Text), 0))
    Entry = ''
    parse value EntryBox( Title,
@@ -1658 +1659 @@
    Title = 'Enter new startup directory for WPS objects'
    Text  = 'Current startup directory is 'CurStartupDir
-   Text  = Text''copies( ' ', Max( 100 - length(Text), 0))
+   Text  = Text''copies( ' ', Max( 100 - length( Text), 0))
    Entry = ''
    parse value EntryBox( Title,
@@ -1827 +1828 @@
 
 ; ---------------------------------------------------------------------------
-; arg(1) = drive, e.g.: X:
+; arg( 1) = drive, e.g.: X:
 ; Returns e.g.: HPFS | CDFS | JFS | FAT | LAN | RAMFS | ISOFS | HPFS386 | FAT32 | NDFS32 | NTFS
 defproc QueryFileSys( Drive)
@@ -1833 +1834 @@
    ordinal = 0
    infobuf = substr( '', 1, 255)
-   infobuflen = atol( length(infobuf))
+   infobuflen = atol( length( infobuf))
    FSAinfolevel = 1
    rc = dynalink32( 'DOSCALLS',              -- dynamic link library name
@@ -2101 +2102 @@
 
          -- Search in subdirs of Dir, if specified
-         SubDirList = arg(3)
+         SubDirList = arg( 3)
          if SubDirLIst = '' then
             SearchDirList = ThisDir
@@ -2181 +2182 @@
    if rc = 0 then
       .visible = 0
-      next = textline(1)
+      next = textline( 1)
       FilePart = substr( next, 1, Len)
       'xcom quit'

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

@@ -30 +30 @@
 
 ; ---------------------------------------------------------------------------
-; RingAutoSavePos is called by 'quit' and 'ProcessAfterload'.
+; RingAutoSavePos is called by 'quit' and 'ProcessFilesLoaded'.
 defproc RingAutoSavePos
    universal CurEditCmd
@@ -61 +61 @@
    KeyPath = '\NEPMD\User\AutoRestore\Ring\MaxFiles'
    MaxFiles = QueryConfigKey( KeyPath)
-   if not isnum(MaxFiles) then
+   if not IsNum( MaxFiles) then
       MaxFiles = 30
    endif
@@ -88 +88 @@
    KeyPath = '\NEPMD\User\AutoRestore\Ring\MaxRings'
    MaxRings = QueryConfigKey( KeyPath)
-   if not isnum(MaxRings) then
+   if not IsNum( MaxRings) then
       MaxRings = 1
    endif
@@ -97 +97 @@
 
    -- Get EPM EFrame window handle
-   hwnd = '0x'ltoa( gethwndc(6), 16)   -- EPMINFO_EDITFRAME
+   hwnd = '0x'ltoa( GethWndC( 6), 16)   -- EPMINFO_EDITFRAME
    WorkDir = directory()
 
@@ -171 +171 @@
    getfileid startfid
    -- Select next file to make current file topmost after restore
-   next_file
+   nextfile
    getfileid firstfid
    i = 0
    -- Loop through all files in ring
    dprintf( 'RINGCMD', 'RingSavePos')
-   do f = 1 to filesinring(1)  -- Provide an upper limit; prevent looping forever
+   do f = 1 to filesinring( 1)  -- Provide an upper limit; prevent looping forever
       -- Skip temp. files
       fIgnore = ((leftstr( .filename, 1) = '.') | (not .visible))
@@ -185 +185 @@
          WriteConfigKey( KeyPath'\Posn'i, .line .col .cursorx .cursory)
       endif
-      next_file
+
+      nextfile
       getfileid fid
-      if fid = firstfid then leave; endif
+      if fid = firstfid then
+         leave
+      endif
    enddo
 
@@ -194 +197 @@
 
    -- Check if file to be activated is still in ring
-   if wordpos( ValidateFileid( startfid), '1 2') then
+   if wordpos( validatefileid( startfid), '1 2') then
       activatefile startfid
    endif
@@ -211 +214 @@
    KeyPath = '\NEPMD\User\AutoRestore\Ring\MaxRings'
    MaxRings = QueryConfigKey( KeyPath)
-   if not isnum(MaxRings) then
+   if not IsNum( MaxRings) then
       MaxRings = 1
    endif
    RestorePosDisabled = 1
    RingSavePosDisabled = 1
-   LastNumber = arg(1)
+   LastNumber = arg( 1)
    if LastNumber = '' then
       KeyPath = '\NEPMD\Var\SavedRings\LastNumber'
@@ -222 +225 @@
    endif
 
-   hwnd = '0x'ltoa( gethwndc(6), 16)   -- EPMINFO_EDITFRAME
+   hwnd = '0x'ltoa( GethWndC( 6), 16)   -- EPMINFO_EDITFRAME
    KeyPath = '\NEPMD\Var\SavedRings\'LastNumber
    LastNumberhwnd = QueryConfigKey( KeyPath'\hwnd')
@@ -259 +262 @@
 
       if OpenNewWindow = 1 then
-         dprintf( 'RESTORE_RING', "i = "i", o 'restorering "LastNumber"'")
+         dprintf( 'RESTORE_RING', "i = "i", o 'RestoreRing "LastNumber"'")
 -- Problems here:
-         "o 'restorering "LastNumber"'"
+         "o 'RestoreRing "LastNumber"'"
          return
       else
-         dprintf( 'RESTORE_RING', 'i = 'i', e "'filename'"'||" 'restorepos "savedpos"'")
+         dprintf( 'RESTORE_RING', 'i = 'i', e "'filename'"'||" 'RestorePos "savedpos"'")
          if pos( ' ', filename) then
             filename = '"'filename'"'
@@ -272 +275 @@
          if rc = 0 then
             getfileid lastfid
-            'restorepos 'savedpos
+            'RestorePos 'savedpos
          endif
       endif
@@ -317 +320 @@
    KeyPath = '\NEPMD\User\AutoRestore\Ring\MaxFiles'
    -- if executed with a num as arg
-   if arg(1) <> '' & isnum(arg(1)) then
-      WriteConfigKey( KeyPath, arg(1))
+   if arg( 1) <> '' & IsNum( arg( 1)) then
+      WriteConfigKey( KeyPath, arg( 1))
       if isadefproc( 'MenuText_maxfilessavering') then
          MenuText_maxfilessavering()
@@ -329 +332 @@
    IniValue = QueryConfigKey( KeyPath)
    DefaultButton = 1
-   parse value entrybox( Title,
+   parse value EntryBox( Title,
                          '/~Set/~Reset/Cancel',   -- max. 4 buttons
                          IniValue,
                          '',
                          260,
-                         atoi(DefaultButton)  ||
-                         atoi(0000)           ||  -- help id
-                         gethwndc(APP_HANDLE) ||
+                         atoi( DefaultButton)  ||
+                         atoi( 0000)           ||  -- help id
+                         GethWndC( APP_HANDLE) ||
                          Text) with Button 2 NewValue \0
    -- strip + or -
@@ -350 +353 @@
 
 ; ---------------------------------------------------------------------------
-; Called by ProcessAfterload if filestoloadmax is less than a limit.
+; Called by ProcessFilesLoaded if filestoloadmax is less than a limit.
 defproc RingAddToHistory
    universal LoadDisabledFid
@@ -365 +368 @@
    Delim = \1  -- \0 doesn't work for NepmdWriteConfigValue
 
-   ListName = upcase( arg(1))
+   ListName = upcase( arg( 1))
    if ListName = '' then
       ListName = 'LOAD'
@@ -382 +385 @@
    -- Loop through all files in ring
    dprintf( 'RINGCMD', 'RingAddToHistory 'ListName', LoadDisabledFid = 'LoadDisabledFid)
-   do f = 1 to filesinring(1)  -- Provide an upper limit; prevent looping forever
+   do f = 1 to filesinring( 1)  -- Provide an upper limit; prevent looping forever
       NewItem = .filename
       rest = History
@@ -403 +406 @@
             NewHistory = History''next''Delim
             -- Check length of string first
-            len = length(NewHistory) + 1
+            len = length( NewHistory) + 1
             if i >= MaxItems then
                fStopList = 1
@@ -409 +412 @@
                fStopList = 1
             -- Append current item only if <> NewItem
-            elseif upcase(next) <> upcase(NewItem) then
+            elseif upcase( next) <> upcase( NewItem) then
                -- Add next
                i = i + 1
@@ -542 +545 @@
       NewHistory = History''next''Delim
       -- Check length of string first
-      len = length(NewHistory) + 1
+      len = length( NewHistory) + 1
       if i >= MaxItems then
          fStopList = 1
@@ -548 +551 @@
          fStopList = 1
       -- Append current item only if <> NewItem
-      elseif upcase(next) <> upcase(NewItem) then
+      elseif upcase( next) <> upcase( NewItem) then
          -- Add next
          i = i + 1
@@ -568 +571 @@
    Delim = \1
 
-   ListName = strip( upcase( arg(1)))
+   ListName = strip( upcase( arg( 1)))
    if ListName = '' then
       ListName = 'LOAD'
@@ -618 +621 @@
 
    -- Check result
-   button = asc(leftstr( select, 1))
-   EOS = pos( \0, select, 2)        -- CHR(0) signifies End Of String
+   button = asc( leftstr( select, 1))
+   EOS = pos( \0, select, 2)        -- CHR( 0) signifies End Of String
    select= substr( select, 2, EOS - 2)
    -- Edit or open filename
@@ -639 +642 @@
 
 ; ---------------------------------------------------------------------------
-; RingSetFileNumber is called by 'quit' and ProcessAfterLoad.
+; RingSetFileNumber is called by 'quit' and ProcessFilesLoaded.
 ; The firstinringfid is checked. If not valid anymore (e.g. if file was
 ; quit), then it is set to the lowest FileNumber of all files in the ring.
@@ -685 +688 @@
       LowestFileNumber = filesinring()  -- initialize to upper limit
       dprintf( 'RINGCMD', 'RingSetFileNumber 1')
-      do f = 1 to filesinring(1)  -- just as an upper limit
+      do f = 1 to filesinring( 1)  -- just as an upper limit
          -- Check if FileNumber was set by a previous call to RingSetFileNumber
          -- and get the lowest
@@ -712 +715 @@
    fid = firstinringfid
    dprintf( 'RINGCMD', 'RingSetFileNumber 2')
-   do f = 1 to filesinring(1)  -- just as an upper limit
+   do f = 1 to filesinring( 1)  -- just as an upper limit
       FileNumber = FileNumber + 1
 
@@ -740 +743 @@
 
 ; ---------------------------------------------------------------------------
-; Called by defproc GetInfoFieldValue('FILE').
+; Called by defproc GetInfoFieldValue( 'FILE').
 defproc GetFileNumber
    -- Get FileNumber for Filename by querying an array var
@@ -809 +812 @@
    'VSyncCursor'
 
-   call windowmessage( 0,  getpminfo(APP_HANDLE),
+   call windowmessage( 0,  getpminfo( APP_HANDLE),
                        5141,               -- EPM_POPRINGDIALOG
                        0,
@@ -836 +839 @@
 ; Executes a cmd on all files of the ring.
 defc Ring
-   if arg(1) = '' then
+   if arg( 1) = '' then
       sayerror 'Specify a command to be executed on all files in the ring.'
       return
@@ -842 +845 @@
    display -3
    getfileid startfid
-   dprintf( 'RINGCMD', 'Ring' arg(1))
-   do f = 1 to filesinring(1)  -- just as an upper limit
+   dprintf( 'RINGCMD', 'Ring' arg( 1))
+   do f = 1 to filesinring( 1)  -- just as an upper limit
       if .visible then
-         arg(1)  -- execute arg(1)
+         arg( 1)  -- execute arg( 1)
       endif
       nextfile

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

@@ -22 +22 @@
 /*
 Todo:
--  Disable Afterload until all files are loaded in loadgroup.
+-  Disable FilesLoaded until all files are loaded in loadgroup.
 */
 
@@ -54 +54 @@
 const
 ; Ask to create a WPS object on the desktop?
-compile if not defined(INCLUDE_DESKTOP_SUPPORT)
+compile if not defined( INCLUDE_DESKTOP_SUPPORT)
    INCLUDE_DESKTOP_SUPPORT = 1
 compile endif
@@ -70 +70 @@
 ; Toolbar actions
 ; ---------------------------------------------------------------------------
-defc groups_actionlist
+defc Groups_ActionList
 universal ActionsList_FileID  -- This is the fileid that gets the line(s)
 
@@ -77 +77 @@
 
 ; ---------------------------------------------------------------------------
-defc group_savegroup
+defc Group_SaveGroup
    parse arg action_letter parms
    if action_letter = 'S' then       -- button Selected
       sayerror 0
-      'savegroup' parms
+      'SaveGroup' parms
    elseif action_letter = 'I' then   -- button Initialized
       'SayHint' GR_SAVE_PROMPT
    elseif action_letter = 'H' then   -- button Help
-      call winmessagebox(GROUPS__MSG, GR_SAVE_PROMPT, MB_OK + MB_INFORMATION + MB_MOVEABLE)
+      call WinMessageBox( GROUPS__MSG, GR_SAVE_PROMPT, MB_OK + MB_INFORMATION + MB_MOVEABLE)
    elseif action_letter = 'E' then   -- button End
 ;;    sayerror 0
@@ -91 +91 @@
 
 ; ---------------------------------------------------------------------------
-defc group_loadgroup
+defc Group_LoadGroup
    parse arg action_letter parms
    if action_letter = 'S' then       -- button Selected
       sayerror 0
-      'loadgroup' parms
+      'LoadGroup' parms
    elseif action_letter = 'I' then   -- button Initialized
       'SayHint' GR_LOAD_PROMPT
    elseif action_letter = 'H' then   -- button Help
-      call winmessagebox(GROUPS__MSG, GR_LOAD_PROMPT, MB_OK + MB_INFORMATION + MB_MOVEABLE)
+      call WinMessageBox( GROUPS__MSG, GR_LOAD_PROMPT, MB_OK + MB_INFORMATION + MB_MOVEABLE)
    elseif action_letter = 'E' then   -- button End
 ;;    sayerror 0
@@ -120 +120 @@
    getfileid startfid
    dprintf( 'RINGCMD', 'SaveGroup 1')
-   do i = 1 to filesinring(1)  -- Provide an upper limit; prevent looping forever
+   do i = 1 to filesinring( 1)  -- Provide an upper limit; prevent looping forever
       if .filename = GetUnnamedFilename() then
-         if .last <> 1 or textline(1) <> '' then
+         if .last <> 1 or textline( 1) <> '' then
             activatefile startfid
             sayerror 'An unnamed file exists in the ring;' ||
@@ -136 +136 @@
    enddo  -- Loop through all files in ring
 
-   group_name = arg(1)
+   group_name = arg( 1)
    if group_name = '' then
-      group_name = entrybox('Group name')
+      group_name = EntryBox( 'Group name')
    endif
    if group_name = '' then
@@ -145 +145 @@
    tempstr = QueryConfigKey( KeyPath'\'group_name'\Entries')
    if tempstr <> '' then
-      if MBID_OK <> winmessagebox( 'Save Group',
+      if MBID_OK <> WinMessageBox( 'Save Group',
                                    'Group already exists.  OK to replace it?',
                                    MB_OKCANCEL + MB_ICONEXCLAMATION + MB_MOVEABLE) then
@@ -158 +158 @@
    n = 0
    dprintf( 'RINGCMD', 'SaveGroup 2')
-   do i = 1 to filesinring(1)  -- Provide an upper limit; prevent looping forever
+   do i = 1 to filesinring( 1)  -- Provide an upper limit; prevent looping forever
       Ignore = ((leftstr( .filename, 1) = '.') | (not .visible))
       if not Ignore then
@@ -183 +183 @@
 
 compile if INCLUDE_DESKTOP_SUPPORT -- Ask whether to include on Desktop?
-   if MBID_YES = winmessagebox( 'Save Group',
+   if MBID_YES = WinMessageBox( 'Save Group',
                                 'Add a program object to the OS/2 desktop' ||
                                 ' for this group?',
@@ -192 +192 @@
       call dynalink32( 'DOSCALLS',  -- dynamic link library name
                        '#312',      -- ordinal value for DOS32GETINFOBLOCKS
-                    address(tib_ptr) ||
-                    address(pib_ptr) )
-;     sayerror 'tib_ptr =' c2x(tib_ptr) 'pib_ptr =' c2x(pib_ptr)
+                    address( tib_ptr) ||
+                    address( pib_ptr) )
+;     sayerror 'tib_ptr =' c2x( tib_ptr) 'pib_ptr =' c2x( pib_ptr)
       pib = peek( itoa( rightstr( pib_ptr, 2), 10),
                   itoa( leftstr( pib_ptr, 2), 10), 28)
@@ -211 +211 @@
       hobj = dynalink32( 'PMWP',      -- dynamic link library name
                          '#281',      -- 'WinCreateObject'
-                         address(class_name)   ||
-                         address(title)        ||
-                         address(setup_string) ||
-                         address(location)     ||
-                         atol(CO_REPLACEIFEXISTS), 2)
-;     if rc then hobj = hobj'; rc = 'rc '-' sayerrortext(rc); endif
+                         address( class_name)   ||
+                         address( title)        ||
+                         address( setup_string) ||
+                         address( location)     ||
+                         atol( CO_REPLACEIFEXISTS), 2)
+;     if rc then hobj = hobj'; rc = 'rc '-' sayerrortext( rc); endif
 ;     sayerror 'hobject =' hobj
       if not hobj then
@@ -232 +232 @@
 
    getfileid startfid
-   group_name = arg(1)
+   group_name = arg( 1)
 
    if (group_name = '') | (group_name = '?') then
@@ -238 +238 @@
       -- Entry box disabled. Always start with the list box now.
       if group_name = '' then
-         parse value entrybox( 'Specify a group name    ',
+         parse value EntryBox( 'Specify a group name    ',
                                '/'OK__MSG'/'LIST__MSG'/'Cancel__MSG'/',
                                '', '', 64,   -- Entrytext, cols, maxchars
-                               atoi(1) ||
-                               atoi(0000) ||
-                               gethwndc(APP_HANDLE)) with button 2 group_name \0
+                               atoi( 1) ||
+                               atoi( 0000) ||
+                               GethWndC( APP_HANDLE)) with button 2 group_name \0
       else
 */
@@ -263 +263 @@
          -- Create a tmp file
          'xcom e /c /q tempfile'
-         if rc <> -282 then  -- sayerror('New file')
-            sayerror ERROR__MSG rc BAD_TMP_FILE__MSG sayerrortext(rc)
+         if rc <> -282 then  -- sayerror( 'New file')
+            sayerror ERROR__MSG rc BAD_TMP_FILE__MSG sayerrortext( rc)
             call buffer( FREEBUF, bufhndl)
             return
@@ -271 +271 @@
          browse_mode = browse()     -- query current state
          if browse_mode then
-            call browse(0)
+            call browse( 0)
          endif
 
@@ -284 +284 @@
          if .last > 2 then  -- E always creates a file with an empty line
             getfileid fileid
-            call sort( 2, .last, 1, 40, fileid, 'I')
+            call Sort( 2, .last, 1, 40, fileid, 'I')
          endif
          if browse_mode then
-            call browse(1)
+            call browse( 1)
          endif  -- restore browse state
 
          if .last = 1 then
             'xcom quit'
-            call winmessagebox( GROUPS__MSG,
+            call WinMessageBox( GROUPS__MSG,
                                 GR_NONE_FOUND,
                                 MB_CANCEL + MB_ICONEXCLAMATION + MB_MOVEABLE)
@@ -299 +299 @@
 
          -- Fill buffer with and quit tmp file
-         if listbox_buffer_from_file( startfid, bufhndl, noflines, usedsize) then
-            return
-         endif
-         parse value listbox( 'Select group name',
-                              \0 || atol(usedsize) || atoi(32) || atoi(bufhndl),
+         if Listbox_Buffer_From_File( startfid, bufhndl, noflines, usedsize) then
+            return
+         endif
+         parse value ListBox( 'Select group name',
+                              \0 || atol( usedsize) || atoi( 32) || atoi( bufhndl),
                               '/~Load/~Delete.../'Cancel__MSG,  -- buttons
                               0, 0,  -- 1, 35,               -- row, col,
-                              min( noflines, 12), 0,         -- height, width
-                              gethwndc(APP_HANDLE) || atoi(1) || atoi(1) ||
-                              atoi(0000)) with button 2 group_name \0
+                              Min( noflines, 12), 0,         -- height, width
+                              GethWndC( APP_HANDLE) || atoi( 1) || atoi( 1) ||
+                              atoi( 0000)) with button 2 group_name \0
          call buffer( FREEBUF, bufhndl)
 
          if button = \2 then -- 'Delete' selected
-            if MBID_OK <> winmessagebox( GROUPS__MSG,
+            if MBID_OK <> WinMessageBox( GROUPS__MSG,
                                          GR_DELETE_PROMPT\10 group_name,
                                          MB_OKCANCEL + MB_QUERY + MB_MOVEABLE) then
@@ -363 +363 @@
          CurEditCmd = 'LOADGROUP'  -- must follow the 'edit' cmd
       endif
-      if not rc | rc = sayerror('Lines truncated') then
+      if not rc | rc = sayerror( 'Lines truncated') then
          this_posn = QueryConfigKey( KeyPath'\'group_name'\Posn'i)
-         call prestore_pos(this_posn)
+         call pRestore_Pos( this_posn)
       endif
    enddo
@@ -391 +391 @@
    do once = 1 to 1
 
-      Group = arg(1)
+      Group = arg( 1)
       if Group = '' then
          sayerror "Error: no group name specified."

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

@@ -27 +27 @@
 ; work properly, but try to avoid it, because it slows processing down.
 ;
-; One advantage is, that the definition, that adds a command to the hook,
+; One advantage is that the definition, that adds a command to the hook,
 ; doesn't need to know where it will be executed. Just the hook's name must
 ; be known.
@@ -46 +46 @@
 ;                     (like load, but change settings for next defload
 ;                     only)
-; -  afterload        executed after all defloads are finished
-; -  afterloadonce    executed once after all defloads are finished
-; -  afterload2once   executed once after afterloadonce
-; -  select           usually contains ProcessSelectSettings, to be used
+; -  postfilesloaded  executed after all defloads are finished
+; -  postfilesloadedonce
+;                     executed once after all defloads are finished
+; -  postpostfilesloadeonce
+;                     executed once after postfilesloadedonce
+; -  fileswitched     usually contains ProcessSelectSettings, to be used
 ;                     for user additions as well
-; -  selectonce       user additions, deleted after execution
-; -  afterselect      usually contains ProcessRefreshInfoLine
+; -  fileswitchedonce user additions, deleted after execution
+; -  postfileswitched usually contains ProcessRefreshInfoLine
 ; -  modify           executed at every defmodify event
 ; -  modifyonce       executed once at every defmodify event
 ; -  save             executed before a file is saved
 ; -  saveonce         executed once before a file is saved
-; -  aftersave        executed after a file is saved
-; -  aftersaveonce    executed once after a file is saved
+; -  postsave         executed after a file is saved
+; -  postsaveonce     executed once after a file is saved
 ; -  quit             executed before a file is quit
 ; -  quitonce         executed once before a file is quit
@@ -86 +88 @@
 ;                               with the file (it was already set at defload).
 ;                 mode      --> An array var mode.<fileid> exists. Its value
-;                               can be queried with the get_array_value
+;                               can be queried with the Get_Array_Value
 ;                               proc together with the fileid or easier with
 ;                               the GetMode procedure. Because the mode
@@ -106 +108 @@
 ;                               to be changed. This can be achived with a
 ;                               a new command, that can be executed via
-;                               'HookAdd select'.
-;                               This is just an example, for the case, that
+;                               'HookAdd fileswitched'.
+;                               This is just an example for the case that
 ;                               no array var exists. In the meantime, the
 ;                               command SetToolBar was defined.
@@ -115 +117 @@
 ; Syntax: HookAdd <HookName> <Cmd>
 defc HookAdd
-   universal EPM_utility_array_ID
+   universal epm_utility_array_id
    prefix = 'hook.'
    parse arg HookName Cmd
-   HookName = strip( lowcase(HookName))
+   HookName = strip( lowcase( HookName))
    Cmd      = strip( Cmd)
    if Cmd <> '' then  -- don't increase imax if no Cmd
       -- Query imax
-      if get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax not set
+      if Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax not set
          imax = 0
       endif
@@ -130 +132 @@
          -- If Cmd already exists in the hook array, delete it
          next = ''
-         rcx = get_array_value( EPM_utility_array_ID, prefix''HookName'.'i, next)
+         rcx = Get_Array_Value( epm_utility_array_id, prefix''HookName'.'i, next)
          if rcx then
             iterate
          endif
          if upcase( Cmd) = upcase( next) then
-            do_array 4, EPM_utility_array_ID, prefix''HookName'.'i  -- delete entry
+            do_array 4, epm_utility_array_id, prefix''HookName'.'i  -- delete entry
             imaxnew = imaxnew - 1
             -- Move following entries
             do j = i + 1 to imax
-               rcx = get_array_value( EPM_utility_array_ID, prefix''HookName'.'j, next)  -- get next
+               rcx = Get_Array_Value( epm_utility_array_id, prefix''HookName'.'j, next)  -- get next
                if rcx then
                   leave
                endif
-               do_array 2, EPM_utility_array_ID, prefix''HookName'.'j - 1, next  -- change entry
+               do_array 2, epm_utility_array_id, prefix''HookName'.'j - 1, next  -- change entry
             enddo
          endif
@@ -150 +152 @@
       -- Append Cmd to ensure that it is executed last
       imax = imax + 1
-      do_array 2, EPM_utility_array_ID, prefix''HookName'.'imax, Cmd   -- add entry
-      do_array 2, EPM_utility_array_ID, prefix''HookName'.0', imax     -- update imax
+      do_array 2, epm_utility_array_id, prefix''HookName'.'imax, Cmd   -- add entry
+      do_array 2, epm_utility_array_id, prefix''HookName'.0', imax     -- update imax
    endif
    return
@@ -160 +162 @@
 ; Syntax: HookChange <HookName> <Cmd>
 defc HookChange
-   universal EPM_utility_array_ID
+   universal epm_utility_array_id
    prefix = 'hook.'
    parse arg HookName Cmd
    parse value Cmd with CmdName CmdArgs
-   HookName = strip( lowcase(HookName))
+   HookName = strip( lowcase( HookName))
    Cmd      = strip( Cmd)
    CmdName  = strip( CmdName)
@@ -170 +172 @@
    if Cmd <> '' then  -- don't increase imax if no Cmd
       Append = 1
-      if get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax not set
+      if Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax not set
          imax = 0
       else
          do i = 1 to imax
-            if not get_array_value( EPM_utility_array_ID, prefix''HookName'.'i, next) then  -- if next set
+            if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.'i, next) then  -- if next set
                parse value next with first rest
                if upcase( first) = upcase( CmdName) then
-                  do_array 2, EPM_utility_array_ID, prefix''HookName'.'i, Cmd  -- change entry
+                  do_array 2, epm_utility_array_id, prefix''HookName'.'i, Cmd  -- change entry
                   Append = 0
                   leave
@@ -186 +188 @@
       if Append then
          imax = imax + 1
-         do_array 2, EPM_utility_array_ID, prefix''HookName'.'imax, Cmd  -- add entry
-         do_array 2, EPM_utility_array_ID, prefix''HookName'.0', imax    -- update imax
+         do_array 2, epm_utility_array_id, prefix''HookName'.'imax, Cmd  -- add entry
+         do_array 2, epm_utility_array_id, prefix''HookName'.0', imax    -- update imax
       endif
    endif
@@ -196 +198 @@
 ; Syntax: HookSet <HookName> <Cmd>
 defc HookSet
-   universal EPM_utility_array_ID
+   universal epm_utility_array_id
    prefix = 'hook.'
    parse arg HookName Cmd
-   HookName = strip( lowcase(HookName))
+   HookName = strip( lowcase( HookName))
    Cmd      = strip( Cmd)
    if Cmd <> '' then  -- don't increase imax if no Cmd
       -- delete all old Cmds first
-      if not get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax set
+      if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax set
          do i = 1 to imax
-            if not get_array_value( EPM_utility_array_ID, prefix''HookName'.'i, Cmd) then  -- if Cmd set
-               do_array 4, EPM_utility_array_ID, prefix''HookName'.'i  -- delete entry
+            if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.'i, Cmd) then  -- if Cmd set
+               do_array 4, epm_utility_array_id, prefix''HookName'.'i  -- delete entry
             endif
          enddo
@@ -212 +214 @@
       -- set new Cmd
       imax = 1
-      do_array 2, EPM_utility_array_ID, prefix''HookName'.'imax, Cmd   -- add entry
-      do_array 2, EPM_utility_array_ID, prefix''HookName'.0', imax     -- update imax
+      do_array 2, epm_utility_array_id, prefix''HookName'.'imax, Cmd   -- add entry
+      do_array 2, epm_utility_array_id, prefix''HookName'.0', imax     -- update imax
    endif
    return
@@ -221 +223 @@
 ; Syntax: HookDelAll <HookName>
 defc HookDelAll
-   universal EPM_utility_array_ID
-   prefix = 'hook.'
-   parse arg HookName
-   HookName = strip( lowcase(HookName))
-   if not get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax set
+   universal epm_utility_array_id
+   prefix = 'hook.'
+   parse arg HookName
+   HookName = strip( lowcase( HookName))
+   if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax set
       do i = 1 to imax
-         if not get_array_value( EPM_utility_array_ID, prefix''HookName'.'i, Cmd) then  -- if Cmd set
-            do_array 4, EPM_utility_array_ID, prefix''HookName'.'i  -- delete entry
+         if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.'i, Cmd) then  -- if Cmd set
+            do_array 4, epm_utility_array_id, prefix''HookName'.'i  -- delete entry
          endif
       enddo
-      do_array 4, EPM_utility_array_ID, prefix''HookName'.0'        -- delete imax
+      do_array 4, epm_utility_array_id, prefix''HookName'.0'        -- delete imax
    endif
    return
@@ -240 +242 @@
 ; Syntax: HookDel <HookName> <Cmd>
 defc HookDel
-   universal EPM_utility_array_ID
+   universal epm_utility_array_id
    prefix = 'hook.'
    parse arg HookName Cmd
-   HookName = strip( lowcase(HookName))
+   HookName = strip( lowcase( HookName))
    Cmd      = strip( Cmd)
    if Cmd <> '' then  -- don't try to process if no Cmd
-      if not get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax set
+      if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax set
          imaxnew = imax
          do i = 1 to imax
-            if not get_array_value( EPM_utility_array_ID, prefix''HookName'.'i, next) then  -- if next set
+            if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.'i, next) then  -- if next set
                if abbrev( upcase( next), upcase( Cmd)) then  -- if abbreviation matches the entry
-                  do_array 4, EPM_utility_array_ID, prefix''HookName'.'i  -- delete entry
+                  do_array 4, epm_utility_array_id, prefix''HookName'.'i  -- delete entry
                   -- move following entries
                   do j = i + 1 to imax
-                     ret = get_array_value( EPM_utility_array_ID, prefix''HookName'.'j, next)  -- get next
+                     ret = Get_Array_Value( epm_utility_array_id, prefix''HookName'.'j, next)  -- get next
                      if ret then
                         leave
                      endif
-                     do_array 2, EPM_utility_array_ID, prefix''HookName'.'j - 1, next  -- change entry
+                     do_array 2, epm_utility_array_id, prefix''HookName'.'j - 1, next  -- change entry
                   enddo
                   if not ret then
@@ -267 +269 @@
          enddo
          if imaxnew <> imax then
-            do_array 2, EPM_utility_array_ID, prefix''HookName'.0', imaxnew    -- update imax
+            do_array 2, epm_utility_array_id, prefix''HookName'.0', imaxnew    -- update imax
          endif
       endif
@@ -277 +279 @@
 ; Syntax: HookExecute <HookName>
 defc HookExecute
-   universal EPM_utility_array_ID
-   prefix = 'hook.'
-   parse arg HookName
-   HookName = strip( lowcase(HookName))
+   universal epm_utility_array_id
+   prefix = 'hook.'
+   parse arg HookName
+   HookName = strip( lowcase( HookName))
    display -1
-   if not get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax set
+   if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax set
       do i = 1 to imax
-         rc = get_array_value( EPM_utility_array_ID, prefix''HookName'.'i, Cmd)
+         rc = Get_Array_Value( epm_utility_array_id, prefix''HookName'.'i, Cmd)
          Cmd
       enddo
@@ -295 +297 @@
 ; Syntax: HookExecuteOnce <HookName>
 defc HookExecuteOnce
-   universal EPM_utility_array_ID
-   prefix = 'hook.'
-   parse arg HookName
-   HookName = strip( lowcase(HookName))
+   universal epm_utility_array_id
+   prefix = 'hook.'
+   parse arg HookName
+   HookName = strip( lowcase( HookName))
    display -1
-   if not get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax set
+   if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax set
       do i = 1 to imax
-         rc = get_array_value( EPM_utility_array_ID, prefix''HookName'.'i, Cmd)
+         rc = Get_Array_Value( epm_utility_array_id, prefix''HookName'.'i, Cmd)
          Cmd
-         do_array 4, EPM_utility_array_ID, prefix''HookName'.'i  -- delete entry
+         do_array 4, epm_utility_array_id, prefix''HookName'.'i  -- delete entry
       enddo
-      do_array 4, EPM_utility_array_ID, prefix''HookName'.0'     -- delete imax
+      do_array 4, epm_utility_array_id, prefix''HookName'.0'     -- delete imax
    endif
    display 1
@@ -315 +317 @@
 ; Syntax: HookExecuteLast <HookName>
 defc HookExecuteLast
-   universal EPM_utility_array_ID
-   prefix = 'hook.'
-   parse arg HookName
-   HookName = strip( lowcase(HookName))
+   universal epm_utility_array_id
+   prefix = 'hook.'
+   parse arg HookName
+   HookName = strip( lowcase( HookName))
    display -1
-   if not get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax set
+   if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax set
       i = imax
-      rc = get_array_value( EPM_utility_array_ID, prefix''HookName'.'i, Cmd)
+      rc = Get_Array_Value( epm_utility_array_id, prefix''HookName'.'i, Cmd)
       Cmd
    endif
@@ -332 +334 @@
 ; Syntax: HookExecuteFirst <HookName>
 defc HookExecuteFirst
-   universal EPM_utility_array_ID
-   prefix = 'hook.'
-   parse arg HookName
-   HookName = strip( lowcase(HookName))
+   universal epm_utility_array_id
+   prefix = 'hook.'
+   parse arg HookName
+   HookName = strip( lowcase( HookName))
    display -1
-   if not get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax set
+   if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax set
       i = 1
-      rc = get_array_value( EPM_utility_array_ID, prefix''HookName'.'i, Cmd)
+      rc = Get_Array_Value( epm_utility_array_id, prefix''HookName'.'i, Cmd)
       Cmd
    endif
@@ -349 +351 @@
 ; Syntax: HookGetNum <HookName>
 defproc HookGetNum
-   universal EPM_utility_array_ID
-   prefix = 'hook.'
-   parse arg HookName
-   HookName = strip( lowcase(HookName))
+   universal epm_utility_array_id
+   prefix = 'hook.'
+   parse arg HookName
+   HookName = strip( lowcase( HookName))
    num = 0
-   if not get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax set
+   if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax set
       num = imax
    endif
@@ -363 +365 @@
 ; Syntax: HookIsDefined <HookName>
 defproc HookIsDefined
-   universal EPM_utility_array_ID
-   prefix = 'hook.'
-   parse arg HookName
-   HookName = strip( lowcase(HookName))
+   universal epm_utility_array_id
+   prefix = 'hook.'
+   parse arg HookName
+   HookName = strip( lowcase( HookName))
    num = 0
-   if not get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax set
+   if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax set
       num = imax
    endif
@@ -377 +379 @@
 ; Syntax: HookGet <HookName>
 defproc HookGet
-   universal EPM_utility_array_ID
-   prefix = 'hook.'
-   parse arg HookName
-   HookName = strip( lowcase(HookName))
+   universal epm_utility_array_id
+   prefix = 'hook.'
+   parse arg HookName
+   HookName = strip( lowcase( HookName))
    next = ''
-   if not get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax set
+   if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax set
       next = '|'
       do i = 1 to imax
-         rc = get_array_value( EPM_utility_array_ID, prefix''HookName'.'i, Cmd)
+         rc = Get_Array_Value( epm_utility_array_id, prefix''HookName'.'i, Cmd)
          next = next''Cmd'|'
       enddo
@@ -395 +397 @@
 ; Syntax: HookShow <HookName>
 defc HookShow
-   universal EPM_utility_array_ID
-   prefix = 'hook.'
-   parse arg HookName
-   HookName = strip( lowcase(HookName))
-   if not get_array_value( EPM_utility_array_ID, prefix''HookName'.0', imax) then  -- if imax set
+   universal epm_utility_array_id
+   prefix = 'hook.'
+   parse arg HookName
+   HookName = strip( lowcase( HookName))
+   if not Get_Array_Value( epm_utility_array_id, prefix''HookName'.0', imax) then  -- if imax set
       next = '|'
       do i = 1 to imax
-         rc = get_array_value( EPM_utility_array_ID, prefix''HookName'.'i, Cmd)
+         rc = Get_Array_Value( epm_utility_array_id, prefix''HookName'.'i, Cmd)
          next = next''Cmd'|'
       enddo
@@ -412 +414 @@
 ; ---------------------------------------------------------------------------
 defc HookShowAll
-   HookList = 'init main load loadonce afterload afterloadonce afterload2once' ||
-               ' select selectonce afterselect modify modifyonce' ||
-               ' save saveonce aftersave aftersaveonce quit quitonce' ||
-               ' addmenu cascademenu'
+   HookList = 'init main load loadonce postfilesloaded postfilesloadedonce' ||
+               ' postpostfilesloadeonce fileswitched fileswitchedonce' ||
+               ' postfileswitched postselect postselctonce' ||
+               ' modify modifyonce save saveonce postsave postsaveonce' ||
+               ' quit quitonce addmenu cascademenu'
    TmpFileName = '.HOOK_ARRAY_VARS'
    getfileid startfid
    display -3
-   if pfile_exists(TmpFileName) then
+   if pFile_Exists( TmpFileName) then
       'xcom e /n' TmpFileName   -- activate tmp file
    else
@@ -431 +434 @@
    savedlast = .last
    .autosave = 0
-   parse value getdatetime() with Hour24 Minutes Seconds . Day MonthNum Year0 Year1 .
-   Date = rightstr(Year0 + 256*Year1, 4, 0)'-'rightstr(monthnum, 2, 0)'-'rightstr(Day, 2, 0)
-   Time = rightstr(hour24, 2)':'rightstr(Minutes,2,'0')':'rightstr(Seconds,2,'0')
-   insertline copies('-', 78), .last + 1
+   parse value GetDateTime() with Hour24 Minutes Seconds . Day MonthNum Year0 Year1 .
+   Date = rightstr( Year0 + (256 * Year1), 4, 0)'-'rightstr( monthnum, 2, 0)'-'rightstr( Day, 2, 0)
+   Time = rightstr( hour24, 2)':'rightstr( Minutes, 2, '0')':'rightstr( Seconds, 2, '0')
+   insertline copies( '-', 78), .last + 1
    insertline 'Hook array vars - created on 'Date' 'Time, .last + 1
    -- First, find longest hook name
@@ -440 +443 @@
    do w = 1 to words( HookList)
       wrd = word( HookList, w)
-      len = max( length( wrd), len)
+      len = Max( length( wrd), len)
    enddo
    -- Next, write var = value lines
@@ -467 +470 @@
 ; submitted files and commands are processed.
 defc AtInit
-   'HookAdd init' arg(1)
+   'HookAdd init' arg( 1)
 
 ; ---------------------------------------------------------------------------
@@ -474 +477 @@
 ; processing the defload event.
 defc AtLoad
-   'HookAdd load' arg(1)
+   'HookAdd load' arg( 1)
 
 ; ---------------------------------------------------------------------------
@@ -481 +484 @@
 ; processing the defload event.
 defc AtNextLoad
-   'HookAdd loadonce' arg(1)
-
-; ---------------------------------------------------------------------------
-; Syntax: AtStartup <UserCmd>
+   'HookAdd loadonce' arg( 1)
+
+; ---------------------------------------------------------------------------
+; Syntax: AtPostLoad <UserCmd>
 ; <UserCmd> is executed after the EPM window was opened and after all load
 ; actions are processed. If the EPM window was already open, <UserCmd> is
@@ -490 +493 @@
 ; defselect event after loading.
 defc AtPostLoad
-   'HookAdd afterload' arg(1)
-
-; ---------------------------------------------------------------------------
-; Syntax: AtNextPostLoad <UserCmd>
+   'HookAdd postfilesloaded' arg( 1)
+
+; ---------------------------------------------------------------------------
+; Syntax: AtStartup <UserCmd>
 ; <UserCmd> is executed after the EPM window was opened and after all load
 ; actions are processed. After execution, the hook is deleted, so that it's
 ; executed at the first defselect event only.
-defc AtStartup, AtNextPostLoad
-   'HookAdd afterloadonce' arg(1)
-
-; ---------------------------------------------------------------------------
-; Syntax: AtNextPostStartup <UserCmd>
+defc AtStartup
+   'HookAdd postfilesloadedonce' arg( 1)
+
+; ---------------------------------------------------------------------------
+; Syntax: AtPostStartup <UserCmd>
 ; <UserCmd> is posted after the EPM window was opened and after all load
 ; actions are processed. Before execution, the screen is refreshed to ensure
 ; that all pending paintings are done. After execution, the hook is deleted,
 ; so that it's posted at the first defselect event only.
-defc AtPostStartup, AtNextPostPostLoad
-   'HookAdd afterload2once' arg(1)
-
-; ---------------------------------------------------------------------------
-; Syntax: AtSelect <UserCmd>
-; <UserCmd> is executed at the end of every defselect event.
-defc AtSelect
-   'HookAdd select' arg(1)
-
-; ---------------------------------------------------------------------------
-; Syntax: AtNextSelect <UserCmd>
-; <UserCmd> is executed at the end of the next defselect event.
-defc AtNextSelect
-   'HookAdd selectonce' arg(1)
+defc AtPostStartup
+   'HookAdd postpostfilesloadedonce' arg( 1)
+
+; ---------------------------------------------------------------------------
+; Syntax: AtFileSwitched <UserCmd>
+; <UserCmd> is executed at the end of every file switching at defselect.
+defc AtFileSwitched
+   'HookAdd fileswitched' arg( 1)
+
+; ---------------------------------------------------------------------------
+; Syntax: AtNextFileSwitched <UserCmd>
+; <UserCmd> is executed at the end of the next file switching at defselect.
+defc AtNextFileSwitched
+   'HookAdd fileswitchedonce' arg( 1)
+
+; ---------------------------------------------------------------------------
+; Syntax: AtPostFileSwitched <UserCmd>
+; <UserCmd> is executed at the end of every file switching at defselect.
+defc AtPostFileSwitched
+   'HookAdd postfileswitched' arg( 1)
 
 ; ---------------------------------------------------------------------------
@@ -525 +534 @@
 ; <UserCmd> is executed at every defmodify event.
 defc AtModify
-   'HookAdd modify' arg(1)
+   'HookAdd modify' arg( 1)
 
 ; ---------------------------------------------------------------------------
@@ -531 +540 @@
 ; <UserCmd> is executed at the next defmodify event only.
 defc AtNextModify
-   'HookAdd modifyonce' arg(1)
+   'HookAdd modifyonce' arg( 1)
 
 ; ---------------------------------------------------------------------------
@@ -537 +546 @@
 ; <UserCmd> is executed before a file is saved.
 defc AtSave
-   'HookAdd save' arg(1)
+   'HookAdd save' arg( 1)
 
 ; ---------------------------------------------------------------------------
@@ -543 +552 @@
 ; <UserCmd> is executed once before a file is saved.
 defc AtNextSave
-   'HookAdd saveonce' arg(1)
+   'HookAdd saveonce' arg( 1)
 
 ; ---------------------------------------------------------------------------
@@ -549 +558 @@
 ; <UserCmd> is executed after a file is saved.
 defc AtPostSave
-   'HookAdd aftersave' arg(1)
+   'HookAdd postsave' arg( 1)
 
 ; ---------------------------------------------------------------------------
@@ -555 +564 @@
 ; <UserCmd> is executed once after a file is saved.
 defc AtNextPostSave
-   'HookAdd aftersaveonce' arg(1)
+   'HookAdd postsaveonce' arg( 1)
 
 ; ---------------------------------------------------------------------------
@@ -561 +570 @@
 ; <UserCmd> is executed before a file is quit.
 defc AtQuit
-   'HookAdd quit' arg(1)
+   'HookAdd quit' arg( 1)
 
 ; ---------------------------------------------------------------------------
@@ -567 +576 @@
 ; <UserCmd> is executed once before a file is quit.
 defc AtNextQuit
-   'HookAdd quitonce' arg(1)
+   'HookAdd quitonce' arg( 1)
 
 ; ---------------------------------------------------------------------------
@@ -573 +582 @@
 ; <UserCmd> is executed during menu loading, beforing the help menu is added.
 defc AtMenuLoad
-   'HookAdd addmenu' arg(1)
+   'HookAdd addmenu' arg( 1)
 
 ; ---------------------------------------------------------------------------
@@ -580 +589 @@
 ; <UserCmd> is executed during menu loading, beforing the help menu is added.
 defc AtCascadeMenuLoad
-   'HookAdd cascademenu' arg(1)
-
+   'HookAdd cascademenu' arg( 1)
+

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

@@ -92 +92 @@
       endif
 
-      Flags = arg(1)
+      Flags = arg( 1)
       -- Todo: 'FILE' should not redetermine <datetimemodified> to make 'quit'
       --       process faster
@@ -103 +103 @@
          call GetTitleFields()
       endif
-      do w = 1 to words(Flags)
+      do w = 1 to words( Flags)
          Flag = word( Flags, w)
          if wordpos( Flag, StatusFieldFlags) > 0 then
@@ -110 +110 @@
          endif
       enddo
-      do w = 1 to words(Flags)
+      do w = 1 to words( Flags)
          Flag = word( Flags, w)
          if wordpos( Flag, TitleFieldFlags) > 0 then
@@ -252 +252 @@
                   '<SEP>' ||
                   substr( Fields, p + 1)
-         startp = p + length('<SEP>')
+         startp = p + length( '<SEP>')
       endif
    enddo -- forever
@@ -288 +288 @@
                Flags  = Flags' 'FFlag
             endif
-            startp = p1 + length(FValue)
+            startp = p1 + length( FValue)
          endif
       endif
@@ -305 +305 @@
       endif
    enddo
-   Flags = strip(Flags)
+   Flags = strip( Flags)
 
    return Fields
@@ -347 +347 @@
 ; ---------------------------------------------------------------------------
 ; Replace info field vars with '%...' or other values
-defproc GetInfoFieldValue(FVar, var FFlag)
+defproc GetInfoFieldValue( FVar, var FFlag)
    universal stream_mode
    universal expand_on
@@ -357 +357 @@
    Sep = GetFieldSep()
 
-   FVar = upcase(FVar)
+   FVar = upcase( FVar)
    FValue = ''
    FFlag  = ''
@@ -401 +401 @@
    elseif FVar = 'MA'               then FValue = .margins
                                          FFlag  = 'MARGINS'
-   elseif FVar = 'TABS'             then FValue = word( .tabs, 1 )                       -- show only 1st tab
+   elseif FVar = 'TABS'             then FValue = word( .tabs, 1 )                        -- show only 1st tab
                                          FFlag  = 'TABS'
    elseif FVar = 'MATCHTAB'         then FValue = word( '- match', (matchtab_on = 1) + 1)  -- show '-' or 'match'
                                          FFlag  = 'MATCHTAB'
-   elseif FVar = 'LOCKED'           then FValue = word( 'L -', (.lockhandle = 0) + 1)    -- show 'L' or '-'
+   elseif FVar = 'LOCKED'           then FValue = word( 'L -', (.lockhandle = 0) + 1)     -- show 'L' or '-'
                                          FFlag  = 'LOCKED'
-   elseif FVar = 'READONLY'         then FValue = word( '- R', (.readonly = 0) + 1)      -- show 'R' or '-'
+   elseif FVar = 'READONLY'         then FValue = word( '- R', (.readonly = 0) + 1)       -- show 'R' or '-'
                                          FFlag  = 'READONLY'
    elseif FVar = 'FILENAME'         then FValue = GetFileName()
                                          FFlag  = 'FILE'
-   elseif FVar = 'DATETIME'         then FValue = NepmdQueryPathInfo('MTIME')            -- show YYYY/MM/DD HH:MM:SS from file on disk
+   elseif FVar = 'DATETIME'         then FValue = NepmdQueryPathInfo( 'MTIME')            -- show YYYY/MM/DD HH:MM:SS from file on disk
                                          FFlag  = 'FILE'
-   elseif FVar = 'ATTR'             then FValue = NepmdQueryPathInfo('ATTR')             -- show 'ADSHR' or '-----'
+   elseif FVar = 'ATTR'             then FValue = NepmdQueryPathInfo( 'ATTR')             -- show 'ADSHR' or '-----'
                                          FFlag  = 'FILE'
-   elseif FVar = 'SIZE'             then FValue = NepmdQueryPathInfo('SIZE')             -- show size in bytes
+   elseif FVar = 'SIZE'             then FValue = NepmdQueryPathInfo( 'SIZE')             -- show size in bytes
                                          FFlag  = 'FILE'
-   elseif FVar = 'EASIZE'           then FValue = NepmdQueryPathInfo('EASIZE')           -- show size of EAs in bytes
+   elseif FVar = 'EASIZE'           then FValue = NepmdQueryPathInfo( 'EASIZE')           -- show size of EAs in bytes
                                          FFlag  = 'FILE'
-   elseif FVar = 'DATETIMEMODIFIED' then FValue = GetDateTimeModified()                  -- show date - time or modified or other infos
+   elseif FVar = 'DATETIMEMODIFIED' then FValue = GetDateTimeModified()                   -- show date - time or modified or other infos
                                          FFlag  = 'MODIFIED'
-   elseif FVar = 'STREAMMODE'       then FValue = word( 'L S', (stream_mode = 1) + 1)    -- show 'S' or 'L'
+   elseif FVar = 'STREAMMODE'       then FValue = word( 'L S', (stream_mode = 1) + 1)     -- show 'S' or 'L'
                                          FFlag  = 'STREAMMODE'
-   elseif FVar = 'EXPAND'           then FValue = word( '- X', (expand_on = 1) + 1)      -- show '-' or 'X'
+   elseif FVar = 'EXPAND'           then FValue = word( '- X', (expand_on = 1) + 1)       -- show '-' or 'X'
                                          FFlag  = 'EXPAND'
    elseif FVar = 'MARKINGMODE'      then FValue = word( 'Adv CUA', (cua_marking_switch = 1) + 1)  -- show 'CUA' or 'Adv'
@@ -455 +455 @@
       newstatuscolor = vmodifiedstatuscolor
    endif
-   if arg(1) then
-      current_status_template = arg(1)
+   if arg( 1) then
+      current_status_template = arg( 1)
       template = atoi( length( current_status_template)) || current_status_template
       template_ptr = put_in_buffer( template)
@@ -462 +462 @@
       template_ptr=0
    endif
-   call windowmessage( 1, getpminfo(EPMINFO_EDITCLIENT),
+   call windowmessage( 1, getpminfo( EPMINFO_EDITCLIENT),
                        5431,      -- EPM_FRAME_STATUSLINE
                        template_ptr,
@@ -476 +476 @@
    universal vmessagecolor
 
-   if arg(1) then
-      template = atoi( length( arg(1))) || arg(1)
+   if arg( 1) then
+      template = atoi( length( arg( 1))) || arg( 1)
       template_ptr = put_in_buffer( template)
    else
       template_ptr = 0
    endif
-   call windowmessage( 1, getpminfo(EPMINFO_EDITCLIENT),
+   call windowmessage( 1, getpminfo( EPMINFO_EDITCLIENT),
                        5432,      -- EPM_FRAME_MESSAGELINE
                        template_ptr,
@@ -495 +495 @@
 defc SayHint
    display -8  -- disable addition to the message box
-   sayerror arg(1)
+   sayerror arg( 1)
    display 8   -- enable addition to the message box
 
@@ -559 +559 @@
 
 ; ---------------------------------------------------------------------------
-; Executed by ProcessSelect, using the afterselect hook.
+; Executed by ProcessFileSwitched, using the postfileswitched hook.
 defc ProcessSelectRefreshInfoline
    if not .visible then
@@ -571 +571 @@
 
 ; ---------------------------------------------------------------------------
-; Add cmd to the afterselect hook.
+; Add cmd to the postfileswitched hook.
 definit
-   'HookAdd afterselect ProcessSelectRefreshInfoLine'
+   'HookAdd postfileswitched ProcessSelectRefreshInfoLine'
 
 ; ---------------------------------------------------------------------------

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

@@ -92 +92 @@
 
 defc DisableLoad
-   universal LoadDisabledFid
-   fid = strip( arg(1))
+   universal loaddisabledfid
+   fid = strip( arg( 1))
    if fid = '' then
       getfileid fid
    endif
-   LoadDisabledFid = fid
+   loaddisabledfid = fid
 
 defc EnableLoad
-   universal LoadDisabledFid
-   LoadDisabledFid = 0
+   universal loaddisabledfid
+   loaddisabledfid = 0
 
 ; ---------------------------------------------------------------------------
@@ -109 +109 @@
    universal vdefault_autosave
    universal default_font
-   universal LoadState
-   universal LoadDisabledFid
+   universal loadstate
+   universal loaddisabledfid
 
    if not .visible then  -- process following only if file is visible
@@ -118 +118 @@
    getfileid fid
    Filename = .filename
-   if LoadDisabledFid = 1 then
+   if loaddisabledfid = 1 then
       return
-   elseif LoadDisabledFid = fid then
+   elseif loaddisabledfid = fid then
       return
    endif
 
-   LoadState = 1  -- This universal var can be used to check if there occured
-                  -- a defload event after the last afterload was processed.
+   loadstate = 1  -- This universal var can be used to check if there occured
+                  -- a defload event after the last filesloaded was processed.
                   --    empty: before loading
                   --    1: defload is running
                   --    2: defload processed
-                  --    0: afterload processed
+                  --    0: filesloaded processed
    dprintf( 'LOAD', 'fid = 'fid', 'Filename)
 
@@ -151 +151 @@
    -- Restore cursor position from EPM.POS
    if .levelofattributesupport < 2 then  -- If not already set (e.g., NAME does a DEFLOAD)
-      'loadattributes'
+      'LoadAttributes'
       'RestorePosFromEa'
    endif
@@ -158 +158 @@
    -- (see also defproc prestore_pos):
    -- Scroll to full cols
-   DeltaScrollx = .scrollx//.fontwidth
+   DeltaScrollx = .scrollx // .fontwidth
    if DeltaScrollx > 0 then
       .scrollx = .scrollx - DeltaScrollx
@@ -167 +167 @@
 
    -- Set mode
-   Mode = GetMode(Filename)
+   Mode = GetMode( Filename)
 
    -- Process all mode-dependent settings for defload
@@ -184 +184 @@
    'HookExecuteOnce loadonce'
 
-   -- Refresh InfoLines
-   'refreshinfoline FILE'
-

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

@@ -1360 +1360 @@
       if rc = 0 then
          -- Found
-         'HookAdd selectonce postme postme HighlightMatch'  -- additionally required to highlight after file switching
+         'HookAdd fileswitchedonce postme postme HighlightMatch'  -- additionally required to highlight after file switching
          if fid = startfid then
             'SayHint String only found in this file.'

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

@@ -47 +47 @@
    universal unnamedfilename  -- use NLS-dependent string from EPMMRI.DLL or
                               -- ETKE603.DLL, not the one from ENGLISH.E
-   universal DisplayDisabled  -- suppress screen refresh during file loading
 
    -- Get args
@@ -56 +55 @@
    --          Fortunately several NEPMD commands can handle filenames with
    --          spaces (e.g. Shell). As a result, that won't matter.
-   EpmArgs = arg(1)
+   EpmArgs = arg( 1)
    -- o  dprintf doesn't work before the end of defmain. It probably works just
    --    after InitConfig. Note that internal (and outdated internal) defs were
    --    already processed when DEFMAIN is executed.
-   --dprintf( 'MAIN: arg(1) = ['arg(1)']')
+   --dprintf( 'MAIN: arg( 1) = ['arg( 1)']')
 
 
@@ -85 +84 @@
 
    -- Host support
-compile if (HOST_SUPPORT='EMUL' | HOST_SUPPORT='E3EMUL') and not defined( my_SAVEPATH)
+compile if (HOST_SUPPORT = 'EMUL' | HOST_SUPPORT = 'E3EMUL') & not defined( my_SAVEPATH)
    call check_savepath()
 compile endif
@@ -109 +108 @@
    --          'Highlight 1 epmkwds.<ext>' from profile.erx didn't work for
    --          every loaded file. Any file stuff didn't work properly there.
-   --          Using the new 'load' hook or the 'AtLoad' command, one can
-   --          execute something for every loaded file -- easily and properly.
+   --          Using the 'load' hook or the 'AtLoad' command, one can execute
+   --          something for every loaded file.
    if rexx_profile then
       ProfileName = 'profile.erx'
@@ -130 +129 @@
    call showwindow( 'ON')
    mouse_setpointer WAIT_POINTER
-   --refresh     -- force to show the window, with the empty file loaded
-
-   -- Not possible: ProcessSelect is not called if starting command takes
-   --               longer
-   display -1  -- disable screen refresh, re-enabled in defselect
-   DisplayDisabled = 1
-
-   dprintf( 'MAIN', 'executing postme main2' unnamedfid','EpmArgs)
-   'postme main2' unnamedfid','EpmArgs
+   'DisableDisplay'  -- Enabled in ProcessPostFilesLoaded
+
+   dprintf( 'MAIN', 'executing PostMe ProcessPostMain' unnamedfid','EpmArgs)
+   'PostMe ProcessPostMain' unnamedfid','EpmArgs
 
 ; ---------------------------------------------------------------------------
 ; When PROFILE.ERX is processed, it often takes a longer time. In order to
-; keep the order of the further steps (e.g. afterload) right, moving the rest
+; keep the order of the further steps (e.g. filesloaded) right, moving the rest
 ; of defmain to a posted defc should delay it until PROFILE.ERX processing
 ; is fully completed. Fortunally the single postme doesn't cause much
 ; overhead here.
-defc main2
+defc ProcessPostMain
    universal nepmd_hini
                              -- following universals are initialized to the
@@ -169 +163 @@
 
    -- Execute the EpmArgs (Edit command)
-   dprintf( 'MAIN', 'main2: EpmArgs = 'EpmArgs)
+   dprintf( 'MAIN', 'ProcessPostMain: EpmArgs = 'EpmArgs)
 
    KeyPath = '\NEPMD\User\AutoRestore\Ring\LoadLast'
@@ -186 +180 @@
    -- o  E automatically created an empty file when it started.
    -- o  If user specified file(s) to edit, get rid of the empty file.
-   -- o  This must be processed at defmain, because this file is the only one,
+   -- o  This must be processed at defmain, because this file is the only one
    --    that doesn't trigger a defload event.
    -- o  Get fileid after processing of EpmArgs.
@@ -192 +186 @@
    dprintf( 'MAIN', 'filesinring = 'filesinring()', filename = '.filename)
    dprintf( 'MAIN_EMPTY_FILE', 'filesinring = 'filesinring()', filename = '.filename)
-   if validatefileid(unnamedfid) <> 0 then
+   if validatefileid( unnamedfid) <> 0 then
       activatefile unnamedfid
       -- Check if other files in ring
-      next_file
+      nextfile
       getfileid otherfid
       if otherfid = unnamedfid then  -- no other file in ring
@@ -206 +200 @@
          getfileid newfid
          -- xcom edit doesn't call defc edit, therefore set the following
-         -- universal vars to make ProcessAfterload happy.
+         -- universal vars to make ProcessFilesLoaded happy.
          -- Usually they are set by defc edit.
          firstloadedfid = newfid  -- first file for this edit cmd
@@ -223 +217 @@
 
    -- Workaround
-   -- o  Ensure that ProcessSelect is called. Sometimes it will be suppressed if
-   --    longer commands have to be executed by the Edit command. ProcessSelect
-   --    won't process a file twice, because the previous fileid is checked.
+   -- o  Ensure that ProcessSelect is called. Sometimes it is suppressed if
+   --    longer commands have to be executed by the Edit command.
    -- o  BTW: The select event for the automatically created empty file is
    --    always executed too early and therefore further processing is
    --    suppressed in SELECT.E.
    -- o  2 postmes would decrease stability compared with 1.
-    dprintf( 'MAIN', 'executing: ProcessSelect')
-   'postme ProcessSelect'
-
-   -- Execute just-installed stuff, if any -------------------------------------
+    dprintf( 'MAIN', 'executing: PostMe ProcessSelect')
+   'PostMe ProcessSelect'
+
+   -- Execute just-installed stuff, if any
    -- o  The JustInstalled key is written with value 1 on import of
    --    DEFAULTS.CFG. Therefore it is added to the RegDefaults ini
@@ -239 +232 @@
    App = 'RegDefaults'
    Key = '\NEPMD\Install\JustInstalled'
-   JustInstalled = QueryProfile( nepmd_hini, App, Key)
+   JustInstalled = queryprofile( nepmd_hini, App, Key)
    if JustInstalled = '' then  -- if key doesn't exist
-      'postme postme DefaultsMissingMsgBox'
+      'PostMe PostMe DefaultsMissingMsgBox'
 
    elseif JustInstalled = 1 then
       -- Reset JustInstalled ini key
-      call SetProfile( nepmd_hini, App, Key, 0)
+      call setprofile( nepmd_hini, App, Key, 0)
 
       -- Link JustInst.ex if present
@@ -253 +246 @@
       if rc > 0 then
          -- Execute defc JustInst
-         if isadefc('JustInst') then
+         if isadefc( 'JustInst') then
             'AtPostStartup JustInst'
          endif
@@ -285 +278 @@
       App = 'Install'
       Key = 'UserFilesMoved'
-      next = QueryProfile( nepmd_hini, App, Key)
+      next = queryprofile( nepmd_hini, App, Key)
       if next = 1 then
-         'postme postme UserFilesMovedMsgBox'
-      endif
-      next = SetProfile( nepmd_hini, App, Key, 0)
+         'PostMe PostMe UserFilesMovedMsgBox'
+      endif
+      next = setprofile( nepmd_hini, App, Key, 0)
    endif
 
@@ -308 +301 @@
    Text = Text || 'Should the workaround be applied now?'
    Style = MB_OKCANCEL + MB_ERROR + MB_MOVEABLE
-   ret1 = winmessagebox( Title,
+   ret1 = WinMessageBox( Title,
                          Text,
                          Style)
@@ -315 +308 @@
       TestKey = 'Test'
       -- Write a test value
-      next = SetProfile( nepmd_hini, App, TestKey, '1')
+      next = setprofile( nepmd_hini, App, TestKey, '1')
       -- Delete the App
-      next = SetProfile( nepmd_hini, App, '', '')  -- delete the App
+      next = setprofile( nepmd_hini, App, '', '')  -- delete the App
       -- Query test value
-      TestVal = QueryProfile( nepmd_hini, App, TestKey)
+      TestVal = queryprofile( nepmd_hini, App, TestKey)
       if TestVal = '' then  -- if key doesn't exist
          Title = 'RegDefaults deleted from NEPMD.INI'
@@ -326 +319 @@
          Text = Text || 'Should EPM be restarted now?'
          Style = MB_OKCANCEL + MB_INFORMATION + MB_MOVEABLE
-         ret2 = winmessagebox( Title,
+         ret2 = WinMessageBox( Title,
                                Text,
                                Style)
@@ -338 +331 @@
          Text = Text || 'not deleted from NEPMD.INI.'
          Style = MB_OK + MB_ERROR + MB_MOVEABLE
-         ret3 = winmessagebox( Title,
+         ret3 = WinMessageBox( Title,
                                Text,
                                Style)
@@ -358 +351 @@
    Text = Text || ' bin, ex or mode subdirectories.'
    Style = MB_OK + MB_INFORMATION + MB_MOVEABLE
-   ret = winmessagebox( Title,
+   ret = WinMessageBox( Title,
                         Text,
                         Style)
 
+; ---------------------------------------------------------------------------
+; Suppress screen refresh.
+
+defc DisableDisplay
+   universal displaydisabled
+   displaydisabled = 1
+   display -1
+
+defc EnableDisplay
+   universal displaydisabled
+   displaydisabled = 0
+   display 1
+

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

@@ -66 +66 @@
          -- Get default mode
          rc = 0
-         DefaultMode = NepmdQueryDefaultMode(Filename)
-         --dprintf( 'GetMode: DefaultMode = NepmdQueryDefaultMode('Filename') = 'DefaultMode', rc = 'rc)
+         DefaultMode = NepmdQueryDefaultMode( Filename)
+         --dprintf( 'GetMode: DefaultMode = NepmdQueryDefaultMode( 'Filename') = 'DefaultMode', rc = 'rc)
          if DefaultMode = '' then
             --sayerror "Default mode can't be determined. NepmdQueryDefaultMode returned rc = "rc"."
@@ -93 +93 @@
 defproc GetHiliteCheckFlag
    universal HiliteModeList
-   Mode = arg(1)
+   Mode = arg( 1)
 
    -- make sure each mode is checked for only once
@@ -118 +118 @@
 ; Resets and redetermines current mode.
 ; Processes settings for current mode only if current mode <> old mode.
-; arg(1) = old mode.
-; Called by defc s,save.
-;
-; Use a command for to call it with 'postme' from defc s,save
+; arg( 1) = old mode.
+; Called by defc s, save.
+;
+; Use a command for to call it with 'postme' from defc s, save
 ; Otherwise a MessageBox (defined in ETK) will pop up when
 ;    -  the window should be closed and
@@ -134 +134 @@
 ; only updated after the ListBox was closed.
 defc ResetMode
-   OldMode = arg(1)
+   OldMode = arg( 1)
 
    -- Set fid'.mode' to an empty string to make GetMode redetermine
@@ -178 +178 @@
    universal LoadState
 
-   arg1 = strip( upcase( arg(1)))
+   arg1 = strip( upcase( arg( 1)))
    ResetModeArgs = '0 OFF DEFAULT'
 
@@ -208 +208 @@
       elseif wordpos( NewMode, ModeList) = 0 then
          sayerror NewMode' is not a valid mode'
-         if LoadState = 0 then  -- after AfterLoad was processed
+         if LoadState = 0 then  -- after FilesLoaded was processed
             -- Reset to empty to open the SelectMode dialog
             NewMode = ''
@@ -227 +227 @@
    elseif wordpos( NewMode, ResetModeArgs) > 0 then
       -- Get the default mode
-      NewMode =  NepmdQueryDefaultMode(.filename)
+      NewMode =  NepmdQueryDefaultMode( .filename)
       if NewMode = '' then
          sayerror "Default mode can't be determined. NepmdQueryDefaultMode returned rc = "rc"."
@@ -234 +234 @@
       -- Update the EPM EA area to make get_EAT_ASCII_value show the actual value.
       -- This will delete the EA on save-as if the source file was readonly.
-      call Delete_Ea('EPM.MODE')
+      call Delete_Ea( 'EPM.MODE')
       if fSetEa then
          if not fReadonly & not .lockhandle then
@@ -247 +247 @@
    else
       -- Update the EPM EA area to make get_EAT_ASCII_value show the actual value.
-      call Delete_Ea('EPM.MODE')
+      call Delete_Ea( 'EPM.MODE')
       if fSetEa then
          -- This will write the EA on save-as if the source file was readonly.
@@ -274 +274 @@
 
    -- Determine current mode
-   CurMode = Get_EAT_ASCII_Value('EPM.MODE')
+   CurMode = Get_EAT_ASCII_Value( 'EPM.MODE')
    DefMode = NepmdQueryDefaultMode( .filename)
 
@@ -302 +302 @@
                      '/~Set/~Reset/Cancel',          -- buttons
                      0, 0,  --5, 5,                  -- top, left,
-                     Min( words(ModeList), 12), 25,  -- height, width
+                     Min( words( ModeList), 12), 25,  -- height, width
                      GethWndC( APP_HANDLE) || atoi( Selection) || atoi( 1) || atoi( 0) ||
                      Text\0 )
@@ -309 +309 @@
    -- Check result
    Button = asc( leftstr( select, 1))
-   EOS = pos( \0, select, 2)        -- CHR(0) signifies End Of String
+   EOS = pos( \0, select, 2)        -- CHR( 0) signifies End Of String
    if Button = 1 then
       ret = substr( select, 2, EOS - 2)
@@ -325 +325 @@
 ; ---------------------------------------------------------------------------
 defc OpenModeDirs
-   Mode = strip( arg(1))
+   Mode = strip( arg( 1))
    if Mode = '' then
       Mode = GetMode()
@@ -339 +339 @@
 
 ; ---------------------------------------------------------------------------
-; arg(1) = Directory. Opens dialog if no arg.
+; arg( 1) = Directory. Opens dialog if no arg.
 defc ModeCacheDir
 
    Dir        = GetModeCacheDir()
    DefaultDir = GetDefaultModeCacheDir()
-   NewDir = strip( arg(1))
+   NewDir = strip( arg( 1))
    if NewDir = '' then
       Title = 'ModeCache directory'
       Text  = 'Enter a fully-qualified directory.'
-      Text  = Text''copies( ' ', max( 100 - length(Text), 0))
+      Text  = Text''copies( ' ', max( 100 - length( Text), 0))
       Buttons = '/~Set/~Reset/Cancel'
       Entry = Dir
@@ -391 +391 @@
 defproc SetModeCacheDir
    KeyPath = '\NEPMD\User\ModeCache\Directory'
-   NewDir = arg(1)
+   NewDir = arg( 1)
    if NewDir = '' then
       call DeleteConfigKey( KeyPath)

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

@@ -436 +436 @@
 ; command. This is required to process these settings for the correct file.)
 definit
-   'HookAdd select ProcessSelectSettings'
+   'HookAdd fileswitched ProcessSelectSettings'
 
 ; ---------------------------------------------------------------------------

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

@@ -100 +100 @@
       Modulename = BaseName'.e'
    else
-      call parse_filename( Modulename)
+      call Parse_Filename( Modulename)
    endif
 
@@ -178 +178 @@
 ; Does use the /v option now.
 ; Doesn't respect options from the commandline, like /v or /e <logfile>.
-defc et, etpm
+defc Et, Etpm
 
    rest = strip( arg(1))
@@ -194 +194 @@
       InFile = 'epm.e'
    else
-      call parse_filename( InFile, .filename)
-   endif
-   call parse_filename( ExFile, .filename)
+      call Parse_Filename( InFile, .filename)
+   endif
+   call Parse_Filename( ExFile, .filename)
    lp = lastpos( '.', ExFile)
    if lp > 0 then
@@ -217 +217 @@
    AutolinkDir  = NepmdUserDir'\autolink'  -- search in <UserDir>\autolink first
    ProjectDir   = NepmdUserDir'\project'   -- search in <UserDir>\project second
-   if exist( AutolinkDir'\'BaseName'.ex') then
+   if Exist( AutolinkDir'\'BaseName'.ex') then
       DestDir = AutolinkDir
-   elseif exist( ProjectDir'\'BaseName'.ex') then
+   elseif Exist( ProjectDir'\'BaseName'.ex') then
       DestDir = ProjectDir
    else
@@ -231 +231 @@
    EtpmCmd = ETPM_CMD
 compile else
-   EtpmCmd = 'etpm'
+   EtpmCmd = 'Etpm'
 compile endif
 
@@ -262 +262 @@
       sayerror 'ETPM.EXE:' CANT_OPEN_TEMP__MSG '"'TempFile'"'
       stop
-   elseif exist( TempFile) then
-      call ec_position_on_error( TempFile)
+   elseif Exist( TempFile) then
+      call Ec_Position_On_Error( TempFile)
       rc = etpmrc
    else
@@ -274 +274 @@
 ; Load file containing error, called by etpm.
 ; This handles the /v output of etpm as well.
-defproc ec_position_on_error( tempfile)
+defproc Ec_Position_On_Error( tempfile)
    'xcom e 'tempfile
    if rc then    -- Unexpected error.
@@ -301 +301 @@
       'e 'filename               -- not xcom here, respect user's window style
       if line <> '' and col <> '' then
-         .cursory = min( .windowheight % 2, .last)
+         .cursory = Min( .windowheight % 2, .last)
          if col > 0 then
-            'postme goto' line col
+            'PostMe GoTo' line col
          else
             line = line - 1
             col = length( textline( line))
-            'postme goto' line col
+            'PostMe GoTo' line col
          endif
       endif
@@ -724 +724 @@
          -- If CurExFile <> NetlabsExFile or if error from deletion
          if next <> 0 | (next = 0 & delrc) then
-            if LastCheckTime < max( CurExFileTime, NetlabsExFileTime) then
+            if LastCheckTime < Max( CurExFileTime, NetlabsExFileTime) then
                fCompExFile = 1
             endif
@@ -1186 +1186 @@
 
    if (not fCheckOnly) & (fRestartEpm = 1) then
-      Cmd = 'postme postme Restart closeother'
+      Cmd = 'PostMe PostMe Restart closeother'
    else
       Cmd = ''
@@ -1438 +1438 @@
    etpmrc = -1
    CompileDir = NepmdUserDir'\ex\tmp'
-   if not exist( CompileDir) then
+   if not Exist( CompileDir) then
       call MakeTree( CompileDir)
-      if not exist( CompileDir) then
+      if not Exist( CompileDir) then
          sayerror 'CallEtpm: Cannot find or create CompileDir "'CompileDir'"'
          stop
@@ -1464 +1464 @@
    call directory( CompileDir)
 
-   Os2Cmd = 'etpm' Params
+   Os2Cmd = 'Etpm' Params
    quietshell 'xcom' Os2Cmd
    etpmrc = rc
@@ -1477 +1477 @@
    elseif etpmrc = 41 then
       sayerror 'ETPM.EXE:' CANT_OPEN_TEMP__MSG '"'
-   elseif exist( EtpmLogFile) then
-      call ec_position_on_error( EtpmLogFile)
+   elseif Exist( EtpmLogFile) then
+      call Ec_Position_On_Error( EtpmLogFile)
    else
       sayerror 'ETPM.EXE returned rc = 'etpmrc' for "'Os2Cmd'"'
@@ -1563 +1563 @@
       ExFile = ExFile'.ex'
    endif
-   if exist( AutolinkDir'\'ExFile) then
+   if Exist( AutolinkDir'\'ExFile) then
       DestDir = AutolinkDir
-   elseif exist( ProjectDir'\'ExFile) then
+   elseif Exist( ProjectDir'\'ExFile) then
       DestDir = ProjectDir
    else
@@ -1602 +1602 @@
 defc CheckEpmMacros
 
-   NepmdUserDir = Get_Env('NEPMD_USERDIR')
+   NepmdUserDir = Get_Env( 'NEPMD_USERDIR')
    call MakeTree( NepmdUserDir)
    call MakeTree( NepmdUserDir'\ex')
@@ -1615 +1615 @@
 ; Todo: use different text for fCheckOnly = 1, cRecompile > 0, cRelink > 0
 defc RecompileNewMsgBox
-   NepmdUserDir = Get_Env('NEPMD_USERDIR')
+/*
+   -- Ensure that the screen is updated before the message box pops up
+   --'EnableDisplay'  -- executed too late
+   display 1
+*/
+   NepmdUserDir = Get_Env( 'NEPMD_USERDIR')
    UserDirName = substr( NepmdUserDir, lastpos( '\', NepmdUserDir) + 1)
    LogFile = NepmdUserDir'\ex\recompilenew.log'
@@ -1686 +1691 @@
 
    Title = 'Checked .E and .EX files from 'upcase(UserDirName)' tree'
-   rcx = winmessagebox( Title,
+   rcx = WinMessageBox( Title,
                         Text,
                         Style)

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

@@ -37 +37 @@
 ; ---------------------------------------------------------------------------
 defselect
-   universal SelectDisabled
-   universal LoadState
+   universal selectdisabled
+   universal loadstate
+
    getfileid fid
-   dprintf( 'SELECT', .filename', fid = 'fid', LoadState = 'LoadState)
+   dprintf( 'SELECT', .filename', fid = 'fid', LoadState = 'loadstate)
    if not .visible then  -- process following only if file is visible
       return
    endif
-   if SelectDisabled <> 1 then
+   if selectdisabled <> 1 then
       'ProcessSelect'
    endif
 
 ; ---------------------------------------------------------------------------
+; Bug: On opening a new EPM window, no defselect event may be triggered.
+; Therefore 'PostMe ProcessSelect' was added to ProcessPostMain. That ensures
+; that it is executed in all cases. The disadvantage is that it might be
+; executed multiple times. Those cases, when the file on top is changed, are
+; filtered out in ProcessSelect.
 defc ProcessSelect
    universal lastselectedfid
-   universal LoadState
-   universal SelectDisabled
+   universal loadstate
+   universal selectfid
 
    getfileid fid
+   selectfid = fid
 
    -- Suppress too early select events
-   if LoadState = '' then
-      dprintf( 'SELECT', 'suppress ProcessSelect for '.filename', fid = 'fid', LoadState = 'LoadState' (initial file)')
+   if loadstate = '' then
+      dprintf( 'SELECT', 'suppress ProcessSelect for '.filename', fid = 'fid', loadstate = 'loadstate' (initial file)')
       return
    endif
 
-   SelectDisabled = 0  -- always reenable it
+   'DisableSelect'
 
    if fid = lastselectedfid then
       -- nop, ProcessSelect2 was already executed for this file
-      dprintf( 'SELECT', 'suppress ProcessSelect for '.filename', fid = 'fid', LoadState = 'LoadState' (already processed)')
+      dprintf( 'SELECT', 'suppress ProcessSelect for '.filename', fid = 'fid', loadstate = 'loadstate' (already processed)')
    else
-      dprintf( 'SELECT', 'ProcessSelect for '.filename', fid = 'fid', LoadState = 'LoadState)
-      if LoadState = 1 then  -- if a defload was processed before
-         LoadState = 2
-         'ProcessAfterLoad'  -- executes multiple ring commands that sometimes
-                             -- left the wrong file on top
+      dprintf( 'SELECT', 'ProcessSelect for '.filename', fid = 'fid', loadstate = 'loadstate)
+      if loadstate = 1 then  -- if a defload was processed before
+         loadstate = 2
+         'ProcessFilesLoaded' -- executes multiple ring commands that sometimes
+                              -- left the wrong file on top
 ; ### critical call ###
-         'postme activatefile' fid  -- postme required, but doesn't work in some rare cases
+         'PostMe ActivateFile' fid  -- postme required, but doesn't work in some rare cases
 ; #####################
 
-         'postme ProcessAfterload2' -- final processing, therefore posted
-         LoadState = 0
+         'PostMe ProcessPostFilesLoaded'  -- final processing, therefore posted
+         loadstate = 0
       endif
 
-      'ProcessSelect2'
+      'ProcessFileSwitched'
       lastselectedfid = fid
    endif
 
+   'EnableSelect'  -- always reenable it
+
 ; ---------------------------------------------------------------------------
 ; This cmd is called once by defselect after all files were loaded.
-defc ProcessAfterLoad
-   universal CurEditCmd
-   universal filestoloadmax   -- set in PreLoadFile, only used for RingAddToHistory('LOAD')
-
-   dprintf( 'AFTERLOAD', .filename', CurEditCmd = 'CurEditCmd)
+defc ProcessFilesLoaded
+   universal cureditcmd
+   universal filestoloadmax   -- set in PreLoadFile, only used for RingAddToHistory( 'LOAD')
+
+   dprintf( 'FILESLOADED', .filename', cureditcmd = 'cureditcmd)
 
    -- Write number for all files in the ring to an array var
@@ -104 +113 @@
    if filestoloadmax <= 1 then
 ; ### critical call ###
-      call RingAddToHistory('LOAD')
+      call RingAddToHistory( 'LOAD')
 ; #####################
    endif
@@ -110 +119 @@
    -- Write position and name of all files in the ring to NEPMD.INI
    -- Don't process if files loaded by Recompile or 'groups loadgroup'
-   if wordpos( CurEditCmd, 'SETPOS LOADGROUP RESTORERING') = 0 then
+   if wordpos( cureditcmd, 'SETPOS LOADGROUP RESTORERING') = 0 then
       -- see FILELIST.E
       -- must not execute 'postme activatefile' at this point
@@ -120 +129 @@
    -- Reset CurEditCmd to enable saving the ring list for the next 'edit'
    -- or 'quit' action
-   CurEditCmd = ''
+   cureditcmd = ''
 
 ; ---------------------------------------------------------------------------
 ; This cmd is posted once by defselect after all files were loaded.
-defc ProcessAfterLoad2
+defc ProcessPostFilesLoaded
    universal vepm_pointer
-   universal DisplayDisabled
-
-   dprintf( 'AFTERLOAD', 'ProcessAfterload2 for '.filename)
-
+   universal displaydisabled
+   universal selectfid
+
+   dprintf( 'FILESLOADED', 'PostFilesLoaded for '.filename)
    mouse_setpointer vepm_pointer
 
-   if DisplayDisabled then
-      DisplayDisabled = 0
-      'trim'  -- Trim window so it's an exact multiple of the font size
+   if displaydisabled then
+      'Trim'  -- Trim window so it's an exact multiple of the font size
               -- This should avoid scrolling caused by temp. cursor pos.
               -- changes and restore.
-      display 1  -- re-enable screen updates, show the loaded files
+      'EnableDisplay'  -- re-enable screen updates, show the loaded files
    endif
    -- Bug to find? display 2 here would cause on defmodify the msg:
@@ -143 +151 @@
    -- statement or Get/SetAVar call.
 
-   dprintf( 'AFTERLOAD', 'HookExecute afterload: 'HookGet( 'afterload'))
-   'HookExecute afterload'
-   dprintf( 'AFTERLOAD', 'HookExecuteOnce afterloadonce: 'HookGet( 'afterloadonce'))
-   'HookExecuteOnce afterloadonce'
-   if HookIsDefined( 'afterload2once') then
+   dprintf( 'FILESLOADED', 'HookExecute postfilesloaded: 'HookGet( 'postfilesloaded'))
+   'HookExecute postfilesloaded'
+
+   dprintf( 'FILESLOADED', 'HookExecuteOnce postfilesloadedonce: 'HookGet( 'postfilesloadedonce'))
+   'HookExecuteOnce postfilesloadedonce'
+
+   if HookIsDefined( 'postpostfilesloadedonce') then
       refresh
-      'postme HookExecuteOnce afterload2once'
-      dprintf( 'AFTERLOAD', 'HookExecuteOnce afterload2once: 'HookGet( 'afterload2once'))
+      'PostMe HookExecuteOnce postpostfilesloadedonce'
+      dprintf( 'FILESLOADED', 'HookExecuteOnce postpostfilesloadedonce: 'HookGet( 'postpostfilesloadedonce'))
    endif
 
 ; ---------------------------------------------------------------------------
 ; Executed by defselect once after all file loading has been processed
-defc ProcessSelect2
-   dprintf( 'SELECT', 'ProcessSelect2 for '.filename)
+defc ProcessFileSwitched
+   dprintf( 'SELECT', 'FileSwitched for '.filename)
 
    -- Change to dir of current file
@@ -171 +181 @@
 
    -- Process hooks
-   -- o  Use the 'select' hook for settings, you want to change on every
-   --    defselect event. That should be only stuff, that don't stick with the
-   --    file. If your stuff sticks, better use the 'load' hook to avoid loss
-   --    of performance and stability.
-   'HookExecute select'          -- usually contains ProcessSelectSettings,
-                                 -- to be used for user additions as well
-   'HookExecuteOnce selectonce'  -- user additions, deleted after execution
-   'HookExecute afterselect'     -- usually contains ProcessRefreshInfoLine
-   'PostMe HighlightCursor'      -- PostMe required in many cases
+   -- o  Use the 'fileswiched' hooks for settings, that you want to change on
+   --    every defselect event. That should be only stuff, that doesn't stick
+   --    with the file. If your stuff sticks, better use the 'load' hook to
+   --    avoid loss of performance and stability.
+   'HookExecute fileswitched'          -- usually contains ProcessSelectSettings,
+                                       -- to be used for user additions as well
+   'HookExecuteOnce fileswitchedonce'  -- user additions, deleted after execution
+
+   'HookExecute postfileswitched'      -- usually contains ProcessRefreshInfoLine
 
 ; ---------------------------------------------------------------------------
@@ -193 +203 @@
 ;                           so that the EnableSelect command will reset the
 ;                           flag before it's been executed.
-;    'postme EnableSelect'  Enable select processsing for all files after
+;    'PostMe EnableSelect'  Enable select processsing for all files after
 ;                           current command (e.g. Name or SaveAs) was
 ;                           completely executed. That triggers defload and
@@ -201 +211 @@
 
 defc DisableSelect
-   universal SelectDisabled
-   SelectDisabled = 1
+   universal selectdisabled
+   selectdisabled = 1
 
 defc EnableSelect
-   universal SelectDisabled
-   SelectDisabled = 0
+   universal selectdisabled
+   selectdisabled = 0
 
 ; ---------------------------------------------------------------------------

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

@@ -54 +54 @@
    -- This sets the universal var reflowmargins to initial values, queried
    -- from NEPMD.INI.
-   -- (Found no better place when to execute the hook.)
-;##############################################
-   'HookAdd select ReflowMarginsInit' -------------------------------- Todo
-;##############################################
+   'HookAdd fileswitched ReflowMarginsInit'
 
 ;--------------------------------------------------------------------------