X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=6a6ea751de789f2a4ee3ac40749b9d38cc25bfb4;hb=babf4db52b58da74c9e1072d14cb0b9ef5b4dee7;hp=8e3d72ff7228687a6555d2ec8ce46b7dfb53ede0;hpb=00ba6969f863c75536910a0138b5161bbd0638c9;p=st.git diff --git a/st.c b/st.c index 8e3d72f..6a6ea75 100644 --- a/st.c +++ b/st.c @@ -16,14 +16,18 @@ #include #include #include -#include #include -#include +#include #include +#include +#include + +#include +#include #if defined(__linux) #include -#elif defined(__OpenBSD__) || defined(__NetBSD__) +#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) #include #elif defined(__FreeBSD__) || defined(__DragonFly__) #include @@ -31,7 +35,7 @@ #define USAGE \ "st-" VERSION ", (c) 2010 st engineers\n" \ - "usage: st [-t title] [-c class] [-e cmd] [-v]\n" + "usage: st [-t title] [-c class] [-v] [-e cmd]\n" /* Arbitrary sizes */ #define ESC_TITLE_SIZ 256 @@ -44,11 +48,12 @@ #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 TIMEDIFFERENCE(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000) /* 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 }; @@ -56,10 +61,9 @@ 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 { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8, MODE_CRLF=16 }; 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 @@ -86,21 +90,21 @@ typedef struct { /* ESC '[' [[ [] [;]] ] */ 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 */ @@ -117,17 +121,18 @@ typedef struct { 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; @@ -149,14 +154,18 @@ typedef struct { 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); @@ -204,7 +213,7 @@ static void xresize(int, int); 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 *); @@ -217,7 +226,7 @@ static void selrequest(XEvent *); static void selinit(void); static inline int selected(int, int); static void selcopy(void); -static void selpaste(void); +static void selpaste(); static int utf8decode(char *, long *); static int utf8encode(long *, char *); @@ -247,7 +256,7 @@ static CSIEscape escseq; 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; @@ -338,7 +347,7 @@ isfullutf8(char *s, int b) { 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 == 1) || ((b == 2) && (*c2&(B7|B6)) == B7))) return 0; else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) && @@ -354,31 +363,36 @@ 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; } 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 +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)); } @@ -387,8 +401,8 @@ 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 = (e->xbutton.x - BORDER)/xw.cw; + *y = (e->xbutton.y - BORDER)/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; @@ -398,14 +412,14 @@ getbuttoninfo(XEvent *e, int *b, int *x, int *y) { 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; + sel.ex = sel.bx = (e->xbutton.x - BORDER)/xw.cw; + sel.ey = sel.by = (e->xbutton.y - BORDER)/xw.ch; } 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; @@ -419,8 +433,8 @@ selcopy(void) { 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; } @@ -452,7 +466,7 @@ selnotify(XEvent *e) { void selpaste() { - XConvertSelection(xw.dpy, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, CurrentTime); + XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime); } void @@ -473,12 +487,12 @@ selrequest(XEvent *e) { 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)); @@ -506,30 +520,58 @@ xsetsel(char *str) { XFlush(xw.dpy); } -/* TODO: doubleclick to select word */ 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) { + 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(TIMEDIFFERENCE(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) { + /* 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(); } void bmotion(XEvent *e) { - if (sel.mode) { + if(sel.mode) { + int oldey = sel.ey, + oldex = sel.ex; getbuttoninfo(e, NULL, &sel.ex, &sel.ey); - /* XXX: draw() can't keep up, disabled for now. - selection is visible on button release. - draw(1); */ + + 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)); + } } } @@ -545,13 +587,14 @@ 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 @@ -606,24 +649,31 @@ dump(char c) { void ttyread(void) { - char buf[BUFSIZ], *ptr; + static char buf[BUFSIZ]; + static int buflen = 0; + char *ptr; char s[UTF_SIZ]; - int ret, br; - static int buflen = 0; - long u; + 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||isfullutf8(ptr,buflen); buflen-=br) { - br = utf8decode(ptr, &u); - utf8encode(&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 @@ -862,9 +912,9 @@ tsetattr(int *attr, int l) { 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]); @@ -876,9 +926,9 @@ tsetattr(int *attr, int l) { 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]); @@ -926,7 +976,7 @@ csihandle(void) { switch(escseq.mode) { default: unknown: - printf("erresc: unknown csi "); + fprintf(stderr, "erresc: unknown csi "); csidump(); /* die(""); */ break; @@ -1198,7 +1248,7 @@ tputc(char *c) { 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 { @@ -1289,7 +1339,6 @@ tputc(char *c) { tmoveto(term.c.x+1, term.c.y); else term.c.state |= CURSOR_WRAPNEXT; - break; } } } @@ -1388,7 +1437,7 @@ xloadcols(void) { unsigned long white = WhitePixel(xw.dpy, xw.scr); for(i = 0; i < 16; i++) { - if (!XAllocNamedColor(xw.dpy, 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 @@ -1402,7 +1451,7 @@ xloadcols(void) { 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.dpy, xw.cmap, &color)) { + if(!XAllocColor(xw.dpy, xw.cmap, &color)) { dc.col[i] = white; fprintf(stderr, "Could not allocate color %d\n", i); } else @@ -1429,8 +1478,7 @@ xclear(int x1, int y1, int x2, int y2) { } void -xhints(void) -{ +xhints(void) { XClassHint class = {opt_class ? opt_class : TNAME, TNAME}; XWMHints wm = {.flags = InputHint, .input = 1}; XSizeHints size = { @@ -1446,8 +1494,7 @@ xhints(void) } XFontSet -xinitfont(char *fontstr) -{ +xinitfont(char *fontstr) { XFontSet set; char *def, **missing; int n; @@ -1463,8 +1510,7 @@ xinitfont(char *fontstr) } void -xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing) -{ +xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing) { XFontStruct **xfonts; char **font_names; int i, n; @@ -1481,8 +1527,7 @@ xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rb } void -initfonts(char *fontstr, char *bfontstr) -{ +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); @@ -1495,6 +1540,7 @@ initfonts(char *fontstr, char *bfontstr) void xinit(void) { XSetWindowAttributes attrs; + Cursor cursor; if(!(xw.dpy = XOpenDisplay(NULL))) die("Can't open display\n"); @@ -1542,6 +1588,13 @@ xinit(void) { /* 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, + &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff}, + &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000}); + XMapWindow(xw.dpy, xw.win); xhints(); XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st"); @@ -1607,37 +1660,13 @@ xdrawcursor(void) { } } -#ifdef DEBUG -/* basic drawing routines */ -void -xdrawc(int x, int y, Glyph g) { - int sl = utf8size(g.c); - XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch }; - XSetBackground(xw.dpy, dc.gc, dc.col[g.bg]); - XSetForeground(xw.dpy, dc.gc, dc.col[g.fg]); - XmbDrawImageString(xw.dpy, xw.buf, g.mode&ATTR_BOLD?dc.bfont.fs:dc.font.fs, - dc.gc, r.x, r.y+dc.font.ascent, g.c, sl); -} - -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.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER); - XFlush(xw.dpy); +void +draw() { + drawregion(0, 0, term.col, term.row); } -#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]; @@ -1645,13 +1674,13 @@ draw(int redraw_all) { 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)) { @@ -1676,15 +1705,13 @@ draw(int redraw_all) { 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.dpy, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER, @@ -1721,14 +1748,14 @@ focus(XEvent *ev) { 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; } @@ -1749,7 +1776,7 @@ kpress(XEvent *ev) { 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 @@ -1758,7 +1785,8 @@ kpress(XEvent *ev) { 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: @@ -1774,12 +1802,10 @@ kpress(XEvent *ev) { /* 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; } } @@ -1798,7 +1824,7 @@ resize(XEvent *e) { if(col == term.col && row == term.row) return; if(tresize(col, row)) - draw(SCREEN_REDRAW); + draw(); ttyresize(col, row); xresize(col, row); } @@ -1820,11 +1846,11 @@ run(void) { } if(FD_ISSET(cmdfd, &rfd)) { ttyread(); - draw(SCREEN_UPDATE); + draw(); } while(XPending(xw.dpy)) { XNextEvent(xw.dpy, &ev); - if (XFilterEvent(&ev, xw.win)) + if(XFilterEvent(&ev, xw.win)) continue; if(handler[ev.type]) (handler[ev.type])(&ev); @@ -1845,12 +1871,15 @@ main(int argc, char *argv[]) { if(++i < argc) opt_class = argv[i]; break; case 'e': - if(++i < argc) opt_cmd = argv[i]; + if(++i < argc) opt_cmd = &argv[i]; break; case 'v': default: die(USAGE); } + /* -e eats every remaining arguments */ + if(opt_cmd) + break; } setlocale(LC_CTYPE, ""); tnew(80, 24);