mirror of
https://github.com/urbit/shrub.git
synced 2024-12-25 04:52:06 +03:00
lull: make dill-blit explicit superset of blit
Likewise for belt. This necessitates renaming the %mor blit for newlines to %nel, making this require a new runtime version. That's fine, more breaking changes are to follow.
This commit is contained in:
fang
parent
f88318b1b7
commit
776de8b3d9
@ -725,7 +725,7 @@
|
||||
(ta-hom %del (dec pos.inp))
|
||||
::
|
||||
++ ta-ctl :: hear control
|
||||
|= key=@ud
|
||||
|= key=@c
|
||||
^+ +>
|
||||
=. ris ?.(?=(?(%g %r) key) ~ ris)
|
||||
?+ key ta-bel
|
||||
@ -790,11 +790,10 @@
|
||||
++ ta-fec :: apply effect
|
||||
|= fec=sole-effect
|
||||
^+ +>
|
||||
?- fec
|
||||
?+ fec +>(..ta (se-blit fec))
|
||||
[%bel *] ta-bel
|
||||
[%blk *] +>
|
||||
[%bye *] +>(..ta (se-klin gyl))
|
||||
[%clr *] +>(..ta (se-blit fec))
|
||||
[%det *] (ta-got +.fec)
|
||||
[%err *] (ta-err p.fec)
|
||||
[%klr *] +>(..ta (se-blit %klr (make:klr p.fec)))
|
||||
@ -805,10 +804,7 @@
|
||||
[%pro *] (ta-pro +.fec)
|
||||
[%tab *] +>(..ta (se-tab p.fec))
|
||||
[%tan *] +>(..ta (se-dump p.fec))
|
||||
[%sag *] +>(..ta (se-blit fec))
|
||||
[%sav *] +>(..ta (se-blit fec))
|
||||
[%txt *] +>(..ta (se-text p.fec))
|
||||
[%url *] +>(..ta (se-blit fec))
|
||||
==
|
||||
::
|
||||
++ ta-dog :: change cursor
|
||||
@ -878,7 +874,7 @@
|
||||
==
|
||||
::
|
||||
++ ta-met :: meta key
|
||||
|= key=@ud
|
||||
|= key=@c
|
||||
^+ +>
|
||||
=. ris ~
|
||||
?+ key ta-bel
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
%clr b+&
|
||||
%hop (numb p.blit)
|
||||
%lin a+(turn p.blit |=(c=@c s+(tuft c)))
|
||||
%mor b+&
|
||||
%nel b+&
|
||||
%url s+p.blit
|
||||
::
|
||||
%sag
|
||||
|
||||
@ -1045,7 +1045,7 @@
|
||||
:::: :: (1d2)
|
||||
::
|
||||
+$ blew [p=@ud q=@ud] :: columns rows
|
||||
+$ belt :: old belt
|
||||
+$ belt :: outside belt
|
||||
$% [%aro p=?(%d %l %r %u)] :: arrow key
|
||||
[%bac ~] :: true backspace
|
||||
[%ctl p=@c] :: control-key
|
||||
@ -1054,43 +1054,31 @@
|
||||
[%ret ~] :: return
|
||||
[%txt p=(list @c)] :: utf32 text
|
||||
== ::
|
||||
+$ blit :: old blit
|
||||
+$ blit :: outside blit
|
||||
$% [%bel ~] :: make a noise
|
||||
[%clr ~] :: clear the screen
|
||||
[%hop p=@ud] :: set cursor position
|
||||
[%klr p=stub] :: set styled line
|
||||
[%lin p=(list @c)] :: set current line
|
||||
[%mor ~] :: newline
|
||||
[%nel ~] :: newline
|
||||
[%sag p=path q=*] :: save to jamfile
|
||||
[%sav p=path q=@] :: save to file
|
||||
[%url p=@t] :: activate url
|
||||
== ::
|
||||
+$ dill-belt :: new belt
|
||||
$% [%aro p=?(%d %l %r %u)] :: arrow key
|
||||
[%bac ~] :: true backspace
|
||||
+$ dill-belt :: inside belt
|
||||
$% belt :: outside belt
|
||||
[%cru p=@tas q=(list tank)] :: echo error
|
||||
[%ctl p=@] :: control-key
|
||||
[%del ~] :: true delete
|
||||
[%hey ~] :: refresh
|
||||
[%met p=@] :: meta-key
|
||||
[%ret ~] :: return
|
||||
[%rez p=@ud q=@ud] :: resize, cols, rows
|
||||
[%txt p=(list @c)] :: utf32 text
|
||||
[%yow p=gill:gall] :: connect to app
|
||||
== ::
|
||||
+$ dill-blit :: new blit
|
||||
$% [%bel ~] :: make a noise
|
||||
[%clr ~] :: clear the screen
|
||||
[%hop p=@ud] :: set cursor position
|
||||
[%klr p=stub] :: styled text
|
||||
+$ dill-blit :: inside blit
|
||||
$% blit :: outside blit
|
||||
[%mor p=(list dill-blit)] :: multiple blits
|
||||
[%pom p=stub] :: styled prompt
|
||||
[%pro p=(list @c)] :: show as cursor+line
|
||||
[%qit ~] :: close console
|
||||
[%out p=(list @c)] :: send output line
|
||||
[%sag p=path q=*] :: save to jamfile
|
||||
[%sav p=path q=@] :: save to file
|
||||
[%url p=@t] :: activate url
|
||||
== ::
|
||||
+$ flog :: sent to %dill
|
||||
$% [%crop p=@ud] :: trim kernel state
|
||||
|
||||
@ -169,14 +169,14 @@
|
||||
?: ?=(%out -.bit)
|
||||
%+ done %blit
|
||||
:~ [%lin p.bit]
|
||||
[%mor ~]
|
||||
[%nel ~]
|
||||
see
|
||||
[%hop pos]
|
||||
==
|
||||
?: ?=(%klr -.bit)
|
||||
%+ done %blit
|
||||
:~ [%klr p.bit]
|
||||
[%mor ~]
|
||||
[%nel ~]
|
||||
see
|
||||
[%hop pos]
|
||||
==
|
||||
|
||||
@ -63,7 +63,7 @@ export default class Store {
|
||||
this.state.lines[this.state.lines.length - 1] = blit;
|
||||
this.setState({ lines: this.state.lines });
|
||||
break;
|
||||
case 'mor':
|
||||
case 'nel':
|
||||
this.state.lines.push('');
|
||||
this.setState({ lines: this.state.lines });
|
||||
break;
|
||||
|
||||
@ -770,6 +770,7 @@
|
||||
# define c3__ne c3_s2('n','e')
|
||||
# define c3__need c3_s4('n','e','e','d')
|
||||
# define c3__neft c3_s4('n','e','f','t')
|
||||
# define c3__nel c3_s3('n','e','l')
|
||||
# define c3__nest c3_s4('n','e','s','t')
|
||||
# define c3__netd c3_s4('n','e','t','d')
|
||||
# define c3__new c3_s3('n','e','w')
|
||||
|
||||
@ -1405,7 +1405,7 @@ _term_ef_blit(u3_utty* uty_u,
|
||||
_term_it_show_tour(uty_u, u3k(u3t(blt)));
|
||||
} break;
|
||||
|
||||
case c3__mor: {
|
||||
case c3__nel: {
|
||||
_term_it_show_more(uty_u);
|
||||
} break;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user