From 609566117e12d3a8845d39c01427ce3f22703a3f Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Thu, 23 Oct 2014 16:29:33 -0700 Subject: [PATCH 1/4] Arm removal with prejudice --- arvo/hoon.hoon | 3 --- 1 file changed, 3 deletions(-) diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index a074b28e6..940a4cfec 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -3258,8 +3258,6 @@ |=(a=tape (rap 3 ^-((list ,@) a))) (star ;~(pose nud low hep dot sig)) ++ voy ;~(pfix bas ;~(pose bas soq bix)) - ++ vym (bass 256 ;~(plug low (star ;~(pose low nud)))) - ++ vyn (bass 256 ;~(plug hep vym (easy ~))) -- ++ ag |% @@ -3285,7 +3283,6 @@ ;~(pfix bas ;~(pose bas soq bix:ab)) ;~(less bas soq prn) == - ++ sym (cook |=(a=(list ,@) (rap 3 a)) ;~(plug vym:ab (star vyn:ab))) ++ tyq (cook |=(a=(list ,@) (rap 3 a)) (plus siq:ab)) ++ viz (ape (bass 0x200.0000 ;~(plug pev:ab (star ;~(pfix dog piv:ab))))) ++ vum (bass 32 (plus siv:ab)) From 23b57f3b2731075722a6fc488420f9a0bd6138fd Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Thu, 23 Oct 2014 17:21:28 -0700 Subject: [PATCH 2/4] Further disarming --- arvo/hoon.hoon | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 940a4cfec..74f8ca9ec 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -3277,12 +3277,6 @@ ++ hex (ape (bass 0x1.0000 ;~(plug qex:ab (star ;~(pfix dog qix:ab))))) ++ lip =+ tod=(ape ted:ab) (bass 256 ;~(plug tod (stun [3 3] ;~(pfix dog tod)))) - ++ qut %+ ifix [soq soq] - %+ boss 256 - %- star ;~ pose - ;~(pfix bas ;~(pose bas soq bix:ab)) - ;~(less bas soq prn) - == ++ tyq (cook |=(a=(list ,@) (rap 3 a)) (plus siq:ab)) ++ viz (ape (bass 0x200.0000 ;~(plug pev:ab (star ;~(pfix dog piv:ab))))) ++ vum (bass 32 (plus siv:ab)) From 22feaa507af5e196796ec44fd9cf428b9442b0d5 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Fri, 24 Oct 2014 12:58:04 -0700 Subject: [PATCH 3/4] Term-line restructure: (list ?(tank [%stem tank tank])) --- arvo/dill.hoon | 11 +++++++++-- main/app/terminal/core.hook | 2 +- main/mar/term-line/door.hook | 6 +++--- main/sur/term-line/gate.hook | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/arvo/dill.hoon b/arvo/dill.hoon index 86d678e99..e6d1f7b8f 100644 --- a/arvo/dill.hoon +++ b/arvo/dill.hoon @@ -110,7 +110,8 @@ [%res p=span] :: [%cmd p=char] :: == == :: -++ term-line ,[p=cord q=(list cord) r=(list tank)] :: +++ term-line ,[p=cord q=(list cord) r=(list tark)] :: +++ tark ?(tank [%stem p=tank q=tank]) :: :::::::: :: dill tiles ++ bein :: terminal control $: $: bul=@ud :: buffer length @@ -358,7 +359,13 @@ %note ?.(p.yar +>.$ (fume p.+.sih q.+.sih)) :: debug message ?(%rush %rust) :: XX reset prompt ?> ?=(%term-line +>-.sih) - =. +>.$ (furl (zing (turn r.q.sih |=(a=tank (~(win re a) 0 p.q.yar))))) + =. +>.$ + =- (furl (zing (turn r.q.sih -))) + |= a=tark + ^- wall + ?+ -.a (~(win re a) 0 p.q.yar) + %stem ~[~(ram re p.a) ~(ram re p.a)] + == %- edit =| bed=bein =+ ^= hyt ^- hist diff --git a/main/app/terminal/core.hook b/main/app/terminal/core.hook index 7e990d332..9b023a2b7 100644 --- a/main/app/terminal/core.hook +++ b/main/app/terminal/core.hook @@ -148,7 +148,7 @@ %line :: command entered =. r.tel :_ r.tel - rose/[~ ~ ~]^~[leaf/(trip p.tel) leaf/(trip p.jof)] + stem/[leaf/(trip p.tel) leaf/(trip p.jof)] =. hiz (~(put by hiz) pax tel) ?: =('\\' (end 3 1 p.jof)) $(jof [%cmd (rsh 3 1 p.jof)]) diff --git a/main/mar/term-line/door.hook b/main/mar/term-line/door.hook index e03c07d9c..fb75d6729 100644 --- a/main/mar/term-line/door.hook +++ b/main/mar/term-line/door.hook @@ -18,10 +18,10 @@ [%history %a (turn q.tel |=(a=cord [%s a]))] :+ %lines %a %- zing ^- (list (list ^json)) - %+ turn (flop r.tel) |= a=tank - ?. ?=([%rose [[%'>' %' ' ~] ~ ~] [%leaf *] [%leaf *] ~] a) + %+ turn (flop r.tel) |= a=?(tank [%stem p=tank q=tank]) + ?. ?=(%stem -.a) (turn (wash 0^80 a) jape) - [(jobe prompt/(jape p.i.q.a) task/(jape p.i.t.q.a) ~)]~ + [(jobe prompt/(jape ~(ram re p.a)) task/(jape ~(ram re q.a)) ~)]~ == -- -- diff --git a/main/sur/term-line/gate.hook b/main/sur/term-line/gate.hook index c48af45cc..65511b4c2 100644 --- a/main/sur/term-line/gate.hook +++ b/main/sur/term-line/gate.hook @@ -1 +1 @@ -,[p=cord q=(list cord) r=(list tank)] +,[p=cord q=(list cord) r=(list ?(tank [%stem p=tank q=tank]))] From f25de520d6c6413c4ec7c5b8082654c176dd5377 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Fri, 24 Oct 2014 13:08:19 -0700 Subject: [PATCH 4/4] Offset input --- main/app/terminal/hymn/script.js | 5 ++--- main/app/terminal/hymn/style.css | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/main/app/terminal/hymn/script.js b/main/app/terminal/hymn/script.js index c3598938b..817cb73f9 100644 --- a/main/app/terminal/hymn/script.js +++ b/main/app/terminal/hymn/script.js @@ -35,7 +35,7 @@ $(function() { if(e.shiftKey) return true v = prom.val().replace(/\xa0/g, ' ') $(cont).append($('').html(prem.innerHTML), - $('').text(v)) + $('
').text(v)) jpok('line', v) hist.unshift(v) @@ -90,8 +90,7 @@ $(function() { $(cont).append($('
').text(lom)) else { $(cont).append($('').text(lom.prompt), - $('').text(lom.task), - $('
')) + $('
').text(lom.task)) } } window.scrollTo(0,document.body.scrollHeight) diff --git a/main/app/terminal/hymn/style.css b/main/app/terminal/hymn/style.css index 4b6c67e70..32a0a9567 100644 --- a/main/app/terminal/hymn/style.css +++ b/main/app/terminal/hymn/style.css @@ -26,9 +26,11 @@ button { background-color: #fff; padding: 1rem; } -#prom-cont { +#prom-cont, +.prom { display: block; position:relative; + left: 1rem; } textarea, #prom-size {