Changeset 4999


Ignore:
Timestamp:
Apr 28, 2022, 12:14:24 AM (3 years ago)
Author:
Andreas Schnellbacher
Message:
  • Fixed quiet shell start. It hasn't worked in all conditions.
  • Made quiet shell start always active. Removed menu item for that.
  • Reworked Shell cmds.
Location:
trunk/src/netlabs
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/src/netlabs/bin/defaults.cfg

    r4994 r4999  
    335335; Shell
    336336\NEPMD\User\Shell\PromptValue        = 'epm: {$r}[$p]$s'
    337 \NEPMD\User\Shell\Start\Quiet        = 1
    338337\NEPMD\User\Shell\FilenameCompletion = 1
    339338\NEPMD\User\Shell\Alias              = 1

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

    r4984 r4999  
    28652865   call DeleteConfigTree( '\NEPMD\User\Search\LastChangeArgs')
    28662866   call DeleteConfigTree( '\NEPMD\User\Search\AddSearchChangeOptions')
     2867   call DeleteConfigTree( '\NEPMD\User\Shell\Start\Quiet')
    28672868   call DeleteConfigTree( '\NEPMD\Var\Search\LastFindDefButton')
    28682869   call DeleteConfigTree( '\NEPMD\Var\Search\LastSearchDialogOptions')

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

    r4994 r4999  
    844844
    845845; ---------------------------------------------------------------------------
    846 const
    847 -- Maybe make that behavior configurable via menu?
    848 compile if not defined( SHELL_SWITCH_BUFFERS)
    849    SHELL_SWITCH_BUFFERS = 1
    850 compile endif
    851 
     846; Executes a passed command in next (current, next or new) shell.
     847; Syntax: Shell [<command>]
     848defc Shell
     849   do once = 1 to 1
     850
     851      parse arg Cmd
     852
     853      if IsAShell() then
     854         -- Execute passed Cmd in current shell
     855         if Cmd then
     856            'ShellWriteCmd' Cmd
     857         endif
     858      else
     859         -- Pass Cmd to next or new Shell
     860         'ShellSwitchStart 'Cmd
     861      endif
     862
     863   end
     864
     865; ---------------------------------------------------------------------------
    852866; Starts a new shell object or switches between shell buffers and a
    853867; (starting) non-shell buffer. If args were specified, then the last shell
    854 ; is reused and the args are executed in that shell. If the optional keyword
    855 ; "new" is specified as the first word of the args string, a new shell
    856 ; buffer is created.
     868; is reused and the args are executed in that shell.
     869; Activates shell1 -> shell2 -> startfile -> shell 1 -> ...
    857870;
    858 ; Syntax: Shell [new] [<command>]
     871; Syntax: ShellSwitchStart [<command>]
    859872;
    860873; shell_index is the number of the last created shell, <shellnum>.
    861874; The array var 'Shell_f'<shellnum> holds the fileid,
    862875; 'Shell_h'<shellnum> the handle.
    863 defc Shell
     876defc ShellSwitchStart
     877   -- fSwitch activates shell1 -> shell2 -> startfile -> shell 1 -> ...
    864878   universal shell_index
    865879   universal ring_enabled
    … …  
    869883   endif
    870884
    871    --dprintf( 'Shell: Args = >'arg( 1)'<')
    872    Args = strip( arg( 1))
    873 
    874    -- fSwitch activates shell1 -> shell2 -> startfile -> shell 1 -> ...
    875    fSwitch = 0
    876    if SHELL_SWITCH_BUFFERS = 1 then
    877       fSwitch = 1
    878    endif
    879 
    880    fCreateNew = 0
    881    wp = wordpos( 'NEW', upcase( Args))
    882    if wp = 1 then
    883       fCreateNew = 1
    884       Args = delword( Args, wp, 1)
    885    endif
    886 
    887    Cmd = strip( Args)
     885   --dprintf( 'Shell: Cmd = >'arg( 1)'<')
     886   Cmd = strip( arg( 1))
    888887
    889888   fShellInRing = 0
    … …  
    896895   enddo
    897896
    898    if fSwitch & fShellInRing & not fCreateNew then
     897   if fShellInRing then
    899898      'ShellSwitch 'Cmd
    900899   else
    … …  
    10611060      SetFileAVar( 'shellstartstate', 1)
    10621061
     1062      -- Current ignore level
     1063      --    0  cmd not ignored (normal cmd) or not found in array
     1064      --    1  cmd quiet (only the prompt is changed)
     1065      --    2  prompt after a quiet cmd (not set by a ShellWrite* cmd)
     1066      --    3  cmd hidden (no output at all)
     1067      --    4  prompt hidden and cmd quiet (used at ShellStart only)
     1068      --    5  next output line is the first after a quiet ShellStart
    10631069      -- Init current ignore level
    1064       SetFileAVar( 'shellcurrentignorelevel', 0)
     1070      SetFileAVar( 'shellcurrentignorelevel', 4)
    10651071
    10661072      -- Alias file
    … …  
    10771083      PromptValue = ShellGetConfiguredPromptValue()
    10781084      PromptCmd = '@prompt 'PromptValue
    1079 
    1080       KeyPath = '\NEPMD\User\Shell\Start\Quiet'
    1081       fQuietStart = QueryConfigKey( KeyPath)
    1082       if fQuietStart then
    1083          'ShellWriteCmdQuiet' ShellNum PromptCmd
    1084       else
    1085          'ShellWriteCmd' ShellNum PromptCmd
    1086       endif
     1085      'ShellWriteCmd' ShellNum PromptCmd
    10871086
    10881087      if fRestored then
    … …  
    11061105      if ShellDir <> ShellDirRealCase then
    11071106         CdCmd = 'cdd 'EnquoteFilespec( ShellDirRealCase)
    1108          if fQuietStart then
    1109             'ShellWriteCmdQuiet' ShellNum CdCmd
    1110          else
    1111             'ShellWriteCmd' ShellNum CdCmd
    1112          endif
     1107         'ShellWriteCmd' ShellNum CdCmd
    11131108      endif
    11141109
    … …  
    11801175         if directory() <> PrevDir then
    11811176            CdCmd = 'cdd' EnquoteFilespec( PrevDir)
     1177            --dprintf( 'ShellRestore: ShellWriteCmdHidden' ShellNum CdCmd)
    11821178            'ShellWriteCmdHidden' ShellNum CdCmd
    11831179         endif
    … …  
    11861182      -- Restore env from .env file
    11871183      EnvFile = RestoredFile'.env'
     1184      --dprintf( 'ShellRestore: ShellLoadEnv 'EnquoteFileSpec( EnvFile))
    11881185      'ShellLoadEnv 'EnquoteFileSpec( EnvFile)
    11891186
    … …  
    17231720      -- prompt line out.
    17241721      'ShellWriteCmdQuiet 'Cmd'>'LogFile
     1722
    17251723      getfileid ShellFid
    17261724
    … …  
    17601758   enddo
    17611759   display 1
     1760
    17621761   return OutputLine
    17631762
    … …  
    19131912         --   2  first line being put out
    19141913         --   3  start ended
     1914
    19151915         if GetFileAVar( 'shellstartstate') < 3 then
    19161916            -- Disable this only for restored shells (StartNumLines > 1)
    … …  
    20102010;    2  prompt after a quiet cmd (not set by a ShellWrite* cmd)
    20112011;    3  cmd hidden (no output at all)
     2012;    4  prompt hidden and cmd quiet (used at ShellStart only)
     2013;    5  next output line is the first after a quiet ShellStart
    20122014defproc ShellGetCmdIgnoreLevel( CurCmd)
    20132015   do once = 1 to 1
    20142016      fDelete = (arg( 2) = 1)
     2017      PrevIgnoreLevel = GetFileAVar( 'shellcurrentignorelevel')
    20152018      --dprintf( 'ShellGetCmdIgnoreLevel for 'CurCmd', fDelete = 'fDelete', arg( 2) = 'arg( 2))
     2019      if PrevIgnoreLevel = 4 then
     2020         IgnoreLevel = 4
     2021         leave
     2022      endif
    20162023      IgnoreLevel = 0
    2017 
    2018       -- Current start state
    2019       --   1  just started
    2020       --   2  first line being put out
    2021       --   3  start ended
    2022       if GetFileAVar( 'shellstartstate') < 3 then
    2023          KeyPath = '\NEPMD\User\Shell\Start\Quiet'
    2024          if QueryConfigKey( KeyPath) = 1 then
    2025             -- Omit output during start. This is not safe, because it depends on
    2026             -- when the output arrives. It works here in all cases.
    2027             IgnoreLevel = 1
    2028             leave  -- once
    2029          endif
    2030       endif
    2031 
    20322024      imax = GetFileAVar( 'shellcmd.0')
    20332025      --dprintf( '      ShellGetCmdIgnoreLevel: imax = 'imax', CurCmd = |'CurCmd'|')
    … …  
    20372029      do i = 1 to imax
    20382030         NextEntry = GetFileAVar( 'shellcmd.'i)
     2031
    20392032         --dprintf( '      ShellGetCmdIgnoreLevel: shellcmd = 'NextEntry', i = 'i)
    20402033         if not NextEntry then
    … …  
    20442037         if CurCmd = NextCmd & NextCmd then
    20452038            IgnoreLevel = NextIgnoreLevel
     2039            --dprintf( '** ShellGetCmdIgnoreLevel: ### Set IgnoreLevel = 'IgnoreLevel' for CurCmd = |'CurCmd'|')
    20462040            --dprintf( '      ShellGetCmdIgnoreLevel: ### Set IgnoreLevel = 'IgnoreLevel' for CurCmd = |'CurCmd'|')
    20472041            -- Remove CurCmd from cmd list, after it was found
    … …  
    20892083   PrevLineState = GetFileAVar( 'shelllinestate')
    20902084   call ShellParsePromptStr( TextStr, CurPrompt, CurCmd)
     2085
     2086   LastLineStr = textline( .last)
     2087   call ShellParsePromptLine( .last, LastPrompt, LastCmd)
     2088
    20912089   fNewCmd = 0
    20922090   if not CurPrompt then
    … …  
    20992097   if fNewCmd then
    21002098      LineState = 1  -- prompt
    2101    elseif PrevLineState = 1 then
     2099   elseif PrevLineState = 1 & LastCmd = '' then
    21022100      LineState = 2  -- echoed cmd
    21032101   else
    … …  
    21092107   -- For the first output after previous empty prompt line, prepend the
    21102108   -- read prompt to the output string for the CheckLineStr parsing
    2111    LastLineStr = textline( .last)
    2112    call ShellParsePromptLine( .last, LastPrompt, LastCmd)
    21132109   CheckLineStr = TextStr
    21142110   if LastPrompt & LineState = 2 then
    … …  
    21282124   --    2  prompt after a quiet cmd (not set by a ShellWrite* cmd)
    21292125   --    3  cmd hidden (no output at all)
     2126   --    4  prompt hidden and cmd quiet (used at ShellStart only)
     2127   --    5  next output line is the first after a quiet ShellStart
    21302128   -- if prompt or echoed cmd
    2131    if LineState = 1 | LineState = 2 then
     2129   if LineState then
    21322130      -- Redetermine and store current IgnoreLevel
    21332131      IgnoreLevel = PrevIgnoreLevel
    … …  
    21382136         fDelete = 1
    21392137         IgnoreLevel = ShellGetCmdIgnoreLevel( CheckCmd, fDelete)
    2140          --dprintf( '  ShellFilerReadLine: IgnoreLevel = 'IgnoreLevel' = ShellGetCmdIgnoreLevel( 'CheckCmd', 'fDelete')')
     2138         --dprintf( '** ShellFilerReadLine: IgnoreLevel = 'IgnoreLevel' = ShellGetCmdIgnoreLevel( 'CheckCmd', 'fDelete')')
    21412139      endif
    21422140
    21432141      -- Prompt after an ignored cmd
    2144       if LineState = 1 & PrevIgnoreLevel = 1 then
    2145          if not CheckCmd | IgnoreLevel = 0 then
     2142      --dprintf( '** IgnoreLevel = 'IgnoreLevel', PrevIgnoreLevel = 'PrevIgnoreLevel', LineState = 'LineState', TextStr = 'TextStr)
     2143      if LineState then
     2144         if PrevIgnoreLevel = 1 then
     2145            if not CheckCmd | IgnoreLevel = 0 then
     2146               IgnoreLevel = 2
     2147               --dprintf( '** Set IgnoreLevel = 'IgnoreLevel)
     2148               --dprintf( '   ShellFilerReadLine: LineState = 1 & PrevIgnoreLevel = 1 & (not CheckCmd | IgnoreLevel = 0): Set IgnorwLevel = 'IgnoreLevel)
     2149            endif
     2150         elseif IgnoreLevel = 1 & PrevIgnoreLevel = 5 then
     2151            IgnoreLevel = 5
     2152            --dprintf( '** Set IgnoreLevel = 'IgnoreLevel)
     2153         elseif PrevIgnoreLevel = 4 then
     2154            IgnoreLevel = 5
     2155            --dprintf( '** Set IgnoreLevel = 'IgnoreLevel)
     2156         elseif PrevIgnoreLevel = 5 then
    21462157            IgnoreLevel = 2
    2147             --dprintf( '   ShellFilerReadLine: LineState = 1 & PrevIgnoreLevel = 1 & (not CheckCmd | IgnoreLevel = 0): Set IgnorwLevel = 'IgnoreLevel)
     2158            --dprintf( '** Set IgnoreLevel = 'IgnoreLevel)
    21482159         endif
    21492160      endif
    … …  
    21752186   --    2  prompt after a quiet cmd (not set by a ShellWrite* cmd)
    21762187   --    3  cmd hidden (no output at all)
     2188   --    4  prompt hidden and cmd quiet (used at ShellStart only)
     2189   --    5  next output line is the first after a quiet ShellStart
    21772190   IgnoreLevel = GetFileAVar( 'shellcurrentignorelevel')
    2178    --dprintf( '#  ShellProcessReadLine: Current IgnoreLevel = 'IgnoreLevel', TextStr = |'TextStr'|')
     2191   --dprintf( '   ShellProcessReadLine: Current IgnoreLevel = 'IgnoreLevel', TextStr = |'TextStr'|')
    21792192
    21802193   if wordpos( IgnoreLevel, '0 2') then
    … …  
    23232336      endif
    23242337
    2325    --dprintf( '   ShellProcessReadLine, end:    IgnoreLevel = 'IgnoreLevel', TextStr = |'TextStr'|')
     2338      --dprintf( '   ShellProcessReadLine, end:    IgnoreLevel = 'IgnoreLevel', TextStr = |'TextStr'|')
    23262339   endif
    23272340
    … …  
    26722685   -- add 'ShellWriteCmdQuiet cd' and 'DiscardChanges' after that.
    26732686   Cmd = 'epmshell loadenv 'EnquoteFileSpec( EnvFile)
     2687   --dprintf( 'ShellLoadEnv: ShellWriteCmdHidden 'Cmd)
    26742688   'ShellWriteCmdHidden 'Cmd
    26752689   -- 'ShellWriteCmdHidden' won't change the prompt line. To achieve that,
    26762690   -- uncomment the following:
    26772691   /*
    2678    'ShellWriteCmd cd'
     2692   'ShellWriteCmdQuiet cd'
    26792693   'DiscardChanges'
    26802694   */

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

    r4857 r4999  
    115115defc TB_Shell
    116116   Action  = 'TB_Shell'
    117    Command = 'Shell'
     117   Command = 'ShellSwitchStart'
    118118   Prompt  = SHELL_PROMPT
    119119   Help    = ''  -- Additional prompt or a help panel id
    120120   Title   = ''  -- Title of the help message box (if no help panel id)
    121121   if CtrlIsDown() then
    122       Command = "Open 'Shell'"
     122      Command = "Open 'ShellSwitchStart'"
    123123   endif
    124124   call ToolbarAction( arg( 1), EXFILE, Action, Command, Prompt, Help, Title)

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

    r4994 r4999  
    26052605   DefMenuItem( '',                                                           -- Create command shell
    26062606                CREATE_SHELL_MENU__MSG,
    2607                 'Shell new',
     2607                'ShellStart',
    26082608                'Create a command shell buffer',
    26092609                HP_COMMAND_SHELL)
    26102610   DefMenuItem( '',                                                           -- Switch command shells
    26112611                'Sw~itch command shells',
    2612                 'Shell',
     2612                'ShellSwitchStart',
    26132613                'Loop through shell or starting non-shell buffers',
    26142614                HP_COMMAND_SHELL)
    … …  
    26452645                'OS/2 command to be executed on start of a shell',
    26462646                '')
    2647    DefMenuItem( 'shellstartquiet',                                                  -- Activate quiet start
    2648                 'Activate ~quiet start',
    2649                 'toggle_shell_quiet',
    2650                 'Omit output during start before the following prompt',
    2651                 '',
    2652                 nodismiss)
    26532647   DefMenuItem( 'shellfnc',                                                         -- Activate filename completion
    26542648                'Activate ~filename completion',
    … …  
    46534647
    46544648defc menuinit_configureshell
    4655    KeyPath = '\NEPMD\User\Shell\Start\Quiet'
    4656    on = (QueryConfigKey( KeyPath) <> 0)
    4657    SetMenuAttribute( 'shellstartquiet', MIA_CHECKED, not on)
    4658 
    46594649   KeyPath = '\NEPMD\User\Shell\FilenameCompletion'
    46604650   on = (QueryConfigKey( KeyPath) <> 0)
    … …  
    54825472   on = not on
    54835473   WriteConfigKey( KeyPath, on)
    5484    SetMenuAttribute( 'dragalwaysmarks', MIA_CHECKED, not on)
     5474   SetMenuAttribute( 'dragalwaysmarks',  MIA_CHECKED, not on)
    54855475  'mouse_init'  -- refresh the register_mousehandler defs
    54865476
    … …  
    58445834      SetMenuAttribute( 'backupdirdialog', MIA_DISABLED, on)
    58455835      SetMenuAttribute( 'backuplistdir',   MIA_DISABLED, on)
    5846    endif
    5847 
    5848 ; ---------------------------------------------------------------------------
    5849 defc toggle_shell_quiet
    5850    universal menuloaded
    5851 
    5852    KeyPath = '\NEPMD\User\Shell\Start\Quiet'
    5853    on = (QueryConfigKey( KeyPath) <> 0)
    5854    on = not on
    5855    WriteConfigKey( KeyPath, on)
    5856    if menuloaded then
    5857       SetMenuAttribute( 'shellstartquiet', MIA_CHECKED, not on)
    58585836   endif
    58595837
Note: See TracChangeset for help on using the changeset viewer.