xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

vt: get rid of "clear" menu entry, fix 24x80 resize, reset selection on setdim(), document snarf/plumb

Browse source
This commit is contained in:
cinap_lenrek 2018-09-03 21:51:32 +02:00
parent 80cd634c4d
commit 676298b16b
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sys/man/1/vt
View file

@ -106,10 +106,6 @@ Display the last screenful; the same as going
.B forward .B forward
to the end. to the end.
.TP .TP
.B clear
Clear the screen. Previous contents can be recovered using
.BR backup .
.TP
.B paste .B paste
Pastes the contents of the Pastes the contents of the
.B rio .B rio
@ -119,6 +115,14 @@ in the
.B rio .B rio
menu. menu.
.TP .TP
.B snarf
Copy selection to the
.B rio
snarf buffer.
.TP
.B plumb
Send selection to the plumber.
.TP
.B scroll .B scroll
Make new lines visible as they appear at the bottom. Make new lines visible as they appear at the bottom.
.TP .TP

20
sys/src/cmd/vt/main.c
View file

@ -17,7 +17,6 @@ enum menuact2{
Mbackup, Mbackup,
Mforward, Mforward,
Mreset, Mreset,
Mclear,
Mpaste, Mpaste,
Msnarf, Msnarf,
Mplumb, Mplumb,
@ -37,7 +36,6 @@ char *menutext2[] = {
[Mbackup] "backup", [Mbackup] "backup",
[Mforward] "forward", [Mforward] "forward",
[Mreset] "reset", [Mreset] "reset",
[Mclear] "clear",
[Mpaste] "paste", [Mpaste] "paste",
[Msnarf] "snarf", [Msnarf] "snarf",
[Mplumb] "plumb", [Mplumb] "plumb",
@ -166,7 +164,7 @@ void bigscroll(void);
void readmenu(void); void readmenu(void);
void selection(void); void selection(void);
int selected(int, int); int selected(int, int);
void resize(void); void resized(void);
void drawcursor(void); void drawcursor(void);
void send_interrupt(void); void send_interrupt(void);
int alnum(int); int alnum(int);
@ -225,7 +223,7 @@ sendnchars(int n, char *p)
drawcursor(); drawcursor();
waitio(); waitio();
if(resize_flag) if(resize_flag)
resize(); resized();
} }
} }
@ -328,8 +326,8 @@ threadmain(int argc, char **argv)
bgcolor = (blkbg? display->black: display->white); bgcolor = (blkbg? display->black: display->white);
fgcolor = (blkbg? display->white: display->black); fgcolor = (blkbg? display->white: display->black);
bgselected = allocimage(display, Rect(0,0,1,1), CMAP8, 1, blkbg ? 0x333333FF : 0xCCCCCCFF); bgselected = allocimage(display, Rect(0,0,1,1), CMAP8, 1, blkbg ? 0x333333FF : 0xCCCCCCFF);
fgselected = allocimage(display, Rect(0,0,1,1), CMAP8, 1, blkbg ? 0xCCCCCCFF : 0x333333FF);; fgselected = allocimage(display, Rect(0,0,1,1), CMAP8, 1, blkbg ? 0xCCCCCCFF : 0x333333FF);
resize(); resized();
pidchan = chancreate(sizeof(int), 0); pidchan = chancreate(sizeof(int), 0);
proccreate(runcmd, argv, 16*1024); proccreate(runcmd, argv, 16*1024);
@ -648,7 +646,7 @@ waitchar(void)
for(;;) { for(;;) {
if(resize_flag) if(resize_flag)
resize(); resized();
if(backp) if(backp)
return(0); return(0);
if(snarffp) { if(snarffp) {
@ -873,6 +871,7 @@ setdim(int ht, int wid)
free(screenchangebuf); free(screenchangebuf);
screenchangebuf = emalloc9p(ymax+1); screenchangebuf = emalloc9p(ymax+1);
scrolloff = 0; scrolloff = 0;
selrect = ZR;
free(onscreenrbuf); free(onscreenrbuf);
onscreenrbuf = emalloc9p((ymax+1)*(xmax+2)*sizeof(Rune)); onscreenrbuf = emalloc9p((ymax+1)*(xmax+2)*sizeof(Rune));
@ -899,7 +898,7 @@ setdim(int ht, int wid)
} }
void void
resize(void) resized(void)
{ {
if(resize_flag > 1 && getwindow(display, Refnone) < 0){ if(resize_flag > 1 && getwindow(display, Refnone) < 0){
fprint(2, "can't reattach to window: %r\n"); fprint(2, "can't reattach to window: %r\n");
@ -1075,6 +1074,7 @@ readmenu(void)
switch(menuhit(3, mc, &menu3, nil)) { switch(menuhit(3, mc, &menu3, nil)) {
case M24x80: /* 24x80 */ case M24x80: /* 24x80 */
setdim(24, 80); setdim(24, 80);
backup(backc);
return; return;
case Mcrnl: /* newline after cr? */ case Mcrnl: /* newline after cr? */
ttystate[cs->raw].crnl = !ttystate[cs->raw].crnl; ttystate[cs->raw].crnl = !ttystate[cs->raw].crnl;
@ -1118,10 +1118,6 @@ readmenu(void)
backup(0); backup(0);
return; return;
case Mclear: /* clear screen */
resize_flag = 1;
return;
case Mpaste: /* paste the snarf buffer */ case Mpaste: /* paste the snarf buffer */
paste(); paste();
return; return;