X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=std.c;h=b0142fe34b5a397719f714b765cda0472f982ac1;hb=3cb67937811b34fcc600b4eb96bd8fdd392ecab4;hp=a7b2f4a21b02c7693f47e801757364079469b22b;hpb=5f287254715dd91f2c508a2a6b9853f0ef4ed785;p=st.git

diff --git a/std.c b/std.c
index a7b2f4a..b0142fe 100644
--- a/std.c
+++ b/std.c
@@ -14,16 +14,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, ...);
+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 parseesc(void);
-void scroll(int l);
-void shell(void);
-void sigchld(int n);
-char unbuffer(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];
@@ -31,14 +33,19 @@ typedef struct {
 	int n;
 } RingBuffer;
 
-int cols = 80, lines = 25;
-int cx = 0, cy = 0;
-int c;
-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, digit, qmark;
-pid_t pid;
-RingBuffer buf;
+static _Bool bold, digit, qmark;
+static pid_t pid;
+static RingBuffer buf;
+static ReadBuffer rbuf;
 
 void
 buffer(char c) {
@@ -61,13 +68,24 @@ cmd(const char *cmdstr, ...) {
 	va_end(ap);
 }
 
+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;
+	}
+	return rbuf.data[rbuf.i];
+}
+
 void
 movea(int x, int y) {
 	x = MAX(x, cols);
 	y = MAX(y, lines);
 	cx = x;
 	cy = y;
-	cmd("s %d,%d", x, y);
+	cmd("seek(%d,%d)", x, y);
 }
 
 void
@@ -81,10 +99,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;
@@ -106,7 +124,7 @@ parseesc(void) {
 				}
 				break;
 			}
-			c = getc(fptm);
+			c = getch();
 		}
 		switch(c) {
 		case '@':
@@ -168,10 +186,10 @@ parseesc(void) {
 				case 0:
 				case 22:
 					if(bold)
-						cmd("b");
+						cmd("bold");
 				case 1:
 					if(!bold)
-						cmd("b");
+						cmd("bold");
 					break;
 				}
 			}
@@ -180,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
@@ -236,26 +254,43 @@ unbuffer(void) {
 	return c;
 }
 
+void
+ungetch(int c) {
+	if(rbuf.i + 1 >= rbuf.n)
+		eprint("error, read buffer full\n");
+	rbuf.data[rbuf.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");
 	else if(argc == 1)
 		eprint("usage: st [-v]\n");
 	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);
-		}
+		r = select(ptm + 1, &rfds, NULL, NULL, NULL);
+		if(r == -1)
+			eprintn("error, cannot select");
+		if(FD_ISSET(ptm, &rfds))
+			do {
+				c = getch();
+				switch(c) {
+				case '\033':
+					parseesc();
+					break;
+				default:
+					putchar(c);
+				}
+				fflush(stdout);
+			} while(rbuf.i < rbuf.n);
 	}
 	return 0;
 }