X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/f9a0524f9430147a3e4a0d200cb3bbd54d1448a4..d61a2a8fce2638594644feb664ce04398825b0f3:/std.c diff --git a/std.c b/std.c index fbabaa4..a9a4f8c 100644 --- a/std.c +++ b/std.c @@ -1,8 +1,12 @@ /* See LICENSE file for copyright and license details. */ -#include "util.h" #include #include #include +#include +#include +#if !(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) +#include +#endif #include #include #include @@ -14,19 +18,6 @@ #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, ...); -int getch(); -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); -void ungetch(int c); - typedef struct { unsigned char data[BUFSIZ]; int s, e; @@ -36,16 +27,31 @@ typedef struct { typedef struct { unsigned char data[BUFSIZ]; int i, n; + int fd; } ReadBuffer; -int cols = 80, lines = 25; -int cx = 0, cy = 0; -int c; -int ptm, pts; -_Bool bold, digit, qmark; -pid_t pid; -RingBuffer buf; -ReadBuffer rbuf; +static void buffer(char c); +static void cmd(const char *cmdstr, ...); +static int getch(ReadBuffer *buf); +static void getpty(void); +static void movea(int x, int y); +static void mover(int x, int y); +static void parsecmd(void); +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(ReadBuffer *buf, int c); + +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 cmdbuf, ptmbuf; void buffer(char c) { @@ -69,14 +75,14 @@ cmd(const char *cmdstr, ...) { } int -getch() { - if(rbuf.i++ >= rbuf.n) { - rbuf.n = read(ptm, rbuf.data, LENGTH(rbuf.data)); - if(rbuf.n == -1) - eprintn("error, cannot read from slave pty"); - rbuf.i = 0; +getch(ReadBuffer *buf) { + if(buf->i++ >= buf->n) { + buf->n = read(buf->fd, buf->data, BUFSIZ); + if(buf->n == -1) + err(EXIT_FAILURE, "cannot read"); + buf->i = 0; } - return rbuf.data[rbuf.i]; + return buf->data[buf->i]; } void @@ -85,7 +91,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 @@ -93,16 +99,20 @@ mover(int x, int y) { movea(cx + x, cy + y); } +void +parsecmd(void) { +} + void parseesc(void) { int i, j; int arg[16]; memset(arg, 0, LENGTH(arg)); - c = getch(); + c = getch(&ptmbuf); switch(c) { case '[': - c = getch(); + c = getch(&ptmbuf); for(j = 0; j < LENGTH(arg);) { if(isdigit(c)) { digit = 1; @@ -113,7 +123,7 @@ parseesc(void) { qmark = 1; else if(c == ';') { if(!digit) - eprint("syntax error\n"); + errx(EXIT_FAILURE, "syntax error"); digit = 0; j++; } @@ -124,7 +134,7 @@ parseesc(void) { } break; } - c = getch(); + c = getch(&ptmbuf); } switch(c) { case '@': @@ -186,10 +196,10 @@ parseesc(void) { case 0: case 22: if(bold) - cmd("b"); + cmd("bold"); case 1: if(!bold) - cmd("b"); + cmd("bold"); break; } } @@ -198,13 +208,45 @@ parseesc(void) { break; default: putchar('\033'); - ungetch(c); + ungetch(&ptmbuf, 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 @@ -216,7 +258,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); @@ -237,7 +279,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 @@ -255,39 +297,52 @@ unbuffer(void) { } void -ungetch(int c) { - if(rbuf.i + 1 >= rbuf.n) - eprint("error, read buffer full\n"); - rbuf.data[rbuf.i++] = c; +ungetch(ReadBuffer *buf, int c) { + if(buf->i + 1 >= buf->n) + errx(EXIT_FAILURE, "buffer full"); + buf->data[buf->i++] = c; } int main(int argc, char *argv[]) { fd_set rfds; - int r; 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(); + cmdbuf.fd = STDIN_FILENO; + ptmbuf.fd = ptm; FD_ZERO(&rfds); FD_SET(STDIN_FILENO, &rfds); FD_SET(ptm, &rfds); for(;;) { - r = select(ptm + 1, &rfds, NULL, NULL, NULL); - if(r == -1) - eprintn("error, cannot select"); + if(select(ptm + 1, &rfds, NULL, NULL, NULL) == -1) + err(EXIT_FAILURE, "cannot select"); + if(FD_ISSET(STDIN_FILENO, &rfds)) + do { + c = getch(&cmdbuf); + switch(c) { + case ':': + parsecmd(); + break; + default: + break; + } + } while(cmdbuf.i < cmdbuf.n); if(FD_ISSET(ptm, &rfds)) { - c = getch(); - switch(c) { - case '\033': - parseesc(); - break; - default: - putchar(c); - } + do { + c = getch(&ptmbuf); + switch(c) { + case '\033': + parseesc(); + break; + default: + putchar(c); + } + } while(ptmbuf.i < ptmbuf.n); fflush(stdout); } }