Xinqi Bao's Git

projects / st.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
selection is removed or scrolled properly. (thx Rafa Garcia Gallego)
[st.git] / st.c
diff --git a/st.c b/st.c
index 11ea9fc..89fbee9 100644 (file)
--- a/st.c
+++ b/st.c
@@ -34,8 +34,12 @@
 #endif
 
 #define USAGE \
 #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] [-w windowid] [-v] [-e command...]\n"
+
+/* XEMBED messages */
+#define XEMBED_FOCUS_IN  4
+#define XEMBED_FOCUS_OUT 5
 
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
 
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
@@ -43,6 +47,8 @@
 #define ESC_ARG_SIZ   16
 #define DRAW_BUF_SIZ  1024
 #define UTF_SIZ       4
 #define ESC_ARG_SIZ   16
 #define DRAW_BUF_SIZ  1024
 #define UTF_SIZ       4
+#define XK_NO_MOD     UINT_MAX
+#define XK_ANY_MOD    0
 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
@@ -53,7 +59,9 @@
 #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 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 };
 
 /* 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 };
@@ -62,7 +70,7 @@ enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT,
 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 { 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_MOUSEBTN=32, MODE_MOUSEMOTION=64, MODE_MOUSE=32|64, MODE_REVERSE=128 };
 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 };
 
 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 };
 
@@ -118,6 +126,7 @@ typedef struct {
        Colormap cmap;
        Window win;
        Pixmap buf;
        Colormap cmap;
        Window win;
        Pixmap buf;
+       Atom xembed;
        XIM xim;
        XIC xic;
        int scr;
        XIM xim;
        XIC xic;
        int scr;
@@ -163,8 +172,8 @@ typedef struct {
 
 #include "config.h"
 
 
 #include "config.h"
 
-static void die(const char *errstr, ...);
-static void draw();
+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 drawregion(int, int, int, int);
 static void execsh(void);
 static void sigchld(int);
@@ -215,6 +224,7 @@ static void visibility(XEvent *);
 static void unmap(XEvent *);
 static char* kmap(KeySym, unsigned int state);
 static void kpress(XEvent *);
 static void unmap(XEvent *);
 static char* kmap(KeySym, unsigned int state);
 static void kpress(XEvent *);
+static void cmessage(XEvent *);
 static void resize(XEvent *);
 static void focus(XEvent *);
 static void brelease(XEvent *);
 static void resize(XEvent *);
 static void focus(XEvent *);
 static void brelease(XEvent *);
@@ -227,6 +237,7 @@ static void selinit(void);
 static inline int selected(int, int);
 static void selcopy(void);
 static void selpaste();
 static inline int selected(int, int);
 static void selcopy(void);
 static void selpaste();
+static void selscroll(int, int);
 
 static int utf8decode(char *, long *);
 static int utf8encode(long *, char *);
 
 static int utf8decode(char *, long *);
 static int utf8encode(long *, char *);
@@ -235,6 +246,7 @@ static int isfullutf8(char *, int);
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
+       [ClientMessage] = cmessage,
        [ConfigureNotify] = resize,
        [VisibilityNotify] = visibility,
        [UnmapNotify] = unmap,
        [ConfigureNotify] = resize,
        [VisibilityNotify] = visibility,
        [UnmapNotify] = unmap,
@@ -258,6 +270,7 @@ static pid_t pid;
 static Selection sel;
 static char **opt_cmd  = NULL;
 static char *opt_title = NULL;
 static Selection sel;
 static char **opt_cmd  = NULL;
 static char *opt_title = NULL;
+static char *opt_embed = NULL;
 static char *opt_class = NULL;
 
 int
 static char *opt_class = NULL;
 
 int
@@ -363,11 +376,11 @@ int
 utf8size(char *s) {
        unsigned char c = *s;
 
 utf8size(char *s) {
        unsigned char c = *s;
 
-       if (~c&B7)
+       if(~c&B7)
                return 1;
                return 1;
-       else if ((c&(B7|B6|B5)) == (B7|B6))
+       else if((c&(B7|B6|B5)) == (B7|B6))
                return 2;
                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
                return 4;
                return 3;
        else
                return 4;
@@ -398,22 +411,60 @@ selected(int x, int y) {
 
 void
 getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
 
 void
 getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
-       if(b) 
+       if(b)
                *b = e->xbutton.button;
 
                *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;
        sel.e.y = MAX(sel.by, sel.ey);
 }
 
        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);
 }
 
+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 };
+       static int ob, ox, oy;
+       
+       /* from urxvt */
+       if(e->xbutton.type == MotionNotify) {
+               if(!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy))
+                       return;
+               button = ob + 32;
+               ox = x, oy = y;
+       } else if(e->xbutton.type == ButtonRelease || button == AnyButton) {
+               button = 3;
+       } else {
+               button -= Button1;
+               if(button >= 3)
+                       button += 64 - 3;
+               if(e->xbutton.type == ButtonPress) {
+                       ob = button;
+                       ox = x, oy = y;
+               }
+       }
+       
+       buf[3] = 32 + button + (state & ShiftMask ? 4 : 0)
+               + (state & Mod4Mask    ? 8  : 0)
+               + (state & ControlMask ? 16 : 0);
+       
+       ttywrite(buf, sizeof(buf));
+}
+
 void
 bpress(XEvent *e) {
 void
 bpress(XEvent *e) {
-       sel.mode = 1;
-       sel.ex = sel.bx = (e->xbutton.x - BORDER)/xw.cw;
-       sel.ey = sel.by = (e->xbutton.y - BORDER)/xw.ch;
+       if(IS_SET(MODE_MOUSE))
+               mousereport(e);
+       else if(e->xbutton.button == Button1) {
+               sel.mode = 1;
+               sel.ex = sel.bx = X2COL(e->xbutton.x);
+               sel.ey = sel.by = Y2ROW(e->xbutton.y);
+       }
 }
 
 void
 }
 
 void
@@ -443,8 +494,7 @@ selcopy(void) {
 
 void
 selnotify(XEvent *e) {
 
 void
 selnotify(XEvent *e) {
-       unsigned long nitems;
-       unsigned long ofs, rem;
+       unsigned long nitems, ofs, rem;
        int format;
        unsigned char *data;
        Atom type;
        int format;
        unsigned char *data;
        Atom type;
@@ -522,42 +572,39 @@ xsetsel(char *str) {
 
 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) {
-               sel.bx = -1;
-               if(b == 2)
-                       selpaste();
-
-               else if(b == 1) {
-                       /* double click to select word */
+       if(IS_SET(MODE_MOUSE)) {
+               mousereport(e);
+               return;
+       }
+       if(e->xbutton.button == Button2)
+               selpaste();
+       else if(e->xbutton.button == Button1) {
+               sel.mode = 0;
+               getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
+               if(sel.bx == sel.ex && sel.by == sel.ey) {
                        struct timeval now;
                        struct timeval now;
+                       sel.bx = -1;
                        gettimeofday(&now, NULL);
 
                        gettimeofday(&now, NULL);
 
-                       if(TIMEDIFFERENCE(now, sel.tclick1) <= DOUBLECLICK_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(TIMEDIFF(now, sel.tclick1) <= DOUBLECLICK_TIMEOUT) {
+                               /* double click to select word */
                                sel.bx = sel.ex;
                                sel.bx = sel.ex;
-                               while(term.line[sel.ey][sel.bx-1].state & GLYPH_SET && 
+                               while(sel.bx > 0 && 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;
                                          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(sel.ex < term.col-1 && 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();
                        }
                                          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();
                        }
-
-                       /* triple click on the line */
-                       if(TIMEDIFFERENCE(now, sel.tclick2) <= TRIPLECLICK_TIMEOUT) {
-                               sel.b.x = sel.bx = 0;
-                               sel.e.x = sel.ex = term.col;
-                               sel.b.y = sel.e.y = sel.ey;
-                               selcopy();
-                       }
-               }
-       } else {
-               if(b == 1) 
+               } else
                        selcopy();
        }
        memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
                        selcopy();
        }
        memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
@@ -567,15 +614,18 @@ brelease(XEvent *e) {
 
 void
 bmotion(XEvent *e) {
 
 void
 bmotion(XEvent *e) {
+       if(IS_SET(MODE_MOUSE)) {
+               mousereport(e);
+               return;
+       }
        if(sel.mode) {
        if(sel.mode) {
-               int oldey = sel.ey, 
-                       oldex = sel.ex;
+               int oldey = sel.ey, oldex = sel.ex;
                getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
 
                if(oldey != sel.ey || oldex != sel.ex) {
                        int starty = MIN(oldey, sel.ey);
                        int endy = MAX(oldey, sel.ey);
                getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
 
                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));
+                       drawregion(0, (starty > 0 ? starty : 0), term.col, (endy < term.row ? endy+1 : term.row));
                }
        }
 }
                }
        }
 }
@@ -602,7 +652,7 @@ execsh(void) {
        exit(EXIT_FAILURE);
 }
 
        exit(EXIT_FAILURE);
 }
 
-void 
+void
 sigchld(int a) {
        int stat = 0;
        if(waitpid(pid, &stat, 0) < 0)
 sigchld(int a) {
        int stat = 0;
        if(waitpid(pid, &stat, 0) < 0)
@@ -655,7 +705,7 @@ dump(char c) {
 void
 ttyread(void) {
        static char buf[BUFSIZ];
 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 */
        char *ptr;
        char s[UTF_SIZ];
        int charsize; /* size of utf8 char in bytes */
@@ -683,10 +733,6 @@ ttyread(void) {
 
 void
 ttywrite(const char *s, size_t n) {
 
 void
 ttywrite(const char *s, size_t n) {
-       {size_t nn;
-               for(nn = 0; nn < n; nn++)
-                       dump(s[nn]);
-       }
        if(write(cmdfd, s, n) == -1)
                die("write error on tty: %s\n", SERRNO);
 }
        if(write(cmdfd, s, n) == -1)
                die("write error on tty: %s\n", SERRNO);
 }
@@ -715,8 +761,8 @@ tcursor(int mode) {
 void
 treset(void) {
        term.c = (TCursor){{
 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};
        
                .bg = DefaultBG
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
        
@@ -731,7 +777,7 @@ tnew(int col, int row) {
        term.row = row, term.col = col;
        term.line = malloc(term.row * sizeof(Line));
        term.alt  = malloc(term.row * sizeof(Line));
        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++) {
+       for(row = 0; row < term.row; row++) {
                term.line[row] = malloc(term.col * sizeof(Glyph));
                term.alt [row] = malloc(term.col * sizeof(Glyph));
        }
                term.line[row] = malloc(term.col * sizeof(Glyph));
                term.alt [row] = malloc(term.col * sizeof(Glyph));
        }
@@ -761,6 +807,8 @@ tscrolldown(int orig, int n) {
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
        }
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
        }
+
+       selscroll(orig, n);
 }
 
 void
 }
 
 void
@@ -771,11 +819,36 @@ tscrollup(int orig, int n) {
        
        tclearregion(0, orig, term.col-1, orig+n-1);
        
        
        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];
                 temp = term.line[i];
-                term.line[i] = term.line[i+n]; 
+                term.line[i] = term.line[i+n];
                 term.line[i+n] = temp;
        }
                 term.line[i+n] = temp;
        }
+
+       selscroll(orig, -n);
+}
+
+void
+selscroll(int orig, int n) {
+       if(sel.bx == -1)
+               return;
+       
+       if(BETWEEN(sel.by, orig, term.bot) || BETWEEN(sel.ey, orig, term.bot)) {
+               if((sel.by += n) > term.bot || (sel.ey += n) < term.top) {
+                       sel.bx = -1;
+                       return;
+               }
+               if(sel.by < term.top) {
+                       sel.by = term.top;
+                       sel.bx = 0;
+               }
+               if(sel.ey > term.bot) {
+                       sel.ey = term.bot;
+                       sel.ex = term.col;
+               }
+               sel.b.y = sel.by, sel.b.x = sel.bx;
+               sel.e.y = sel.ey, sel.e.x = sel.ex;
+       }
 }
 
 void
 }
 
 void
@@ -903,47 +976,47 @@ tsetattr(int *attr, int l) {
                        term.c.attr.bg = DefaultBG;
                        break;
                case 1:
                        term.c.attr.bg = DefaultBG;
                        break;
                case 1:
-                       term.c.attr.mode |= ATTR_BOLD;   
+                       term.c.attr.mode |= ATTR_BOLD;
                        break;
                        break;
-               case 4: 
+               case 4:
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
-               case 7: 
-                       term.c.attr.mode |= ATTR_REVERSE;       
+               case 7:
+                       term.c.attr.mode |= ATTR_REVERSE;
                        break;
                        break;
-               case 22: 
-                       term.c.attr.mode &= ~ATTR_BOLD;  
+               case 22:
+                       term.c.attr.mode &= ~ATTR_BOLD;
                        break;
                        break;
-               case 24: 
+               case 24:
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                        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:
                        break;
                case 38:
-                       if (i + 2 < l && attr[i + 1] == 5) {
+                       if(i + 2 < l && attr[i + 1] == 5) {
                                i += 2;
                                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
                                        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:
                        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;
                                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
                                        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;
                        break;
                case 49:
                        term.c.attr.bg = DefaultBG;
@@ -957,7 +1030,7 @@ tsetattr(int *attr, int l) {
                                term.c.attr.fg = attr[i] - 90 + 8;
                        else if(BETWEEN(attr[i], 100, 107))
                                term.c.attr.fg = attr[i] - 100 + 8;
                                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;
                                fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
                        
                        break;
@@ -977,7 +1050,7 @@ tsetscroll(int t, int b) {
                b = temp;
        }
        term.top = t;
                b = temp;
        }
        term.top = t;
-       term.bot = b;    
+       term.bot = b;
 }
 
 void
 }
 
 void
@@ -1032,6 +1105,7 @@ csihandle(void) {
                break;
        /* XXX: (CSI n I) CHT -- Cursor Forward Tabulation <n> tab stops */
        case 'J': /* ED -- Clear screen */
                break;
        /* XXX: (CSI n I) CHT -- Cursor Forward Tabulation <n> tab stops */
        case 'J': /* ED -- Clear screen */
+               sel.bx = -1;
                switch(escseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                switch(escseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
@@ -1081,7 +1155,11 @@ csihandle(void) {
                        case 1:
                                term.mode &= ~MODE_APPKEYPAD;
                                break;
                        case 1:
                                term.mode &= ~MODE_APPKEYPAD;
                                break;
-                       case 5: /* TODO: DECSCNM -- Remove reverse video */
+                       case 5: /* DECSCNM -- Remove reverse video */
+                               if(IS_SET(MODE_REVERSE)) {
+                                       term.mode &= ~MODE_REVERSE;
+                                       draw();
+                               }
                                break;
                        case 7:
                                term.mode &= ~MODE_WRAP;
                                break;
                        case 7:
                                term.mode &= ~MODE_WRAP;
@@ -1094,13 +1172,20 @@ csihandle(void) {
                        case 25:
                                term.c.state |= CURSOR_HIDE;
                                break;
                        case 25:
                                term.c.state |= CURSOR_HIDE;
                                break;
+                       case 1000: /* disable X11 xterm mouse reporting */
+                               term.mode &= ~MODE_MOUSEBTN;
+                               break;
+                       case 1002:
+                               term.mode &= ~MODE_MOUSEMOTION;
+                               break;
                        case 1049: /* = 1047 and 1048 */
                        case 1049: /* = 1047 and 1048 */
+                       case 47:
                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN)) {
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                        tswapscreen();
                                }
                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN)) {
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                        tswapscreen();
                                }
-                               if(escseq.arg[0] == 1047)
+                               if(escseq.arg[0] != 1049)
                                        break;
                        case 1048:
                                tcursor(CURSOR_LOAD);
                                        break;
                        case 1048:
                                tcursor(CURSOR_LOAD);
@@ -1142,7 +1227,10 @@ csihandle(void) {
                                term.mode |= MODE_APPKEYPAD;
                                break;
                        case 5: /* DECSCNM -- Reverve video */
                                term.mode |= MODE_APPKEYPAD;
                                break;
                        case 5: /* DECSCNM -- Reverve video */
-                               /* TODO: set REVERSE on the whole screen (f) */
+                               if(!IS_SET(MODE_REVERSE)) {
+                                       term.mode |= MODE_REVERSE;
+                                       draw();
+                               }
                                break;
                        case 7:
                                term.mode |= MODE_WRAP;
                                break;
                        case 7:
                                term.mode |= MODE_WRAP;
@@ -1157,13 +1245,20 @@ csihandle(void) {
                        case 25:
                                term.c.state &= ~CURSOR_HIDE;
                                break;
                        case 25:
                                term.c.state &= ~CURSOR_HIDE;
                                break;
+                       case 1000: /* 1000,1002: enable xterm mouse report */
+                               term.mode |= MODE_MOUSEBTN;
+                               break;
+                       case 1002:
+                               term.mode |= MODE_MOUSEMOTION;
+                               break;
                        case 1049: /* = 1047 and 1048 */
                        case 1049: /* = 1047 and 1048 */
+                       case 47:
                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN))
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                else
                                        tswapscreen();
                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN))
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                else
                                        tswapscreen();
-                               if(escseq.arg[0] == 1047)
+                               if(escseq.arg[0] != 1049)
                                        break;
                        case 1048:
                                tcursor(CURSOR_SAVE);
                                        break;
                        case 1048:
                                tcursor(CURSOR_SAVE);
@@ -1202,7 +1297,7 @@ csihandle(void) {
 }
 
 void
 }
 
 void
-csidump(void) { 
+csidump(void) {
        int i;
        printf("ESC [ %s", escseq.priv ? "? " : "");
        if(escseq.narg)
        int i;
        printf("ESC [ %s", escseq.priv ? "? " : "");
        if(escseq.narg)
@@ -1235,7 +1330,7 @@ tputc(char *c) {
                                csiparse(), csihandle();
                        }
                        /* TODO: handle other OSC */
                                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 == ';') {
                                term.titlelen = 0;
                                term.esc = ESC_START | ESC_TITLE;
@@ -1316,6 +1411,7 @@ tputc(char *c) {
                        }
                }
        } else {
                        }
                }
        } else {
+               if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey)) sel.bx = -1;
                switch(ascii) {
                case '\t':
                        tputtab();
                switch(ascii) {
                case '\t':
                        tputtab();
@@ -1348,7 +1444,6 @@ tputc(char *c) {
                                tmoveto(term.c.x+1, term.c.y);
                        else
                                term.c.state |= CURSOR_WRAPNEXT;
                                tmoveto(term.c.x+1, term.c.y);
                        else
                                term.c.state |= CURSOR_WRAPNEXT;
-                       break;
                }
        }
 }
                }
        }
 }
@@ -1447,7 +1542,7 @@ xloadcols(void) {
        unsigned long white = WhitePixel(xw.dpy, xw.scr);
 
        for(i = 0; i < 16; i++) {
        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
                        dc.col[i] = white;
                        fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
                } else
@@ -1461,7 +1556,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;
                                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
                                        dc.col[i] = white;
                                        fprintf(stderr, "Could not allocate color %d\n", i);
                                } else
@@ -1481,15 +1576,14 @@ xloadcols(void) {
 
 void
 xclear(int x1, int y1, int x2, int y2) {
 
 void
 xclear(int x1, int y1, int x2, int y2) {
-       XSetForeground(xw.dpy, dc.gc, dc.col[DefaultBG]);
+       XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? DefaultFG : 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
        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)
-{
+xhints(void) {
        XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
        XWMHints wm = {.flags = InputHint, .input = 1};
        XSizeHints size = {
        XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
        XWMHints wm = {.flags = InputHint, .input = 1};
        XSizeHints size = {
@@ -1505,8 +1599,7 @@ xhints(void)
 }
 
 XFontSet
 }
 
 XFontSet
-xinitfont(char *fontstr)
-{
+xinitfont(char *fontstr) {
        XFontSet set;
        char *def, **missing;
        int n;
        XFontSet set;
        char *def, **missing;
        int n;
@@ -1522,8 +1615,7 @@ xinitfont(char *fontstr)
 }
 
 void
 }
 
 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;
        XFontStruct **xfonts;
        char **font_names;
        int i, n;
@@ -1540,8 +1632,7 @@ xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rb
 }
 
 void
 }
 
 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);
        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);
@@ -1555,6 +1646,7 @@ void
 xinit(void) {
        XSetWindowAttributes attrs;
        Cursor cursor;
 xinit(void) {
        XSetWindowAttributes attrs;
        Cursor cursor;
+       Window parent;
 
        if(!(xw.dpy = XOpenDisplay(NULL)))
                die("Can't open display\n");
 
        if(!(xw.dpy = XOpenDisplay(NULL)))
                die("Can't open display\n");
@@ -1564,7 +1656,7 @@ xinit(void) {
        initfonts(FONT, BOLDFONT);
 
        /* XXX: Assuming same size for bold font */
        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.ch = dc.font.ascent + dc.font.descent;
 
        /* colors */
@@ -1572,8 +1664,8 @@ xinit(void) {
        xloadcols();
 
        /* window - default size */
        xloadcols();
 
        /* window - default size */
-       xw.bufh = 24 * xw.ch;
-       xw.bufw = 80 * xw.cw;
+       xw.bufh = term.row * xw.ch;
+       xw.bufw = term.col * xw.cw;
        xw.h = xw.bufh + 2*BORDER;
        xw.w = xw.bufw + 2*BORDER;
 
        xw.h = xw.bufh + 2*BORDER;
        xw.w = xw.bufw + 2*BORDER;
 
@@ -1582,10 +1674,12 @@ xinit(void) {
        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask
        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask
-               | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
+               | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask
+               | EnterWindowMask | LeaveWindowMask;
        attrs.colormap = xw.cmap;
 
        attrs.colormap = xw.cmap;
 
-       xw.win = XCreateWindow(xw.dpy, XRootWindow(xw.dpy, xw.scr), 0, 0,
+       parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
+       xw.win = XCreateWindow(xw.dpy, parent, 0, 0,
                        xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        XDefaultVisual(xw.dpy, xw.scr),
                        CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
                        xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        XDefaultVisual(xw.dpy, xw.scr),
                        CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
@@ -1596,8 +1690,8 @@ xinit(void) {
 
        /* input methods */
        xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
 
        /* 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);
                                           XNFocusWindow, xw.win, NULL);
        /* gc */
        dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL);
@@ -1605,26 +1699,34 @@ xinit(void) {
        /* white cursor, black outline */
        cursor = XCreateFontCursor(xw.dpy, XC_xterm);
        XDefineCursor(xw.dpy, xw.win, cursor);
        /* 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});
 
                &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
                &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
 
+       xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
+
+       XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
        XMapWindow(xw.dpy, xw.win);
        xhints();
        XMapWindow(xw.dpy, xw.win);
        xhints();
-       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 charlen, int bytelen) {
        XSync(xw.dpy, 0);
 }
 
 void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
-       unsigned long xfg, xbg;
+       unsigned long xfg = dc.col[base.fg], xbg = dc.col[base.bg], temp;
        int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
        int i;
        int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
        int i;
+       
+       /* only switch default fg/bg if term is in RV mode */
+       if(IS_SET(MODE_REVERSE)) {
+               if(base.fg == DefaultFG)
+                       xfg = dc.col[DefaultBG];
+               if(base.bg == DefaultBG)
+                       xbg = dc.col[DefaultFG];
+       }
 
        if(base.mode & ATTR_REVERSE)
 
        if(base.mode & ATTR_REVERSE)
-               xfg = dc.col[base.bg], xbg = dc.col[base.fg];
-       else
-               xfg = dc.col[base.fg], xbg = dc.col[base.bg];
+               temp = xfg, xfg = xbg, xbg = temp;
 
        XSetBackground(xw.dpy, dc.gc, xbg);
        XSetForeground(xw.dpy, dc.gc, xfg);
 
        XSetBackground(xw.dpy, dc.gc, xbg);
        XSetForeground(xw.dpy, dc.gc, xfg);
@@ -1640,7 +1742,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        }
 
        XmbDrawImageString(xw.dpy, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.set : dc.font.set,
        }
 
        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);
        
        if(base.mode & ATTR_UNDERLINE)
                XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
@@ -1669,46 +1771,14 @@ xdrawcursor(void) {
        /* draw the new one */
        if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
                sl = utf8size(g.c);
        /* draw the new one */
        if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
                sl = utf8size(g.c);
+               if(IS_SET(MODE_REVERSE))
+                       g.mode |= ATTR_REVERSE, g.fg = DefaultCS, g.bg = DefaultFG;
                xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
                oldx = term.c.x, oldy = term.c.y;
        }
 }
 
                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 = 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 
-drawregion(int x0, int x1, int y0, int y1) {
-       draw();
-}
-
 void
 void
-draw() {
-       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);
-}
-
-#else
-/* optimized drawing routine */
-void 
 draw() {
        drawregion(0, 0, term.col, term.row);
 }
 draw() {
        drawregion(0, 0, term.col, term.row);
 }
@@ -1753,8 +1823,6 @@ drawregion(int x1, int y1, int x2, int y2) {
        XCopyArea(xw.dpy, 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;
 void
 expose(XEvent *ev) {
        XExposeEvent *e = &ev->xexpose;
@@ -1804,9 +1872,12 @@ focus(XEvent *ev) {
 char*
 kmap(KeySym k, unsigned int state) {
        int i;
 char*
 kmap(KeySym k, unsigned int state) {
        int i;
-       for(i = 0; i < LEN(key); i++)
-               if(key[i].k == k && (key[i].mask == 0 || key[i].mask & state))
+       state &= ~Mod2Mask;
+       for(i = 0; i < LEN(key); i++) {
+               unsigned int mask = key[i].mask;
+               if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state)))
                        return (char*)key[i].s;
                        return (char*)key[i].s;
+       }
        return NULL;
 }
 
        return NULL;
 }
 
@@ -1835,6 +1906,7 @@ kpress(XEvent *ev) {
                case XK_Down:
                case XK_Left:
                case XK_Right:
                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;
                        sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', (shift ? "dacb":"DACB")[ksym - XK_Left]);
                        ttywrite(buf, 3);
                        break;
@@ -1859,6 +1931,21 @@ kpress(XEvent *ev) {
                }
 }
 
                }
 }
 
+void
+cmessage(XEvent *e) {
+       /* See xembed specs
+          http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html */
+       if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
+               if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
+                       xw.state |= WIN_FOCUSED;
+                       xseturgency(0);
+               } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
+                       xw.state &= ~WIN_FOCUSED;
+               }
+               draw();
+       }
+}
+
 void
 resize(XEvent *e) {
        int col, row;
 void
 resize(XEvent *e) {
        int col, row;
@@ -1895,11 +1982,11 @@ run(void) {
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
-                       draw(); 
+                       draw();
                }
                while(XPending(xw.dpy)) {
                        XNextEvent(xw.dpy, &ev);
                }
                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);
                                continue;
                        if(handler[ev.type])
                                (handler[ev.type])(&ev);
@@ -1919,17 +2006,20 @@ main(int argc, char *argv[]) {
                case 'c':
                        if(++i < argc) opt_class = argv[i];
                        break;
                case 'c':
                        if(++i < argc) opt_class = argv[i];
                        break;
-               case 'e':
-                       if(++i < argc) opt_cmd = &argv[i];
+               case 'w':
+                       if(++i < argc) opt_embed = argv[i];
                        break;
                        break;
+               case 'e': 
+                       /* eat every remaining arguments */
+                       if(++i < argc) opt_cmd = &argv[i];
+                       goto run;
                case 'v':
                default:
                        die(USAGE);
                }
                case 'v':
                default:
                        die(USAGE);
                }
-               /* -e eats every remaining arguments */
-               if(opt_cmd)
-                       break;
        }
        }
+
+ run:
        setlocale(LC_CTYPE, "");
        tnew(80, 24);
        ttynew();
        setlocale(LC_CTYPE, "");
        tnew(80, 24);
        ttynew();