From 5739d77bc5ed29b907e264d4d8187dbc7618364d Mon Sep 17 00:00:00 2001 From: Galen Wolfe-Pauly Date: Tue, 7 Oct 2014 11:34:21 -0700 Subject: [PATCH 1/3] just a few minor changes --- main/app/terminal/core.hook | 45 +++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/main/app/terminal/core.hook b/main/app/terminal/core.hook index 066d03932..fbe1738e2 100644 --- a/main/app/terminal/core.hook +++ b/main/app/terminal/core.hook @@ -68,6 +68,8 @@ ;script(src "//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"); ;script: urb.appl = "{(trip app.hid)}" ;script: urb.term = \{pax: "{(spud pax)}"} + ;script(src "//use.typekit.net/fkv0sjk.js"); + ;script:'try{Typekit.load();}catch(e){}' ;script:''' jpok = function(a,b){ var dat = {pax:urb.term.pax, act:{}} @@ -84,8 +86,9 @@ } body, span, + pre, input { - font-family: monospace; + font-family: 'source-code-pro', monospace; font-size: 1rem; background-color: #000; color: #fff; @@ -117,26 +120,30 @@ var hist = [], hind = 0; $(prom).keydown(function(e){ switch(e.which){ - default: return true - break; case 13: // %retn - prem.textContent += prom.value - jpok('line', prom.value) - hist.unshift(prom.value) - $(this).val('') - break; case 38: // %up - if(hind == hist.length) return true; - prom.value = [hist[hind], hist[hind] = prom.value][0] - hind++ - return false - break; case 40: // %down - if(hind == 0) return true - hind-- - prom.value = [hist[hind], hist[hind] = prom.value][0] - return false + default: return true + break; + case 13: // %retn + prem.textContent += prom.value + jpok('line', prom.value) + hist.unshift(prom.value) + $(this).val('') + break; + case 38: // %up + if(hind == hist.length) return true; + prom.value = [hist[hind], hist[hind] = prom.value][0] + hind++ + return false + break; + case 40: // %down + if(hind == 0) return true + hind-- + prom.value = [hist[hind], hist[hind] = prom.value][0] + return false } }) - $(prom).focus() - $(prem).on('click', function() { $(prom).focus(); }) + var focus = function() { $(prom).focus(); } + $('body').on('click', focus) + focus() var pax = '/lines' if(urb.term.pax != "/") pax += urb.term.pax urb.subscribe({path: pax}, function(e, dat){ From 7b6e95df86ab12d2bda0a76a225ee39f4b2454b3 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Tue, 7 Oct 2014 14:58:35 -0700 Subject: [PATCH 2/3] Re-fixed history (apparently it got lost in transit) --- main/app/shell/core.hook | 9 ++++++--- main/app/terminal/core.hook | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/main/app/shell/core.hook b/main/app/shell/core.hook index 5d83386c9..7f2a32494 100644 --- a/main/app/shell/core.hook +++ b/main/app/shell/core.hook @@ -10,14 +10,17 @@ :: |% :: ++ gift :: - $% [%rush p=%txt q=cord] :: - [%rush p=%term-line q=term-line] :: + $% [%rush p=gilt] :: [%mean p=ares] :: [%nice ~] :: [%meta p=vase] :: [%veer p=@ta q=path r=@t] :: [%vega p=path] :: == :: +++ gilt :: + $% [%term-line p=term-line] :: + [%txt p=cord] :: + == :: ++ hapt ,[p=ship q=path] :: ++ move ,[p=bone q=(mold note gift)] :: ++ note :: @@ -287,7 +290,7 @@ ++ stash |= [a=bone b=ship c=cord] %^ spam /out %meta - !>(`gift`[%rush %term-line [prompt [c]~ ~]]) + !>([%rush %term-line [prompt [c]~ ~]]) :: ++ print |=([a=bone b=ship c=(list tank)] (print-vase a b !>(c))) ++ print-vase diff --git a/main/app/terminal/core.hook b/main/app/terminal/core.hook index fbe1738e2..49da8ddc6 100644 --- a/main/app/terminal/core.hook +++ b/main/app/terminal/core.hook @@ -203,7 +203,7 @@ :_ +>.$ %+ welp mof :^ [ost %give %nice ~] - :^ ost %pass hi/in/pax + :^ ost %pass hi/in/[pax] :^ %g %show [our.hid (encode p.jof pax) imp.hid] :- you /out [ost %pass hi/mar/pax %g %sire [p.jof (encode p.jof pax)]] From d151549e4354bdfeb74b04110d7c6b0d7b353f30 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Tue, 7 Oct 2014 15:38:15 -0700 Subject: [PATCH 3/3] Prompt resets --- main/app/shell/core.hook | 12 +++++++++--- main/app/terminal/core.hook | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/main/app/shell/core.hook b/main/app/shell/core.hook index 7f2a32494..cdf928a89 100644 --- a/main/app/shell/core.hook +++ b/main/app/shell/core.hook @@ -106,7 +106,8 @@ (print ost you ~) %out :: to terminal ?> ?=(~ t.pax) - `+>.$ + :_ +>.$ + [ost %give %rush %term-line `term-line`[prompt ~ ~]]~ == :: ++ cubs @@ -251,6 +252,7 @@ ++ purr |= [ost=bone pax=path typ=type sih=sign] ^- [(list move) _+>] + ::~& shel-purr/pax :: ~& [%shell-pour -.sih (,@ta +<.sih)] ::=+ sih=((hard sign) sih) ?: ?=(%veer +<.sih) :: vomit @@ -272,7 +274,9 @@ ?+ &3.pax ~& %strange-child-path !! %main ?> ?=(?(%nice %mean) +<.sih) - [ost %give +.sih]~ + :- [ost %give +.sih] + ::~& act + (print ost our.hid ~) %out ?. ?=(?(%rust %rush) +<.sih) ~ ?: (~(has by pip) &2.pax) @@ -290,16 +294,18 @@ ++ stash |= [a=bone b=ship c=cord] %^ spam /out %meta - !>([%rush %term-line [prompt [c]~ ~]]) + !>([%rush %term-line `term-line`[prompt [c]~ ~]]) :: ++ print |=([a=bone b=ship c=(list tank)] (print-vase a b !>(c))) ++ print-vase |= [ost=bone you=ship tan=vase] :: [p=p:!>(*(list tank)) q=*] ^- (list move) + ::~& shel-print/prompt %^ spam /out %meta :(slop !>(%rush) !>(%term-line) !>(prompt) !>(~) tan) :: ++ prompt + ^- @t ?^ act (rap 3 (~(got by cub.hid) u.act) '(' u.act ') ' ~) ?. =('0' &3.pax) diff --git a/main/app/terminal/core.hook b/main/app/terminal/core.hook index 49da8ddc6..88437653d 100644 --- a/main/app/terminal/core.hook +++ b/main/app/terminal/core.hook @@ -233,8 +233,9 @@ (some (jell ost pax)) :: ++ pour - |= [ost=bone pax=path sih=sign] + |= [ost=bone pax=path sih=*] ^- [(list move) _+>] + =+ sih=;;(sign sih) :: XX gall types ?: ?=(%veer +<.sih) :: vomit [[ost %give +.sih]~ +>.$] ?: ?=(%vega +<.sih) :: vomit