add support for utf8 clipboard. fix usage message.

[st.git] / st.c

diff --git a/st.c b/st.c
index e7e292f..ed750e6 100644 (file)
--- a/st.c
+++ b/st.c
@@ -16,14 +16,15 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>

-#include <X11/Xlib.h>

 #include <X11/Xatom.h>
 #include <X11/Xatom.h>

-#include <X11/keysym.h>
+#include <X11/Xlib.h>

 #include <X11/Xutil.h>
 #include <X11/Xutil.h>

+#include <X11/cursorfont.h>
+#include <X11/keysym.h>

 
 #if   defined(__linux)
  #include <pty.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>
  #include <util.h>
 #elif defined(__FreeBSD__) || defined(__DragonFly__)
  #include <libutil.h>


@@ -31,7 +32,7 @@
 
 #define USAGE \
        "st-" VERSION ", (c) 2010 st engineers\n" \
 
 #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
 
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256


@@ -110,7 +111,7 @@ typedef struct {
 
 /* Purely graphic info */
 typedef struct {
 
 /* Purely graphic info */
 typedef struct {

-       Display* dis;
+       Display* dpy;

        Colormap cmap;
        Window win;
        Pixmap buf;
        Colormap cmap;
        Window win;
        Pixmap buf;


@@ -151,6 +152,7 @@ typedef struct {
        int ex, ey;
        struct {int x, y;}  b, e;
        char *clip;
        int ex, ey;
        struct {int x, y;}  b, e;
        char *clip;

+       Atom xtarget;

 } Selection;
 
 #include "config.h"
 } Selection;
 
 #include "config.h"


@@ -247,7 +249,7 @@ static CSIEscape escseq;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;
 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;
 
 static char *opt_title = NULL;
 static char *opt_class = NULL;
 


@@ -369,6 +371,9 @@ selinit(void) {
        sel.mode = 0;
        sel.bx = -1;
        sel.clip = NULL;
        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 


@@ -405,7 +410,7 @@ bpress(XEvent *e) {
 void
 selcopy(void) {
        char *str, *ptr;
 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;
 
        if(sel.bx == -1)
                str = NULL;


@@ -419,8 +424,8 @@ selcopy(void) {
                                        memcpy(ptr, term.line[y][x].c, sl);
                                        ptr += sl;
                                }
                                        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;
        }
                }
                *ptr = 0;
        }


@@ -437,7 +442,7 @@ selnotify(XEvent *e) {
 
        ofs = 0;
        do {
 
        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");
                                        False, AnyPropertyType, &type, &format,
                                        &nitems, &rem, &data)) {
                        fprintf(stderr, "Clipboard allocation failed\n");


@@ -452,7 +457,7 @@ selnotify(XEvent *e) {
 
 void
 selpaste() {
 
 void
 selpaste() {

-       XConvertSelection(xw.dis, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, CurrentTime);
+       XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);

 }
 
 void
 }
 
 void


@@ -470,10 +475,10 @@ selrequest(XEvent *e) {
        /* reject */
        xev.property = None;
 
        /* 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 */
        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);
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,
                                (unsigned char *) &string, 1);


@@ -498,12 +503,12 @@ xsetsel(char *str) {
        free(sel.clip);
        sel.clip = str;
 
        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 */
 }
 
 /* TODO: doubleclick to select word */


@@ -545,13 +550,14 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
 
 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);
        putenv("TERM="TNAME);

+       args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};

        execvp(args[0], args);
        execvp(args[0], args);

+       exit(EXIT_FAILURE);

 }
 
 void 
 }
 
 void 


@@ -606,24 +612,31 @@ dump(char c) {
 
 void
 ttyread(void) {
 
 void
 ttyread(void) {

-       char buf[BUFSIZ], *ptr;
+       static char buf[BUFSIZ];
+       static int buflen = 0; 
+       char *ptr;

        char s[UTF_SIZ];
        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);
        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
 }
 
 void


@@ -926,7 +939,7 @@ csihandle(void) {
        switch(escseq.mode) {
        default:
        unknown:
        switch(escseq.mode) {
        default:
        unknown:

-               printf("erresc: unknown csi ");
+               fprintf(stderr, "erresc: unknown csi ");

                csidump();
                /* die(""); */
                break;
                csidump();
                /* die(""); */
                break;


@@ -1185,7 +1198,7 @@ tputc(char *c) {
                        if(ascii == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
                                term.esc = 0;
                                term.title[term.titlelen] = '\0';
                        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;
                        }
                        } else {
                                term.title[term.titlelen++] = ascii;
                        }


@@ -1198,7 +1211,7 @@ tputc(char *c) {
                                term.c.attr.mode &= ~ATTR_GFX;
                                break;
                        default:
                                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 {
                        }
                        term.esc = 0;
                } else {


@@ -1360,22 +1373,22 @@ xresize(int col, int row) {
        oldh = xw.bufh;
        xw.bufw = MAX(1, col * xw.cw);
        xw.bufh = MAX(1, row * xw.ch);
        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)
        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))
                                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)
                                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))
                                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;
                                xw.w-2*BORDER, xw.h-xw.bufh-BORDER,
                                False);
        xw.buf = newbuf;


@@ -1385,10 +1398,10 @@ void
 xloadcols(void) {
        int i, r, g, b;
        XColor color;
 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++) {
 
        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
                        dc.col[i] = white;
                        fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
                } else


@@ -1402,7 +1415,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.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
                                        dc.col[i] = white;
                                        fprintf(stderr, "Could not allocate color %d\n", i);
                                } else


@@ -1412,7 +1425,7 @@ xloadcols(void) {
 
        for(r = 0; r < 24; r++, i++) {
                color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
 
        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
                        dc.col[i] = white;
                        fprintf(stderr, "Could not allocate color %d\n", i);
                } else


@@ -1422,8 +1435,8 @@ xloadcols(void) {
 
 void
 xclear(int x1, int y1, int x2, int y2) {
 
 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);
 }
                       x1 * xw.cw, y1 * xw.ch,
                       (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
 }


@@ -1442,7 +1455,7 @@ xhints(void)
                .base_height = 2*BORDER,
                .base_width = 2*BORDER,
        };
                .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
 }
 
 XFontSet


@@ -1453,7 +1466,7 @@ xinitfont(char *fontstr)
        int n;
 
        missing = NULL;
        int n;
 
        missing = NULL;

-       set = XCreateFontSet(xw.dis, fontstr, &missing, &n, &def);
+       set = XCreateFontSet(xw.dpy, fontstr, &missing, &n, &def);

        if(missing) {
                while(n--)
                        fprintf(stderr, "st: missing fontset: %s\n", missing[n]);
        if(missing) {
                while(n--)
                        fprintf(stderr, "st: missing fontset: %s\n", missing[n]);


@@ -1495,10 +1508,11 @@ initfonts(char *fontstr, char *bfontstr)
 void
 xinit(void) {
        XSetWindowAttributes attrs;
 void
 xinit(void) {
        XSetWindowAttributes attrs;

+       Cursor cursor;

 
 

-       if(!(xw.dis = XOpenDisplay(NULL)))
+       if(!(xw.dpy = XOpenDisplay(NULL)))

                die("Can't open display\n");
                die("Can't open display\n");

-       xw.scr = XDefaultScreen(xw.dis);
+       xw.scr = XDefaultScreen(xw.dpy);

        
        /* font */
        initfonts(FONT, BOLDFONT);
        
        /* font */
        initfonts(FONT, BOLDFONT);


@@ -1508,7 +1522,7 @@ xinit(void) {
        xw.ch = dc.font.ascent + dc.font.descent;
 
        /* colors */
        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 */
        xloadcols();
 
        /* window - default size */


@@ -1525,27 +1539,34 @@ xinit(void) {
                | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
        attrs.colormap = xw.cmap;
 
                | 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);
                        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 */
 
 
        /* input methods */

-       xw.xim = XOpenIM(xw.dis, NULL, NULL, NULL);
+       xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);

        xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing 
                                           | XIMStatusNothing, XNClientWindow, xw.win, 
                                           XNFocusWindow, xw.win, NULL);
        /* gc */
        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();
        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
 }
 
 void


@@ -1559,10 +1580,10 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        else
                xfg = dc.col[base.fg], xbg = dc.col[base.bg];
 
        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)
+       if(base.mode & ATTR_GFX) {

                for(i = 0; i < bytelen; i++) {
                        char c = gfx[(unsigned int)s[i] % 256];
                        if(c)
                for(i = 0; i < bytelen; i++) {
                        char c = gfx[(unsigned int)s[i] % 256];
                        if(c)


@@ -1570,12 +1591,13 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        else if(s[i] > 0x5f)
                                s[i] -= 0x5f;
                }
                        else if(s[i] > 0x5f)
                                s[i] -= 0x5f;
                }

+       }

 
 

-       XmbDrawImageString(xw.dis, 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);
        
        if(base.mode & ATTR_UNDERLINE)
            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
 }
 
 void


@@ -1612,9 +1634,9 @@ 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 };
 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.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,
+       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);
 }
 
            dc.gc, r.x, r.y+dc.font.ascent, g.c, sl);
 }
 


@@ -1629,8 +1651,8 @@ draw(int dummy) {
                                xdrawc(x, y, term.line[y][x]);
 
        xdrawcursor();
                                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);
+       XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
+       XFlush(xw.dpy);

 }
 
 #else
 }
 
 #else


@@ -1672,7 +1694,7 @@ draw(int redraw_all) {
                        xdraws(buf, base, ox, y, ic, ib);
        }
        xdrawcursor();
                        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
 }
 
 #endif


@@ -1686,7 +1708,7 @@ expose(XEvent *ev) {
                        draw(SCREEN_REDRAW);
                }
        } else
                        draw(SCREEN_REDRAW);
                }
        } 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);
 }
 
                                e->width, e->height, e->x, e->y);
 }
 


@@ -1707,9 +1729,9 @@ unmap(XEvent *ev) {
 
 void
 xseturgency(int add) {
 
 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);
        h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);

-       XSetWMHints(xw.dis, xw.win, h);
+       XSetWMHints(xw.dpy, xw.win, h);

        XFree(h);
 }
 
        XFree(h);
 }
 


@@ -1773,12 +1795,10 @@ kpress(XEvent *ev) {
                        /* 3. X lookup  */
                default:
                        if(len > 0) {
                        /* 3. X lookup  */
                default:
                        if(len > 0) {

-                               buf[sizeof(buf)-1] = '\0';

                                if(meta && len == 1)
                                        ttywrite("\033", 1);
                                ttywrite(buf, len);
                                if(meta && len == 1)
                                        ttywrite("\033", 1);
                                ttywrite(buf, len);

-                       } else /* 4. nothing to send */
-                               fprintf(stderr, "errkey: %d\n", (int)ksym);
+                       }

                        break;
                }
 }
                        break;
                }
 }


@@ -1806,7 +1826,7 @@ void
 run(void) {
        XEvent ev;
        fd_set rfd;
 run(void) {
        XEvent ev;
        fd_set rfd;

-       int xfd = XConnectionNumber(xw.dis);
+       int xfd = XConnectionNumber(xw.dpy);

 
        for(;;) {
                FD_ZERO(&rfd);
 
        for(;;) {
                FD_ZERO(&rfd);


@@ -1821,8 +1841,8 @@ run(void) {
                        ttyread();
                        draw(SCREEN_UPDATE); 
                }
                        ttyread();
                        draw(SCREEN_UPDATE); 
                }

-               while(XPending(xw.dis)) {
-                       XNextEvent(xw.dis, &ev);
+               while(XPending(xw.dpy)) {
+                       XNextEvent(xw.dpy, &ev);

                        if (XFilterEvent(&ev, xw.win))
                                continue;
                        if(handler[ev.type])
                        if (XFilterEvent(&ev, xw.win))
                                continue;
                        if(handler[ev.type])


@@ -1844,12 +1864,15 @@ main(int argc, char *argv[]) {
                        if(++i < argc) opt_class = argv[i];
                        break;
                case 'e':
                        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);
                }
                        break;
                case 'v':
                default:
                        die(USAGE);
                }

+               /* -e eats every remaining arguments */
+               if(opt_cmd)
+                       break;

        }
        setlocale(LC_CTYPE, "");
        tnew(80, 24);
        }
        setlocale(LC_CTYPE, "");
        tnew(80, 24);