#endif
#define USAGE \
- "st-" VERSION ", (c) 2010 st engineers\n" \
- "usage: st [-t title] [-c class] [-v] [-e cmd]\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 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 TIMEDIFFERENCE(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
+#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 };
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 };
+ MODE_CRLF=16, MODE_MOUSE=32 };
enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
void
getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
- if(b)
+ if(b)
*b = e->xbutton.button;
- *x = (e->xbutton.x - BORDER)/xw.cw;
- *y = (e->xbutton.y - BORDER)/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;
}
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 - BORDER)/xw.cw;
- sel.ey = sel.by = (e->xbutton.y - BORDER)/xw.ch;
+ sel.ex = sel.bx = X2COL(e->xbutton.x);
+ sel.ey = sel.by = Y2ROW(e->xbutton.y);
}
void
sel.mode = 0;
getbuttoninfo(e, &b, &sel.ex, &sel.ey);
+ mousereport(e);
if(sel.bx == sel.ex && sel.by == sel.ey) {
sel.bx = -1;
if(b == 2)
struct timeval now;
gettimeofday(&now, NULL);
- if(TIMEDIFFERENCE(now, sel.tclick2) <= TRIPLECLICK_TIMEOUT) {
+ 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(TIMEDIFFERENCE(now, sel.tclick1) <= DOUBLECLICK_TIMEOUT) {
+ } 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 &&
+ 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 &&
+ 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)
+ } else if(b == 1)
selcopy();
memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
gettimeofday(&sel.tclick1, NULL);
void
bmotion(XEvent *e) {
if(sel.mode) {
- int oldey = sel.ey,
+ int oldey = sel.ey,
oldex = sel.ex;
getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
exit(EXIT_FAILURE);
}
-void
+void
sigchld(int a) {
int stat = 0;
if(waitpid(pid, &stat, 0) < 0)
void
ttyread(void) {
static char buf[BUFSIZ];
- static int buflen = 0;
+ static int buflen = 0;
char *ptr;
char s[UTF_SIZ];
int charsize; /* size of utf8 char in bytes */
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) {
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;
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
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;
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 */
/* input methods */
xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
- xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
- | XIMStatusNothing, XNClientWindow, xw.win,
+ xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
+ | XIMStatusNothing, XNClientWindow, xw.win,
XNFocusWindow, xw.win, NULL);
/* gc */
dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL);
/* white cursor, black outline */
cursor = XCreateFontCursor(xw.dpy, XC_xterm);
XDefineCursor(xw.dpy, xw.win, cursor);
- XRecolorCursor(xw.dpy, cursor,
+ XRecolorCursor(xw.dpy, cursor,
&(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
&(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
}
XmbDrawImageString(xw.dpy, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.set : dc.font.set,
- dc.gc, winx, winy, s, bytelen);
+ dc.gc, winx, winy, s, bytelen);
if(base.mode & ATTR_UNDERLINE)
XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
}
}
-void
+void
draw() {
drawregion(0, 0, term.col, term.row);
}
}
if(FD_ISSET(cmdfd, &rfd)) {
ttyread();
- draw();
+ draw();
}
while(XPending(xw.dpy)) {
XNextEvent(xw.dpy, &ev);
case 'c':
if(++i < argc) opt_class = argv[i];
break;
- case 'e':
+ case 'e':
+ /* eat every remaining arguments */
if(++i < argc) opt_cmd = &argv[i];
- break;
+ goto run;
case 'v':
default:
die(USAGE);
}
- /* -e eats every remaining arguments */
- if(opt_cmd)
- break;
}
+
+ run:
setlocale(LC_CTYPE, "");
tnew(80, 24);
ttynew();
Got questions, comments, patches, etc.? Contact Jason Woofenden