diff --git a/arvo/ames.hoon b/arvo/ames.hoon index d5fcc5231..1fdd4ffb3 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -1123,7 +1123,6 @@ ++ done :: done:ho:um:am |= [cha=path num=@ud] :: complete outgoing ^- [(unit duct) _+>] - ~? =(~wicwyc-sitlyr her) [%done cha num] =+ rol=(need (~(get by ryl.bah) cha)) =+ rix=(~(get by san.rol) num) ?~ rix [~ +>.$] diff --git a/arvo/batz.hoon b/arvo/batz.hoon index 193282e85..de7646806 100644 --- a/arvo/batz.hoon +++ b/arvo/batz.hoon @@ -27,6 +27,8 @@ ++ kiss :: in request ->$ $% [%crud p=@tas q=(list tank)] :: error with trace [%hail ~] :: refresh + [%hook ~] :: this term hung up + [%harm ~] :: all terms hung up [%init p=@p] :: report install [%kill p=~] :: kill a task [%line p=@t] :: source line @@ -269,6 +271,8 @@ ?- -.kyz %crud [[[hen [%slip %d %flog kyz]] ~] +<.^^$] %hail [[[hen [%give %helo prot]] ~] +<.^^$] + %harm ~&(%batz-harm [~ +<.^^$]) + %hook ~&(%batz-hook [~ +<.^^$]) %line =+ gyp=?>(?=(^ fog) i.fog) ?: &(=(0 gyp) =(%$ p.kyz)) $(kyz [%hail ~]) =< abet @@ -276,8 +280,11 @@ lash:(gill:(fist hen) p.kyz) lash:(como:(fest gyp hen) p.kyz) %kill =+ gyp=?>(?=(^ fog) i.fog) - ?: =(0 gyp) [[[hen [%give %logo ~]] ~] +<.^^$] - abet:kill:(fest gyp hen) + ?. =(0 gyp) + abet:kill:(fest gyp hen) + ?: =(~[/gold/term/1] ?>(?=(^ hen) t.hen)) :: XX gross + [[[hen [%give %logo ~]] ~] +<.^^$] + [~ +<.^^$] %ling ?> ?=(^ fog) => .(fog (weld t.fog `(list ,@ud)`[i.fog ~])) [[[hen [%give %helo prot]] ~] +<.^^$] diff --git a/arvo/dill.hoon b/arvo/dill.hoon index d0bd79c6a..8449f1e25 100644 --- a/arvo/dill.hoon +++ b/arvo/dill.hoon @@ -1,8 +1,8 @@ -:: +!: :: dill (4d), terminal handling :: |= pit=vase -=> |% +=> |% :: interface tiles ++ gift :: out result <-$ $% [%bbye ~] :: reset prompt [%blit p=(list blit)] :: terminal output @@ -20,10 +20,11 @@ [%crud p=@tas q=(list tank)] :: error with trace [%flog p=flog] :: wrapped error [%hail ~] :: terminal refresh + [%hook ~] :: this term hung up + [%harm ~] :: all terms hung up [%noop ~] :: no operation [%talk p=tank] :: [%text p=tape] :: - [%wipe ~] :: clear terminal == :: ++ flog :: sent to %dill $% [%crud p=@tas q=(list tank)] :: @@ -33,6 +34,8 @@ ++ note :: out request $-> $% [%crud p=@tas q=(list tank)] :: to %dill [%hail ~] :: to %batz + [%harm ~] :: to %batz + [%hook ~] :: to %batz [%kill p=~] :: to %batz [%line p=@t] :: to %batz [%ling ~] :: to %batz @@ -57,11 +60,56 @@ [%vega p=path] :: by %batz [%warn p=tape] :: by %batz == +:::::::: :: dill tiles +++ bein :: terminal control + $: $: bul=@ud :: buffer length + bus=@ud :: cursor in buffer + but=(list ,@c) :: buffer text + buy=prom :: input style + == :: + $: hiz=@ud :: history depth + hux=path :: history path + hym=(map ,@ud (list ,@c)) :: history overlay + hyt=hist :: history object + hyr=(unit (list ,@c)) :: history search + == :: + $: pol=@ud :: length of prompt + pot=tape :: prompt text + == :: + == :: +++ blew ,[p=@ud q=@ud] :: columns rows +++ belt :: raw console input + $% [%aro p=?(%d %l %r %u)] :: arrow key + [%bac ~] :: true backspace + [%ctl p=@ud] :: control-key + [%del ~] :: true delete + [%met p=@ud] :: meta-key + [%ret ~] :: return + [%txt p=(list ,@c)] :: utf32 text + == :: +++ blit :: raw console output + $% [%bel ~] :: make a noise + [%clr ~] :: clear the screen + [%hop p=@ud] :: set cursor position + [%lin p=(list ,@c)] :: set current line + [%mor ~] :: newline + [%sav p=path q=@] :: save to file + == :: +++ blot :: kill ring + $: p=@ud :: length + q=@ud :: depth + r=(list (list ,@c)) :: kills + == :: +++ blur ,[p=@ud q=(unit bein) r=blot] :: columns, prompt +++ yard :: terminal state + $: p=? :: verbose + q=blur :: display state + r=(map path hist) :: history + == :: -- => |% ++ dy |= [hen=duct dug=(map duct yard)] - =+ wip=| =+ ^= yar ^- yard =+ yur=(~(get by dug) hen) ?^ yur u.yur @@ -487,17 +535,26 @@ :: %hail :: refresh +>.$(mos :_(mos [hen %toss %b ~ kyz])) + :: + %harm :: all terms hung up + =+ nug=((map duct yard) [[hen (~(get by dug) hen)] ~ ~]) + ^+ +>.$ + %= +>.$ + dug nug + mos :_(mos [hen %toss %b ~ kyz]) + == + :: + %hook :: this term hung up + +>.$(dug (~(del by dug) hen), mos :_(mos [hen %toss %b ~ kyz])) :: %talk (furl (~(win re p.kyz) 0 p.q.yar)) :: program output %text $(kyz [%talk %leaf p.kyz]) :: simple message - :: - %wipe +>.$(wip &) :: delete old == :: ++ yerk :: complete core ^- [p=(list move) q=(map duct yard)] :- (flop mos) - ?.(wip (~(put by dug) hen yar) (~(del by dug) hen)) + (~(put by dug) hen yar) -- -- =| $: %0 :: @@ -540,7 +597,7 @@ ++ scry |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] ^- (unit (unit (pair lode ,*))) - ~ + [~ ~ [%tank >dug<]] :: ++ stay [%0 dug] ++ take :: process move diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index e71757f1d..b33130427 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -2023,22 +2023,6 @@ raz=(map path race) :: statements inbound ryl=(map path rill) :: statements outbound == :: -++ bein :: terminal control - $: $: bul=@ud :: buffer length - bus=@ud :: cursor in buffer - but=(list ,@c) :: buffer text - buy=prom :: input style - == :: - $: hiz=@ud :: history depth - hux=path :: history path - hym=(map ,@ud (list ,@c)) :: history overlay - hyt=hist :: history object - hyr=(unit (list ,@c)) :: history search - == :: - $: pol=@ud :: length of prompt - pot=tape :: prompt text - == :: - == :: ++ bead ,[p=(set beam) q=cage] :: computed result ++ beam ,[[p=ship q=desk r=case] s=path] :: global name ++ beak ,[p=ship q=desk r=case] :: garnish with beak @@ -2049,30 +2033,6 @@ lys=@da :: last sent pac=rock :: packet data == :: -++ belt :: raw console input - $% [%aro p=?(%d %l %r %u)] :: arrow key - [%bac ~] :: true backspace - [%ctl p=@ud] :: control-key - [%del ~] :: true delete - [%met p=@ud] :: meta-key - [%ret ~] :: return - [%txt p=(list ,@c)] :: utf32 text - == :: -++ blew ,[p=@ud q=@ud] :: columns rows -++ blit :: raw console output - $% [%bel ~] :: make a noise - [%clr ~] :: clear the screen - [%hop p=@ud] :: set cursor position - [%lin p=(list ,@c)] :: set current line - [%mor ~] :: newline - [%sav p=path q=@] :: save to file - == :: -++ blot :: kill ring - $: p=@ud :: length - q=@ud :: depth - r=(list (list ,@c)) :: kills - == :: -++ blur ,[p=@ud q=(unit bein) r=blot] :: columns, prompt ++ boat ,[(list slip) tart] :: user stage ++ boon :: fort output $% [%beer p=ship q=@uvG] :: gained ownership @@ -2530,9 +2490,4 @@ ++ wund (list ,[p=life q=ring r=acru]) :: mace in action ++ will (list deed) :: certificate ++ worm ,* :: vase of tart -++ yard :: terminal state - $: p=? :: verbose - q=blur :: display state - r=(map path hist) :: history - == :: -- diff --git a/main/bin/tach.hoon b/main/bin/tach.hoon deleted file mode 100644 index 14397e529..000000000 --- a/main/bin/tach.hoon +++ /dev/null @@ -1,8 +0,0 @@ -:: -:: /=main=/bin/tach/hoon -:: -|= * -|= ~ -^- bowl -:_ ~ :_ ~ -[%la %leaf "you probably meant to run :chat."]