X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=std.c;h=be3f41a3d85aba5935b4507532f2c9fad16d228c;hb=dc01596e6d7b81d52b805a3e8c16e47228325540;hp=080c490d309d26e1810974527c1a632970e8ab28;hpb=40c0ecfe821036a3eefc210e6f5dc09e846ae5bf;p=st.git

diff --git a/std.c b/std.c
index 080c490..be3f41a 100644
--- a/std.c
+++ b/std.c
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#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))
 
@@ -31,8 +31,6 @@ void shell(void);
 void sigchld(int n);
 char unbuffer(void);
 
-enum { QuestionMark = 1, Digit = 2 };
-
 typedef struct {
 	unsigned char data[BUFSIZ];
 	int s, e;
@@ -41,10 +39,10 @@ typedef struct {
 
 int cols = 80, lines = 25;
 int cx = 0, cy = 0;
-int c, s;
+int c;
 FILE *fptm = NULL;
 int ptm, pts;
-_Bool bold;
+_Bool bold, digit, qmark;
 pid_t pid;
 RingBuffer buf;
 
@@ -109,11 +107,9 @@ getpty(void) {
 	ptm = posix_openpt(O_RDWR);
 #else
 	ptm = open("/dev/ptmx", O_RDWR);
-	if(ptm == -1) {
+	if(ptm == -1)
 		if(openpty(&ptm, &pts, NULL, NULL, NULL) == -1)
 			eprintn("error, cannot open pty");
-		return;
-	}
 #endif
 #if defined(_XOPEN_SOURCE)
 	if(ptm != -1) {
@@ -127,7 +123,6 @@ getpty(void) {
 		pts = open(ptsdev, O_RDWR);
 		if(pts == -1)
 			eprintn("error, cannot open slave pty");
-		puts(ptsdev);
 	}
 	else
 		eprintn("error, cannot open pty");
@@ -154,28 +149,27 @@ parseesc(void) {
 	int arg[16];
 
 	memset(arg, 0, LENGTH(arg));
-	s = 0;
 	c = getc(fptm);
 	switch(c) {
 	case '[':
 		c = getc(fptm);
 		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)
+					eprint("syntax error\n");
+				digit = 0;
 				j++;
 			}
 			else {
-				if(s & Digit) {
-					s &= ~Digit;
+				if(digit) {
+					digit = 0;
 					j++;
 				}
 				break;
@@ -312,12 +306,24 @@ unbuffer(void) {
 
 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");
 	getpty();
 	shell();
+	fptm = fdopen(ptm, "r+");
+	if(!fptm)
+		eprintn("cannot open slave pty");
+	for(;;) {
+		c = getc(fptm);
+		switch(c) {
+		case '\033':
+			parseesc();
+			break;
+		default:
+			putchar(c);
+		}
+	}
 	return 0;
 }