#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 };
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 tmoveto(int, int);
static void tnew(int, int);
static void tnewline(void);
+static void tputtab(void);
static void tputc(char);
static void tputs(char*, int);
static void treset(void);
static void ttyresize(int, int);
static void ttywrite(const char *, size_t);
+static void xbell(void);
+static void xdraws(char *, Glyph, int, int, int);
+static void xhints(void);
static void xclear(int, int, int, int);
static void xcursor(int);
static void xinit(void);
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
-tnew(int col, int row) { /* screen size */
+tnew(int col, int row) {
+ /* screen size */
term.row = row, term.col = col;
term.top = 0, term.bot = term.row - 1;
/* mode */
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--;
- if(term.mode & MODE_WRAP && xf < 0) {
- xf = term.col-1, yf--;
- if(yf < term.top)
- yf = term.top, xf = 0;
- }
- 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;
return;
}
memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph));
- tclearregion(term.col-size, term.c.y, term.col-1, term.c.y);
+ tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
}
void
tinsertblank(int n) {
int src = term.c.x;
int dst = src + n;
- int size = term.col - n - src;
+ int size = term.col - dst;
if(dst >= term.col) {
tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
return;
}
memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph));
- tclearregion(src, term.c.y, dst, term.c.y);
+ tclearregion(src, term.c.y, dst - 1, term.c.y);
}
void
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[term.c.y][term.c.x].state & GLYPH_SET)
g.c = term.line[term.c.y][term.c.x].c;
-
+
/* remove the old cursor */
if(term.line[oldy][oldx].state & GLYPH_SET)
xdraws(&term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1);
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:
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, "");