Changeset 4046


Ignore:
Timestamp:
Jun 9, 2020, 7:59:20 AM (5 years ago)
Author:
Andreas Schnellbacher
Message:
  • Moved processing of PgmInputs and StartDir ini keys to separate procs.
  • Added processing of PgmInputs to Edit, because defmain is only called if a new window is opened, e.g. for "start epm filename". If an EPM window is already open, "start epm /r filename" goes directly to the Edit command. The first processing in defmain may now be removed, but that has to be tested first.
  • EPM loader: Moved write and delete of ini keys to before starting the EPM executable. Now querying these keys by Edit works always reliable.
Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/src/gui/epmcall/epmcall.c

    r4035 r4046  
    8686         CHAR           szTmp[ _MAX_PATH];
    8787         ULONG          ulLen = 0;
    88          BOOL           fEpmStarted = FALSE;
    8988         FILE          *pfile = NULL;
    9089         PPIB           ppibEPM;
    … …  
    300299      break;
    301300
     301   // save original params and current dir to NEPMD.INI to process them later
     302   // by defmain and Edit - write that before starting the EPM executable
     303   hab = WinInitialize( 0);
     304   hNepmdIni = PrfOpenProfile( hab, szNepmdIniFile);
     305   if (hNepmdIni != NULLHANDLE)
     306      {
     307      // save PgmInputs
     308      PrfWriteProfileString( hNepmdIni, pszAppRegKeys, pszRegPathPgmInputs,
     309                             ppibEPM->pib_pchcmd + strlen( ppibEPM->pib_pchcmd) + 1);
     310
     311      // query drive and dir
     312      DosQueryCurrentDisk( &ulDisk, &ulDiskMap);
     313      sprintf( szDir, "%c:\\", ulDisk + 'A' - 1);
     314      DosQueryCurrentDir( 0, &szDir[ strlen( szDir)], &ulPathLen);
     315      // save it
     316      PrfWriteProfileString( hNepmdIni, pszAppRegKeys, pszRegPathStartDir, szDir);
     317
     318      PrfCloseProfile( hNepmdIni);
     319      }
     320
    302321   // start program - fill STARTDATA
    303322   memset( &startdata, 0, sizeof( startdata));
    … …  
    323342   DPRINTF(( "CallEPM: call %s\n   params = >>%s<<\n   rc = %u\n", startdata.PgmName, startdata.PgmInputs, rc));
    324343
    325    if ((rc == NO_ERROR) || (rc == ERROR_SMG_START_IN_BACKGROUND))
    326       fEpmStarted = TRUE;
    327 
    328    if (fEpmStarted != TRUE)
    329       break;
    330 
    331    // save original params and current dir to NEPMD.INI to process them by MAIN.E
    332    hab = WinInitialize( 0);
    333    hNepmdIni = PrfOpenProfile( hab, szNepmdIniFile);
    334    if (hNepmdIni != NULLHANDLE)
    335       {
    336       // save PgmInputs
    337       PrfWriteProfileString( hNepmdIni, pszAppRegKeys, pszRegPathPgmInputs, startdata.PgmInputs);
    338 
    339       // query drive and dir
    340       DosQueryCurrentDisk( &ulDisk, &ulDiskMap);
    341       sprintf( szDir, "%c:\\", ulDisk + 'A' - 1);
    342       DosQueryCurrentDir( 0, &szDir[ strlen( szDir)], &ulPathLen);
    343       // save it
    344       PrfWriteProfileString( hNepmdIni, pszAppRegKeys, pszRegPathStartDir, szDir);
    345 
    346       PrfCloseProfile( hNepmdIni);
    347       }
     344   if ((rc != NO_ERROR) && (rc != ERROR_SMG_START_IN_BACKGROUND))
     345      break;
    348346
    349347   if (fAsync == FALSE)

  • TabularUnified trunk/src/netlabs/macros/edit.e

    r4045 r4046  
    570570      endif  -- RestorePosDisabled <> 1
    571571   endif  -- RestorePos = 1
     572
     573; ---------------------------------------------------------------------------
     574defproc QueryClearPgmInputs
     575   universal nepmd_hini
     576
     577   NewArgs = ''
     578
     579   -- Query the original args saved by the loader (standard ini key).
     580   App = 'RegKeys'
     581   Key = '\NEPMD\Var\Loader\PgmInputs'
     582   OrgArgs = queryprofile( nepmd_hini, App, Key)
     583
     584   -- Delete PgmInputs
     585   call setprofile( nepmd_hini, App, Key, '')
     586
     587   -- Strip EPM options from OrgArgs
     588   EpmOptions    = '/B /F /H /I /M /O /R /W'
     589   EpmArgOptions = '/E'  -- syntax: /Eexfile
     590   rest = OrgArgs
     591   do forever
     592      srest = strip( rest)
     593      if leftstr( srest, 1) = '/' then
     594         NextOpt = upcase( leftstr( srest, 2))
     595         if wordpos( NextOpt, EpmOptions) then
     596            parse value srest with +2 rest
     597         elseif wordpos( NextOpt, EpmArgOptions) then
     598            parse value srest with +2 next rest
     599            if leftstr( next, 1) = '"' then
     600               parse value srest with +2 '"'next'"' rest
     601            endif
     602         else
     603            NewArgs = NewArgs''leftstr( srest, 2)
     604            parse value srest with +2 rest
     605         endif
     606      else
     607         NewArgs = NewArgs''rest
     608         leave
     609      endif
     610   enddo
     611   NewArgs = strip( NewArgs)
     612
     613   return NewArgs
     614
     615; ---------------------------------------------------------------------------
     616defproc QueryClearStartDir
     617   universal nepmd_hini
     618
     619   StartDir = ''
     620
     621   -- Query the StartDir
     622   App = 'RegKeys'
     623   Key = '\NEPMD\Var\Loader\StartDir'
     624   StartDir = queryprofile( nepmd_hini, App, Key)
     625
     626   -- Delete the StartDir
     627   call setprofile( nepmd_hini, App, Key, '')
     628
     629   return StartDir
    572630
    573631; ---------------------------------------------------------------------------
    … …  
    605663      getfileid startfid  -- save fid of topmost file before current edit cmd
    606664
    607       -- Delete the original args saved by the loader (standard ini key).
    608       -- defmain -> ProcessPostMain is only called when a new EPM window is
    609       -- opened. If any file laoding or the execution of an EPM command goes
    610       -- to the loader, that key was written. This ensures that the key is
    611       -- removed properly. Previously, 'Open ""' loaded the last saved
    612       -- filespec, instead of opening a new .Untitled file.
    613       App = 'RegKeys'
    614       Key = '\NEPMD\Var\Loader\PgmInputs'
    615       call setprofile( nepmd_hini, App, Key, '')
     665      EpmArgs = strip( arg( 1))
     666      dprintf( 'EDIT', 'EpmArgs = >>'EpmArgs'<<')
     667
     668      -- defmain is not processed, if the EPM window, that should process the
     669      -- args, is already open. That's the case, if option /r was specified.
     670      -- The Edit command is executed directly in that case. To make the
     671      -- workaround with submitting the original paramters seen by the loader
     672      -- work, that has to be executed by Edit.
     673      -- To avoid infinite recursion, processing here is much easier if the
     674      -- PgmInputs key was already processed and deleted. Therefore
     675      -- processing it in defmain was additionally kept.
     676
     677      -- Query the original args saved by the loader without the options
     678      -- known to the EPM executable
     679      OrgArgs = QueryClearPgmInputs()
     680      dprintf( 'EDIT', 'OrgArgs = >>'OrgArgs'<<')
     681
    616682      -- Query the StartDir
    617       Key = '\NEPMD\Var\Loader\StartDir'
    618       StartDir = queryprofile( nepmd_hini, App, Key)
    619       -- Delete the StartDir
    620       call setprofile( nepmd_hini, App, Key, '')
     683      StartDir = QueryClearStartDir()
     684
     685      -- Replace EpmArgs with OrgArgs if non-empty
     686      if OrgArgs <> '' & EpmArgs <> '' then
     687         -- Ensure that infinite recursion is avoided, e.g. if the key wasn't
     688         -- deleted after 'RestoreRing'
     689         if not pos( 'RESTORERING', upcase( OrgArgs)) then
     690            EpmArgs = OrgArgs
     691         endif
     692      endif
     693
     694      if EpmArgs = '' then
     695         leave
     696      endif
    621697
    622698      -- Workaround: This avoids unwanted window scrolling of the previous file.
    … …  
    635711      endif
    636712
    637       args = strip( arg( 1))
    638 
    639       if args = '' then  -- The original 'edit' by itself goes to next file
    640          --nextfile      -- Removed to make 'epm /r' only bring an EPM window to the foreground
    641                          -- instead of switching to the next file in the ring.
    642          leave
    643       endif
    644 
    645713      Options  = default_edit_options
    646714      FileSpec = ''
    … …  
    662730      call SetAVar( 'edit.0', e)
    663731
    664       rest = args
     732      rest = EpmArgs
    665733      do while rest <> ''
    666734         rest = strip( rest, 'L')
    … …  
    848916
    849917      dprintf( 'EDIT', 'arg( 1) = ['arg( 1)'], FirstFid = ['FirstFid'], ['FirstFid.filename']')
    850       -- If 1 or more files are loaded by the current edit cmd (or if loadfile has returned rc = 0):
     918      -- If 1 or more files are loaded by the current Edit cmd
     919      -- (or if loadfile has returned rc = 0)
    851920      if FirstFid <> '' then
    852 
    853          -- activatefile is now executed in ProcessFilesLoaded with postme.
    854          -- This finally works properly. With activatefile here the ring would get messed.
    855          --activatefile FirstFid
    856          -- Set fid for ProcessFilesLoaded:
     921         -- Set fid for ProcessFilesLoaded
    857922         firstloadedfid = FirstFid
    858923
    859          -- Initialize firstinringfid if not already set by a previous edit command:
     924         -- Initialize firstinringfid if not already set by a previous Edit command
    860925         if firstinringfid = '' then
    861926            firstinringfid = firstloadedfid
    … …  
    864929
    865930      if upcase( cureditcmd) <> 'RESTORERING' then
    866          'AtStartup AddToHistory EDIT' args
    867       endif
    868 
    869    enddo
     931         'AtStartup AddToHistory EDIT' EpmArgs
     932      endif
     933
     934   enddo  -- once
    870935
    871936   if mainstate <> 1 & mainstate <> 2 then
    … …  
    11501215         endif
    11511216         -- Ignore empty lines
    1152          if Linestr = '' then
     1217         if LineStr = '' then
    11531218            iterate
    11541219         endif

  • TabularUnified trunk/src/netlabs/macros/main.e

    r4035 r4046  
    194194   dprintf( 'MAIN', 'ProcessPostMain: EpmArgs = >>'EpmArgs'<<')
    195195
    196    -- Query the original args saved by the loader (standard ini key).
    197    App = 'RegKeys'
    198    Key = '\NEPMD\Var\Loader\PgmInputs'
    199    OrgArgs = queryprofile( nepmd_hini, App, Key)
     196   -- Query the original args saved by the loader without the options
     197   -- known to the EPM executable
     198   OrgArgs = QueryClearPgmInputs()
    200199   dprintf( 'MAIN', 'ProcessPostMain: OrgArgs = >>'OrgArgs'<<')
    201 
    202    -- Delete Key
    203    call setprofile( nepmd_hini, App, Key, '')
    204 
    205    -- Strip EPM options from OrgArgs
    206    EpmOptions    = '/B /F /H /I /M /O /R /W'
    207    EpmArgOptions = '/E'  -- syntax: /Eexfile
    208    rest = OrgArgs
    209    NewArgs = ''
    210    do forever
    211       srest = strip( rest)
    212       if leftstr( srest, 1) = '/' then
    213          NextOpt = upcase( leftstr( srest, 2))
    214          if wordpos( NextOpt, EpmOptions) then
    215             parse value srest with +2 rest
    216          elseif wordpos( NextOpt, EpmArgOptions) then
    217             parse value srest with +2 next rest
    218             if leftstr( next, 1) = '"' then
    219                parse value srest with +2 '"'next'"' rest
    220             endif
    221          else
    222             NewArgs = NewArgs''leftstr( srest, 2)
    223             parse value srest with +2 rest
    224          endif
    225       else
    226          NewArgs = NewArgs''rest
    227          leave
    228       endif
    229    enddo
    230    NewArgs = strip( NewArgs)
    231    dprintf( 'MAIN', 'ProcessPostMain: NewArgs = >>'NewArgs'<<')
    232    OrgArgs = NewArgs
    233200
    234201   -- Replace EpmArgs with OrgArgs if non-empty
Note: See TracChangeset for help on using the changeset viewer.