#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/Xlib.h>
#include <X11/Xutil.h>
+#include <X11/cursorfont.h>
+#include <X11/keysym.h>
+
+#include <sys/time.h>
+#include <time.h>
#if defined(__linux)
#include <pty.h>
-#elif defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
#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"
+ "st-" VERSION ", (c) 2010-2011 st engineers\n" \
+ "usage: st [-t title] [-c class] [-v] [-e command...]\n"
/* Arbitrary sizes */
#define ESC_TITLE_SIZ 256
#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 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))
+#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
+#define X2COL(x) (((x) - BORDER)/xw.cw)
+#define Y2ROW(y) (((y) - BORDER)/xw.ch)
/* 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 };
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,
- MODE_CRLF=16 };
+enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8,
+ MODE_CRLF=16, MODE_MOUSE=32 };
enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
-enum { SCREEN_UPDATE, SCREEN_REDRAW };
enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
#undef B0
/* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
typedef struct {
char buf[ESC_BUF_SIZ]; /* raw string */
- int len; /* raw string length */
+ int len; /* raw string length */
char priv;
int arg[ESC_ARG_SIZ];
- int narg; /* nb of args */
+ int narg; /* nb of args */
char mode;
} CSIEscape;
/* Internal representation of the screen */
typedef struct {
- int row; /* nb row */
+ int row; /* nb row */
int col; /* nb col */
Line* line; /* screen */
Line* alt; /* alternate screen */
TCursor c; /* cursor */
- int top; /* top scroll limit */
+ int top; /* top scroll limit */
int bot; /* bottom scroll limit */
int mode; /* terminal mode flags */
int esc; /* escape state flags */
/* Purely graphic info */
typedef struct {
- Display* dis;
+ Display* dpy;
Colormap cmap;
Window win;
Pixmap buf;
XIM xim;
XIC xic;
int scr;
- int w; /* window width */
+ int w; /* window width */
int h; /* window height */
int bufw; /* pixmap width */
int bufh; /* pixmap height */
int ch; /* char height */
int cw; /* char width */
char state; /* focus, redraw, visible */
-} XWindow;
+} XWindow;
typedef struct {
KeySym k;
+ unsigned int mask;
char s[ESC_BUF_SIZ];
} Key;
-typedef struct {
- XFontSet fs;
- short lbearing;
- short rbearing;
- int ascent;
- int descent;
-} FontInfo;
-
/* Drawing Context */
typedef struct {
unsigned long col[256];
- FontInfo font;
- FontInfo bfont;
GC gc;
+ struct {
+ int ascent;
+ int descent;
+ short lbearing;
+ short rbearing;
+ XFontSet set;
+ } font, bfont;
} DC;
/* TODO: use better name for vars... */
int mode;
int bx, by;
int ex, ey;
- struct {int x, y;} b, e;
+ struct {int x, y;} b, e;
char *clip;
+ Atom xtarget;
+ struct timeval tclick1;
+ struct timeval tclick2;
} Selection;
#include "config.h"
-static void die(const char *errstr, ...);
-static void draw(int);
+static void die(const char*, ...);
+static void draw(void);
+static void drawregion(int, int, int, int);
static void execsh(void);
static void sigchld(int);
static void run(void);
static void expose(XEvent *);
static void visibility(XEvent *);
static void unmap(XEvent *);
-static char* kmap(KeySym);
+static char* kmap(KeySym, unsigned int state);
static void kpress(XEvent *);
static void resize(XEvent *);
static void focus(XEvent *);
static void selinit(void);
static inline int selected(int, int);
static void selcopy(void);
-static void selpaste(void);
+static void selpaste();
-static int stou(char *, long *);
-static int utos(long *, char *);
-static int slen(char *);
-static int canstou(char *, int);
+static int utf8decode(char *, long *);
+static int utf8encode(long *, char *);
+static int utf8size(char *);
+static int isfullutf8(char *, int);
static void (*handler[LASTEvent])(XEvent *) = {
[KeyPress] = kpress,
static int cmdfd;
static pid_t pid;
static Selection sel;
-static char *opt_cmd = NULL;
+static char **opt_cmd = NULL;
static char *opt_title = NULL;
+static char *opt_class = NULL;
-/* UTF-8 decode */
-static int stou(char *s, long *u) {
+int
+utf8decode(char *s, long *u) {
unsigned char c;
int i, n, rtn;
if(~c&B7) { /* 0xxxxxxx */
*u = c;
return rtn;
- } else if ((c&(B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */
+ } else if((c&(B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */
*u = c&(B4|B3|B2|B1|B0);
n = 1;
- } else if ((c&(B7|B6|B5|B4)) == (B7|B6|B5)) { /* 1110xxxx */
+ } else if((c&(B7|B6|B5|B4)) == (B7|B6|B5)) { /* 1110xxxx */
*u = c&(B3|B2|B1|B0);
n = 2;
- } else if ((c&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
+ } else if((c&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
*u = c&(B2|B1|B0);
n = 3;
} else
goto invalid;
- for (i=n,++s; i>0; --i,++rtn,++s) {
+ for(i=n,++s; i>0; --i,++rtn,++s) {
c = *s;
- if ((c&(B7|B6)) != B7) /* 10xxxxxx */
+ if((c&(B7|B6)) != B7) /* 10xxxxxx */
goto invalid;
*u <<= 6;
*u |= c&(B5|B4|B3|B2|B1|B0);
}
- if ((n == 1 && *u < 0x80) ||
- (n == 2 && *u < 0x800) ||
- (n == 3 && *u < 0x10000) ||
- (*u >= 0xD800 && *u <= 0xDFFF))
+ if((n == 1 && *u < 0x80) ||
+ (n == 2 && *u < 0x800) ||
+ (n == 3 && *u < 0x10000) ||
+ (*u >= 0xD800 && *u <= 0xDFFF))
goto invalid;
return rtn;
invalid:
return rtn;
}
-/* UTF-8 encode */
-static int utos(long *u, char *s) {
+int
+utf8encode(long *u, char *s) {
unsigned char *sp;
unsigned long uc;
int i, n;
sp = (unsigned char*) s;
uc = *u;
- if (uc < 0x80) {
+ if(uc < 0x80) {
*sp = uc; /* 0xxxxxxx */
return 1;
- } else if (*u < 0x800) {
+ } else if(*u < 0x800) {
*sp = (uc >> 6) | (B7|B6); /* 110xxxxx */
n = 1;
- } else if (uc < 0x10000) {
+ } else if(uc < 0x10000) {
*sp = (uc >> 12) | (B7|B6|B5); /* 1110xxxx */
n = 2;
- } else if (uc <= 0x10FFFF) {
+ } else if(uc <= 0x10FFFF) {
*sp = (uc >> 18) | (B7|B6|B5|B4); /* 11110xxx */
n = 3;
} else {
goto invalid;
}
- for (i=n,++sp; i>0; --i,++sp)
+ for(i=n,++sp; i>0; --i,++sp)
*sp = ((uc >> 6*(i-1)) & (B5|B4|B3|B2|B1|B0)) | B7; /* 10xxxxxx */
return n+1;
invalid:
/* use this if your buffer is less than UTF_SIZ, it returns 1 if you can decode
UTF-8 otherwise return 0 */
-static int canstou(char *s, int b) {
- unsigned char c = *s;
- int n;
+int
+isfullutf8(char *s, int b) {
+ unsigned char *c1, *c2, *c3;
- if (b < 1)
+ c1 = (unsigned char *) s;
+ c2 = (unsigned char *) ++s;
+ c3 = (unsigned char *) ++s;
+ if(b < 1)
return 0;
- else if (~c&B7)
- return 1;
- else if ((c&(B7|B6|B5)) == (B7|B6))
- n = 1;
- else if ((c&(B7|B6|B5|B4)) == (B7|B6|B5))
- n = 2;
- else if ((c&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4))
- n = 3;
- else
- return 1;
- for (--b,++s; n>0&&b>0; --n,--b,++s) {
- c = *s;
- if ((c&(B7|B6)) != B7)
- break;
- }
- if (n > 0 && b == 0)
+ else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1)
+ return 0;
+ else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) &&
+ ((b == 1) ||
+ ((b == 2) && (*c2&(B7|B6)) == B7)))
+ return 0;
+ else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
+ ((b == 1) ||
+ ((b == 2) && (*c2&(B7|B6)) == B7) ||
+ ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7)))
return 0;
else
return 1;
}
-static int slen(char *s) {
+int
+utf8size(char *s) {
unsigned char c = *s;
- if (~c&B7)
+ if(~c&B7)
return 1;
- else if ((c&(B7|B6|B5)) == (B7|B6))
+ else if((c&(B7|B6|B5)) == (B7|B6))
return 2;
- else if ((c&(B7|B6|B5|B4)) == (B7|B6|B5))
+ else if((c&(B7|B6|B5|B4)) == (B7|B6|B5))
return 3;
- else
+ else
return 4;
}
-static void selinit(void) {
+void
+selinit(void) {
+ sel.tclick1.tv_sec = 0;
+ sel.tclick1.tv_usec = 0;
sel.mode = 0;
sel.bx = -1;
sel.clip = NULL;
+ sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
+ if(sel.xtarget == None)
+ sel.xtarget = XA_STRING;
}
-static inline int selected(int x, int y) {
+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))
+ 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)
+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;
+ *x = X2COL(e->xbutton.x);
+ *y = Y2ROW(e->xbutton.y);
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) {
+void
+mousereport(XEvent *e) {
+ int x = X2COL(e->xbutton.x);
+ int y = Y2ROW(e->xbutton.y);
+ int button = e->xbutton.button;
+ int state = e->xbutton.state;
+ char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 };
+
+ if(!IS_SET(MODE_MOUSE))
+ return;
+
+ /* from urxvt */
+ if(e->xbutton.type == ButtonRelease || button == AnyButton)
+ button = 3;
+ else {
+ button -= Button1;
+ if(button >= 3)
+ button += 64 - 3;
+ }
+
+ buf[3] = 32 + button + (state & ShiftMask ? 4 : 0)
+ + (state & Mod4Mask ? 8 : 0)
+ + (state & ControlMask ? 16 : 0);
+
+ ttywrite(buf, sizeof(buf));
+}
+
+void
+bpress(XEvent *e) {
+ mousereport(e);
sel.mode = 1;
- sel.ex = sel.bx = e->xbutton.x/xw.cw;
- sel.ey = sel.by = e->xbutton.y/xw.ch;
+ sel.ex = sel.bx = X2COL(e->xbutton.x);
+ sel.ey = sel.by = Y2ROW(e->xbutton.y);
}
-static void selcopy() {
+void
+selcopy(void) {
char *str, *ptr;
- int ls, x, y, sz, sl;
+ int x, y, sz, sl, ls = 0;
if(sel.bx == -1)
str = NULL;
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))) {
- sl = slen(term.line[y][x].c);
+ sl = utf8size(term.line[y][x].c);
memcpy(ptr, term.line[y][x].c, sl);
ptr += sl;
}
- if(ls)
- *ptr = '\n', ptr++;
+ if(ls && y < sel.e.y)
+ *ptr++ = '\n';
}
*ptr = 0;
}
xsetsel(str);
}
-static void selnotify(XEvent *e) {
+void
+selnotify(XEvent *e) {
unsigned long nitems;
unsigned long ofs, rem;
int format;
ofs = 0;
do {
- if(XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
+ if(XGetWindowProperty(xw.dpy, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
False, AnyPropertyType, &type, &format,
&nitems, &rem, &data)) {
fprintf(stderr, "Clipboard allocation failed\n");
} while(rem > 0);
}
-static void selpaste() {
- XConvertSelection(xw.dis, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, CurrentTime);
+void
+selpaste() {
+ XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
}
-static void selrequest(XEvent *e)
-{
+void
+selrequest(XEvent *e) {
XSelectionRequestEvent *xsre;
XSelectionEvent xev;
Atom xa_targets;
/* reject */
xev.property = None;
- xa_targets = XInternAtom(xw.dis, "TARGETS", 0);
+ xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
if(xsre->target == xa_targets) {
/* respond with the supported type */
- Atom string = XA_STRING;
+ Atom string = sel.xtarget;
XChangeProperty(xsre->display, xsre->requestor, xsre->property,
XA_ATOM, 32, PropModeReplace,
(unsigned char *) &string, 1);
xev.property = xsre->property;
- } else if(xsre->target == XA_STRING) {
+ } else if(xsre->target == sel.xtarget) {
XChangeProperty(xsre->display, xsre->requestor, xsre->property,
xsre->target, 8, PropModeReplace,
(unsigned char *) sel.clip, strlen(sel.clip));
fprintf(stderr, "Error sending SelectionNotify event\n");
}
-static void xsetsel(char *str) {
+void
+xsetsel(char *str) {
/* register the selection for both the clipboard and the primary */
Atom clipboard;
free(sel.clip);
sel.clip = str;
- XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime);
+ XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
- clipboard = XInternAtom(xw.dis, "CLIPBOARD", 0);
- XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime);
+ clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+ XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
- XFlush(xw.dis);
+ XFlush(xw.dpy);
}
-/* TODO: doubleclick to select word */
-static void brelease(XEvent *e) {
+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) {
+ mousereport(e);
+ if(sel.bx == sel.ex && sel.by == sel.ey) {
sel.bx = -1;
- if(b==2)
+ if(b == 2)
selpaste();
- } else {
- if(b==1)
- selcopy();
- }
- draw(1);
+ else if(b == 1) {
+ struct timeval now;
+ gettimeofday(&now, NULL);
+
+ if(TIMEDIFF(now, sel.tclick2) <= TRIPLECLICK_TIMEOUT) {
+ /* triple click on the line */
+ sel.b.x = sel.bx = 0;
+ sel.e.x = sel.ex = term.col;
+ sel.b.y = sel.e.y = sel.ey;
+ selcopy();
+ } else if(TIMEDIFF(now, sel.tclick1) <= DOUBLECLICK_TIMEOUT) {
+ /* double click to select word */
+ sel.bx = sel.ex;
+ while(term.line[sel.ey][sel.bx-1].state & GLYPH_SET &&
+ term.line[sel.ey][sel.bx-1].c[0] != ' ') sel.bx--;
+ sel.b.x = sel.bx;
+ while(term.line[sel.ey][sel.ex+1].state & GLYPH_SET &&
+ term.line[sel.ey][sel.ex+1].c[0] != ' ') sel.ex++;
+ sel.e.x = sel.ex;
+ sel.b.y = sel.e.y = sel.ey;
+ selcopy();
+ }
+ }
+ } else if(b == 1)
+ selcopy();
+ memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
+ gettimeofday(&sel.tclick1, NULL);
+ draw();
}
-static void bmotion(XEvent *e) {
- if (sel.mode) {
+void
+bmotion(XEvent *e) {
+ if(sel.mode) {
+ int oldey = sel.ey,
+ oldex = sel.ex;
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 : '.');
- }
+ if(oldey != sel.ey || oldex != sel.ex) {
+ int starty = MIN(oldey, sel.ey);
+ int endy = MAX(oldey, sel.ey);
+ drawregion(0, (starty > 0 ? starty : 0), term.col, (sel.ey < term.row ? endy+1 : term.row));
}
- putchar('\n');
}
}
-#endif
void
die(const char *errstr, ...) {
void
execsh(void) {
- char *args[] = {getenv("SHELL"), "-i", NULL};
- if(opt_cmd)
- args[0] = opt_cmd, args[1] = NULL;
- else
- DEFAULT(args[0], SHELL);
+ char **args;
+ char *envshell = getenv("SHELL");
+
+ DEFAULT(envshell, "sh");
putenv("TERM="TNAME);
+ args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
execvp(args[0], args);
+ exit(EXIT_FAILURE);
}
-void
+void
sigchld(int a) {
int stat = 0;
if(waitpid(pid, &stat, 0) < 0)
void
ttyread(void) {
- char buf[BUFSIZ], *ptr;
- char s[UTF_SIZ];
- int ret, br;
+ static char buf[BUFSIZ];
static int buflen = 0;
- long u;
+ char *ptr;
+ char s[UTF_SIZ];
+ int charsize; /* size of utf8 char in bytes */
+ long utf8c;
+ int ret;
+ /* append read bytes to unprocessed bytes */
if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
die("Couldn't read from shell: %s\n", SERRNO);
- else {
- buflen += ret;
- for(ptr=buf; buflen>=UTF_SIZ||canstou(ptr,buflen); buflen-=br) {
- br = stou(ptr, &u);
- utos(&u, s);
- tputc(s);
- ptr += br;
- }
- memcpy(buf, ptr, buflen);
+
+ /* process every complete utf8 char */
+ buflen += ret;
+ ptr = buf;
+ while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) {
+ charsize = utf8decode(ptr, &utf8c);
+ utf8encode(&utf8c, s);
+ tputc(s);
+ ptr += charsize;
+ buflen -= charsize;
}
+
+ /* keep any uncomplete utf8 char for the next call */
+ memmove(buf, ptr, buflen);
}
void
void
treset(void) {
term.c = (TCursor){{
- .mode = ATTR_NULL,
- .fg = DefaultFG,
+ .mode = ATTR_NULL,
+ .fg = DefaultFG,
.bg = DefaultBG
}, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
tclearregion(0, orig, term.col-1, orig+n-1);
- for(i = orig; i <= term.bot-n; i++) {
+ for(i = orig; i <= term.bot-n; i++) {
temp = term.line[i];
- term.line[i] = term.line[i+n];
+ term.line[i] = term.line[i+n];
term.line[i+n] = temp;
}
}
term.c.attr.bg = DefaultBG;
break;
case 1:
- term.c.attr.mode |= ATTR_BOLD;
+ term.c.attr.mode |= ATTR_BOLD;
break;
- case 4:
+ case 4:
term.c.attr.mode |= ATTR_UNDERLINE;
break;
- case 7:
- term.c.attr.mode |= ATTR_REVERSE;
+ case 7:
+ term.c.attr.mode |= ATTR_REVERSE;
break;
- case 22:
- term.c.attr.mode &= ~ATTR_BOLD;
+ case 22:
+ term.c.attr.mode &= ~ATTR_BOLD;
break;
- case 24:
+ case 24:
term.c.attr.mode &= ~ATTR_UNDERLINE;
break;
- case 27:
- term.c.attr.mode &= ~ATTR_REVERSE;
+ case 27:
+ term.c.attr.mode &= ~ATTR_REVERSE;
break;
case 38:
- if (i + 2 < l && attr[i + 1] == 5) {
+ if(i + 2 < l && attr[i + 1] == 5) {
i += 2;
- if (BETWEEN(attr[i], 0, 255))
+ 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]);
+ 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) {
+ if(i + 2 < l && attr[i + 1] == 5) {
i += 2;
- if (BETWEEN(attr[i], 0, 255))
+ 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]);
+ fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]);
break;
case 49:
term.c.attr.bg = DefaultBG;
term.c.attr.fg = attr[i] - 90 + 8;
else if(BETWEEN(attr[i], 100, 107))
term.c.attr.fg = attr[i] - 100 + 8;
- else
+ else
fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
break;
b = temp;
}
term.top = t;
- term.bot = b;
+ term.bot = b;
}
void
switch(escseq.mode) {
default:
unknown:
- printf("erresc: unknown csi ");
+ fprintf(stderr, "erresc: unknown csi ");
csidump();
/* die(""); */
break;
case 25:
term.c.state |= CURSOR_HIDE;
break;
+ case 1000: /* disable X11 xterm mouse reporting */
+ term.mode &= ~MODE_MOUSE;
+ break;
case 1049: /* = 1047 and 1048 */
case 1047:
if(IS_SET(MODE_ALTSCREEN)) {
case 25:
term.c.state &= ~CURSOR_HIDE;
break;
+ case 1000: /* enable X11 xterm mouse reporting */
+ term.mode |= MODE_MOUSE;
+ break;
case 1049: /* = 1047 and 1048 */
case 1047:
if(IS_SET(MODE_ALTSCREEN))
}
void
-csidump(void) {
+csidump(void) {
int i;
printf("ESC [ %s", escseq.priv ? "? " : "");
if(escseq.narg)
csiparse(), csihandle();
}
/* TODO: handle other OSC */
- } else if(term.esc & ESC_OSC) {
+ } else if(term.esc & ESC_OSC) {
if(ascii == ';') {
term.titlelen = 0;
term.esc = ESC_START | ESC_TITLE;
if(ascii == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
term.esc = 0;
term.title[term.titlelen] = '\0';
- XStoreName(xw.dis, xw.win, term.title);
+ XStoreName(xw.dpy, xw.win, term.title);
} else {
term.title[term.titlelen++] = ascii;
}
term.c.attr.mode &= ~ATTR_GFX;
break;
default:
- printf("esc unhandled charset: ESC ( %c\n", ascii);
+ fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
}
term.esc = 0;
} else {
tmoveto(term.c.x+1, term.c.y);
else
term.c.state |= CURSOR_WRAPNEXT;
- break;
}
}
}
oldh = xw.bufh;
xw.bufw = MAX(1, col * xw.cw);
xw.bufh = MAX(1, row * xw.ch);
- newbuf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
- XCopyArea(xw.dis, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0);
- XFreePixmap(xw.dis, xw.buf);
- XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
+ newbuf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr));
+ XCopyArea(xw.dpy, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0);
+ XFreePixmap(xw.dpy, xw.buf);
+ XSetForeground(xw.dpy, dc.gc, dc.col[DefaultBG]);
if(xw.bufw > oldw)
- XFillRectangle(xw.dis, newbuf, dc.gc, oldw, 0,
+ XFillRectangle(xw.dpy, newbuf, dc.gc, oldw, 0,
xw.bufw-oldw, MIN(xw.bufh, oldh));
else if(xw.bufw < oldw && (BORDER > 0 || xw.w > xw.bufw))
- XClearArea(xw.dis, xw.win, BORDER+xw.bufw, BORDER,
+ XClearArea(xw.dpy, xw.win, BORDER+xw.bufw, BORDER,
xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh),
False);
if(xw.bufh > oldh)
- XFillRectangle(xw.dis, newbuf, dc.gc, 0, oldh,
+ XFillRectangle(xw.dpy, newbuf, dc.gc, 0, oldh,
xw.bufw, xw.bufh-oldh);
else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh))
- XClearArea(xw.dis, xw.win, BORDER, BORDER+xw.bufh,
+ XClearArea(xw.dpy, xw.win, BORDER, BORDER+xw.bufh,
xw.w-2*BORDER, xw.h-xw.bufh-BORDER,
False);
xw.buf = newbuf;
xloadcols(void) {
int i, r, g, b;
XColor color;
- unsigned long white = WhitePixel(xw.dis, xw.scr);
+ unsigned long white = WhitePixel(xw.dpy, xw.scr);
for(i = 0; i < 16; i++) {
- if (!XAllocNamedColor(xw.dis, xw.cmap, colorname[i], &color, &color)) {
+ if(!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
} else
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)) {
+ if(!XAllocColor(xw.dpy, xw.cmap, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color %d\n", i);
} else
for(r = 0; r < 24; r++, i++) {
color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
- if (!XAllocColor(xw.dis, xw.cmap, &color)) {
+ if (!XAllocColor(xw.dpy, xw.cmap, &color)) {
dc.col[i] = white;
fprintf(stderr, "Could not allocate color %d\n", i);
} else
void
xclear(int x1, int y1, int x2, int y2) {
- XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
- XFillRectangle(xw.dis, xw.buf, dc.gc,
+ XSetForeground(xw.dpy, dc.gc, dc.col[DefaultBG]);
+ XFillRectangle(xw.dpy, xw.buf, dc.gc,
x1 * xw.cw, y1 * xw.ch,
(x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
}
void
-xhints(void)
-{
- XClassHint class = {TNAME, TNAME};
+xhints(void) {
+ XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
XWMHints wm = {.flags = InputHint, .input = 1};
XSizeHints size = {
.flags = PSize | PResizeInc | PBaseSize,
.base_height = 2*BORDER,
.base_width = 2*BORDER,
};
- XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
+ XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
+}
+
+XFontSet
+xinitfont(char *fontstr) {
+ XFontSet set;
+ char *def, **missing;
+ int n;
+
+ missing = NULL;
+ set = XCreateFontSet(xw.dpy, fontstr, &missing, &n, &def);
+ if(missing) {
+ while(n--)
+ fprintf(stderr, "st: missing fontset: %s\n", missing[n]);
+ XFreeStringList(missing);
+ }
+ return set;
}
void
-xsetfontinfo(FontInfo *fi)
-{
+xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing) {
XFontStruct **xfonts;
- int fnum;
- int i;
- char **fontnames;
-
- fi->lbearing = 0;
- fi->rbearing = 0;
- fi->ascent = 0;
- fi->descent = 0;
- fnum = XFontsOfFontSet(fi->fs, &xfonts, &fontnames);
- for(i=0; i<fnum; i++,xfonts++,fontnames++) {
- puts(*fontnames);
- if(fi->ascent < (*xfonts)->ascent)
- fi->ascent = (*xfonts)->ascent;
- if(fi->descent < (*xfonts)->descent)
- fi->descent = (*xfonts)->descent;
- if(fi->rbearing < (*xfonts)->max_bounds.rbearing)
- fi->rbearing = (*xfonts)->max_bounds.rbearing;
- if(fi->lbearing < (*xfonts)->min_bounds.lbearing)
- fi->lbearing = (*xfonts)->min_bounds.lbearing;
+ char **font_names;
+ int i, n;
+
+ *ascent = *descent = *lbearing = *rbearing = 0;
+ n = XFontsOfFontSet(set, &xfonts, &font_names);
+ for(i = 0; i < n; i++) {
+ *ascent = MAX(*ascent, (*xfonts)->ascent);
+ *descent = MAX(*descent, (*xfonts)->descent);
+ *lbearing = MAX(*lbearing, (*xfonts)->min_bounds.lbearing);
+ *rbearing = MAX(*rbearing, (*xfonts)->max_bounds.rbearing);
+ xfonts++;
}
}
void
+initfonts(char *fontstr, char *bfontstr) {
+ if((dc.font.set = xinitfont(fontstr)) == NULL ||
+ (dc.bfont.set = xinitfont(bfontstr)) == NULL)
+ die("Can't load font %s\n", dc.font.set ? BOLDFONT : FONT);
+ xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
+ &dc.font.lbearing, &dc.font.rbearing);
+ xgetfontinfo(dc.bfont.set, &dc.bfont.ascent, &dc.bfont.descent,
+ &dc.bfont.lbearing, &dc.bfont.rbearing);
+}
+
+void
xinit(void) {
XSetWindowAttributes attrs;
- char **mc;
- char *ds;
- int nmc;
+ Cursor cursor;
- if(!(xw.dis = XOpenDisplay(NULL)))
+ if(!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
- xw.scr = XDefaultScreen(xw.dis);
+ xw.scr = XDefaultScreen(xw.dpy);
/* font */
- if ((dc.font.fs = XCreateFontSet(xw.dis, FONT, &mc, &nmc, &ds)) == NULL ||
- (dc.bfont.fs = XCreateFontSet(xw.dis, BOLDFONT, &mc, &nmc, &ds)) == NULL)
- die("Can't load font %s\n", dc.font.fs ? BOLDFONT : FONT);
- xsetfontinfo(&dc.font);
- xsetfontinfo(&dc.bfont);
+ initfonts(FONT, BOLDFONT);
/* XXX: Assuming same size for bold font */
- xw.cw = dc.font.rbearing - dc.font.lbearing;
+ xw.cw = dc.font.rbearing - dc.font.lbearing;
xw.ch = dc.font.ascent + dc.font.descent;
/* colors */
- xw.cmap = XDefaultColormap(xw.dis, xw.scr);
+ xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
xloadcols();
/* window - default size */
| 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),
+ xw.win = XCreateWindow(xw.dpy, XRootWindow(xw.dpy, xw.scr), 0, 0,
+ xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
+ XDefaultVisual(xw.dpy, xw.scr),
CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
| CWColormap,
&attrs);
- xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+ xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr));
/* input methods */
- xw.xim = XOpenIM(xw.dis, NULL, NULL, NULL);
- xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
- | XIMStatusNothing, XNClientWindow, xw.win,
+ xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
+ xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
+ | XIMStatusNothing, XNClientWindow, xw.win,
XNFocusWindow, xw.win, NULL);
/* gc */
- dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
+ dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL);
- XMapWindow(xw.dis, xw.win);
+ /* white cursor, black outline */
+ cursor = XCreateFontCursor(xw.dpy, XC_xterm);
+ XDefineCursor(xw.dpy, xw.win, cursor);
+ XRecolorCursor(xw.dpy, cursor,
+ &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
+ &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
+
+ XMapWindow(xw.dpy, xw.win);
xhints();
- XStoreName(xw.dis, xw.win, opt_title ? opt_title : "st");
- XSync(xw.dis, 0);
+ XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
+ XSync(xw.dpy, 0);
}
void
-xdraws(char *s, Glyph base, int x, int y, int cl, int sl) {
+xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
unsigned long xfg, xbg;
- int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = cl*xw.cw;
+ int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
int i;
if(base.mode & ATTR_REVERSE)
else
xfg = dc.col[base.fg], xbg = dc.col[base.bg];
- XSetBackground(xw.dis, dc.gc, xbg);
- XSetForeground(xw.dis, dc.gc, xfg);
+ XSetBackground(xw.dpy, dc.gc, xbg);
+ XSetForeground(xw.dpy, dc.gc, xfg);
- if(base.mode & ATTR_GFX)
- for(i = 0; i < cl; i++) {
+ if(base.mode & ATTR_GFX) {
+ for(i = 0; i < bytelen; i++) {
char c = gfx[(unsigned int)s[i] % 256];
if(c)
s[i] = c;
else if(s[i] > 0x5f)
s[i] -= 0x5f;
}
+ }
- XmbDrawImageString(xw.dis, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.fs : dc.font.fs,
- dc.gc, winx, winy, s, sl);
+ XmbDrawImageString(xw.dpy, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.set : dc.font.set,
+ dc.gc, winx, winy, s, bytelen);
if(base.mode & ATTR_UNDERLINE)
- XDrawLine(xw.dis, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
+ XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
}
void
/* remove the old cursor */
if(term.line[oldy][oldx].state & GLYPH_SET) {
- sl = slen(term.line[oldy][oldx].c);
+ sl = utf8size(term.line[oldy][oldx].c);
xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
} else
xclear(oldx, oldy, oldx, oldy);
/* draw the new one */
if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
- sl = slen(g.c);
+ sl = utf8size(g.c);
xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
oldx = term.c.x, oldy = term.c.y;
}
}
-#ifdef DEBUG
-/* basic drawing routines */
void
-xdrawc(int x, int y, Glyph g) {
- int sl = slen(g.c);
- 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]);
- XmbDrawImageString(xw.dis, xw.buf, g.mode&ATTR_BOLD?dc.bfont.fs:dc.font.fs,
- dc.gc, r.x, r.y+dc.font.ascent, g.c, sl);
+draw() {
+ drawregion(0, 0, term.col, term.row);
}
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) {
+drawregion(int x1, int y1, int x2, int y2) {
int ic, ib, x, y, ox, sl;
Glyph base, new;
char buf[DRAW_BUF_SIZ];
if(!(xw.state & WIN_VISIBLE))
return;
- xclear(0, 0, term.col-1, term.row-1);
- for(y = 0; y < term.row; y++) {
+ xclear(x1, y1, x2-1, y2-1);
+ for(y = y1; y < y2; y++) {
base = term.line[y][0];
ic = ib = ox = 0;
- for(x = 0; x < term.col; x++) {
+ for(x = x1; x < x2; x++) {
new = term.line[y][x];
- if(sel.bx!=-1 && *(new.c) && selected(x, y))
+ if(sel.bx != -1 && *(new.c) && selected(x, y))
new.mode ^= ATTR_REVERSE;
if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
ox = x;
base = new;
}
- sl = slen(new.c);
+ sl = utf8size(new.c);
memcpy(buf+ib, new.c, sl);
ib += sl;
++ic;
xdraws(buf, base, ox, y, ic, ib);
}
xdrawcursor();
- XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
+ XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
}
-#endif
-
void
expose(XEvent *ev) {
XExposeEvent *e = &ev->xexpose;
if(xw.state & WIN_REDRAW) {
if(!e->count) {
xw.state &= ~WIN_REDRAW;
- draw(SCREEN_REDRAW);
+ draw();
}
} else
- XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER,
+ XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER,
e->width, e->height, e->x, e->y);
}
void
xseturgency(int add) {
- XWMHints *h = XGetWMHints(xw.dis, xw.win);
+ XWMHints *h = XGetWMHints(xw.dpy, xw.win);
h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
- XSetWMHints(xw.dis, xw.win, h);
+ XSetWMHints(xw.dpy, xw.win, h);
XFree(h);
}
xseturgency(0);
} else
xw.state &= ~WIN_FOCUSED;
- draw(SCREEN_UPDATE);
+ draw();
}
char*
-kmap(KeySym k) {
+kmap(KeySym k, unsigned int state) {
int i;
for(i = 0; i < LEN(key); i++)
- if(key[i].k == k)
+ if(key[i].k == k && (key[i].mask == 0 || key[i].mask & state))
return (char*)key[i].s;
return NULL;
}
len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
/* 1. custom keys from config.h */
- if((customkey = kmap(ksym)))
+ if((customkey = kmap(ksym, e->state)))
ttywrite(customkey, strlen(customkey));
/* 2. hardcoded (overrides X lookup) */
else
case XK_Down:
case XK_Left:
case XK_Right:
- sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', "DACB"[ksym - XK_Left]);
+ /* XXX: shift up/down doesn't work */
+ sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', (shift ? "dacb":"DACB")[ksym - XK_Left]);
ttywrite(buf, 3);
break;
case XK_Insert:
/* 3. X lookup */
default:
if(len > 0) {
- buf[sizeof(buf)-1] = '\0';
if(meta && len == 1)
ttywrite("\033", 1);
ttywrite(buf, len);
- } else /* 4. nothing to send */
- fprintf(stderr, "errkey: %d\n", (int)ksym);
+ }
break;
}
}
if(col == term.col && row == term.row)
return;
if(tresize(col, row))
- draw(SCREEN_REDRAW);
+ draw();
ttyresize(col, row);
xresize(col, row);
}
run(void) {
XEvent ev;
fd_set rfd;
- int xfd = XConnectionNumber(xw.dis);
+ int xfd = XConnectionNumber(xw.dpy);
for(;;) {
FD_ZERO(&rfd);
}
if(FD_ISSET(cmdfd, &rfd)) {
ttyread();
- draw(SCREEN_UPDATE);
+ draw();
}
- while(XPending(xw.dis)) {
- XNextEvent(xw.dis, &ev);
- if (XFilterEvent(&ev, xw.win))
+ while(XPending(xw.dpy)) {
+ XNextEvent(xw.dpy, &ev);
+ if(XFilterEvent(&ev, xw.win))
continue;
if(handler[ev.type])
(handler[ev.type])(&ev);
case 't':
if(++i < argc) opt_title = argv[i];
break;
- case 'e':
- if(++i < argc) opt_cmd = argv[i];
+ case 'c':
+ if(++i < argc) opt_class = argv[i];
break;
+ case 'e':
+ /* eat every remaining arguments */
+ if(++i < argc) opt_cmd = &argv[i];
+ goto run;
case 'v':
default:
die(USAGE);
}
}
+
+ run:
setlocale(LC_CTYPE, "");
tnew(80, 24);
ttynew();
Got questions, comments, patches, etc.? Contact Jason Woofenden