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

diff --git a/std.c b/std.c
index fbabaa4..b0142fe 100644
--- a/std.c
+++ b/std.c
@@ -14,18 +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, ...);
-int getch();
+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);
-void ungetch(int c);
+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];
@@ -38,14 +38,14 @@ typedef struct {
 	int i, n;
 } ReadBuffer;
 
-int cols = 80, lines = 25;
-int cx = 0, cy = 0;
-int c;
+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;
-ReadBuffer rbuf;
+static _Bool bold, digit, qmark;
+static pid_t pid;
+static RingBuffer buf;
+static ReadBuffer rbuf;
 
 void
 buffer(char c) {
@@ -85,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
@@ -186,10 +186,10 @@ parseesc(void) {
 				case 0:
 				case 22:
 					if(bold)
-						cmd("b");
+						cmd("bold");
 				case 1:
 					if(!bold)
-						cmd("b");
+						cmd("bold");
 					break;
 				}
 			}
@@ -204,7 +204,7 @@ parseesc(void) {
 
 void
 scroll(int l) {
-	cmd("s %d, %d", cx, cy + l);
+	cmd("seek(%d,%d)", cx, cy + l);
 }
 
 void
@@ -279,17 +279,18 @@ main(int argc, char *argv[]) {
 		r = select(ptm + 1, &rfds, NULL, NULL, NULL);
 		if(r == -1)
 			eprintn("error, cannot select");
-		if(FD_ISSET(ptm, &rfds)) {
-			c = getch();
-			switch(c) {
-			case '\033':
-				parseesc();
-				break;
-			default:
-				putchar(c);
-			}
-			fflush(stdout);
-		}
+		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;
 }