-/* See LICENSE for licence details. */
-#include "st.h"
+/* See LICENSE for licence details. */
+#define _XOPEN_SOURCE 600
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <locale.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <X11/keysym.h>
+#include <X11/Xutil.h>
+
+#if defined(__linux)
+ #include <pty.h>
+#elif defined(__OpenBSD__) || defined(__NetBSD__)
+ #include <util.h>
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <libutil.h>
+#endif
+
+#define USAGE \
+ "st-" VERSION ", (c) 2010 st engineers\n" \
+ "usage: st [-t title] [-e cmd] [-v]\n"
+
+/* Arbitrary sizes */
+#define ESC_TITLE_SIZ 256
+#define ESC_BUF_SIZ 256
+#define ESC_ARG_SIZ 16
+#define DRAW_BUF_SIZ 1024
+
+#define SERRNO strerror(errno)
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MAX(a, b) ((a) < (b) ? (b) : (a))
+#define LEN(a) (sizeof(a) / sizeof(a[0]))
+#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
+#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_SAVE, CURSOR_LOAD };
+enum { CURSOR_DEFAULT = 0, CURSOR_HIDE = 1, CURSOR_WRAPNEXT = 2 };
+enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
+enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8 };
+enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
+enum { SCREEN_UPDATE, SCREEN_REDRAW };
+
+typedef struct {
+ char c; /* character code */
+ char mode; /* attribute flags */
+ int fg; /* foreground */
+ int bg; /* background */
+ char state; /* state flags */
+} Glyph;
+
+typedef Glyph* Line;
+
+typedef struct {
+ Glyph attr; /* current char attributes */
+ int x;
+ int y;
+ char state;
+} TCursor;
+
+/* CSI Escape sequence structs */
+/* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
+typedef struct {
+ char buf[ESC_BUF_SIZ]; /* raw string */
+ int len; /* raw string length */
+ char priv;
+ int arg[ESC_ARG_SIZ];
+ int narg; /* nb of args */
+ char mode;
+} CSIEscape;
+
+/* Internal representation of the screen */
+typedef struct {
+ int row; /* nb row */
+ int col; /* nb col */
+ Line* line; /* screen */
+ Line* alt; /* alternate screen */
+ TCursor c; /* cursor */
+ int top; /* top scroll limit */
+ int bot; /* bottom scroll limit */
+ int mode; /* terminal mode flags */
+ int esc; /* escape state flags */
+ char title[ESC_TITLE_SIZ];
+ int titlelen;
+} Term;
+
+/* Purely graphic info */
+typedef struct {
+ Display* dis;
+ Colormap cmap;
+ Window win;
+ Pixmap buf;
+ XIM xim;
+ XIC xic;
+ int scr;
+ int w; /* window width */
+ int h; /* window height */
+ int bufw; /* pixmap width */
+ int bufh; /* pixmap height */
+ int ch; /* char height */
+ int cw; /* char width */
+ int focus;
+ int vis; /* is visible */
+} XWindow;
+
+typedef struct {
+ KeySym k;
+ char s[ESC_BUF_SIZ];
+} Key;
+
+/* Drawing Context */
+typedef struct {
+ unsigned long col[256];
+ XFontStruct* font;
+ XFontStruct* bfont;
+ GC gc;
+} DC;
+
+/* TODO: use better name for vars... */
+typedef struct {
+ int mode;
+ int bx, by;
+ int ex, ey;
+ struct {int x, y;} b, e;
+ char *clip;
+} Selection;
+
+#include "config.h"
+
+static void die(const char *errstr, ...);
+static void draw(int);
+static void execsh(void);
+static void sigchld(int);
+static void run(void);
+
+static void csidump(void);
+static void csihandle(void);
+static void csiparse(void);
+static void csireset(void);
+
+static void tclearregion(int, int, int, int);
+static void tcursor(int);
+static void tdeletechar(int);
+static void tdeleteline(int);
+static void tinsertblank(int);
+static void tinsertblankline(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 tresize(int, int);
+static void tscrollup(int, int);
+static void tscrolldown(int, int);
+static void tsetattr(int*, int);
+static void tsetchar(char);
+static void tsetscroll(int, int);
+static void tswapscreen(void);
+
+static void ttynew(void);
+static void ttyread(void);
+static void ttyresize(int, int);
+static void ttywrite(const char *, size_t);
+
+static void xdraws(char *, Glyph, int, int, int);
+static void xhints(void);
+static void xclear(int, int, int, int);
+static void xdrawcursor(void);
+static void xinit(void);
+static void xloadcols(void);
+static void xseturgency(int);
+
+static void expose(XEvent *);
+static void visibility(XEvent *);
+static void unmap(XEvent *);
+static char* kmap(KeySym);
+static void kpress(XEvent *);
+static void resize(XEvent *);
+static void focus(XEvent *);
+static void brelease(XEvent *);
+static void bpress(XEvent *);
+static void bmotion(XEvent *);
+static void selection_notify(XEvent *);
+static void selection_request(XEvent *);
+
+static void (*handler[LASTEvent])(XEvent *) = {
+ [KeyPress] = kpress,
+ [ConfigureNotify] = resize,
+ [VisibilityNotify] = visibility,
+ [UnmapNotify] = unmap,
+ [Expose] = expose,
+ [FocusIn] = focus,
+ [FocusOut] = focus,
+ [MotionNotify] = bmotion,
+ [ButtonPress] = bpress,
+ [ButtonRelease] = brelease,
+ [SelectionNotify] = selection_notify,
+ [SelectionRequest] = selection_request,
+};
/* Globals */
-DC dc;
-XWindow xw;
-Term term;
-Escseq escseq;
-int cmdfd;
-int running;
+static DC dc;
+static XWindow xw;
+static Term term;
+static CSIEscape escseq;
+static int cmdfd;
+static pid_t pid;
+static Selection sel;
+static char *opt_cmd = NULL;
+static char *opt_title = NULL;
+
+void
+selinit(void) {
+ sel.mode = 0;
+ sel.bx = -1;
+ sel.clip = NULL;
+}
+
+static inline int selected(int x, int y) {
+ if(sel.ey == y && sel.by == y) {
+ int bx = MIN(sel.bx, sel.ex);
+ int ex = MAX(sel.bx, sel.ex);
+ return BETWEEN(x, bx, ex);
+ }
+ return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x))
+ || (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y));
+}
+
+static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
+ if(b)
+ *b = e->xbutton.button;
+
+ *x = e->xbutton.x/xw.cw;
+ *y = e->xbutton.y/xw.ch;
+ sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
+ sel.b.y = MIN(sel.by, sel.ey);
+ sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
+ sel.e.y = MAX(sel.by, sel.ey);
+}
+
+static void bpress(XEvent *e) {
+ sel.mode = 1;
+ sel.ex = sel.bx = e->xbutton.x/xw.cw;
+ sel.ey = sel.by = e->xbutton.y/xw.ch;
+}
+
+static char *getseltext() {
+ char *str, *ptr;
+ int ls, x, y, sz;
+ if(sel.bx == -1)
+ return NULL;
+ sz = (term.col+1) * (sel.e.y-sel.b.y+1);
+ ptr = str = malloc(sz);
+ for(y = 0; y < term.row; y++) {
+ for(x = 0; x < term.col; x++)
+ if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y)))
+ *ptr = term.line[y][x].c, ptr++;
+ if(ls)
+ *ptr = '\n', ptr++;
+ }
+ *ptr = 0;
+ return str;
+}
+
+static void selection_notify(XEvent *e) {
+ unsigned long nitems;
+ unsigned long length;
+ int format, res;
+ unsigned char *data;
+ Atom type;
+
+ res = XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, 0, 0, False,
+ AnyPropertyType, &type, &format, &nitems, &length, &data);
+ switch(res) {
+ case BadAtom:
+ case BadValue:
+ case BadWindow:
+ fprintf(stderr, "Invalid paste, XGetWindowProperty0");
+ return;
+ }
+
+ res = XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, 0, length, False,
+ AnyPropertyType, &type, &format, &nitems, &length, &data);
+ switch(res) {
+ case BadAtom:
+ case BadValue:
+ case BadWindow:
+ fprintf(stderr, "Invalid paste, XGetWindowProperty0");
+ return;
+ }
+
+ if(data) {
+ ttywrite((const char *) data, nitems * format / 8);
+ XFree(data);
+ }
+}
+
+static void selpaste() {
+ XConvertSelection(xw.dis, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, CurrentTime);
+}
+
+static void selection_request(XEvent *e)
+{
+ XSelectionRequestEvent *xsre;
+ XSelectionEvent xev;
+ int res;
+ Atom xa_targets;
+
+ xsre = (XSelectionRequestEvent *) e;
+ xev.type = SelectionNotify;
+ xev.requestor = xsre->requestor;
+ xev.selection = xsre->selection;
+ xev.target = xsre->target;
+ xev.time = xsre->time;
+ /* reject */
+ xev.property = None;
+
+ xa_targets = XInternAtom(xw.dis, "TARGETS", 0);
+ if(xsre->target == xa_targets) {
+ /* respond with the supported type */
+ Atom string = XA_STRING;
+ res = XChangeProperty(xsre->display, xsre->requestor, xsre->property, XA_ATOM, 32,
+ PropModeReplace, (unsigned char *) &string, 1);
+ switch(res) {
+ case BadAlloc:
+ case BadAtom:
+ case BadMatch:
+ case BadValue:
+ case BadWindow:
+ fprintf(stderr, "Error in selection_request, TARGETS");
+ break;
+ default:
+ xev.property = xsre->property;
+ }
+ } else if(xsre->target == XA_STRING) {
+ res = XChangeProperty(xsre->display, xsre->requestor, xsre->property,
+ xsre->target, 8, PropModeReplace, (unsigned char *) sel.clip,
+ strlen(sel.clip));
+ switch(res) {
+ case BadAlloc:
+ case BadAtom:
+ case BadMatch:
+ case BadValue:
+ case BadWindow:
+ fprintf(stderr, "Error in selection_request, XA_STRING");
+ break;
+ default:
+ xev.property = xsre->property;
+ }
+ }
+
+ /* all done, send a notification to the listener */
+ res = XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev);
+ switch(res) {
+ case 0:
+ case BadValue:
+ case BadWindow:
+ fprintf(stderr, "Error in selection_requested, XSendEvent");
+ }
+}
+
+static void selcopy(char *str) {
+ /* register the selection for both the clipboard and the primary */
+ Atom clipboard;
+ int res;
+
+ free(sel.clip);
+ sel.clip = str;
+
+ res = XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime);
+ switch(res) {
+ case BadAtom:
+ case BadWindow:
+ fprintf(stderr, "Invalid copy, XSetSelectionOwner");
+ return;
+ }
+
+ clipboard = XInternAtom(xw.dis, "CLIPBOARD", 0);
+ res = XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime);
+ switch(res) {
+ case BadAtom:
+ case BadWindow:
+ fprintf(stderr, "Invalid copy, XSetSelectionOwner");
+ return;
+ }
+
+ XFlush(xw.dis);
+}
+
+/* TODO: doubleclick to select word */
+static void brelease(XEvent *e) {
+ int b;
+ sel.mode = 0;
+ getbuttoninfo(e, &b, &sel.ex, &sel.ey);
+ if(sel.bx==sel.ex && sel.by==sel.ey) {
+ sel.bx = -1;
+ if(b==2)
+ selpaste();
+ } else {
+ if(b==1)
+ selcopy(getseltext());
+ }
+ draw(1);
+}
+
+static void bmotion(XEvent *e) {
+ if (sel.mode) {
+ getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
+ draw(1);
+ }
+}
+
+#ifdef DEBUG
+void
+tdump(void) {
+ int row, col;
+ Glyph c;
+
+ for(row = 0; row < term.row; row++) {
+ for(col = 0; col < term.col; col++) {
+ if(col == term.c.x && row == term.c.y)
+ putchar('#');
+ else {
+ c = term.line[row][col];
+ putchar(c.state & GLYPH_SET ? c.c : '.');
+ }
+ }
+ putchar('\n');
+ }
+}
+#endif
void
die(const char *errstr, ...) {
void
execsh(void) {
- char *args[3] = {SHELL, "-i", NULL};
- putenv("TERM=" TNAME);
- execvp(SHELL, args);
+ char *args[] = {getenv("SHELL"), "-i", NULL};
+ if(opt_cmd)
+ args[0] = opt_cmd, args[1] = NULL;
+ else
+ DEFAULT(args[0], SHELL);
+ putenv("TERM="TNAME);
+ execvp(args[0], args);
}
-void
-xbell(void) { /* visual bell */
- XRectangle r = { 0, 0, xw.w, xw.h };
- XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
- XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1);
- XFlush(xw.dis);
- usleep(30000);
- draw(SCredraw);
+void
+sigchld(int a) {
+ int stat = 0;
+ if(waitpid(pid, &stat, 0) < 0)
+ die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
+ if(WIFEXITED(stat))
+ exit(WEXITSTATUS(stat));
+ else
+ exit(EXIT_FAILURE);
}
void
ttynew(void) {
int m, s;
- pid_t pid;
- char *pts;
-
- if((m = posix_openpt(O_RDWR | O_NOCTTY)) < 0)
- die("openpt");
- if(grantpt(m) == -1)
- die("grandpt");
- if(unlockpt(m) == -1)
- die("unlockpt");
- if((pts = ptsname(m)) == NULL)
- die("ptsname");
- if((s = open(pts, O_RDWR | O_NOCTTY)) < 0)
- die("slave open");
- 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");
+ die("fork failed\n");
break;
case 0:
setsid(); /* create a new process group */
dup2(s, STDOUT_FILENO);
dup2(s, STDERR_FILENO);
if(ioctl(s, TIOCSCTTY, NULL) < 0)
- die("slave TTIOCSTTY");
+ die("ioctl TIOCSCTTY failed: %s\n", SERRNO);
+ close(s);
+ close(m);
execsh();
break;
default:
close(s);
cmdfd = m;
+ signal(SIGCHLD, sigchld);
}
}
void
dump(char c) {
static int col;
- fprintf(stderr, " %02x %c ", c, isprint(c)?c:'.');
+ fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.');
if(++col % 10 == 0)
fprintf(stderr, "\n");
}
void
ttyread(void) {
- char buf[BUFSIZ] = {0};
+ char buf[BUFSIZ];
int ret;
- switch(ret = read(cmdfd, buf, BUFSIZ)) {
- case -1: /* error or exit */
- /* XXX: be more precise */
- running = 0;
- break;
- default:
+ if((ret = read(cmdfd, buf, LEN(buf))) < 0)
+ die("Couldn't read from shell: %s\n", SERRNO);
+ else
tputs(buf, ret);
- }
}
void
-ttywrite(char *s, size_t n) {
+ttywrite(const char *s, size_t n) {
if(write(cmdfd, s, n) == -1)
- die("write error on tty.");
+ die("write error on tty: %s\n", SERRNO);
}
void
w.ws_col = term.col;
w.ws_xpixel = w.ws_ypixel = 0;
if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
- fprintf(stderr, "Couldn't set window size: %m\n");
-}
-
-int
-escfinal(char c) {
- if(escseq.len == 1)
- switch(c) {
- case '[':
- case ']':
- case '(':
- return 0;
- case '=':
- case '>':
- default:
- return 1;
- }
- else if(BETWEEN(c, 0x40, 0x7E))
- return 1;
- return 0;
+ fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
}
void
-tcpos(int mode) {
- static int x = 0;
- static int y = 0;
+tcursor(int mode) {
+ static TCursor c;
- if(mode == CSsave)
- x = term.c.x, y = term.c.y;
- else if(mode == CSload)
- tmoveto(x, y);
+ if(mode == CURSOR_SAVE)
+ c = term.c;
+ else if(mode == CURSOR_LOAD)
+ term.c = c, tmoveto(c.x, c.y);
}
void
-tnew(int col, int row) { /* screen size */
- term.row = row, term.col = col;
+treset(void) {
+ term.c = (TCursor){{
+ .mode = ATTR_NULL,
+ .fg = DefaultFG,
+ .bg = DefaultBG
+ }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
+
term.top = 0, term.bot = term.row - 1;
- /* mode */
- term.mode = TMwrap;
- /* cursor */
- term.c.attr.mode = ATnone;
- term.c.attr.fg = DefaultFG;
- term.c.attr.bg = DefaultBG;
- term.c.x = term.c.y = 0;
- term.c.hidden = 0;
- /* allocate screen */
- term.line = calloc(term.row, sizeof(Line));
- for(row = 0 ; row < term.row; row++)
- term.line[row] = calloc(term.col, sizeof(Glyph));
-}
-
-void
-tscroll(void) {
- Line temp = term.line[term.top];
- int i;
+ term.mode = MODE_WRAP;
+ tclearregion(0, 0, term.col-1, term.row-1);
+}
- 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;
- xscroll();
+void
+tnew(int col, int row) {
+ /* set screen size */
+ term.row = row, term.col = col;
+ term.line = malloc(term.row * sizeof(Line));
+ term.alt = malloc(term.row * sizeof(Line));
+ for(row = 0 ; row < term.row; row++) {
+ term.line[row] = malloc(term.col * sizeof(Glyph));
+ term.alt [row] = malloc(term.col * sizeof(Glyph));
+ }
+ /* setup screen */
+ treset();
}
void
-tnewline(void) {
- int y = term.c.y + 1;
+tswapscreen(void) {
+ Line* tmp = term.line;
+ term.line = term.alt;
+ term.alt = tmp;
+ term.mode ^= MODE_ALTSCREEN;
+}
- if(y > term.bot) {
- tscroll(), y = term.bot;
+void
+tscrolldown(int orig, int n) {
+ int i;
+ Line temp;
+
+ LIMIT(n, 0, term.bot-orig+1);
+
+ tclearregion(0, term.bot-n+1, term.col-1, term.bot);
+
+ for(i = term.bot; i >= orig+n; i--) {
+ temp = term.line[i];
+ term.line[i] = term.line[i-n];
+ term.line[i-n] = temp;
}
- tmoveto(0, y);
}
-int
-escaddc(char c) {
- escseq.buf[escseq.len++] = c;
- if(escfinal(c) || escseq.len >= ESCSIZ) {
- escparse(), eschandle();
- return 0;
+void
+tscrollup(int orig, int n) {
+ int i;
+ Line temp;
+ LIMIT(n, 0, term.bot-orig+1);
+
+ tclearregion(0, orig, term.col-1, orig+n-1);
+
+ for(i = orig; i <= term.bot-n; i++) {
+ temp = term.line[i];
+ term.line[i] = term.line[i+n];
+ term.line[i+n] = temp;
}
- return 1;
}
void
-escparse(void) {
+tnewline(void) {
+ int x = term.c.x+1 < term.col ? term.c.x : 0;
+ int y = term.c.y;
+ if(term.c.y == term.bot)
+ tscrollup(term.top, 1);
+ else
+ y++;
+ tmoveto(x, y);
+}
+
+void
+csiparse(void) {
/* int noarg = 1; */
char *p = escseq.buf;
escseq.narg = 0;
- switch(escseq.pre = *p++) {
- case '[': /* CSI */
- if(*p == '?')
- escseq.priv = 1, p++;
-
- while(p < escseq.buf+escseq.len) {
- while(isdigit(*p)) {
- escseq.arg[escseq.narg] *= 10;
- escseq.arg[escseq.narg] += *(p++) - '0'/*, noarg = 0 */;
- }
- if(*p == ';')
- escseq.narg++, p++;
- else {
- escseq.mode = *p;
- escseq.narg++;
- return;
- }
+ if(*p == '?')
+ escseq.priv = 1, p++;
+
+ while(p < escseq.buf+escseq.len) {
+ while(isdigit(*p)) {
+ escseq.arg[escseq.narg] *= 10;
+ escseq.arg[escseq.narg] += *p++ - '0'/*, noarg = 0 */;
+ }
+ if(*p == ';' && escseq.narg+1 < ESC_ARG_SIZ)
+ escseq.narg++, p++;
+ else {
+ escseq.mode = *p;
+ escseq.narg++;
+ return;
}
- break;
- case '(':
- /* XXX: graphic character set */
- break;
}
}
void
tmoveto(int x, int y) {
- term.c.x = x < 0 ? 0 : x >= term.col ? term.col-1 : x;
- term.c.y = y < 0 ? 0 : y >= term.row ? term.row-1 : y;
-}
-
-void
-tcursor(int dir) {
- int xf = term.c.x, yf = term.c.y;
-
- switch(dir) {
- case CSup:
- yf--;
- break;
- case CSdown:
- yf++;
- break;
- case CSleft:
- xf--;
- if(xf < 0) {
- xf = term.col-1, yf--;
- if(yf < term.top)
- yf = term.top, xf = 0;
- }
- break;
- case CSright:
- xf++;
- if(xf >= term.col) {
- xf = 0, yf++;
- if(yf > term.bot)
- yf = term.bot, tscroll();
- }
- break;
- }
- tmoveto(xf, yf);
+ LIMIT(x, 0, term.col-1);
+ LIMIT(y, 0, term.row-1);
+ term.c.state &= ~CURSOR_WRAPNEXT;
+ term.c.x = x;
+ term.c.y = y;
}
void
tsetchar(char c) {
term.line[term.c.y][term.c.x] = term.c.attr;
term.line[term.c.y][term.c.x].c = c;
- term.line[term.c.y][term.c.x].state |= CRset | CRupdate;
+ term.line[term.c.y][term.c.x].state |= GLYPH_SET;
}
void
tclearregion(int x1, int y1, int x2, int y2) {
- int x, y;
+ int x, y, temp;
+
+ if(x1 > x2)
+ temp = x1, x1 = x2, x2 = temp;
+ if(y1 > y2)
+ temp = y1, y1 = y2, y2 = temp;
LIMIT(x1, 0, term.col-1);
LIMIT(x2, 0, term.col-1);
LIMIT(y1, 0, term.row-1);
LIMIT(y2, 0, term.row-1);
- /* XXX: could be optimized */
- for(x = x1; x <= x2; x++)
- for(y = y1; y <= y2; y++)
- memset(&term.line[y][x], 0, sizeof(Glyph));
-
- xclear(x1, y1, x2, y2);
+ for(y = y1; y <= y2; y++)
+ for(x = x1; x <= x2; x++)
+ term.line[y][x].state = 0;
}
void
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
-tinsertblankline (int n) {
- int i;
- Line blank;
- int bot = term.bot;
-
- if(term.c.y > term.bot)
- bot = term.row - 1;
- else if(term.c.y < term.top)
- bot = term.top - 1;
- if(term.c.y + n >= bot) {
- tclearregion(0, term.c.y, term.col-1, bot);
+tinsertblankline(int n) {
+ if(term.c.y < term.top || term.c.y > term.bot)
return;
- }
- for(i = bot; i >= term.c.y+n; i--) {
- /* swap deleted line <-> blanked line */
- blank = term.line[i];
- term.line[i] = term.line[i-n];
- term.line[i-n] = blank;
- /* blank it */
- memset(blank, 0, term.col * sizeof(Glyph));
- }
-}
+ tscrolldown(term.c.y, n);
+}
void
tdeleteline(int n) {
- int i;
- Line blank;
- int bot = term.bot;
-
- if(term.c.y > term.bot)
- bot = term.row - 1;
- else if(term.c.y < term.top)
- bot = term.top - 1;
- if(term.c.y + n >= bot) {
- tclearregion(0, term.c.y, term.col-1, bot);
+ if(term.c.y < term.top || term.c.y > term.bot)
return;
- }
- for(i = term.c.y; i <= bot-n; i++) {
- /* swap deleted line <-> blanked line */
- blank = term.line[i];
- term.line[i] = term.line[i+n];
- term.line[i+n] = blank;
- /* blank it */
- memset(blank, 0, term.col * sizeof(Glyph));
- }
+
+ tscrollup(term.c.y, n);
}
void
tsetattr(int *attr, int l) {
int i;
-#ifdef TRUECOLOR /* ESC [ ? <fg/bg> ; <r> ; <g> ; <b> m */
- Color col;
- if(escseq.priv && escseq.len == 4) { /* True color extension :) */
- col = (escseq.arg[1]<<16) + (escseq.arg[2]<<8) + escseq.arg[3];
- switch(escseq.arg[0]) {
- case 3: /* foreground */
- term.c.attr.fg = col;
+ for(i = 0; i < l; i++) {
+ switch(attr[i]) {
+ case 0:
+ term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD);
+ term.c.attr.fg = DefaultFG;
+ term.c.attr.bg = DefaultBG;
break;
- case 4: /* background */
- term.c.attr.bg = col;
+ case 1:
+ term.c.attr.mode |= ATTR_BOLD;
break;
- }
- }
- else
-#endif
- for(i = 0; i < l; i++) {
- switch(attr[i]) {
- case 0:
- memset(&term.c.attr, 0, sizeof(term.c.attr));
- term.c.attr.fg = DefaultFG;
- term.c.attr.bg = DefaultBG;
- break;
- case 1:
- term.c.attr.mode |= ATbold;
- break;
- case 4:
- term.c.attr.mode |= ATunderline;
- break;
- case 7:
- term.c.attr.mode |= ATreverse;
- break;
- case 8:
- term.c.hidden = CShide;
- break;
- case 22:
- term.c.attr.mode &= ~ATbold;
- break;
- case 24:
- term.c.attr.mode &= ~ATunderline;
- break;
- case 27:
- term.c.attr.mode &= ~ATreverse;
- break;
- case 39:
- term.c.attr.fg = DefaultFG;
- break;
- case 49:
- term.c.attr.fg = DefaultBG;
- break;
- default:
- if(BETWEEN(attr[i], 30, 37))
- term.c.attr.fg = attr[i] - 30;
- else if(BETWEEN(attr[i], 40, 47))
- term.c.attr.bg = attr[i] - 40;
- break;
+ case 4:
+ term.c.attr.mode |= ATTR_UNDERLINE;
+ break;
+ case 7:
+ term.c.attr.mode |= ATTR_REVERSE;
+ break;
+ case 22:
+ term.c.attr.mode &= ~ATTR_BOLD;
+ break;
+ case 24:
+ term.c.attr.mode &= ~ATTR_UNDERLINE;
+ break;
+ case 27:
+ term.c.attr.mode &= ~ATTR_REVERSE;
+ break;
+ case 38:
+ if (i + 2 < l && attr[i + 1] == 5) {
+ i += 2;
+ if (BETWEEN(attr[i], 0, 255))
+ term.c.attr.fg = attr[i];
+ else
+ fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]);
+ }
+ else
+ fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]);
+ break;
+ case 39:
+ term.c.attr.fg = DefaultFG;
+ break;
+ case 48:
+ if (i + 2 < l && attr[i + 1] == 5) {
+ i += 2;
+ if (BETWEEN(attr[i], 0, 255))
+ term.c.attr.bg = attr[i];
+ else
+ fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]);
}
+ else
+ fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]);
+ break;
+ case 49:
+ term.c.attr.bg = DefaultBG;
+ break;
+ default:
+ if(BETWEEN(attr[i], 30, 37))
+ term.c.attr.fg = attr[i] - 30;
+ else if(BETWEEN(attr[i], 40, 47))
+ term.c.attr.bg = attr[i] - 40;
+ else if(BETWEEN(attr[i], 90, 97))
+ term.c.attr.fg = attr[i] - 90 + 8;
+ else if(BETWEEN(attr[i], 100, 107))
+ term.c.attr.fg = attr[i] - 100 + 8;
+ else
+ fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
+
+ break;
}
+ }
}
void
b = temp;
}
term.top = t;
- term.bot = b;
+ term.bot = b;
}
-
void
-eschandle(void) {
- /* escdump(); */
- switch(escseq.pre) {
- case '[':
- switch(escseq.mode) {
- case '@': /* Insert <n> blank char */
- DEFAULT(escseq.arg[0], 1);
- tinsertblank(escseq.arg[0]);
- break;
- case 'A': /* Cursor <n> Up */
- case 'e':
- DEFAULT(escseq.arg[0], 1);
- tmoveto(term.c.x, term.c.y-escseq.arg[0]);
- break;
- case 'B': /* Cursor <n> Down */
- DEFAULT(escseq.arg[0], 1);
- tmoveto(term.c.x, term.c.y+escseq.arg[0]);
- break;
- case 'C': /* Cursor <n> Forward */
- case 'a':
- DEFAULT(escseq.arg[0], 1);
- tmoveto(term.c.x+escseq.arg[0], term.c.y);
+csihandle(void) {
+ switch(escseq.mode) {
+ default:
+ unknown:
+ printf("erresc: unknown csi ");
+ csidump();
+ /* die(""); */
+ break;
+ case '@': /* ICH -- Insert <n> blank char */
+ DEFAULT(escseq.arg[0], 1);
+ tinsertblank(escseq.arg[0]);
+ break;
+ case 'A': /* CUU -- Cursor <n> Up */
+ case 'e':
+ DEFAULT(escseq.arg[0], 1);
+ tmoveto(term.c.x, term.c.y-escseq.arg[0]);
+ break;
+ case 'B': /* CUD -- Cursor <n> Down */
+ DEFAULT(escseq.arg[0], 1);
+ tmoveto(term.c.x, term.c.y+escseq.arg[0]);
+ break;
+ case 'C': /* CUF -- Cursor <n> Forward */
+ case 'a':
+ DEFAULT(escseq.arg[0], 1);
+ tmoveto(term.c.x+escseq.arg[0], term.c.y);
+ break;
+ case 'D': /* CUB -- Cursor <n> Backward */
+ DEFAULT(escseq.arg[0], 1);
+ tmoveto(term.c.x-escseq.arg[0], term.c.y);
+ break;
+ case 'E': /* CNL -- Cursor <n> Down and first col */
+ DEFAULT(escseq.arg[0], 1);
+ tmoveto(0, term.c.y+escseq.arg[0]);
+ break;
+ case 'F': /* CPL -- Cursor <n> Up and first col */
+ DEFAULT(escseq.arg[0], 1);
+ tmoveto(0, term.c.y-escseq.arg[0]);
+ break;
+ case 'G': /* CHA -- Move to <col> */
+ case '`': /* XXX: HPA -- same? */
+ DEFAULT(escseq.arg[0], 1);
+ tmoveto(escseq.arg[0]-1, term.c.y);
+ break;
+ case 'H': /* CUP -- Move to <row> <col> */
+ case 'f': /* XXX: HVP -- same? */
+ DEFAULT(escseq.arg[0], 1);
+ DEFAULT(escseq.arg[1], 1);
+ tmoveto(escseq.arg[1]-1, escseq.arg[0]-1);
+ break;
+ /* XXX: (CSI n I) CHT -- Cursor Forward Tabulation <n> tab stops */
+ case 'J': /* ED -- Clear screen */
+ switch(escseq.arg[0]) {
+ case 0: /* below */
+ tclearregion(term.c.x, term.c.y, term.col-1, term.row-1);
break;
- case 'D': /* Cursor <n> Backward */
- DEFAULT(escseq.arg[0], 1);
- tmoveto(term.c.x-escseq.arg[0], term.c.y);
+ case 1: /* above */
+ tclearregion(0, 0, term.c.x, term.c.y);
break;
- case 'E': /* Cursor <n> Down and first col */
- DEFAULT(escseq.arg[0], 1);
- tmoveto(0, term.c.y+escseq.arg[0]);
+ case 2: /* all */
+ tclearregion(0, 0, term.col-1, term.row-1);
break;
- case 'F': /* Cursor <n> Up and first col */
- DEFAULT(escseq.arg[0], 1);
- tmoveto(0, term.c.y-escseq.arg[0]);
+ default:
+ goto unknown;
+ }
+ break;
+ case 'K': /* EL -- Clear line */
+ switch(escseq.arg[0]) {
+ case 0: /* right */
+ tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
break;
- case 'G': /* Move to <col> */
- case '`':
- DEFAULT(escseq.arg[0], 1);
- tmoveto(escseq.arg[0]-1, term.c.y);
+ case 1: /* left */
+ tclearregion(0, term.c.y, term.c.x, term.c.y);
break;
- case 'H': /* Move to <row> <col> */
- case 'f':
- DEFAULT(escseq.arg[0], 1);
- DEFAULT(escseq.arg[1], 1);
- tmoveto(escseq.arg[1]-1, escseq.arg[0]-1);
+ case 2: /* all */
+ tclearregion(0, term.c.y, term.col-1, term.c.y);
break;
- case 'J': /* Clear screen */
+ }
+ break;
+ case 'S': /* SU -- Scroll <n> line up */
+ DEFAULT(escseq.arg[0], 1);
+ tscrollup(term.top, escseq.arg[0]);
+ break;
+ case 'T': /* SD -- Scroll <n> line down */
+ DEFAULT(escseq.arg[0], 1);
+ tscrolldown(term.top, escseq.arg[0]);
+ break;
+ case 'L': /* IL -- Insert <n> blank lines */
+ DEFAULT(escseq.arg[0], 1);
+ tinsertblankline(escseq.arg[0]);
+ break;
+ case 'l': /* RM -- Reset Mode */
+ if(escseq.priv) {
switch(escseq.arg[0]) {
- case 0: /* below */
- tclearregion(term.c.x, term.c.y, term.col-1, term.row-1);
+ case 1:
+ term.mode &= ~MODE_APPKEYPAD;
+ break;
+ case 5: /* TODO: DECSCNM -- Remove reverse video */
+ break;
+ case 7:
+ term.mode &= ~MODE_WRAP;
+ break;
+ case 12: /* att610 -- Stop blinking cursor (IGNORED) */
+ break;
+ case 25:
+ term.c.state |= CURSOR_HIDE;
break;
- case 1: /* above */
- tclearregion(0, 0, term.c.x, term.c.y);
+ case 1049: /* = 1047 and 1048 */
+ case 1047:
+ if(IS_SET(MODE_ALTSCREEN)) {
+ tclearregion(0, 0, term.col-1, term.row-1);
+ tswapscreen();
+ }
+ if(escseq.arg[0] == 1047)
+ break;
+ case 1048:
+ tcursor(CURSOR_LOAD);
break;
- case 2: /* all */
- tclearregion(0, 0, term.col-1, term.row-1);
- break;
+ default:
+ goto unknown;
}
- break;
- case 'K': /* Clear line */
+ } else {
switch(escseq.arg[0]) {
- case 0: /* right */
- tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
+ case 4:
+ term.mode &= ~MODE_INSERT;
break;
- case 1: /* left */
- tclearregion(0, term.c.y, term.c.x, term.c.y);
+ default:
+ goto unknown;
+ }
+ }
+ break;
+ case 'M': /* DL -- Delete <n> lines */
+ DEFAULT(escseq.arg[0], 1);
+ tdeleteline(escseq.arg[0]);
+ break;
+ case 'X': /* ECH -- Erase <n> char */
+ DEFAULT(escseq.arg[0], 1);
+ tclearregion(term.c.x, term.c.y, term.c.x + escseq.arg[0], term.c.y);
+ break;
+ case 'P': /* DCH -- Delete <n> char */
+ DEFAULT(escseq.arg[0], 1);
+ tdeletechar(escseq.arg[0]);
+ break;
+ /* XXX: (CSI n Z) CBT -- Cursor Backward Tabulation <n> tab stops */
+ case 'd': /* VPA -- Move to <row> */
+ DEFAULT(escseq.arg[0], 1);
+ tmoveto(term.c.x, escseq.arg[0]-1);
+ break;
+ case 'h': /* SM -- Set terminal mode */
+ if(escseq.priv) {
+ switch(escseq.arg[0]) {
+ case 1:
+ term.mode |= MODE_APPKEYPAD;
break;
- case 2: /* all */
- tclearregion(0, term.c.y, term.col-1, term.c.y);
+ case 5: /* DECSCNM -- Reverve video */
+ /* TODO: set REVERSE on the whole screen (f) */
break;
+ case 7:
+ term.mode |= MODE_WRAP;
+ break;
+ case 12: /* att610 -- Start blinking cursor (IGNORED) */
+ /* fallthrough for xterm cvvis = CSI [ ? 12 ; 25 h */
+ if(escseq.narg > 1 && escseq.arg[1] != 25)
+ break;
+ case 25:
+ term.c.state &= ~CURSOR_HIDE;
+ break;
+ case 1049: /* = 1047 and 1048 */
+ case 1047:
+ if(IS_SET(MODE_ALTSCREEN))
+ tclearregion(0, 0, term.col-1, term.row-1);
+ else
+ tswapscreen();
+ if(escseq.arg[0] == 1047)
+ break;
+ case 1048:
+ tcursor(CURSOR_SAVE);
+ break;
+ default: goto unknown;
}
- break;
- case 'L': /* Insert <n> blank lines */
- DEFAULT(escseq.arg[0], 1);
- tinsertblankline(escseq.arg[0]);
- break;
- case 'M': /* Delete <n> lines */
- DEFAULT(escseq.arg[0], 1);
- tdeleteline(escseq.arg[0]);
- break;
- case 'P': /* Delete <n> char */
- DEFAULT(escseq.arg[0], 1);
- tdeletechar(escseq.arg[0]);
- break;
- case 'd': /* Move to <row> */
- DEFAULT(escseq.arg[0], 1);
- tmoveto(term.c.x, escseq.arg[0]-1);
- break;
- case 'h': /* Set terminal mode */
- break;
- case 'm': /* Terminal attribute (color) */
- tsetattr(escseq.arg, escseq.narg);
- break;
- case 'r':
- if(escseq.priv)
- ;
- else {
- DEFAULT(escseq.arg[0], 1);
- DEFAULT(escseq.arg[1], term.row);
- tsetscroll(escseq.arg[0]-1, escseq.arg[1]-1);
+ } else {
+ switch(escseq.arg[0]) {
+ case 4:
+ term.mode |= MODE_INSERT;
+ break;
+ default: goto unknown;
}
- break;
- case 's': /* Save cursor position */
- tcpos(CSsave);
- break;
- case 'u': /* Load cursor position */
- tcpos(CSload);
- break;
+ };
+ break;
+ case 'm': /* SGR -- Terminal attribute (color) */
+ tsetattr(escseq.arg, escseq.narg);
+ break;
+ case 'r': /* DECSTBM -- Set Scrolling Region */
+ if(escseq.priv)
+ goto unknown;
+ else {
+ DEFAULT(escseq.arg[0], 1);
+ DEFAULT(escseq.arg[1], term.row);
+ tsetscroll(escseq.arg[0]-1, escseq.arg[1]-1);
+ tmoveto(0, 0);
}
break;
+ case 's': /* DECSC -- Save cursor position (ANSI.SYS) */
+ tcursor(CURSOR_SAVE);
+ break;
+ case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
+ tcursor(CURSOR_LOAD);
+ break;
}
}
void
-escdump(void) {
+csidump(void) {
int i;
- puts("------");
- printf("rawbuf : %s\n", escseq.buf);
- printf("prechar : %c\n", escseq.pre);
- printf("private : %c\n", escseq.priv ? '?' : ' ');
- printf("narg : %d\n", escseq.narg);
- if(escseq.narg) {
+ printf("ESC [ %s", escseq.priv ? "? " : "");
+ if(escseq.narg)
for(i = 0; i < escseq.narg; i++)
- printf("\targ %d = %d\n", i, escseq.arg[i]);
- }
- printf("mode : %c\n", escseq.mode);
+ printf("%d ", escseq.arg[i]);
+ if(escseq.mode)
+ putchar(escseq.mode);
+ putchar('\n');
}
void
-escreset(void) {
+csireset(void) {
memset(&escseq, 0, sizeof(escseq));
}
+void
+tputtab(void) {
+ int space = TAB - term.c.x % TAB;
+ tmoveto(term.c.x + space, term.c.y);
+}
+
void
tputc(char c) {
- static int inesc = 0;
-
- dump(c);
- /* start of escseq */
- if(c == '\033')
- escreset(), inesc = 1;
- else if(inesc) {
- inesc = escaddc(c);
- } /* normal char */
- else switch(c) {
- default:
- tsetchar(c);
- tcursor(CSright);
+ if(term.esc & ESC_START) {
+ if(term.esc & ESC_CSI) {
+ escseq.buf[escseq.len++] = c;
+ if(BETWEEN(c, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) {
+ term.esc = 0;
+ csiparse(), csihandle();
+ }
+ /* TODO: handle other OSC */
+ } else if(term.esc & ESC_OSC) {
+ if(c == ';') {
+ term.titlelen = 0;
+ term.esc = ESC_START | ESC_TITLE;
+ }
+ } else if(term.esc & ESC_TITLE) {
+ if(c == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
+ term.esc = 0;
+ term.title[term.titlelen] = '\0';
+ XStoreName(xw.dis, xw.win, term.title);
+ } else {
+ term.title[term.titlelen++] = c;
+ }
+ } else if(term.esc & ESC_ALTCHARSET) {
+ switch(c) {
+ case '0': /* Line drawing crap */
+ term.c.attr.mode |= ATTR_GFX;
+ break;
+ case 'B': /* Back to regular text */
+ term.c.attr.mode &= ~ATTR_GFX;
+ break;
+ default:
+ printf("esc unhandled charset: ESC ( %c\n", c);
+ }
+ term.esc = 0;
+ } else {
+ switch(c) {
+ case '[':
+ term.esc |= ESC_CSI;
+ break;
+ case ']':
+ term.esc |= ESC_OSC;
+ break;
+ case '(':
+ term.esc |= ESC_ALTCHARSET;
+ break;
+ case 'D': /* IND -- Linefeed */
+ if(term.c.y == term.bot)
+ tscrollup(term.top, 1);
+ else
+ tmoveto(term.c.x, term.c.y+1);
+ term.esc = 0;
+ break;
+ case 'E': /* NEL -- Next line */
+ tnewline();
+ term.esc = 0;
+ break;
+ case 'M': /* RI -- Reverse index */
+ if(term.c.y == term.top)
+ tscrolldown(term.top, 1);
+ else
+ tmoveto(term.c.x, term.c.y-1);
+ term.esc = 0;
+ break;
+ case 'c': /* RIS -- Reset to inital state */
+ treset();
+ term.esc = 0;
+ break;
+ case '=': /* DECPAM -- Application keypad */
+ term.mode |= MODE_APPKEYPAD;
+ term.esc = 0;
+ break;
+ case '>': /* DECPNM -- Normal keypad */
+ term.mode &= ~MODE_APPKEYPAD;
+ term.esc = 0;
+ break;
+ case '7': /* DECSC -- Save Cursor */
+ tcursor(CURSOR_SAVE);
+ term.esc = 0;
+ break;
+ case '8': /* DECRC -- Restore Cursor */
+ tcursor(CURSOR_LOAD);
+ term.esc = 0;
+ break;
+ default:
+ fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n", c, isprint(c)?c:'.');
+ term.esc = 0;
+ }
+ }
+ } else {
+ switch(c) {
+ case '\t':
+ tputtab();
break;
case '\b':
- tcursor(CSleft);
+ tmoveto(term.c.x-1, term.c.y);
break;
case '\r':
tmoveto(0, term.c.y);
tnewline();
break;
case '\a':
- xbell();
+ if(!xw.focus)
+ xseturgency(1);
break;
+ case '\033':
+ csireset();
+ term.esc = ESC_START;
+ break;
+ default:
+ if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
+ tnewline();
+ tsetchar(c);
+ if(term.c.x+1 < term.col)
+ tmoveto(term.c.x+1, term.c.y);
+ else
+ term.c.state |= CURSOR_WRAPNEXT;
+ break;
+ }
}
}
void
-tputs(char *s, int len) {
+tputs(char *s, int len) {
for(; len > 0; len--)
tputc(*s++);
}
-void
-tdump(void) {
- int row, col;
- Glyph c;
-
- for(row = 0; row < term.row; row++) {
- for(col = 0; col < term.col; col++) {
- if(col == term.c.x && row == term.c.y)
- putchar('#');
- else {
- c = term.line[row][col];
- putchar(c.state & CRset ? c.c : '.');
- }
- }
- putchar('\n');
- }
-}
-
void
tresize(int col, int row) {
- int i;
- Line *line;
+ int i, x;
int minrow = MIN(row, term.row);
int mincol = MIN(col, term.col);
+ int slide = term.c.y - row + 1;
if(col < 1 || row < 1)
return;
- line = calloc(row, sizeof(Line));
- for(i = 0 ; i < row; i++)
- line[i] = calloc(col, sizeof(Glyph));
- for(i = 0 ; i < minrow; i++) {
- memcpy(line[i], term.line[i], mincol * sizeof(Glyph));
+
+ /* free unneeded rows */
+ i = 0;
+ if(slide > 0) {
+ /* slide screen to keep cursor where we expect it -
+ * tscrollup would work here, but we can optimize to
+ * memmove because we're freeing the earlier lines */
+ for(/* i = 0 */; i < slide; i++) {
+ free(term.line[i]);
+ free(term.alt[i]);
+ }
+ memmove(term.line, term.line + slide, row * sizeof(Line));
+ memmove(term.alt, term.alt + slide, row * sizeof(Line));
+ }
+ for(i += row; i < term.row; i++) {
free(term.line[i]);
+ free(term.alt[i]);
+ }
+
+ /* resize to new height */
+ term.line = realloc(term.line, row * sizeof(Line));
+ term.alt = realloc(term.alt, 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));
+ term.alt[i] = realloc(term.alt[i], col * sizeof(Glyph));
+ for(x = mincol; x < col; x++) {
+ term.line[i][x].state = 0;
+ term.alt[i][x].state = 0;
+ }
+ }
+
+ /* allocate any new rows */
+ for(/* i == minrow */; i < row; i++) {
+ term.line[i] = calloc(col, sizeof(Glyph));
+ term.alt [i] = calloc(col, sizeof(Glyph));
}
- free(term.line);
- LIMIT(term.c.x, 0, col-1);
- LIMIT(term.c.y, 0, row-1);
- LIMIT(term.top, 0, row-1);
- LIMIT(term.bot, 0, row-1);
- // if(term.bot == term.row-1)
- term.bot = row-1;
- term.line = line;
+
+ /* update terminal size */
term.col = col, term.row = row;
+ /* make use of the LIMIT in tmoveto */
+ tmoveto(term.c.x, term.c.y);
+ /* reset scrolling region */
+ tsetscroll(0, row-1);
}
-unsigned long
-xgetcol(const char *s) {
+void
+xloadcols(void) {
+ int i, r, g, b;
XColor color;
- Colormap cmap = DefaultColormap(xw.dis, xw.scr);
+ unsigned long white = WhitePixel(xw.dis, xw.scr);
+
+ for(i = 0; i < 16; i++) {
+ if (!XAllocNamedColor(xw.dis, xw.cmap, colorname[i], &color, &color)) {
+ dc.col[i] = white;
+ fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
+ } else
+ dc.col[i] = color.pixel;
+ }
- if(!XAllocNamedColor(xw.dis, cmap, s, &color, &color)) {
- color.pixel = WhitePixel(xw.dis, xw.scr);
- fprintf(stderr, "Could not allocate color '%s'\n", s);
+ /* same colors as xterm */
+ for(r = 0; r < 6; r++)
+ for(g = 0; g < 6; g++)
+ for(b = 0; b < 6; b++) {
+ color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
+ color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
+ color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
+ if (!XAllocColor(xw.dis, xw.cmap, &color)) {
+ dc.col[i] = white;
+ fprintf(stderr, "Could not allocate color %d\n", i);
+ } else
+ dc.col[i] = color.pixel;
+ i++;
+ }
+
+ for(r = 0; r < 24; r++, i++) {
+ color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
+ if (!XAllocColor(xw.dis, xw.cmap, &color)) {
+ dc.col[i] = white;
+ fprintf(stderr, "Could not allocate color %d\n", i);
+ } else
+ dc.col[i] = color.pixel;
}
- return color.pixel;
}
-
void
xclear(int x1, int y1, int x2, int y2) {
- XClearArea(xw.dis, xw.win,
- x1 * xw.cw, y1 * xw.ch,
- (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch,
- False);
+ XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
+ XFillRectangle(xw.dis, xw.buf, dc.gc,
+ x1 * xw.cw, y1 * xw.ch,
+ (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
}
-
void
-xscroll(void) {
- int srcy = (term.top+1) * xw.ch;
- int dsty = term.top * xw.ch;
- int height = (term.bot-term.top) * xw.ch;
-
- xcursor(CShide);
- XCopyArea(xw.dis, xw.win, xw.win, dc.gc, 0, srcy, xw.w, height, 0, dsty);
- xclear(0, term.bot, term.col-1, term.bot);
+xhints(void)
+{
+ XClassHint class = {TNAME, TNAME};
+ XWMHints wm = {.flags = InputHint, .input = 1};
+ XSizeHints size = {
+ .flags = PSize | PResizeInc | PBaseSize,
+ .height = xw.h,
+ .width = xw.w,
+ .height_inc = xw.ch,
+ .width_inc = xw.cw,
+ .base_height = 2*BORDER,
+ .base_width = 2*BORDER,
+ };
+ XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
}
-
-
-
void
xinit(void) {
- XGCValues values;
- unsigned long valuemask;
- XClassHint chint;
- XWMHints wmhint;
- XSizeHints shint;
- char *args[] = {NULL};
- int i;
+ XSetWindowAttributes attrs;
- xw.dis = XOpenDisplay(NULL);
+ if(!(xw.dis = XOpenDisplay(NULL)))
+ die("Can't open display\n");
xw.scr = XDefaultScreen(xw.dis);
- if(!(xw.dis && xw.scr))
- die("can not open display");
-
+
/* font */
- if(!(dc.font = XLoadQueryFont(xw.dis, FONT)))
- die("can not find font " FONT);
+ if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT)))
+ die("Can't load font %s\n", dc.font ? BOLDFONT : FONT);
+ /* XXX: Assuming same size for bold font */
xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing;
- xw.ch = dc.font->ascent + dc.font->descent + LINESPACE;
+ xw.ch = dc.font->ascent + dc.font->descent;
/* colors */
- for(i = 0; i < LEN(colorname); i++)
- dc.col[i] = xgetcol(colorname[i]);
-
- term.c.attr.fg = DefaultFG;
- term.c.attr.bg = DefaultBG;
- term.c.attr.mode = ATnone;
- /* windows */
- xw.h = term.row * xw.ch;
- xw.w = term.col * xw.cw;
- /* XXX: this BORDER is useless after the first resize, handle it in xdraws() */
- xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
- xw.w, xw.h, BORDER,
- dc.col[DefaultBG],
- dc.col[DefaultBG]);
+ xw.cmap = XDefaultColormap(xw.dis, xw.scr);
+ xloadcols();
+
+ /* window - default size */
+ xw.bufh = 24 * xw.ch;
+ xw.bufw = 80 * xw.cw;
+ xw.h = xw.bufh + 2*BORDER;
+ xw.w = xw.bufw + 2*BORDER;
+
+ attrs.background_pixel = dc.col[DefaultBG];
+ attrs.border_pixel = dc.col[DefaultBG];
+ attrs.bit_gravity = NorthWestGravity;
+ attrs.event_mask = FocusChangeMask | KeyPressMask
+ | ExposureMask | VisibilityChangeMask | StructureNotifyMask
+ | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
+ attrs.colormap = xw.cmap;
+
+ xw.win = XCreateWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
+ xw.w, xw.h, 0, XDefaultDepth(xw.dis, xw.scr), InputOutput,
+ XDefaultVisual(xw.dis, xw.scr),
+ CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
+ | CWColormap,
+ &attrs);
+ xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+
+
+ /* input methods */
+ xw.xim = XOpenIM(xw.dis, NULL, NULL, NULL);
+ xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
+ | XIMStatusNothing, XNClientWindow, xw.win,
+ XNFocusWindow, xw.win, NULL);
/* gc */
- values.foreground = XWhitePixel(xw.dis, xw.scr);
- values.font = dc.font->fid;
- valuemask = GCForeground | GCFont;
- dc.gc = XCreateGC(xw.dis, xw.win, valuemask, &values);
+ dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
+
XMapWindow(xw.dis, xw.win);
- /* wm stuff */
- chint.res_name = TNAME, chint.res_class = TNAME;
- wmhint.input = 1, wmhint.flags = InputHint;
- shint.height_inc = xw.ch, shint.width_inc = xw.cw;
- shint.height = xw.h, shint.width = xw.w;
- shint.flags = PSize | PResizeInc;
- XSetWMProperties(xw.dis, xw.win, NULL, NULL, &args[0], 0, &shint, &wmhint, &chint);
- XStoreName(xw.dis, xw.win, TNAME);
+ xhints();
+ XStoreName(xw.dis, xw.win, opt_title ? opt_title : "st");
XSync(xw.dis, 0);
-
}
void
-xdrawc(int x, int y, Glyph g) {
- XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
+xdraws(char *s, Glyph base, int x, int y, int len) {
unsigned long xfg, xbg;
+ int winx = x*xw.cw, winy = y*xw.ch + dc.font->ascent, width = len*xw.cw;
+ int i;
- /* reverse video */
- if(g.mode & ATreverse)
- xfg = dc.col[g.bg], xbg = dc.col[g.fg];
+ if(base.mode & ATTR_REVERSE)
+ xfg = dc.col[base.bg], xbg = dc.col[base.fg];
else
- xfg = dc.col[g.fg], xbg = dc.col[g.bg];
- /* background */
- XSetForeground(xw.dis, dc.gc, xbg);
- XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1);
- /* string */
+ xfg = dc.col[base.fg], xbg = dc.col[base.bg];
+
+ XSetBackground(xw.dis, dc.gc, xbg);
XSetForeground(xw.dis, dc.gc, xfg);
- XDrawString(xw.dis, xw.win, dc.gc, r.x, r.y+dc.font->ascent, &(g.c), 1);
- if(g.mode & ATbold) /* XXX: bold hack (draw again at x+1) */
- XDrawString(xw.dis, xw.win, dc.gc, r.x+1, r.y+dc.font->ascent, &(g.c), 1);
- /* underline */
- if(g.mode & ATunderline) {
- r.y += dc.font->ascent + 1;
- XDrawLine(xw.dis, xw.win, dc.gc, r.x, r.y, r.x+r.width-1, r.y);
- }
+
+ if(base.mode & ATTR_GFX)
+ for(i = 0; i < len; i++) {
+ char c = gfx[(unsigned int)s[i] % 256];
+ if(c)
+ s[i] = c;
+ else if(s[i] > 0x5f)
+ s[i] -= 0x5f;
+ }
+
+ XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
+ XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len);
+
+ if(base.mode & ATTR_UNDERLINE)
+ XDrawLine(xw.dis, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
}
void
-xcursor(int mode) {
+xdrawcursor(void) {
static int oldx = 0;
static int oldy = 0;
- Glyph g = {' ', ATnone, DefaultBG, DefaultCS, 0};
-
- if(term.line[term.c.y][term.c.x].state & CRset)
+ Glyph g = {' ', ATTR_NULL, DefaultBG, DefaultCS, 0};
+
+ LIMIT(oldx, 0, term.col-1);
+ LIMIT(oldy, 0, term.row-1);
+
+ 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 & CRset)
- xdrawc(oldx, oldy, term.line[oldy][oldx]);
- else xclear(oldx, oldy, oldx, oldy); /* XXX: maybe a bug */
- if(mode == CSdraw && !term.c.hidden) {
- xdrawc(term.c.x, term.c.y, g);
+ if(term.line[oldy][oldx].state & GLYPH_SET)
+ xdraws(&term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1);
+ else
+ xclear(oldx, oldy, oldx, oldy);
+
+ /* draw the new one */
+ if(!(term.c.state & CURSOR_HIDE) && xw.focus) {
+ xdraws(&g.c, g, term.c.x, term.c.y, 1);
oldx = term.c.x, oldy = term.c.y;
}
}
+#ifdef DEBUG
+/* basic drawing routines */
+void
+xdrawc(int x, int y, Glyph g) {
+ XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
+ XSetBackground(xw.dis, dc.gc, dc.col[g.bg]);
+ XSetForeground(xw.dis, dc.gc, dc.col[g.fg]);
+ XSetFont(xw.dis, dc.gc, g.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
+ XDrawImageString(xw.dis, xw.buf, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1);
+}
+
+void
+draw(int dummy) {
+ int x, y;
+ xclear(0, 0, term.col-1, term.row-1);
+ for(y = 0; y < term.row; y++)
+ for(x = 0; x < term.col; x++)
+ if(term.line[y][x].state & GLYPH_SET)
+ xdrawc(x, y, term.line[y][x]);
+
+ xdrawcursor();
+ XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
+ XFlush(xw.dis);
+}
+
+#else
+/* optimized drawing routine */
void
draw(int redraw_all) {
- int x, y;
- int changed, set;
+ int i, x, y, ox;
+ Glyph base, new;
+ char buf[DRAW_BUF_SIZ];
- if(redraw_all)
- XClearWindow(xw.dis, xw.win);
- /* XXX: drawing could be optimised */
+ if(!xw.vis)
+ return;
+
+ xclear(0, 0, term.col-1, term.row-1);
for(y = 0; y < term.row; y++) {
+ base = term.line[y][0];
+ i = ox = 0;
for(x = 0; x < term.col; x++) {
- changed = term.line[y][x].state & CRupdate;
- set = term.line[y][x].state & CRset;
- if((changed && set) || (redraw_all && set)) {
- term.line[y][x].state &= ~CRupdate;
- xdrawc(x, y, term.line[y][x]);
+ new = term.line[y][x];
+ if(sel.bx!=-1 && new.c && selected(x, y))
+ new.mode ^= ATTR_REVERSE;
+ if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
+ i >= DRAW_BUF_SIZ)) {
+ xdraws(buf, base, ox, y, i);
+ i = 0;
+ }
+ if(new.state & GLYPH_SET) {
+ if(i == 0) {
+ ox = x;
+ base = new;
+ }
+ buf[i++] = new.c;
}
}
+ if(i > 0)
+ xdraws(buf, base, ox, y, i);
}
- xcursor(CSdraw);
+ xdrawcursor();
+ XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
+ XFlush(xw.dis);
+}
+
+#endif
+
+void
+expose(XEvent *ev) {
+ draw(SCREEN_REDRAW);
+}
+
+void
+visibility(XEvent *ev) {
+ XVisibilityEvent *e = &ev->xvisibility;
+ /* XXX if this goes from 0 to 1, need a full redraw for next Expose,
+ * not just a buf copy */
+ xw.vis = e->state != VisibilityFullyObscured;
}
void
-kpress(XKeyEvent *e) {
+unmap(XEvent *ev) {
+ xw.vis = 0;
+}
+
+void
+xseturgency(int add) {
+ XWMHints *h = XGetWMHints(xw.dis, xw.win);
+ h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
+ XSetWMHints(xw.dis, xw.win, h);
+ XFree(h);
+}
+
+void
+focus(XEvent *ev) {
+ if((xw.focus = ev->type == FocusIn))
+ xseturgency(0);
+ draw(SCREEN_UPDATE);
+}
+
+char*
+kmap(KeySym k) {
+ int i;
+ for(i = 0; i < LEN(key); i++)
+ if(key[i].k == k)
+ return (char*)key[i].s;
+ return NULL;
+}
+
+void
+kpress(XEvent *ev) {
+ XKeyEvent *e = &ev->xkey;
KeySym ksym;
char buf[32];
+ char *customkey;
int len;
int meta;
int shift;
+ Status status;
- meta = e->state & Mod4Mask;
+ meta = e->state & Mod1Mask;
shift = e->state & ShiftMask;
- len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
- if(len > 0) {
+ len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
+
+ if((customkey = kmap(ksym)))
+ ttywrite(customkey, strlen(customkey));
+ else if(len > 0) {
buf[sizeof(buf)-1] = '\0';
if(meta && len == 1)
ttywrite("\033", 1);
ttywrite(buf, len);
- return;
- }
- switch(ksym) {
-#ifdef DEBUG1
- default:
- printf("errkey: %d\n", (int)ksym);
- break;
-#endif
- case XK_Up:
- case XK_Down:
- case XK_Left:
- case XK_Right:
- sprintf(buf, "\033[%c", "DACB"[ksym - XK_Left]);
- ttywrite(buf, 3);
- break;
- case XK_Delete: ttywrite(KEYDELETE, sizeof(KEYDELETE)-1); break;
- case XK_Home: ttywrite( KEYHOME, sizeof( KEYHOME)-1); break;
- case XK_End: ttywrite( KEYEND, sizeof( KEYEND)-1); break;
- case XK_Prior: ttywrite( KEYPREV, sizeof( KEYPREV)-1); break;
- case XK_Next: ttywrite( KEYNEXT, sizeof( KEYNEXT)-1); break;
- case XK_Insert:
- /* XXX: paste X clipboard */
- if(shift);
- break;
- }
+ } else
+ switch(ksym) {
+ case XK_Up:
+ case XK_Down:
+ case XK_Left:
+ case XK_Right:
+ sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', "DACB"[ksym - XK_Left]);
+ ttywrite(buf, 3);
+ break;
+ case XK_Insert:
+ if(shift)
+ selpaste();
+ break;
+ default:
+ fprintf(stderr, "errkey: %d\n", (int)ksym);
+ break;
+ }
}
void
resize(XEvent *e) {
int col, row;
- col = e->xconfigure.width / xw.cw;
- row = e->xconfigure.height / xw.ch;
-
- if(term.col != col && term.row != row) {
- tresize(col, row);
- ttyresize(col, row);
- xw.w = e->xconfigure.width;
- xw.h = e->xconfigure.height;
- draw(SCredraw);
- }
+
+ if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
+ return;
+
+ xw.w = e->xconfigure.width;
+ xw.h = e->xconfigure.height;
+ xw.bufw = xw.w - 2*BORDER;
+ xw.bufh = xw.h - 2*BORDER;
+ col = xw.bufw / xw.cw;
+ row = xw.bufh / xw.ch;
+ tresize(col, row);
+ ttyresize(col, row);
+ xw.bufh = MAX(1, xw.bufh);
+ xw.bufw = MAX(1, xw.bufw);
+ XFreePixmap(xw.dis, xw.buf);
+ xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
}
-
void
run(void) {
- int ret;
XEvent ev;
fd_set rfd;
- struct timeval tv = {0, 10000};
+ int xfd = XConnectionNumber(xw.dis);
- running = 1;
- XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask | StructureNotifyMask);
- XResizeWindow(xw.dis, xw.win, xw.w , xw.h); /* seems to fix the resize bug in wmii */
- while(running) {
- while(XPending(xw.dis)) {
- XNextEvent(xw.dis, &ev);
- switch (ev.type) {
- default:
- break;
- case KeyPress:
- kpress(&ev.xkey);
- break;
- case Expose:
- draw(SCredraw);
- break;
- case ConfigureNotify:
- resize(&ev);
- break;
- }
- }
+ for(;;) {
FD_ZERO(&rfd);
FD_SET(cmdfd, &rfd);
- ret = select(cmdfd+1, &rfd, NULL, NULL, &tv);
- if(ret < 0) {
- fprintf(stderr, "select: %m\n");
- running = 0;
+ FD_SET(xfd, &rfd);
+ if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) {
+ if(errno == EINTR)
+ continue;
+ die("select failed: %s\n", SERRNO);
}
- if(!ret)
- continue;
if(FD_ISSET(cmdfd, &rfd)) {
ttyread();
- draw(SCupdate);
+ draw(SCREEN_UPDATE);
+ }
+ while(XPending(xw.dis)) {
+ XNextEvent(xw.dis, &ev);
+ if (XFilterEvent(&ev, xw.win))
+ continue;
+ if(handler[ev.type])
+ (handler[ev.type])(&ev);
}
}
}
int
main(int argc, char *argv[]) {
- if(argc == 2 && !strncmp("-v", argv[1], 3))
- die("st-"", © 2009 st engineers\n");
- else if(argc != 1)
- die("usage: st [-v]\n");
+ int i;
+
+ for(i = 1; i < argc; i++) {
+ switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
+ case 't':
+ if(++i < argc) opt_title = argv[i];
+ break;
+ case 'e':
+ if(++i < argc) opt_cmd = argv[i];
+ break;
+ case 'v':
+ default:
+ die(USAGE);
+ }
+ }
setlocale(LC_CTYPE, "");
- tnew(80, 24);
- ttynew();
- xinit();
- run();
+ tnew(80, 24);
+ ttynew();
+ xinit();
+ selinit();
+ run();
return 0;
}