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

change to use new library.

Browse source
This commit is contained in:
rsc 2005-01-04 21:27:19 +00:00
parent 30968c3fe9
commit 452c09358f
2 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/9term/mkfile
View file

@ -6,11 +6,7 @@ OFILES=\
rcstart.$O\ rcstart.$O\
$SYSNAME.$O\ $SYSNAME.$O\
SHORTLIB=complete frame draw plumb fs mux thread 9
<$PLAN9/src/mkmany <$PLAN9/src/mkmany
LDFLAGS=-L$X11/lib -lX11
Darwin.$O Linux.$O FreeBSD.$O: bsdpty.c Darwin.$O Linux.$O FreeBSD.$O: bsdpty.c

42
src/cmd/9term/win.c
View file

@ -2,7 +2,7 @@
#include <libc.h> #include <libc.h>
#include <thread.h> #include <thread.h>
#include <fcall.h> #include <fcall.h>
#include <fs.h> #include <9pclient.h>
#include "term.h" #include "term.h"
int noecho = 1; int noecho = 1;
@ -43,10 +43,10 @@ struct Q
Q q; Q q;
Fid *eventfd; CFid *eventfd;
Fid *addrfd; CFid *addrfd;
Fid *datafd; CFid *datafd;
Fid *ctlfd; CFid *ctlfd;
// int bodyfd; // int bodyfd;
char *typing; char *typing;
@ -66,15 +66,15 @@ int label(char*, int);
void error(char*); void error(char*);
void stdinproc(void*); void stdinproc(void*);
void stdoutproc(void*); void stdoutproc(void*);
void type(Event*, int, Fid*, Fid*); void type(Event*, int, CFid*, CFid*);
void sende(Event*, int, Fid*, Fid*, Fid*, int); void sende(Event*, int, CFid*, CFid*, CFid*, int);
char *onestring(int, char**); char *onestring(int, char**);
int delete(Event*); int delete(Event*);
void deltype(uint, uint); void deltype(uint, uint);
void runproc(void*); void runproc(void*);
int int
fsfidprint(Fid *fid, char *fmt, ...) fsfidprint(CFid *fid, char *fmt, ...)
{ {
char buf[256]; char buf[256];
va_list arg; va_list arg;
@ -129,7 +129,7 @@ threadmain(int argc, char **argv)
int fd, id; int fd, id;
char buf[256]; char buf[256];
char buf1[128]; char buf1[128];
Fsys *fs; CFsys *fs;
ARGBEGIN{ ARGBEGIN{
case 'd': case 'd':
@ -240,7 +240,7 @@ onestring(int argc, char **argv)
} }
int int
getec(Fid *efd) getec(CFid *efd)
{ {
static char buf[8192]; static char buf[8192];
static char *bufp; static char *bufp;
@ -257,7 +257,7 @@ getec(Fid *efd)
} }
int int
geten(Fid *efd) geten(CFid *efd)
{ {
int n, c; int n, c;
@ -270,7 +270,7 @@ geten(Fid *efd)
} }
int int
geter(Fid *efd, char *buf, int *nb) geter(CFid *efd, char *buf, int *nb)
{ {
Rune r; Rune r;
int n; int n;
@ -289,7 +289,7 @@ geter(Fid *efd, char *buf, int *nb)
} }
void void
gete(Fid *efd, Event *e) gete(CFid *efd, Event *e)
{ {
int i, nb; int i, nb;
@ -327,10 +327,10 @@ nrunes(char *s, int nb)
void void
stdinproc(void *v) stdinproc(void *v)
{ {
Fid *cfd = ctlfd; CFid *cfd = ctlfd;
Fid *efd = eventfd; CFid *efd = eventfd;
Fid *dfd = datafd; CFid *dfd = datafd;
Fid *afd = addrfd; CFid *afd = addrfd;
int fd0 = rcfd; int fd0 = rcfd;
Event e, e2, e3, e4; Event e, e2, e3, e4;
@ -429,8 +429,8 @@ void
stdoutproc(void *v) stdoutproc(void *v)
{ {
int fd1 = rcfd; int fd1 = rcfd;
Fid *afd = addrfd; CFid *afd = addrfd;
Fid *dfd = datafd; CFid *dfd = datafd;
int n, m, w, npart; int n, m, w, npart;
char *buf, *s, *t; char *buf, *s, *t;
Rune r; Rune r;
@ -648,7 +648,7 @@ deltype(uint p0, uint p1)
} }
void void
type(Event *e, int fd0, Fid *afd, Fid *dfd) type(Event *e, int fd0, CFid *afd, CFid *dfd)
{ {
int m, n, nr; int m, n, nr;
char buf[128]; char buf[128];
@ -676,7 +676,7 @@ type(Event *e, int fd0, Fid *afd, Fid *dfd)
} }
void void
sende(Event *e, int fd0, Fid *cfd, Fid *afd, Fid *dfd, int donl) sende(Event *e, int fd0, CFid *cfd, CFid *afd, CFid *dfd, int donl)
{ {
int l, m, n, nr, lastc, end; int l, m, n, nr, lastc, end;
char abuf[16], buf[128]; char abuf[16], buf[128];