X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=std.c;h=5b430b8111e525833f4c080aff7a992257f40099;hb=b3902ca1782515ee8b9cd38af10e51bc3ba2fc98;hp=5368f6712ad3bd880c98a7e49fb91606e18b6378;hpb=693e2413c8c114c6a95327a609c28be643b9d582;p=st.git diff --git a/std.c b/std.c index 5368f67..5b430b8 100644 --- a/std.c +++ b/std.c @@ -1,11 +1,8 @@ -#include -#include -#include +/* See LICENSE file for copyright and license details. */ #include #include #include -#include -#include +#include #include #include #include @@ -13,25 +10,22 @@ #include #include -#define LENGTH(x) (sizeof (x) / sizeof (x)[0]) +#define LENGTH(x) (sizeof(x) / sizeof((x)[0])) #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, ...); +static void buffer(char c); +static void cmd(const char *cmdstr, ...); +static int getch(); void getpty(void); -void movea(int x, int y); -void mover(int x, int y); -void parse(void); -void scroll(int l); -void shell(void); -void sigchld(int n); -char unbuffer(void); - -enum { QuestionMark = 1, Digit = 2 }; +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]; @@ -39,14 +33,19 @@ typedef struct { int n; } RingBuffer; -int cols = 80, lines = 25; -int cx = 0, cy = 0; -int c, s; -FILE *fptm = NULL; +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; int ptm, pts; -_Bool bold; -pid_t pid; -RingBuffer buf; +static _Bool bold, digit, qmark; +static pid_t pid; +static RingBuffer buf; +static ReadBuffer rbuf; void buffer(char c) { @@ -69,66 +68,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); -} - -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) - eprintn("error, cannot open pty"); -#endif -#if defined(_XOPEN_SOURCE) - if(ptm != -1) { - if(grantpt(ptm) == -1) - eprintn("error, cannot grant access to pty"); - if(unlockpt(ptm) == -1) - eprintn("error, cannot unlock pty"); - ptsdev = ptsname(ptm); - if(!ptsdev) - eprintn("error, slave pty name undefined"); - pts = open(ptsdev, O_RDWR); - if(pts == -1) - eprintn("error, cannot open slave pty"); +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; } - else - eprintn("error, cannot open pty"); -#endif + return rbuf.data[rbuf.i]; } void @@ -137,7 +85,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 @@ -151,33 +99,32 @@ parseesc(void) { int arg[16]; memset(arg, 0, LENGTH(arg)); - s = 0; - c = getc(fptm); + c = getch(); switch(c) { case '[': - c = getc(fptm); + c = getch(); for(j = 0; j < LENGTH(arg);) { if(isdigit(c)) { - s |= Digit; + digit = 1; arg[j] *= 10; arg[j] += c - '0'; } else if(c == '?') - s |= QuestionMark; + qmark = 1; else if(c == ';') { - if(!(s & Digit)) - eprint("syntax error"); - s &= ~Digit; + if(!digit) + errx(EXIT_FAILURE, "syntax error"); + digit = 0; j++; } else { - if(s & Digit) { - s &= ~Digit; + if(digit) { + digit = 0; j++; } break; } - c = getc(fptm); + c = getch(); } switch(c) { case '@': @@ -239,10 +186,10 @@ parseesc(void) { case 0: case 22: if(bold) - cmd("b"); + cmd("bold"); case 1: if(!bold) - cmd("b"); + cmd("bold"); break; } } @@ -251,13 +198,13 @@ 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 @@ -269,7 +216,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); @@ -290,7 +237,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 @@ -307,14 +254,48 @@ 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 rd; - if(argc == 2 && !strcmp("-v", argv[1])) - eprint("std-"VERSION", © 2008 Matthias-Christian Ott\n"); - else if(argc == 1) - eprint("usage: st [-v]\n"); + fd_set rfds; + int r; + + if(argc == 2 && !strcmp("-v", argv[1])) { + fprintf(stderr, "std-"VERSION", © 2008 Matthias-Christian Ott\n"); + exit(EXIT_SUCCESS); + } + else if(argc == 1) { + fprintf(stderr, "usage: st [-v]\n"); + exit(EXIT_FAILURE); + } getpty(); shell(); + FD_ZERO(&rfds); + FD_SET(STDIN_FILENO, &rfds); + FD_SET(ptm, &rfds); + for(;;) { + r = select(ptm + 1, &rfds, NULL, NULL, NULL); + if(r == -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; }