o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Various fixes.

Browse source
This commit is contained in:
rsc 2003-12-04 04:29:47 +00:00
parent d2a414f28d
commit 3fd755b763
1 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/cmd/9term/9term.c
View file

@ -3,7 +3,7 @@
Rectangle scrollr; /* scroll bar rectangle */ Rectangle scrollr; /* scroll bar rectangle */
Rectangle lastsr; /* used for scroll bar */ Rectangle lastsr; /* used for scroll bar */
int holdon; /* hold mode */ int holdon; /* hold mode */
int rawon(void); /* raw mode */ int rawon; /* raw mode */
int scrolling; /* window scrolls */ int scrolling; /* window scrolls */
int clickmsec; /* time of last click */ int clickmsec; /* time of last click */
uint clickq0; /* point of last click */ uint clickq0; /* point of last click */
@ -59,7 +59,7 @@ Cursor whitearrow = {
void void
usage(void) usage(void)
{ {
fprint(2, "usage: 9term [-a] [-s] [cmd ...]\n"); fprint(2, "usage: 9term [-ars] [cmd ...]\n");
threadexitsall("usage"); threadexitsall("usage");
} }
@ -76,6 +76,10 @@ threadmain(int argc, char *argv[])
case 'a': /* acme mode */ case 'a': /* acme mode */
button2exec++; button2exec++;
break; break;
case 'r':
/* not clear this is useful */
rawon = 1;
break;
case 's': case 's':
scrolling++; scrolling++;
break; break;
@ -162,16 +166,6 @@ hoststart(void)
proccreate(hostproc, hostc, 32*1024); proccreate(hostproc, hostc, 32*1024);
} }
int crawon = -1;
int
rawon(void)
{
if(crawon != -1)
return crawon;
return 0;
}
void void
loop(void) loop(void)
{ {
@ -193,7 +187,6 @@ loop(void)
a[2].op = CHANRCV; a[2].op = CHANRCV;
if(!scrolling && t.qh > t.org+t.f->nchars) if(!scrolling && t.qh > t.org+t.f->nchars)
a[2].op = CHANNOP;; a[2].op = CHANNOP;;
crawon = -1;
switch(alt(a)) { switch(alt(a)) {
default: default:
fatal("impossible"); fatal("impossible");
@ -353,7 +346,7 @@ mouse(void)
if (ptinrect(t.m.xy, scrollr)) { if (ptinrect(t.m.xy, scrollr)) {
scroll(but); scroll(but);
if(t.qh<=t.org+t.f->nchars) if(t.qh<=t.org+t.f->nchars)
consread();; consread();
return; return;
} }
@ -529,8 +522,9 @@ key(Rune r)
return; return;
} }
if(rawon() && t.q0==t.nr){ if(rawon && t.q0==t.nr){
addraw(&r, 1); addraw(&r, 1);
consread();
return; return;
} }
@ -610,7 +604,8 @@ consready(void)
if(holdon) if(holdon)
return 0; return 0;
if(rawon()) fprint(2, "consready? %d %d\n", rawon, t.nraw);
if(rawon)
return t.nraw != 0; return t.nraw != 0;
/* look to see if there is a complete line */ /* look to see if there is a complete line */
@ -646,7 +641,7 @@ consread(void)
c = *p; c = *p;
p += width; p += width;
n -= width; n -= width;
if(!rawon() && (c == '\n' || c == '\004')) if(!rawon && (c == '\n' || c == '\004'))
break; break;
} }
/* take out control-d when not doing a zero length write */ /* take out control-d when not doing a zero length write */
@ -893,7 +888,7 @@ paste(Rune *r, int n, int advance)
uint m; uint m;
uint q0; uint q0;
if(rawon() && t.q0==t.nr){ if(rawon && t.q0==t.nr){
addraw(r, n); addraw(r, n);
return; return;
} }