#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
+#include <pty.h>
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include <X11/Xutil.h>
+#if defined(LINUX)
+ #include <pty.h>
+#elif defined(OPENBSD)
+ #include <util.h>
+#elif defined(FREEBSD)
+ #include <libutil.h>
+#endif
+
/* Arbitrary sizes */
#define ESC_TITLE_SIZ 256
#define ESC_BUF_SIZ 256
#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
+#define IS_SET(flag) (term.mode & (flag))
/* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */
enum { ATTR_NULL=0 , ATTR_REVERSE=1 , ATTR_UNDERLINE=2, ATTR_BOLD=4, ATTR_GFX=8 };
-enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_HIDE, CURSOR_DRAW,
- CURSOR_SAVE, CURSOR_LOAD };
+enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_HIDE = 1,
+ CURSOR_DRAW = 0, CURSOR_SAVE, CURSOR_LOAD };
enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4 };
enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
Glyph attr; /* current char attributes */
int x;
int y;
+ char hide;
} TCursor;
/* CSI Escape sequence structs */
int col; /* nb col */
Line* line; /* screen */
TCursor c; /* cursor */
- char hidec;
int top; /* top scroll limit */
int bot; /* bottom scroll limit */
int mode; /* terminal mode flags */
static void tclearregion(int, int, int, int);
static void tcursor(int);
-static void tmovecursor(int);
static void tdeletechar(int);
static void tdeleteline(int);
static void tinsertblank(int);
static void tputs(char*, int);
static void treset(void);
static void tresize(int, int);
-static void tscroll(void);
static void tscrollup(int);
static void tscrolldown(int);
static void tsetattr(int*, int);
void
execsh(void) {
char *args[3] = {getenv("SHELL"), "-i", NULL};
- DEFAULT(args[0], "/bin/sh"); /* default shell if getenv() failed */
+ DEFAULT(args[0], "/bin/sh"); /* if getenv() failed */
putenv("TERM=" TNAME);
execvp(args[0], args);
}
void
-xbell(void) { /* visual bell */
- XRectangle r = { BORDER, BORDER, xw.bufw, xw.bufh };
+xbell(void) {
XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
- XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1);
- /* usleep(30000); */
+ XFillRectangle(xw.dis, xw.win, dc.gc, BORDER, BORDER, xw.bufw, xw.bufh);
+ XFlush(xw.dis);
+ usleep(BellTime);
draw(SCREEN_REDRAW);
}
void
ttynew(void) {
int m, s;
- char *pts;
-
- if((m = posix_openpt(O_RDWR | O_NOCTTY)) < 0)
- die("openpt failed: %s\n", SERRNO);
- if(grantpt(m) < 0)
- die("grandpt failed: %s\n", SERRNO);
- if(unlockpt(m) < 0)
- die("unlockpt failed: %s\n", SERRNO);
- if(!(pts = ptsname(m)))
- die("ptsname failed: %s\n", SERRNO);
- if((s = open(pts, O_RDWR | O_NOCTTY)) < 0)
- die("Couldn't open slave: %s\n", SERRNO);
- fcntl(s, F_SETFL, O_NDELAY);
+
+ /* seems to work fine on linux, openbsd and freebsd */
+ struct winsize w = {term.row, term.col, 0, 0};
+ if(openpty(&m, &s, NULL, NULL, &w) < 0)
+ die("openpty failed: %s\n", SERRNO);
+
switch(pid = fork()) {
case -1:
die("fork failed\n");
dup2(s, STDOUT_FILENO);
dup2(s, STDERR_FILENO);
if(ioctl(s, TIOCSCTTY, NULL) < 0)
- die("ioctl TTIOCSTTY failed: %s\n", SERRNO);
+ die("ioctl TIOCSCTTY failed: %s\n", SERRNO);
+ close(s);
+ close(m);
execsh();
break;
default:
void
treset(void) {
- term.c.attr.mode = ATTR_NULL;
- term.c.attr.fg = DefaultFG;
- term.c.attr.bg = DefaultBG;
- term.c.x = term.c.y = 0;
- term.hidec = 0;
+ term.c = (TCursor){{
+ .mode = ATTR_NULL,
+ .fg = DefaultFG,
+ .bg = DefaultBG
+ }, .x = 0, .y = 0, .hide = 0};
+
term.top = 0, term.bot = term.row - 1;
term.mode = MODE_WRAP;
tclearregion(0, 0, term.col-1, term.row-1);
}
void
-tnew(int col, int row) { /* screen size */
+tnew(int col, int row) {
+ /* set screen size */
term.row = row, term.col = col;
- term.top = 0, term.bot = term.row - 1;
- /* mode */
- term.mode = MODE_WRAP;
- /* cursor */
- term.c.attr.mode = ATTR_NULL;
- term.c.attr.fg = DefaultFG;
- term.c.attr.bg = DefaultBG;
- term.c.x = term.c.y = 0;
- term.hidec = 0;
- /* allocate screen */
- term.line = calloc(term.row, sizeof(Line));
+ term.line = malloc(term.row * sizeof(Line));
for(row = 0 ; row < term.row; row++)
- term.line[row] = calloc(term.col, sizeof(Glyph));
-}
-
-/* TODO: Replace with scrollup/scolldown */
-void
-tscroll(void) {
- Line temp = term.line[term.top];
- int i;
-
- for(i = term.top; i < term.bot; i++)
- term.line[i] = term.line[i+1];
- memset(temp, 0, sizeof(Glyph) * term.col);
- term.line[term.bot] = temp;
+ term.line[row] = malloc(term.col * sizeof(Glyph));
+ /* setup screen */
+ treset();
}
void
for(i = 0; i < n; i++)
memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
- for(i = term.top; i <= term.bot-n; i++) {
+ for(i = term.top; i <= term.bot-n; i++) {
temp = term.line[i];
term.line[i] = term.line[i+n];
term.line[i+n] = temp;
- }
+ }
}
void
tnewline(void) {
int y = term.c.y + 1;
if(y > term.bot)
- tscroll(), y = term.bot;
+ tscrollup(1), y = term.bot;
tmoveto(0, y);
}
term.c.y = y < 0 ? 0 : y >= term.row ? term.row-1 : y;
}
-void
-tmovecursor(int dir) {
- int xf = term.c.x, yf = term.c.y;
-
- switch(dir) {
- case CURSOR_UP:
- yf--;
- break;
- case CURSOR_DOWN:
- yf++;
- break;
- case CURSOR_LEFT:
- xf--;
- break;
- case CURSOR_RIGHT:
- xf++;
- if(term.mode & MODE_WRAP && xf >= term.col) {
- xf = 0, yf++;
- if(yf > term.bot)
- yf = term.bot, tscroll();
- }
- break;
- }
- tmoveto(xf, yf);
-}
-
void
tsetchar(char c) {
term.line[term.c.y][term.c.x] = term.c.attr;
case 12: /* att610 -- Stop blinking cursor (IGNORED) */
break;
case 25:
- term.hidec = 1;
+ term.c.hide = CURSOR_HIDE;
break;
case 1048: /* XXX: no alt. screen to erase/save */
case 1049:
case 12: /* att610 -- Start blinking cursor (IGNORED) */
break;
case 25:
- term.hidec = 0;
+ term.c.hide = CURSOR_DRAW;
break;
case 1048:
case 1049: /* XXX: no alt. screen to erase/save */
void
tputtab(void) {
int space = TAB - term.c.x % TAB;
-
- if(term.c.x + space >= term.col)
- space--;
-
- for(; space > 0; space--)
- tmovecursor(CURSOR_RIGHT);
+ tmoveto(term.c.x + space, term.c.y);
}
void
tputtab();
break;
case '\b':
- tmovecursor(CURSOR_LEFT);
+ tmoveto(term.c.x-1, term.c.y);
break;
case '\r':
tmoveto(0, term.c.y);
break;
default:
tsetchar(c);
- tmovecursor(CURSOR_RIGHT);
+ if(term.c.x+1 < term.col) {
+ tmoveto(term.c.x+1, term.c.y);
+ } else if(IS_SET(MODE_WRAP))
+ tnewline();
break;
}
}
void
tresize(int col, int row) {
int i;
- Line *line;
int minrow = MIN(row, term.row);
int mincol = MIN(col, term.col);
if(col < 1 || row < 1)
return;
- /* alloc */
- line = calloc(row, sizeof(Line));
- for(i = 0 ; i < row; i++)
- line[i] = calloc(col, sizeof(Glyph));
- /* copy */
- for(i = 0 ; i < minrow; i++)
- memcpy(line[i], term.line[i], mincol * sizeof(Glyph));
- /* free */
- for(i = 0; i < term.row; i++)
+
+ /* free uneeded rows */
+ for(i = row; i < term.row; i++)
free(term.line[i]);
- free(term.line);
+
+ /* resize to new height */
+ term.line = realloc(term.line, row * sizeof(Line));
+
+ /* resize each row to new width, zero-pad if needed */
+ for(i = 0; i < minrow; i++) {
+ term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
+ memset(term.line[i] + mincol, 0, (col - mincol) * sizeof(Glyph));
+ }
+
+ /* allocate any new rows */
+ for(/* i == minrow */; i < row; i++)
+ term.line[i] = calloc(col, sizeof(Glyph));
LIMIT(term.c.x, 0, col-1);
LIMIT(term.c.y, 0, row-1);
LIMIT(term.bot, 0, row-1);
term.bot = row-1;
- term.line = line;
term.col = col, term.row = row;
}
void
xinit(void) {
- xw.dis = XOpenDisplay(NULL);
- xw.scr = XDefaultScreen(xw.dis);
- if(!xw.dis)
+ if(!(xw.dis = XOpenDisplay(NULL)))
die("Can't open display\n");
+ xw.scr = XDefaultScreen(xw.dis);
/* font */
if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT)))
if(term.line[y][x].state & GLYPH_SET)
xdrawc(x, y, term.line[y][x]);
- if(!term.hidec)
- xcursor(CURSOR_DRAW);
+ xcursor(term.c.hide);
XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
XFlush(xw.dis);
}
char buf[DRAW_BUF_SIZ];
XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
- XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
+ XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.bufw, xw.bufh);
for(y = 0; y < term.row; y++) {
base = term.line[y][0];
i = ox = 0;
for(x = 0; x < term.col; x++) {
new = term.line[y][x];
- if(!ATTRCMP(base, new) && i < DRAW_BUF_SIZ)
- buf[i++] = new.c;
- else {
+ if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
+ i >= DRAW_BUF_SIZ)) {
xdraws(buf, base, ox, y, i);
- buf[0] = new.c;
- i = 1;
- ox = x;
- base = new;
+ i = 0;
+ }
+ if(new.state & GLYPH_SET) {
+ if(i == 0) {
+ ox = x;
+ base = new;
+ }
+ buf[i++] = new.c;
}
}
- xdraws(buf, base, ox, y, i);
+ if(i > 0)
+ xdraws(buf, base, ox, y, i);
}
- xcursor(term.hidec ? CURSOR_HIDE : CURSOR_DRAW);
+ xcursor(term.c.hide);
XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
XFlush(xw.dis);
}
case XK_Down:
case XK_Left:
case XK_Right:
- sprintf(buf, "\033%c%c", term.mode & MODE_APPKEYPAD ? 'O' : '[', "DACB"[ksym - XK_Left]);
+ sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', "DACB"[ksym - XK_Left]);
ttywrite(buf, 3);
break;
case XK_Insert:
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
FD_SET(xfd, &rfd);
- if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) == -1) {
+ if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) {
if(errno == EINTR)
continue;
die("select failed: %s\n", SERRNO);
int
main(int argc, char *argv[]) {
if(argc == 2 && !strncmp("-v", argv[1], 3))
- die("st-" VERSION ", © 2009 st engineers\n");
+ die("st-" VERSION ", (c) 2010 st engineers\n");
else if(argc != 1)
die("usage: st [-v]\n");
setlocale(LC_CTYPE, "");