/* See LICENSE file for copyright and license details. */
-#include "util.h"
#include <sys/types.h>
#include <sys/wait.h>
#include <ctype.h>
+#include <err.h>
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
#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];
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) {
va_end(ap);
}
+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;
+ }
+ 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
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;
qmark = 1;
else if(c == ';') {
if(!digit)
- eprint("syntax error\n");
+ errx(EXIT_FAILURE, "syntax error");
digit = 0;
j++;
}
}
break;
}
- c = getc(fptm);
+ c = getch();
}
switch(c) {
case '@':
case 0:
case 22:
if(bold)
- cmd("b");
+ cmd("bold");
case 1:
if(!bold)
- cmd("b");
+ cmd("bold");
break;
}
}
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
pid = fork();
switch(pid) {
case -1:
- eprint("error, cannot fork\n");
+ err(EXIT_FAILURE, "cannot fork");
case 0:
setsid();
dup2(pts, STDIN_FILENO);
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
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[]) {
- 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();
- 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)
+ 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;