X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=std.c;h=ef9e57ac89b0ca7ea06090dbf1194a8fd24de574;hb=e0d0a2b96e84bba95f6f3e274131e3bbfb3a4f56;hp=1b918f557096f6273fdb14a2a1e4caa088da7915;hpb=47d8633f157156ef4701ce71ed7eff766206c107;p=st.git diff --git a/std.c b/std.c index 1b918f5..ef9e57a 100644 --- a/std.c +++ b/std.c @@ -1,11 +1,12 @@ -#include -#include -#include +/* See LICENSE file for copyright and license details. */ #include #include #include -#include +#include #include +#if !(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) +#include +#endif #include #include #include @@ -17,19 +18,18 @@ #define MAX(a,b) (((a) > (b)) ? (a) : (b)) #define MIN(a,b) (((a) < (b)) ? (a) : (b)) -void buffer(char c); -void cmd(const char *cmdstr, ...); -void *emallocz(unsigned int size); -void eprint(const char *errstr, ...); -void eprintn(const char *errstr, ...); -void getpty(void); -void movea(int x, int y); -void mover(int x, int y); -void parseesc(void); -void scroll(int l); -void shell(void); -void sigchld(int n); -char unbuffer(void); +static void buffer(char c); +static void cmd(const char *cmdstr, ...); +static int getch(); +static void getpty(void); +static void movea(int x, int y); +static void mover(int x, int y); +static void parseesc(void); +static void scroll(int l); +static void shell(void); +static void sigchld(int n); +static char unbuffer(void); +static void ungetch(int c); typedef struct { unsigned char data[BUFSIZ]; @@ -37,14 +37,19 @@ typedef struct { int n; } RingBuffer; -int cols = 80, lines = 25; -int cx = 0, cy = 0; -int c; -FILE *fptm = NULL; -int ptm, pts; -_Bool bold, digit, qmark; -pid_t pid; -RingBuffer buf; +typedef struct { + unsigned char data[BUFSIZ]; + int i, n; +} ReadBuffer; + +static int cols = 80, lines = 25; +static int cx = 0, cy = 0; +static int c; +static int ptm, pts; +static _Bool bold, digit, qmark; +static pid_t pid; +static RingBuffer buf; +static ReadBuffer rbuf; void buffer(char c) { @@ -67,34 +72,15 @@ cmd(const char *cmdstr, ...) { va_end(ap); } -void * -emallocz(unsigned int size) { - void *res = calloc(1, size); - - if(!res) - eprint("fatal: could not malloc() %u bytes\n", size); - return res; -} - -void -eprint(const char *errstr, ...) { - va_list ap; - - va_start(ap, errstr); - vfprintf(stderr, errstr, ap); - va_end(ap); - exit(EXIT_FAILURE); -} - -void -eprintn(const char *errstr, ...) { - va_list ap; - - va_start(ap, errstr); - vfprintf(stderr, errstr, ap); - va_end(ap); - fprintf(stderr, ": %s\n", strerror(errno)); - exit(EXIT_FAILURE); +int +getch() { + if(rbuf.i++ >= rbuf.n) { + rbuf.n = read(ptm, rbuf.data, LENGTH(rbuf.data)); + if(rbuf.n == -1) + err(EXIT_FAILURE, "cannot read from slave pty"); + rbuf.i = 0; + } + return rbuf.data[rbuf.i]; } void @@ -103,7 +89,7 @@ movea(int x, int y) { y = MAX(y, lines); cx = x; cy = y; - cmd("s %d,%d", x, y); + cmd("seek(%d,%d)", x, y); } void @@ -117,10 +103,10 @@ parseesc(void) { int arg[16]; memset(arg, 0, LENGTH(arg)); - c = getc(fptm); + c = getch(); switch(c) { case '[': - c = getc(fptm); + c = getch(); for(j = 0; j < LENGTH(arg);) { if(isdigit(c)) { digit = 1; @@ -131,7 +117,7 @@ parseesc(void) { qmark = 1; else if(c == ';') { if(!digit) - eprint("syntax error\n"); + errx(EXIT_FAILURE, "syntax error"); digit = 0; j++; } @@ -142,7 +128,7 @@ parseesc(void) { } break; } - c = getc(fptm); + c = getch(); } switch(c) { case '@': @@ -204,10 +190,10 @@ parseesc(void) { case 0: case 22: if(bold) - cmd("b"); + cmd("bold"); case 1: if(!bold) - cmd("b"); + cmd("bold"); break; } } @@ -216,13 +202,45 @@ parseesc(void) { break; default: putchar('\033'); - ungetc(c, fptm); + ungetch(c); } } void scroll(int l) { - cmd("s %d, %d", cx, cy + l); + cmd("seek(%d,%d)", cx, cy + l); +} + +void +getpty(void) { + char *ptsdev; + +#if defined(_GNU_SOURCE) + ptm = getpt(); +#elif _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 + ptm = posix_openpt(O_RDWR); +#else + ptm = open("/dev/ptmx", O_RDWR); + if(ptm == -1) + if(openpty(&ptm, &pts, NULL, NULL, NULL) == -1) + err(EXIT_FAILURE, "cannot open pty"); +#endif +#if defined(_XOPEN_SOURCE) + if(ptm != -1) { + if(grantpt(ptm) == -1) + err(EXIT_FAILURE, "cannot grant access to pty"); + if(unlockpt(ptm) == -1) + err(EXIT_FAILURE, "cannot unlock pty"); + ptsdev = ptsname(ptm); + if(!ptsdev) + err(EXIT_FAILURE, "slave pty name undefined"); + pts = open(ptsdev, O_RDWR); + if(pts == -1) + err(EXIT_FAILURE, "cannot open slave pty"); + } + else + err(EXIT_FAILURE, "cannot open pty"); +#endif } void @@ -234,7 +252,7 @@ shell(void) { pid = fork(); switch(pid) { case -1: - eprint("error, cannot fork\n"); + err(EXIT_FAILURE, "cannot fork"); case 0: setsid(); dup2(pts, STDIN_FILENO); @@ -255,7 +273,7 @@ sigchld(int n) { int ret; if(waitpid(pid, &ret, 0) == -1) - eprintn("error, waiting for child failed"); + err(EXIT_FAILURE, "waiting for child failed"); if(WIFEXITED(ret)) exit(WEXITSTATUS(ret)); else @@ -272,25 +290,41 @@ unbuffer(void) { return c; } +void +ungetch(int c) { + if(rbuf.i + 1 >= rbuf.n) + errx(EXIT_FAILURE, "read buffer full"); + rbuf.data[rbuf.i++] = c; +} + int main(int argc, char *argv[]) { + fd_set rfds; + if(argc == 2 && !strcmp("-v", argv[1])) - eprint("std-"VERSION", © 2008 Matthias-Christian Ott\n"); + errx(EXIT_SUCCESS, "std-"VERSION", © 2008 Matthias-Christian Ott"); else if(argc == 1) - eprint("usage: st [-v]\n"); + errx(EXIT_FAILURE, "usage: std [-v]"); getpty(); shell(); - fptm = fdopen(ptm, "r+"); - if(!fptm) - eprintn("cannot open slave pty"); + FD_ZERO(&rfds); + FD_SET(STDIN_FILENO, &rfds); + FD_SET(ptm, &rfds); for(;;) { - c = getc(fptm); - switch(c) { - case '\033': - parseesc(); - break; - default: - putchar(c); + if(select(ptm + 1, &rfds, NULL, NULL, NULL) == -1) + err(EXIT_FAILURE, "cannot select"); + if(FD_ISSET(ptm, &rfds)) { + do { + c = getch(); + switch(c) { + case '\033': + parseesc(); + break; + default: + putchar(c); + } + } while(rbuf.i < rbuf.n); + fflush(stdout); } } return 0;