#include <X11/extensions/Xdbe.h>
#include <X11/Xft/Xft.h>
#include <fontconfig/fontconfig.h>
+
#define Glyph Glyph_
#define Font Font_
+#define Draw XftDraw *
+#define Colour XftColor
+#define Colourmap Colormap
#if defined(__linux)
#include <pty.h>
enum cursor_state {
CURSOR_DEFAULT = 0,
- CURSOR_HIDE = 1,
- CURSOR_WRAPNEXT = 2
+ CURSOR_WRAPNEXT = 1,
+ CURSOR_ORIGIN = 2
};
enum glyph_state {
};
enum term_mode {
- MODE_WRAP = 1,
+ MODE_WRAP = 1,
MODE_INSERT = 2,
MODE_APPKEYPAD = 4,
MODE_ALTSCREEN = 8,
- MODE_CRLF = 16,
+ MODE_CRLF = 16,
MODE_MOUSEBTN = 32,
MODE_MOUSEMOTION = 64,
MODE_MOUSE = 32|64,
MODE_REVERSE = 128,
- MODE_KBDLOCK = 256
+ MODE_KBDLOCK = 256,
+ MODE_HIDE = 512,
+ MODE_ECHO = 1024,
+ MODE_APPCURSOR = 2048
};
enum escape_state {
/* Purely graphic info */
typedef struct {
- Display* dpy;
- Colormap cmap;
+ Display *dpy;
+ Colourmap cmap;
Window win;
XdbeBackBuffer buf;
Atom xembed, wmdeletewin;
XIM xim;
XIC xic;
- XftDraw *xft_draw;
+ Draw draw;
Visual *vis;
int scr;
bool isfixed; /* is fixed geometry? */
KeySym k;
uint mask;
char s[ESC_BUF_SIZ];
+ /* three valued logic variables: 0 indifferent, 1 on, -1 off */
+ signed char appkey; /* application keypad */
+ signed char appcursor; /* application cursor */
+ signed char crlf; /* crlf mode */
} Key;
/* TODO: use better name for vars... */
/* function definitions used in config.h */
static void xzoom(const Arg *);
+static void selpaste(const Arg *);
/* Config.h for applying patches and the configuration. */
#include "config.h"
int descent;
short lbearing;
short rbearing;
- XftFont *xft_set;
+ XftFont *set;
} Font;
/* Drawing Context */
typedef struct {
- XftColor xft_col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
- GC gc;
+ Colour col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
Font font, bfont, ifont, ibfont;
} DC;
static void tinsertblank(int);
static void tinsertblankline(int);
static void tmoveto(int, int);
+static void tmoveato(int x, int y);
static void tnew(int, int);
static void tnewline(int);
static void tputtab(bool);
static void tsetdirt(int, int);
static void tsetmode(bool, bool, int *, int);
static void tfulldirt(void);
+static void techo(char *, int);
static void ttynew(void);
static void ttyread(void);
static void selinit(void);
static inline bool selected(int, int);
static void selcopy(void);
-static void selpaste(void);
static void selscroll(int, int);
static int utf8decode(char *, long *);
sel.mode = 1;
sel.ex = sel.bx = x2col(e->xbutton.x);
sel.ey = sel.by = y2row(e->xbutton.y);
+ } else if(e->xbutton.button == Button4) {
+ ttywrite("\031", 1);
+ } else if(e->xbutton.button == Button5) {
+ ttywrite("\005", 1);
}
}
}
void
-selpaste(void) {
+selpaste(const Arg *dummy) {
XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY,
xw.win, CurrentTime);
}
}
if(e->xbutton.button == Button2) {
- selpaste();
+ selpaste(NULL);
} else if(e->xbutton.button == Button1) {
sel.mode = 0;
getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
term.mode = MODE_WRAP;
tclearregion(0, 0, term.col-1, term.row-1);
+ tmoveto(0, 0);
+ tcursor(CURSOR_SAVE);
}
void
}
}
+/* for absolute user moves, when decom is set */
+void
+tmoveato(int x, int y) {
+ tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0));
+}
+
void
tmoveto(int x, int y) {
+ int miny, maxy;
+
+ if(term.c.state & CURSOR_ORIGIN) {
+ miny = term.top;
+ maxy = term.bot;
+ } else {
+ miny = 0;
+ maxy = term.row - 1;
+ }
LIMIT(x, 0, term.col-1);
- LIMIT(y, 0, term.row-1);
+ LIMIT(y, miny, maxy);
term.c.state &= ~CURSOR_WRAPNEXT;
term.c.x = x;
term.c.y = y;
void
tsetmode(bool priv, bool set, int *args, int narg) {
int *lim, mode;
+ bool alt;
for(lim = args + narg; args < lim; ++args) {
if(priv) {
switch(*args) {
break;
case 1: /* DECCKM -- Cursor key */
- MODBIT(term.mode, set, MODE_APPKEYPAD);
+ MODBIT(term.mode, set, MODE_APPCURSOR);
break;
case 5: /* DECSCNM -- Reverse video */
mode = term.mode;
if(mode != term.mode)
redraw();
break;
- case 6: /* XXX: DECOM -- Origin */
+ case 6: /* DECOM -- Origin */
+ MODBIT(term.c.state, set, CURSOR_ORIGIN);
+ tmoveato(0, 0);
break;
case 7: /* DECAWM -- Auto wrap */
MODBIT(term.mode, set, MODE_WRAP);
break;
- case 8: /* XXX: DECARM -- Auto repeat */
- break;
case 0: /* Error (IGNORED) */
+ case 2: /* DECANM -- ANSI/VT52 (IGNORED) */
+ case 3: /* DECCOLM -- Column (IGNORED) */
+ case 4: /* DECSCLM -- Scroll (IGNORED) */
+ case 8: /* DECARM -- Auto repeat (IGNORED) */
+ case 18: /* DECPFF -- Printer feed (IGNORED) */
+ case 19: /* DECPEX -- Printer extent (IGNORED) */
+ case 42: /* DECNRCM -- National characters (IGNORED) */
case 12: /* att610 -- Start blinking cursor (IGNORED) */
break;
- case 25:
- MODBIT(term.c.state, !set, CURSOR_HIDE);
+ case 25: /* DECTCEM -- Text Cursor Enable Mode */
+ MODBIT(term.mode, !set, MODE_HIDE);
break;
case 1000: /* 1000,1002: enable xterm mouse report */
MODBIT(term.mode, set, MODE_MOUSEBTN);
break;
case 1049: /* = 1047 and 1048 */
case 47:
- case 1047:
- if(IS_SET(MODE_ALTSCREEN))
+ case 1047: {
+ alt = IS_SET(MODE_ALTSCREEN) != 0;
+ if(alt)
tclearregion(0, 0, term.col-1, term.row-1);
- if((set && !IS_SET(MODE_ALTSCREEN)) ||
- (!set && IS_SET(MODE_ALTSCREEN))) {
+ if(set ^ alt) /* set is always 1 or 0 */
tswapscreen();
- }
if(*args != 1049)
break;
+ }
/* pass through */
case 1048:
tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
break;
default:
- /* case 2: DECANM -- ANSI/VT52 (NOT SUPPOURTED) */
- /* case 3: DECCOLM -- Column (NOT SUPPORTED) */
- /* case 4: DECSCLM -- Scroll (NOT SUPPORTED) */
- /* case 18: DECPFF -- Printer feed (NOT SUPPORTED) */
- /* case 19: DECPEX -- Printer extent (NOT SUPPORTED) */
- /* case 42: DECNRCM -- National characters (NOT SUPPORTED) */
fprintf(stderr,
"erresc: unknown private set/reset mode %d\n",
*args);
case 4: /* IRM -- Insertion-replacement */
MODBIT(term.mode, set, MODE_INSERT);
break;
- case 12: /* XXX: SRM -- Send/Receive */
+ case 12: /* SRM -- Send/Receive */
+ MODBIT(term.mode, !set, MODE_ECHO);
break;
case 20: /* LNM -- Linefeed/new line */
MODBIT(term.mode, set, MODE_CRLF);
tinsertblank(csiescseq.arg[0]);
break;
case 'A': /* CUU -- Cursor <n> Up */
- case 'e':
DEFAULT(csiescseq.arg[0], 1);
tmoveto(term.c.x, term.c.y-csiescseq.arg[0]);
break;
case 'B': /* CUD -- Cursor <n> Down */
+ case 'e': /* VPR --Cursor <n> Down */
DEFAULT(csiescseq.arg[0], 1);
tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
break;
ttywrite(VT102ID, sizeof(VT102ID) - 1);
break;
case 'C': /* CUF -- Cursor <n> Forward */
- case 'a':
+ case 'a': /* HPR -- Cursor <n> Forward */
DEFAULT(csiescseq.arg[0], 1);
tmoveto(term.c.x+csiescseq.arg[0], term.c.y);
break;
case 'f': /* HVP */
DEFAULT(csiescseq.arg[0], 1);
DEFAULT(csiescseq.arg[1], 1);
- tmoveto(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
+ tmoveato(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
break;
case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
DEFAULT(csiescseq.arg[0], 1);
break;
case 'd': /* VPA -- Move to <row> */
DEFAULT(csiescseq.arg[0], 1);
- tmoveto(term.c.x, csiescseq.arg[0]-1);
+ tmoveato(term.c.x, csiescseq.arg[0]-1);
break;
case 'h': /* SM -- Set terminal mode */
tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg);
DEFAULT(csiescseq.arg[0], 1);
DEFAULT(csiescseq.arg[1], term.row);
tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1);
- tmoveto(0, 0);
+ tmoveato(0, 0);
}
break;
case 's': /* DECSC -- Save cursor position (ANSI.SYS) */
tmoveto(x, term.c.y);
}
+void
+techo(char *buf, int len) {
+ for(; len > 0; buf++, len--) {
+ char c = *buf;
+
+ if(c == '\033') { /* escape */
+ tputc("^", 1);
+ tputc("[", 1);
+ } else if (c < '\x20') { /* control code */
+ if(c != '\n' && c != '\r' && c != '\t') {
+ c |= '\x40';
+ tputc("^", 1);
+ }
+ tputc(&c, 1);
+ } else {
+ break;
+ }
+ }
+ if (len)
+ tputc(buf, len);
+}
+
void
tputc(char *c, int len) {
uchar ascii = *c;
}
}
/*
- * STR sequences must be checked before of anything
- * because it can use some control codes as part of the sequence
+ * STR sequences must be checked before anything else
+ * because it can use some control codes as part of the sequence.
*/
if(term.esc & ESC_STR) {
switch(ascii) {
}
return;
}
+
/*
* Actions of control codes must be performed as soon they arrive
* because they can be embedded inside a control sequence, and
case '\030': /* CAN */
csireset();
return;
- case '\005': /* ENQ (IGNORED) */
- case '\000': /* NUL (IGNORED) */
- case '\021': /* XON (IGNORED) */
- case '\023': /* XOFF (IGNORED) */
- case 0177: /* DEL (IGNORED) */
+ case '\005': /* ENQ (IGNORED) */
+ case '\000': /* NUL (IGNORED) */
+ case '\021': /* XON (IGNORED) */
+ case '\023': /* XOFF (IGNORED) */
+ case 0177: /* DEL (IGNORED) */
return;
}
} else if(term.esc & ESC_START) {
/* 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);
+ /* make use of the LIMIT in tmoveto */
+ tmoveto(term.c.x, term.c.y);
return (slide > 0);
}
xw.tw = MAX(1, 2*borderpx + col * xw.cw);
xw.th = MAX(1, 2*borderpx + row * xw.ch);
- XftDrawChange(xw.xft_draw, xw.buf);
+ XftDrawChange(xw.draw, xw.buf);
}
void
xloadcols(void) {
int i, r, g, b;
- XRenderColor xft_color = { .alpha = 0 };
+ XRenderColor color = { .alpha = 0 };
/* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
for(i = 0; i < LEN(colorname); i++) {
if(!colorname[i])
continue;
- if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.xft_col[i])) {
+ if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.col[i])) {
die("Could not allocate color '%s'\n", colorname[i]);
}
}
for(i = 16, r = 0; r < 6; r++) {
for(g = 0; g < 6; g++) {
for(b = 0; b < 6; b++) {
- xft_color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
- xft_color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
- xft_color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
- if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {
+ 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(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i])) {
die("Could not allocate color %d\n", i);
}
i++;
}
for(r = 0; r < 24; r++, i++) {
- xft_color.red = xft_color.green = xft_color.blue = 0x0808 + 0x0a0a * r;
- if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color,
- &dc.xft_col[i])) {
+ color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
+ if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color,
+ &dc.col[i])) {
die("Could not allocate color %d\n", i);
}
}
void
xtermclear(int col1, int row1, int col2, int row2) {
- XftDrawRect(xw.xft_draw,
- &dc.xft_col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
+ XftDrawRect(xw.draw,
+ &dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
borderpx + col1 * xw.cw,
borderpx + row1 * xw.ch,
(col2-col1+1) * xw.cw,
*/
void
xclear(int x1, int y1, int x2, int y2) {
- XftDrawRect(xw.xft_draw,
- &dc.xft_col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
+ XftDrawRect(xw.draw,
+ &dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
x1, y1, x2-x1, y2-y1);
}
match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
if(!match)
return 1;
- if(!(f->xft_set = XftFontOpenPattern(xw.dpy, match))) {
+ if(!(f->set = XftFontOpenPattern(xw.dpy, match))) {
FcPatternDestroy(match);
return 1;
}
- f->ascent = f->xft_set->ascent;
- f->descent = f->xft_set->descent;
+ f->ascent = f->set->ascent;
+ f->descent = f->set->descent;
f->lbearing = 0;
- f->rbearing = f->xft_set->max_advance_width;
+ f->rbearing = f->set->max_advance_width;
- f->height = f->xft_set->height;
+ f->height = f->set->height;
f->width = f->lbearing + f->rbearing;
return 0;
xw.fy = 0;
}
- attrs.background_pixel = dc.xft_col[defaultbg].pixel;
- attrs.border_pixel = dc.xft_col[defaultbg].pixel;
+ attrs.background_pixel = dc.col[defaultbg].pixel;
+ attrs.border_pixel = dc.col[defaultbg].pixel;
attrs.bit_gravity = NorthWestGravity;
attrs.event_mask = FocusChangeMask | KeyPressMask
| ExposureMask | VisibilityChangeMask | StructureNotifyMask
xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied);
/* Xft rendering context */
- xw.xft_draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
+ xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
/* input methods */
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.dpy, xw.win, 0, NULL);
/* white cursor, black outline */
cursor = XCreateFontCursor(xw.dpy, XC_xterm);
width = charlen * xw.cw;
Font *font = &dc.font;
XGlyphInfo extents;
- XftColor *fg = &dc.xft_col[base.fg], *bg = &dc.xft_col[base.bg],
+ Colour *fg = &dc.col[base.fg], *bg = &dc.col[base.bg],
*temp, revfg, revbg;
XRenderColor colfg, colbg;
if(base.mode & ATTR_BOLD) {
if(BETWEEN(base.fg, 0, 7)) {
/* basic system colors */
- fg = &dc.xft_col[base.fg + 8];
+ fg = &dc.col[base.fg + 8];
} else if(BETWEEN(base.fg, 16, 195)) {
/* 256 colors */
- fg = &dc.xft_col[base.fg + 36];
+ fg = &dc.col[base.fg + 36];
} else if(BETWEEN(base.fg, 232, 251)) {
/* greyscale */
- fg = &dc.xft_col[base.fg + 4];
+ fg = &dc.col[base.fg + 4];
}
/*
* Those ranges will not be brightened:
font = &dc.ibfont;
if(IS_SET(MODE_REVERSE)) {
- if(fg == &dc.xft_col[defaultfg]) {
- fg = &dc.xft_col[defaultbg];
+ if(fg == &dc.col[defaultfg]) {
+ fg = &dc.col[defaultbg];
} else {
colfg.red = ~fg->color.red;
colfg.green = ~fg->color.green;
fg = &revfg;
}
- if(bg == &dc.xft_col[defaultbg]) {
- bg = &dc.xft_col[defaultfg];
+ if(bg == &dc.col[defaultbg]) {
+ bg = &dc.col[defaultfg];
} else {
colbg.red = ~bg->color.red;
colbg.green = ~bg->color.green;
if(base.mode & ATTR_REVERSE)
temp = fg, fg = bg, bg = temp;
- XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen,
+ XftTextExtentsUtf8(xw.dpy, font->set, (FcChar8 *)s, bytelen,
&extents);
width = extents.xOff;
if(y == term.row-1)
xclear(winx, winy + xw.ch, winx + width, xw.h);
- XftDrawRect(xw.xft_draw, bg, winx, winy, width, xw.ch);
- XftDrawStringUtf8(xw.xft_draw, fg, font->xft_set, winx,
+ XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch);
+ XftDrawStringUtf8(xw.draw, fg, font->set, winx,
winy + font->ascent, (FcChar8 *)s, bytelen);
if(base.mode & ATTR_UNDERLINE) {
- XftDrawRect(xw.xft_draw, fg, winx, winy + font->ascent + 1,
+ XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
width, 1);
}
}
}
/* draw the new one */
- if(!(term.c.state & CURSOR_HIDE)) {
+ if(!(IS_SET(MODE_HIDE))) {
if(!(xw.state & WIN_FOCUSED))
g.bg = defaultucs;
int ic, ib, x, y, ox, sl;
Glyph base, new;
char buf[DRAW_BUF_SIZ];
- bool ena_sel = sel.bx != -1, alt = IS_SET(MODE_ALTSCREEN);
+ bool ena_sel = sel.bx != -1, alt = IS_SET(MODE_ALTSCREEN) != 0;
- if((sel.alt && !alt) || (!sel.alt && alt))
+ if((sel.alt != 0) ^ alt)
ena_sel = 0;
if(!(xw.state & WIN_VISIBLE))
return;
char*
kmap(KeySym k, uint state) {
- int i;
uint mask;
+ Key *kp;
state &= ~Mod2Mask;
- for(i = 0; i < LEN(key); i++) {
- mask = key[i].mask;
+ for(kp = key; kp < key + LEN(key); kp++) {
+ mask = kp->mask;
- if(key[i].k == k && ((state & mask) == mask
- || (mask == XK_NO_MOD && !state))) {
- return (char*)key[i].s;
+ if(kp->k != k)
+ continue;
+ if((state & mask) != mask &&
+ (mask == XK_NO_MOD && state)) {
+ continue;
+ }
+ if((kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) ||
+ (kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD))) {
+ continue;
+ }
+ if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
+ (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) {
+ continue;
}
+ if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
+ (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
+ continue;
+ }
+
+ return kp->s;
}
return NULL;
}
kpress(XEvent *ev) {
XKeyEvent *e = &ev->xkey;
KeySym ksym;
- char buf[32], *customkey;
- int len, meta, shift, i;
+ char xstr[31], buf[32], *customkey, *cp = buf;
+ int len, i;
Status status;
if (IS_SET(MODE_KBDLOCK))
return;
- meta = e->state & Mod1Mask;
- shift = e->state & ShiftMask;
- len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
+ len = XmbLookupString(xw.xic, e, xstr, sizeof(xstr), &ksym, &status);
/* 1. shortcuts */
for(i = 0; i < LEN(shortcuts); i++) {
/* 2. custom keys from config.h */
if((customkey = kmap(ksym, e->state))) {
- ttywrite(customkey, strlen(customkey));
+ len = strlen(customkey);
+ memcpy(buf, customkey, len);
/* 2. hardcoded (overrides X lookup) */
} else {
- switch(ksym) {
- case XK_Up:
- case XK_Down:
- case XK_Left:
- case XK_Right:
- /* 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:
- if(shift)
- selpaste();
- break;
- case XK_Return:
- if(IS_SET(MODE_CRLF)) {
- ttywrite("\r\n", 2);
- } else {
- ttywrite("\r", 1);
- }
- break;
- /* 3. X lookup */
- default:
- if(len > 0) {
- if(meta && len == 1)
- ttywrite("\033", 1);
- ttywrite(buf, len);
- }
- break;
- }
+ if(len == 0)
+ return;
+
+ if (len == 1 && e->state & Mod1Mask)
+ *cp++ = '\033';
+
+ memcpy(cp, xstr, len);
+ len = cp - buf + len;
}
+
+ ttywrite(buf, len);
+ if(IS_SET(MODE_ECHO))
+ techo(buf, len);
}
+
void
cmessage(XEvent *e) {
/* See xembed specs
void
resize(XEvent *e) {
- fprintf(stderr, "resize -> %d,%d\n", e->xconfigure.width,
- e->xconfigure.height);
if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
return;
opt_class = argv[i];
break;
case 'e':
- /* eat every remaining arguments */
+ /* eat all remaining arguments */
if(++i < argc)
opt_cmd = &argv[i];
goto run;
ttynew();
selinit();
run();
+
return 0;
}