Merge commit 'f252988' into cc-merge

This commit is contained in:
C. Guy Yarvin 2016-11-13 18:51:21 -08:00
commit ba22c9b86d
3 changed files with 38 additions and 1 deletions

View File

@ -173,6 +173,19 @@
[%lin see]
[%hop pos]
==
?: ?=($klr -.bit)
=/ out/(list @c)
%- zing
%+ turn p.bit
|= a/_?>(?=(^ p.bit) i.p.bit)
~& [p.a (tufa q.a)]
q.a
%+ done %blit
:~ [%lin out]
[%mor ~]
[%lin see]
[%hop pos]
==
?: ?=($pro -.bit)
(done(see p.bit) %blit [[%lin p.bit] [%hop pos] ~])
?: ?=($hop -.bit)

View File

@ -512,6 +512,7 @@
{$sav p/path q/@} :: save to file
{$url p/@t} :: activate url
== ::
++ deco ?($~ $bl $br $un) :: text decoration
++ dill-belt :: new belt
$% {$aro p/?($d $l $r $u)} :: arrow key
{$bac $~} :: true backspace
@ -529,6 +530,7 @@
$% {$bel $~} :: make a noise
{$clr $~} :: clear the screen
{$hop p/@ud} :: set cursor position
{$klr p/stub} :: styled text
{$mor p/(list dill-blit)} :: multiple blits
{$pro p/(list @c)} :: show as cursor+line
{$qit $~} :: close console
@ -545,6 +547,14 @@
{$vega p/path} :: reboot by path
{$verb $~} :: verbose mode
== ::
++ stub (list (pair styd (list @c))) :: styled tuba
++ styd (pair (set deco) (pair tint tint)) :: decos/bg/fg
++ styl :: cascading styd
%+ pair (unit deco) ::
(pair (unit tint) (unit tint)) ::
:: ::
++ styx (list $@(@t (pair styl styx))) :: styled text
++ tint ?($~ $r $g $b $c $m $y $k $w) :: text color
-- ::dill
::
++ eyre ^?

View File

@ -787,7 +787,21 @@
::
++ ta-pro :: set prompt
|= pom/sole-prompt
+>(pom pom(cad :(welp ?.(?=($earl (clan p.gyl)) (cite p.gyl) (scow %p p.gyl)) ":" (trip q.gyl) cad.pom)))
%_ +>
pom
%_ pom
cad
;: welp
?. ?=($earl (clan:title:jael p.gyl))
(cite:title:jael p.gyl)
(scow %p p.gyl)
::
":"
(trip q.gyl)
cad.pom
==
==
==
::
++ ta-ret :: hear return
(ta-act %ret ~)