bump version to 0.8.1

[st.git] / x.c

diff --git a/x.c b/x.c
index fbfd350..c343ba2 100644 (file)
--- a/x.c
+++ b/x.c
@@ -1,46 +1,95 @@
 /* See LICENSE for license details. */
 #include <errno.h>
 /* See LICENSE for license details. */
 #include <errno.h>

+#include <math.h>
+#include <limits.h>

 #include <locale.h>
 #include <signal.h>
 #include <locale.h>
 #include <signal.h>

-#include <stdint.h>

 #include <sys/select.h>
 #include <time.h>
 #include <unistd.h>
 #include <libgen.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <sys/select.h>
 #include <time.h>
 #include <unistd.h>
 #include <libgen.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>

-#include <X11/Xutil.h>

 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>
 #include <X11/XKBlib.h>
 
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>
 #include <X11/XKBlib.h>
 

+static char *argv0;

 #include "arg.h"
 #include "arg.h"

+#include "st.h"
+#include "win.h"

 
 

-#define Glyph Glyph_
-#define Font Font_
+/* types used in config.h */
+typedef struct {
+       uint mod;
+       KeySym keysym;
+       void (*func)(const Arg *);
+       const Arg arg;
+} Shortcut;

 
 

-#include "win.h"
-#include "st.h"
+typedef struct {
+       uint b;
+       uint mask;
+       char *s;
+} MouseShortcut;
+
+typedef struct {
+       KeySym k;
+       uint mask;
+       char *s;
+       /* three-valued logic variables: 0 indifferent, 1 on, -1 off */
+       signed char appkey;    /* application keypad */
+       signed char appcursor; /* application cursor */
+} Key;
+
+/* X modifiers */
+#define XK_ANY_MOD    UINT_MAX
+#define XK_NO_MOD     0
+#define XK_SWITCH_MOD (1<<13)
+
+/* function definitions used in config.h */
+static void clipcopy(const Arg *);
+static void clippaste(const Arg *);
+static void numlock(const Arg *);
+static void selpaste(const Arg *);
+static void zoom(const Arg *);
+static void zoomabs(const Arg *);
+static void zoomreset(const Arg *);
+
+/* config.h for applying patches and the configuration. */
+#include "config.h"

 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
 #define XEMBED_FOCUS_OUT 5
 
 /* macros */
 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
 #define XEMBED_FOCUS_OUT 5
 
 /* macros */

+#define IS_SET(flag)           ((win.mode & (flag)) != 0)

 #define TRUERED(x)             (((x) & 0xff0000) >> 8)
 #define TRUEGREEN(x)           (((x) & 0xff00))
 #define TRUEBLUE(x)            (((x) & 0xff) << 8)
 
 typedef XftDraw *Draw;
 typedef XftColor Color;
 #define TRUERED(x)             (((x) & 0xff0000) >> 8)
 #define TRUEGREEN(x)           (((x) & 0xff00))
 #define TRUEBLUE(x)            (((x) & 0xff) << 8)
 
 typedef XftDraw *Draw;
 typedef XftColor Color;

+typedef XftGlyphFontSpec GlyphFontSpec;

 
 /* Purely graphic info */
 
 /* Purely graphic info */

+typedef struct {
+       int tw, th; /* tty width and height */
+       int w, h; /* window width and height */
+       int ch; /* char height */
+       int cw; /* char width  */
+       int mode; /* window state/mode flags */
+       int cursor; /* cursor style */
+} TermWindow;
+

 typedef struct {
        Display *dpy;
        Colormap cmap;
        Window win;
        Drawable buf;
 typedef struct {
        Display *dpy;
        Colormap cmap;
        Window win;
        Drawable buf;

+       GlyphFontSpec *specbuf; /* font spec buffer used for rendering */

        Atom xembed, wmdeletewin, netwmname, netwmpid;
        XIM xim;
        XIC xic;
        Atom xembed, wmdeletewin, netwmname, netwmpid;
        XIM xim;
        XIC xic;


@@ -55,9 +104,13 @@ typedef struct {
 
 typedef struct {
        Atom xtarget;
 
 typedef struct {
        Atom xtarget;

+       char *primary, *clipboard;
+       struct timespec tclick1;
+       struct timespec tclick2;

 } XSelection;
 
 /* Font structure */
 } XSelection;
 
 /* Font structure */

+#define Font Font_

 typedef struct {
        int height;
        int width;
 typedef struct {
        int height;
        int width;


@@ -85,10 +138,20 @@ static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int)
 static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
 static void xdrawglyph(Glyph, int, int);
 static void xclear(int, int, int, int);
 static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
 static void xdrawglyph(Glyph, int, int);
 static void xclear(int, int, int, int);

-static void xdrawcursor(void);

 static int xgeommasktogravity(int);
 static int xgeommasktogravity(int);

+static void xinit(int, int);
+static void cresize(int, int);
+static void xresize(int, int);
+static void xhints(void);
+static int xloadcolor(int, const char *, Color *);

 static int xloadfont(Font *, FcPattern *);
 static int xloadfont(Font *, FcPattern *);

+static void xloadfonts(char *, double);

 static void xunloadfont(Font *);
 static void xunloadfont(Font *);

+static void xunloadfonts(void);
+static void xsetenv(void);
+static void xseturgency(int);
+static int evcol(XEvent *);
+static int evrow(XEvent *);

 
 static void expose(XEvent *);
 static void visibility(XEvent *);
 
 static void expose(XEvent *);
 static void visibility(XEvent *);


@@ -104,10 +167,14 @@ static void propnotify(XEvent *);
 static void selnotify(XEvent *);
 static void selclear_(XEvent *);
 static void selrequest(XEvent *);
 static void selnotify(XEvent *);
 static void selclear_(XEvent *);
 static void selrequest(XEvent *);

-
-static void selcopy(Time);
-static void getbuttoninfo(XEvent *);
+static void setsel(char *, Time);
+static void mousesel(XEvent *, int);

 static void mousereport(XEvent *);
 static void mousereport(XEvent *);

+static char *kmap(KeySym, uint);
+static int match(uint, uint);
+
+static void run(void);
+static void usage(void);

 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,


@@ -139,6 +206,7 @@ static void (*handler[LASTEvent])(XEvent *) = {
 static DC dc;
 static XWindow xw;
 static XSelection xsel;
 static DC dc;
 static XWindow xw;
 static XSelection xsel;

+static TermWindow win;

 
 /* Font Ring Cache */
 enum {
 
 /* Font Ring Cache */
 enum {


@@ -157,34 +225,127 @@ typedef struct {
 /* Fontcache is an array now. A new font will be appended to the array. */
 static Fontcache frc[16];
 static int frclen = 0;
 /* Fontcache is an array now. A new font will be appended to the array. */
 static Fontcache frc[16];
 static int frclen = 0;

+static char *usedfont = NULL;
+static double usedfontsize = 0;
+static double defaultfontsize = 0;
+
+static char *opt_class = NULL;
+static char **opt_cmd  = NULL;
+static char *opt_embed = NULL;
+static char *opt_font  = NULL;
+static char *opt_io    = NULL;
+static char *opt_line  = NULL;
+static char *opt_name  = NULL;
+static char *opt_title = NULL;
+
+static int oldbutton = 3; /* button event on startup: 3 = release */

 
 void
 
 void

-getbuttoninfo(XEvent *e)
+clipcopy(const Arg *dummy)

 {
 {

-       int type;
-       uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
+       Atom clipboard;
+
+       free(xsel.clipboard);
+       xsel.clipboard = NULL;
+
+       if (xsel.primary != NULL) {
+               xsel.clipboard = xstrdup(xsel.primary);
+               clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+               XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
+       }
+}
+
+void
+clippaste(const Arg *dummy)
+{
+       Atom clipboard;

 
 

-       sel.alt = IS_SET(MODE_ALTSCREEN);
+       clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+       XConvertSelection(xw.dpy, clipboard, xsel.xtarget, clipboard,
+                       xw.win, CurrentTime);
+}
+
+void
+selpaste(const Arg *dummy)
+{
+       XConvertSelection(xw.dpy, XA_PRIMARY, xsel.xtarget, XA_PRIMARY,
+                       xw.win, CurrentTime);
+}

 
 

-       sel.oe.x = x2col(e->xbutton.x);
-       sel.oe.y = y2row(e->xbutton.y);
-       selnormalize();
+void
+numlock(const Arg *dummy)
+{
+       win.mode ^= MODE_NUMLOCK;
+}

 
 

-       sel.type = SEL_REGULAR;
-       for (type = 1; type < selmaskslen; ++type) {
+void
+zoom(const Arg *arg)
+{
+       Arg larg;
+
+       larg.f = usedfontsize + arg->f;
+       zoomabs(&larg);
+}
+
+void
+zoomabs(const Arg *arg)
+{
+       xunloadfonts();
+       xloadfonts(usedfont, arg->f);
+       cresize(0, 0);
+       redraw();
+       xhints();
+}
+
+void
+zoomreset(const Arg *arg)
+{
+       Arg larg;
+
+       if (defaultfontsize > 0) {
+               larg.f = defaultfontsize;
+               zoomabs(&larg);
+       }
+}
+
+int
+evcol(XEvent *e)
+{
+       int x = e->xbutton.x - borderpx;
+       LIMIT(x, 0, win.tw - 1);
+       return x / win.cw;
+}
+
+int
+evrow(XEvent *e)
+{
+       int y = e->xbutton.y - borderpx;
+       LIMIT(y, 0, win.th - 1);
+       return y / win.ch;
+}
+
+void
+mousesel(XEvent *e, int done)
+{
+       int type, seltype = SEL_REGULAR;
+       uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
+
+       for (type = 1; type < LEN(selmasks); ++type) {

                if (match(selmasks[type], state)) {
                if (match(selmasks[type], state)) {

-                       sel.type = type;
+                       seltype = type;

                        break;
                }
        }
                        break;
                }
        }

+       selextend(evcol(e), evrow(e), seltype, done);
+       if (done)
+               setsel(getsel(), e->xbutton.time);

 }
 
 void
 mousereport(XEvent *e)
 {
 }
 
 void
 mousereport(XEvent *e)
 {

-       int x = x2col(e->xbutton.x), y = y2row(e->xbutton.y),
-           button = e->xbutton.button, state = e->xbutton.state,
-           len;
+       int len, x = evcol(e), y = evrow(e),
+           button = e->xbutton.button, state = e->xbutton.state;

        char buf[40];
        static int ox, oy;
 
        char buf[40];
        static int ox, oy;
 


@@ -240,7 +401,7 @@ mousereport(XEvent *e)
                return;
        }
 
                return;
        }
 

-       ttywrite(buf, len);
+       ttywrite(buf, len, 0);

 }
 
 void
 }
 
 void


@@ -248,57 +409,41 @@ bpress(XEvent *e)
 {
        struct timespec now;
        MouseShortcut *ms;
 {
        struct timespec now;
        MouseShortcut *ms;

+       int snap;

 
        if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
 
 
        if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
 

-       for (ms = mshortcuts; ms < mshortcuts + mshortcutslen; ms++) {
+       for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {

                if (e->xbutton.button == ms->b
                                && match(ms->mask, e->xbutton.state)) {
                if (e->xbutton.button == ms->b
                                && match(ms->mask, e->xbutton.state)) {

-                       ttysend(ms->s, strlen(ms->s));
+                       ttywrite(ms->s, strlen(ms->s), 1);

                        return;
                }
        }
 
        if (e->xbutton.button == Button1) {
                        return;
                }
        }
 
        if (e->xbutton.button == Button1) {

-               clock_gettime(CLOCK_MONOTONIC, &now);
-
-               /* Clear previous selection, logically and visually. */
-               selclear_(NULL);
-               sel.mode = SEL_EMPTY;
-               sel.type = SEL_REGULAR;
-               sel.oe.x = sel.ob.x = x2col(e->xbutton.x);
-               sel.oe.y = sel.ob.y = y2row(e->xbutton.y);
-

                /*
                 * If the user clicks below predefined timeouts specific
                 * snapping behaviour is exposed.
                 */
                /*
                 * If the user clicks below predefined timeouts specific
                 * snapping behaviour is exposed.
                 */

-               if (TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
-                       sel.snap = SNAP_LINE;
-               } else if (TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
-                       sel.snap = SNAP_WORD;
+               clock_gettime(CLOCK_MONOTONIC, &now);
+               if (TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout) {
+                       snap = SNAP_LINE;
+               } else if (TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout) {
+                       snap = SNAP_WORD;

                } else {
                } else {

-                       sel.snap = 0;
+                       snap = 0;

                }
                }

-               selnormalize();
+               xsel.tclick2 = xsel.tclick1;
+               xsel.tclick1 = now;

 
 

-               if (sel.snap != 0)
-                       sel.mode = SEL_READY;
-               tsetdirt(sel.nb.y, sel.ne.y);
-               sel.tclick2 = sel.tclick1;
-               sel.tclick1 = now;
+               selstart(evcol(e), evrow(e), snap);

        }
 }
 
        }
 }
 

-void
-selcopy(Time t)
-{
-       xsetsel(getsel(), t);
-}
-

 void
 propnotify(XEvent *e)
 {
 void
 propnotify(XEvent *e)
 {


@@ -319,18 +464,16 @@ selnotify(XEvent *e)
        ulong nitems, ofs, rem;
        int format;
        uchar *data, *last, *repl;
        ulong nitems, ofs, rem;
        int format;
        uchar *data, *last, *repl;

-       Atom type, incratom, property;
+       Atom type, incratom, property = None;

 
        incratom = XInternAtom(xw.dpy, "INCR", 0);
 
        ofs = 0;
 
        incratom = XInternAtom(xw.dpy, "INCR", 0);
 
        ofs = 0;

-       if (e->type == SelectionNotify) {
+       if (e->type == SelectionNotify)

                property = e->xselection.property;
                property = e->xselection.property;

-       } else if(e->type == PropertyNotify) {
+       else if (e->type == PropertyNotify)

                property = e->xproperty.atom;
                property = e->xproperty.atom;

-       } else {
-               return;
-       }
+

        if (property == None)
                return;
 
        if (property == None)
                return;
 


@@ -386,10 +529,10 @@ selnotify(XEvent *e)
                }
 
                if (IS_SET(MODE_BRCKTPASTE) && ofs == 0)
                }
 
                if (IS_SET(MODE_BRCKTPASTE) && ofs == 0)

-                       ttywrite("\033[200~", 6);
-               ttysend((char *)data, nitems * format / 8);
+                       ttywrite("\033[200~", 6, 0);
+               ttywrite((char *)data, nitems * format / 8, 1);

                if (IS_SET(MODE_BRCKTPASTE) && rem == 0)
                if (IS_SET(MODE_BRCKTPASTE) && rem == 0)

-                       ttywrite("\033[201~", 6);
+                       ttywrite("\033[201~", 6, 0);

                XFree(data);
                /* number of 32-bit chunks returned */
                ofs += nitems * format / 32;
                XFree(data);
                /* number of 32-bit chunks returned */
                ofs += nitems * format / 32;


@@ -402,36 +545,10 @@ selnotify(XEvent *e)
        XDeleteProperty(xw.dpy, xw.win, (int)property);
 }
 
        XDeleteProperty(xw.dpy, xw.win, (int)property);
 }
 

-void
-xselpaste(void)
-{
-       XConvertSelection(xw.dpy, XA_PRIMARY, xsel.xtarget, XA_PRIMARY,
-                       xw.win, CurrentTime);
-}
-

 void
 xclipcopy(void)
 {
 void
 xclipcopy(void)
 {

-       Atom clipboard;
-
-       if (sel.clipboard != NULL)
-               free(sel.clipboard);
-
-       if (sel.primary != NULL) {
-               sel.clipboard = xstrdup(sel.primary);
-               clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-               XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
-       }
-}
-
-void
-xclippaste(void)
-{
-       Atom clipboard;
-
-       clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-       XConvertSelection(xw.dpy, clipboard, xsel.xtarget, clipboard,
-                       xw.win, CurrentTime);
+       clipcopy(NULL);

 }
 
 void
 }
 
 void


@@ -475,9 +592,9 @@ selrequest(XEvent *e)
                 */
                clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
                if (xsre->selection == XA_PRIMARY) {
                 */
                clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
                if (xsre->selection == XA_PRIMARY) {

-                       seltext = sel.primary;
+                       seltext = xsel.primary;

                } else if (xsre->selection == clipboard) {
                } else if (xsre->selection == clipboard) {

-                       seltext = sel.clipboard;
+                       seltext = xsel.clipboard;

                } else {
                        fprintf(stderr,
                                "Unhandled clipboard selection 0x%lx\n",
                } else {
                        fprintf(stderr,
                                "Unhandled clipboard selection 0x%lx\n",


@@ -499,14 +616,23 @@ selrequest(XEvent *e)
 }
 
 void
 }
 
 void

-xsetsel(char *str, Time t)
+setsel(char *str, Time t)

 {
 {

-       free(sel.primary);
-       sel.primary = str;
+       if (!str)
+               return;
+
+       free(xsel.primary);
+       xsel.primary = str;

 
        XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
        if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
 
        XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
        if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)

-               selclear_(NULL);
+               selclear();
+}
+
+void
+xsetsel(char *str)
+{
+       setsel(str, CurrentTime);

 }
 
 void
 }
 
 void


@@ -517,41 +643,39 @@ brelease(XEvent *e)
                return;
        }
 
                return;
        }
 

-       if (e->xbutton.button == Button2) {
-               xselpaste();
-       } else if (e->xbutton.button == Button1) {
-               if (sel.mode == SEL_READY) {
-                       getbuttoninfo(e);
-                       selcopy(e->xbutton.time);
-               } else
-                       selclear_(NULL);
-               sel.mode = SEL_IDLE;
-               tsetdirt(sel.nb.y, sel.ne.y);
-       }
+       if (e->xbutton.button == Button2)
+               selpaste(NULL);
+       else if (e->xbutton.button == Button1)
+               mousesel(e, 1);

 }
 
 void
 bmotion(XEvent *e)
 {
 }
 
 void
 bmotion(XEvent *e)
 {

-       int oldey, oldex, oldsby, oldsey;
-

        if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
 
        if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
 

-       if (!sel.mode)
-               return;
+       mousesel(e, 0);
+}

 
 

-       sel.mode = SEL_READY;
-       oldey = sel.oe.y;
-       oldex = sel.oe.x;
-       oldsby = sel.nb.y;
-       oldsey = sel.ne.y;
-       getbuttoninfo(e);
+void
+cresize(int width, int height)
+{
+       int col, row;
+
+       if (width != 0)
+               win.w = width;
+       if (height != 0)
+               win.h = height;
+
+       col = (win.w - 2 * borderpx) / win.cw;
+       row = (win.h - 2 * borderpx) / win.ch;

 
 

-       if (oldey != sel.oe.y || oldex != sel.oe.x)
-               tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
+       tresize(col, row);
+       xresize(col, row);
+       ttyresize(win.tw, win.th);

 }
 
 void
 }
 
 void


@@ -565,6 +689,9 @@ xresize(int col, int row)
                        DefaultDepth(xw.dpy, xw.scr));
        XftDrawChange(xw.draw, xw.buf);
        xclear(0, 0, win.w, win.h);
                        DefaultDepth(xw.dpy, xw.scr));
        XftDrawChange(xw.draw, xw.buf);
        xclear(0, 0, win.w, win.h);

+
+       /* resize to new width */
+       xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec));

 }
 
 ushort
 }
 
 ushort


@@ -604,7 +731,7 @@ xloadcols(void)
        static int loaded;
        Color *cp;
 
        static int loaded;
        Color *cp;
 

-       dc.collen = MAX(colornamelen, 256);
+       dc.collen = MAX(LEN(colorname), 256);

        dc.col = xmalloc(dc.collen * sizeof(Color));
 
        if (loaded) {
        dc.col = xmalloc(dc.collen * sizeof(Color));
 
        if (loaded) {


@@ -657,7 +784,7 @@ xhints(void)
        XClassHint class = {opt_name ? opt_name : termname,
                            opt_class ? opt_class : termname};
        XWMHints wm = {.flags = InputHint, .input = 1};
        XClassHint class = {opt_name ? opt_name : termname,
                            opt_class ? opt_class : termname};
        XWMHints wm = {.flags = InputHint, .input = 1};

-       XSizeHints *sizeh = NULL;
+       XSizeHints *sizeh;

 
        sizeh = XAllocSizeHints();
 
 
        sizeh = XAllocSizeHints();
 


@@ -778,7 +905,6 @@ xloadfonts(char *fontstr, double fontsize)
 {
        FcPattern *pattern;
        double fontval;
 {
        FcPattern *pattern;
        double fontval;

-       float ceilf(float);

 
        if (fontstr[0] == '-') {
                pattern = XftXlfdParse(fontstr, False, False);
 
        if (fontstr[0] == '-') {
                pattern = XftXlfdParse(fontstr, False, False);


@@ -868,7 +994,7 @@ xunloadfonts(void)
 }
 
 void
 }
 
 void

-xinit(void)
+xinit(int cols, int rows)

 {
        XGCValues gcvalues;
        Cursor cursor;
 {
        XGCValues gcvalues;
        Cursor cursor;


@@ -893,8 +1019,8 @@ xinit(void)
        xloadcols();
 
        /* adjust fixed window geometry */
        xloadcols();
 
        /* adjust fixed window geometry */

-       win.w = 2 * borderpx + term.col * win.cw;
-       win.h = 2 * borderpx + term.row * win.ch;
+       win.w = 2 * borderpx + cols * win.cw;
+       win.h = 2 * borderpx + rows * win.ch;

        if (xw.gm & XNegative)
                xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
        if (xw.gm & YNegative)
        if (xw.gm & XNegative)
                xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
        if (xw.gm & YNegative)


@@ -925,6 +1051,9 @@ xinit(void)
        XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
        XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
 
        XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
        XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
 

+       /* font spec buffer */
+       xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec));
+

        /* Xft rendering context */
        xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
 
        /* Xft rendering context */
        xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
 


@@ -973,11 +1102,16 @@ xinit(void)
        XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
                        PropModeReplace, (uchar *)&thispid, 1);
 
        XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
                        PropModeReplace, (uchar *)&thispid, 1);
 

+       win.mode = MODE_NUMLOCK;

        resettitle();
        XMapWindow(xw.dpy, xw.win);
        xhints();
        XSync(xw.dpy, False);
 
        resettitle();
        XMapWindow(xw.dpy, xw.win);
        xhints();
        XSync(xw.dpy, False);
 

+       clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1);
+       clock_gettime(CLOCK_MONOTONIC, &xsel.tclick2);
+       xsel.primary = NULL;
+       xsel.clipboard = NULL;

        xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
        if (xsel.xtarget == None)
                xsel.xtarget = XA_STRING;
        xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
        if (xsel.xtarget == None)
                xsel.xtarget = XA_STRING;


@@ -1092,6 +1226,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
 
                        frc[frclen].font = XftFontOpenPattern(xw.dpy,
                                        fontpattern);
 
                        frc[frclen].font = XftFontOpenPattern(xw.dpy,
                                        fontpattern);

+                       if (!frc[frclen].font)
+                               die("XftFontOpenPattern failed seeking fallback font: %s\n",
+                                       strerror(errno));

                        frc[frclen].flags = frcflags;
                        frc[frclen].unicodep = rune;
 
                        frc[frclen].flags = frcflags;
                        frc[frclen].unicodep = rune;
 


@@ -1186,21 +1323,22 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
                }
        }
 
                }
        }
 

-       if (base.mode & ATTR_REVERSE) {
-               temp = fg;
-               fg = bg;
-               bg = temp;
-       }
-

        if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) {
                colfg.red = fg->color.red / 2;
                colfg.green = fg->color.green / 2;
                colfg.blue = fg->color.blue / 2;
        if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) {
                colfg.red = fg->color.red / 2;
                colfg.green = fg->color.green / 2;
                colfg.blue = fg->color.blue / 2;

+               colfg.alpha = fg->color.alpha;

                XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
                fg = &revfg;
        }
 
                XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
                fg = &revfg;
        }
 

-       if (base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
+       if (base.mode & ATTR_REVERSE) {
+               temp = fg;
+               fg = bg;
+               bg = temp;
+       }
+
+       if (base.mode & ATTR_BLINK && win.mode & MODE_BLINK)

                fg = bg;
 
        if (base.mode & ATTR_INVISIBLE)
                fg = bg;
 
        if (base.mode & ATTR_INVISIBLE)


@@ -1209,15 +1347,16 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
        /* Intelligent cleaning up of the borders. */
        if (x == 0) {
                xclear(0, (y == 0)? 0 : winy, borderpx,
        /* Intelligent cleaning up of the borders. */
        if (x == 0) {
                xclear(0, (y == 0)? 0 : winy, borderpx,

-                       winy + win.ch + ((y >= term.row-1)? win.h : 0));
+                       winy + win.ch +
+                       ((winy + win.ch >= borderpx + win.th)? win.h : 0));

        }
        }

-       if (x + charlen >= term.col) {
+       if (winx + width >= borderpx + win.tw) {

                xclear(winx + width, (y == 0)? 0 : winy, win.w,
                xclear(winx + width, (y == 0)? 0 : winy, win.w,

-                       ((y >= term.row-1)? win.h : (winy + win.ch)));
+                       ((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));

        }
        if (y == 0)
                xclear(winx, 0, winx + width, borderpx);
        }
        if (y == 0)
                xclear(winx, 0, winx + width, borderpx);

-       if (y == term.row-1)
+       if (winy + win.ch >= borderpx + win.th)

                xclear(winx, winy + win.ch, winx + width, win.h);
 
        /* Clean up the region we want to draw to. */
                xclear(winx, winy + win.ch, winx + width, win.h);
 
        /* Clean up the region we want to draw to. */


@@ -1259,42 +1398,27 @@ xdrawglyph(Glyph g, int x, int y)
 }
 
 void
 }
 
 void

-xdrawcursor(void)
+xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)

 {
 {

-       static int oldx = 0, oldy = 0;
-       int curx;
-       Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og;
-       int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);

        Color drawcol;
 
        Color drawcol;
 

-       LIMIT(oldx, 0, term.col-1);
-       LIMIT(oldy, 0, term.row-1);
-
-       curx = term.c.x;
-
-       /* adjust position if in dummy */
-       if (term.line[oldy][oldx].mode & ATTR_WDUMMY)
-               oldx--;
-       if (term.line[term.c.y][curx].mode & ATTR_WDUMMY)
-               curx--;
-

        /* remove the old cursor */
        /* remove the old cursor */

-       og = term.line[oldy][oldx];
-       if (ena_sel && selected(oldx, oldy))
+       if (selected(ox, oy))

                og.mode ^= ATTR_REVERSE;
                og.mode ^= ATTR_REVERSE;

-       xdrawglyph(og, oldx, oldy);
+       xdrawglyph(og, ox, oy);

 
 

-       g.u = term.line[term.c.y][term.c.x].u;
-       g.mode |= term.line[term.c.y][term.c.x].mode &
-                 (ATTR_BOLD | ATTR_ITALIC | ATTR_UNDERLINE | ATTR_STRUCK);
+       if (IS_SET(MODE_HIDE))
+               return;

 
        /*
         * Select the right color for the right mode.
         */
 
        /*
         * Select the right color for the right mode.
         */

+       g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
+

        if (IS_SET(MODE_REVERSE)) {
                g.mode |= ATTR_REVERSE;
                g.bg = defaultfg;
        if (IS_SET(MODE_REVERSE)) {
                g.mode |= ATTR_REVERSE;
                g.bg = defaultfg;

-               if (ena_sel && selected(term.c.x, term.c.y)) {
+               if (selected(cx, cy)) {

                        drawcol = dc.col[defaultcs];
                        g.fg = defaultrcs;
                } else {
                        drawcol = dc.col[defaultcs];
                        g.fg = defaultrcs;
                } else {


@@ -1302,64 +1426,60 @@ xdrawcursor(void)
                        g.fg = defaultcs;
                }
        } else {
                        g.fg = defaultcs;
                }
        } else {

-               if (ena_sel && selected(term.c.x, term.c.y)) {
-                       drawcol = dc.col[defaultrcs];
+               if (selected(cx, cy)) {

                        g.fg = defaultfg;
                        g.bg = defaultrcs;
                } else {
                        g.fg = defaultfg;
                        g.bg = defaultrcs;
                } else {

-                       drawcol = dc.col[defaultcs];
+                       g.fg = defaultbg;
+                       g.bg = defaultcs;

                }
                }

+               drawcol = dc.col[g.bg];

        }
 
        }
 

-       if (IS_SET(MODE_HIDE))
-               return;
-

        /* draw the new one */
        /* draw the new one */

-       if (win.state & WIN_FOCUSED) {
+       if (IS_SET(MODE_FOCUSED)) {

                switch (win.cursor) {
                switch (win.cursor) {

-               case 7: /* st extension: snowman */
-                       utf8decode("☃", &g.u, UTF_SIZ);
+               case 7: /* st extension: snowman (U+2603) */
+                       g.u = 0x2603;

                case 0: /* Blinking Block */
                case 1: /* Blinking Block (Default) */
                case 2: /* Steady Block */
                case 0: /* Blinking Block */
                case 1: /* Blinking Block (Default) */
                case 2: /* Steady Block */

-                       g.mode |= term.line[term.c.y][curx].mode & ATTR_WIDE;
-                       xdrawglyph(g, term.c.x, term.c.y);
+                       xdrawglyph(g, cx, cy);

                        break;
                case 3: /* Blinking Underline */
                case 4: /* Steady Underline */
                        XftDrawRect(xw.draw, &drawcol,
                        break;
                case 3: /* Blinking Underline */
                case 4: /* Steady Underline */
                        XftDrawRect(xw.draw, &drawcol,

-                                       borderpx + curx * win.cw,
-                                       borderpx + (term.c.y + 1) * win.ch - \
+                                       borderpx + cx * win.cw,
+                                       borderpx + (cy + 1) * win.ch - \

                                                cursorthickness,
                                        win.cw, cursorthickness);
                        break;
                case 5: /* Blinking bar */
                case 6: /* Steady bar */
                        XftDrawRect(xw.draw, &drawcol,
                                                cursorthickness,
                                        win.cw, cursorthickness);
                        break;
                case 5: /* Blinking bar */
                case 6: /* Steady bar */
                        XftDrawRect(xw.draw, &drawcol,

-                                       borderpx + curx * win.cw,
-                                       borderpx + term.c.y * win.ch,
+                                       borderpx + cx * win.cw,
+                                       borderpx + cy * win.ch,

                                        cursorthickness, win.ch);
                        break;
                }
        } else {
                XftDrawRect(xw.draw, &drawcol,
                                        cursorthickness, win.ch);
                        break;
                }
        } else {
                XftDrawRect(xw.draw, &drawcol,

-                               borderpx + curx * win.cw,
-                               borderpx + term.c.y * win.ch,
+                               borderpx + cx * win.cw,
+                               borderpx + cy * win.ch,

                                win.cw - 1, 1);
                XftDrawRect(xw.draw, &drawcol,
                                win.cw - 1, 1);
                XftDrawRect(xw.draw, &drawcol,

-                               borderpx + curx * win.cw,
-                               borderpx + term.c.y * win.ch,
+                               borderpx + cx * win.cw,
+                               borderpx + cy * win.ch,

                                1, win.ch - 1);
                XftDrawRect(xw.draw, &drawcol,
                                1, win.ch - 1);
                XftDrawRect(xw.draw, &drawcol,

-                               borderpx + (curx + 1) * win.cw - 1,
-                               borderpx + term.c.y * win.ch,
+                               borderpx + (cx + 1) * win.cw - 1,
+                               borderpx + cy * win.ch,

                                1, win.ch - 1);
                XftDrawRect(xw.draw, &drawcol,
                                1, win.ch - 1);
                XftDrawRect(xw.draw, &drawcol,

-                               borderpx + curx * win.cw,
-                               borderpx + (term.c.y + 1) * win.ch - 1,
+                               borderpx + cx * win.cw,
+                               borderpx + (cy + 1) * win.ch - 1,

                                win.cw, 1);
        }
                                win.cw, 1);
        }

-       oldx = curx, oldy = term.c.y;

 }
 
 void
 }
 
 void


@@ -1375,6 +1495,7 @@ void
 xsettitle(char *p)
 {
        XTextProperty prop;
 xsettitle(char *p)
 {
        XTextProperty prop;

+       DEFAULT(p, opt_title);

 
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);
 
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);


@@ -1383,60 +1504,51 @@ xsettitle(char *p)
        XFree(prop.value);
 }
 
        XFree(prop.value);
 }
 

-void
-draw(void)
+int
+xstartdraw(void)

 {
 {

-       drawregion(0, 0, term.col, term.row);
-       XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w,
-                       win.h, 0, 0);
-       XSetForeground(xw.dpy, dc.gc,
-                       dc.col[IS_SET(MODE_REVERSE)?
-                               defaultfg : defaultbg].pixel);
+       return IS_SET(MODE_VISIBLE);

 }
 
 void
 }
 
 void

-drawregion(int x1, int y1, int x2, int y2)
+xdrawline(Line line, int x1, int y1, int x2)

 {
 {

-       int i, x, y, ox, numspecs;
+       int i, x, ox, numspecs;

        Glyph base, new;
        Glyph base, new;

-       XftGlyphFontSpec *specs;
-       int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
+       XftGlyphFontSpec *specs = xw.specbuf;

 
 

-       if (!(win.state & WIN_VISIBLE))
-               return;
-
-       for (y = y1; y < y2; y++) {
-               if (!term.dirty[y])
+       numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
+       i = ox = 0;
+       for (x = x1; x < x2 && i < numspecs; x++) {
+               new = line[x];
+               if (new.mode == ATTR_WDUMMY)

                        continue;
                        continue;

-
-               term.dirty[y] = 0;
-
-               specs = term.specbuf;
-               numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y);
-
-               i = ox = 0;
-               for (x = x1; x < x2 && i < numspecs; x++) {
-                       new = term.line[y][x];
-                       if (new.mode == ATTR_WDUMMY)
-                               continue;
-                       if (ena_sel && selected(x, y))
-                               new.mode ^= ATTR_REVERSE;
-                       if (i > 0 && ATTRCMP(base, new)) {
-                               xdrawglyphfontspecs(specs, base, i, ox, y);
-                               specs += i;
-                               numspecs -= i;
-                               i = 0;
-                       }
-                       if (i == 0) {
-                               ox = x;
-                               base = new;
-                       }
-                       i++;
+               if (selected(x, y1))
+                       new.mode ^= ATTR_REVERSE;
+               if (i > 0 && ATTRCMP(base, new)) {
+                       xdrawglyphfontspecs(specs, base, i, ox, y1);
+                       specs += i;
+                       numspecs -= i;
+                       i = 0;
+               }
+               if (i == 0) {
+                       ox = x;
+                       base = new;

                }
                }

-               if (i > 0)
-                       xdrawglyphfontspecs(specs, base, i, ox, y);
+               i++;

        }
        }

-       xdrawcursor();
+       if (i > 0)
+               xdrawglyphfontspecs(specs, base, i, ox, y1);
+}
+
+void
+xfinishdraw(void)
+{
+       XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w,
+                       win.h, 0, 0);
+       XSetForeground(xw.dpy, dc.gc,
+                       dc.col[IS_SET(MODE_REVERSE)?
+                               defaultfg : defaultbg].pixel);

 }
 
 void
 }
 
 void


@@ -1450,13 +1562,13 @@ visibility(XEvent *ev)
 {
        XVisibilityEvent *e = &ev->xvisibility;
 
 {
        XVisibilityEvent *e = &ev->xvisibility;
 

-       MODBIT(win.state, e->state != VisibilityFullyObscured, WIN_VISIBLE);
+       MODBIT(win.mode, e->state != VisibilityFullyObscured, MODE_VISIBLE);

 }
 
 void
 unmap(XEvent *ev)
 {
 }
 
 void
 unmap(XEvent *ev)
 {

-       win.state &= ~WIN_VISIBLE;
+       win.mode &= ~MODE_VISIBLE;

 }
 
 void
 }
 
 void


@@ -1466,6 +1578,25 @@ xsetpointermotion(int set)
        XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
 }
 
        XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
 }
 

+void
+xsetmode(int set, unsigned int flags)
+{
+       int mode = win.mode;
+       MODBIT(win.mode, set, flags);
+       if ((win.mode & MODE_REVERSE) != (mode & MODE_REVERSE))
+               redraw();
+}
+
+int
+xsetcursor(int cursor)
+{
+       DEFAULT(cursor, 1);
+       if (!BETWEEN(cursor, 0, 6))
+               return 1;
+       win.cursor = cursor;
+       return 0;
+}
+

 void
 xseturgency(int add)
 {
 void
 xseturgency(int add)
 {


@@ -1477,15 +1608,12 @@ xseturgency(int add)
 }
 
 void
 }
 
 void

-xbell(int vol)
+xbell(void)

 {
 {

-       XkbBell(xw.dpy, xw.win, vol, (Atom)NULL);
-}
-
-unsigned long
-xwinid(void)
-{
-       return xw.win;
+       if (!(IS_SET(MODE_FOCUSED)))
+               xseturgency(1);
+       if (bellvolume)
+               XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);

 }
 
 void
 }
 
 void


@@ -1498,18 +1626,61 @@ focus(XEvent *ev)
 
        if (ev->type == FocusIn) {
                XSetICFocus(xw.xic);
 
        if (ev->type == FocusIn) {
                XSetICFocus(xw.xic);

-               win.state |= WIN_FOCUSED;
+               win.mode |= MODE_FOCUSED;

                xseturgency(0);
                if (IS_SET(MODE_FOCUS))
                xseturgency(0);
                if (IS_SET(MODE_FOCUS))

-                       ttywrite("\033[I", 3);
+                       ttywrite("\033[I", 3, 0);

        } else {
                XUnsetICFocus(xw.xic);
        } else {
                XUnsetICFocus(xw.xic);

-               win.state &= ~WIN_FOCUSED;
+               win.mode &= ~MODE_FOCUSED;

                if (IS_SET(MODE_FOCUS))
                if (IS_SET(MODE_FOCUS))

-                       ttywrite("\033[O", 3);
+                       ttywrite("\033[O", 3, 0);

        }
 }
 
        }
 }
 

+int
+match(uint mask, uint state)
+{
+       return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
+}
+
+char*
+kmap(KeySym k, uint state)
+{
+       Key *kp;
+       int i;
+
+       /* Check for mapped keys out of X11 function keys. */
+       for (i = 0; i < LEN(mappedkeys); i++) {
+               if (mappedkeys[i] == k)
+                       break;
+       }
+       if (i == LEN(mappedkeys)) {
+               if ((k & 0xFFFF) < 0xFD00)
+                       return NULL;
+       }
+
+       for (kp = key; kp < key + LEN(key); kp++) {
+               if (kp->k != k)
+                       continue;
+
+               if (!match(kp->mask, state))
+                       continue;
+
+               if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
+                       continue;
+               if (IS_SET(MODE_NUMLOCK) && kp->appkey == 2)
+                       continue;
+
+               if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
+                       continue;
+
+               return kp->s;
+       }
+
+       return NULL;
+}
+

 void
 kpress(XEvent *ev)
 {
 void
 kpress(XEvent *ev)
 {


@@ -1526,7 +1697,7 @@ kpress(XEvent *ev)
 
        len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
        /* 1. shortcuts */
 
        len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
        /* 1. shortcuts */

-       for (bp = shortcuts; bp < shortcuts + shortcutslen; bp++) {
+       for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {

                if (ksym == bp->keysym && match(bp->mod, e->state)) {
                        bp->func(&(bp->arg));
                        return;
                if (ksym == bp->keysym && match(bp->mod, e->state)) {
                        bp->func(&(bp->arg));
                        return;


@@ -1535,7 +1706,7 @@ kpress(XEvent *ev)
 
        /* 2. custom keys from config.h */
        if ((customkey = kmap(ksym, e->state))) {
 
        /* 2. custom keys from config.h */
        if ((customkey = kmap(ksym, e->state))) {

-               ttysend(customkey, strlen(customkey));
+               ttywrite(customkey, strlen(customkey), 1);

                return;
        }
 
                return;
        }
 


@@ -1554,7 +1725,7 @@ kpress(XEvent *ev)
                        len = 2;
                }
        }
                        len = 2;
                }
        }

-       ttysend(buf, len);
+       ttywrite(buf, len, 1);

 }
 
 
 }
 
 


@@ -1567,14 +1738,13 @@ cmessage(XEvent *e)
         */
        if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
                if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
         */
        if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
                if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {

-                       win.state |= WIN_FOCUSED;
+                       win.mode |= MODE_FOCUSED;

                        xseturgency(0);
                } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
                        xseturgency(0);
                } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {

-                       win.state &= ~WIN_FOCUSED;
+                       win.mode &= ~MODE_FOCUSED;

                }
        } else if (e->xclient.data.l[0] == xw.wmdeletewin) {
                }
        } else if (e->xclient.data.l[0] == xw.wmdeletewin) {

-               /* Send SIGHUP to shell */
-               kill(pid, SIGHUP);
+               ttyhangup();

                exit(0);
        }
 }
                exit(0);
        }
 }


@@ -1586,7 +1756,6 @@ resize(XEvent *e)
                return;
 
        cresize(e->xconfigure.width, e->xconfigure.height);
                return;
 
        cresize(e->xconfigure.width, e->xconfigure.height);

-       ttyresize();

 }
 
 void
 }
 
 void


@@ -1596,6 +1765,7 @@ run(void)
        int w = win.w, h = win.h;
        fd_set rfd;
        int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
        int w = win.w, h = win.h;
        fd_set rfd;
        int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;

+       int ttyfd;

        struct timespec drawtimeout, *tv = NULL, now, last, lastblink;
        long deltatime;
 
        struct timespec drawtimeout, *tv = NULL, now, last, lastblink;
        long deltatime;
 


@@ -1615,29 +1785,28 @@ run(void)
                }
        } while (ev.type != MapNotify);
 
                }
        } while (ev.type != MapNotify);
 

+       ttyfd = ttynew(opt_line, shell, opt_io, opt_cmd);

        cresize(w, h);
        cresize(w, h);

-       ttynew();
-       ttyresize();

 
        clock_gettime(CLOCK_MONOTONIC, &last);
        lastblink = last;
 
        for (xev = actionfps;;) {
                FD_ZERO(&rfd);
 
        clock_gettime(CLOCK_MONOTONIC, &last);
        lastblink = last;
 
        for (xev = actionfps;;) {
                FD_ZERO(&rfd);

-               FD_SET(cmdfd, &rfd);
+               FD_SET(ttyfd, &rfd);

                FD_SET(xfd, &rfd);
 
                FD_SET(xfd, &rfd);
 

-               if (pselect(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
+               if (pselect(MAX(xfd, ttyfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {

                        if (errno == EINTR)
                                continue;
                        die("select failed: %s\n", strerror(errno));
                }
                        if (errno == EINTR)
                                continue;
                        die("select failed: %s\n", strerror(errno));
                }

-               if (FD_ISSET(cmdfd, &rfd)) {
+               if (FD_ISSET(ttyfd, &rfd)) {

                        ttyread();
                        if (blinktimeout) {
                                blinkset = tattrset(ATTR_BLINK);
                                if (!blinkset)
                        ttyread();
                        if (blinktimeout) {
                                blinkset = tattrset(ATTR_BLINK);
                                if (!blinkset)

-                                       MODBIT(term.mode, 0, MODE_BLINK);
+                                       MODBIT(win.mode, 0, MODE_BLINK);

                        }
                }
 
                        }
                }
 


@@ -1652,7 +1821,7 @@ run(void)
                dodraw = 0;
                if (blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
                        tsetdirtattr(ATTR_BLINK);
                dodraw = 0;
                if (blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
                        tsetdirtattr(ATTR_BLINK);

-                       term.mode ^= MODE_BLINK;
+                       win.mode ^= MODE_BLINK;

                        lastblink = now;
                        dodraw = 1;
                }
                        lastblink = now;
                        dodraw = 1;
                }


@@ -1676,7 +1845,7 @@ run(void)
 
                        if (xev && !FD_ISSET(xfd, &rfd))
                                xev--;
 
                        if (xev && !FD_ISSET(xfd, &rfd))
                                xev--;

-                       if (!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) {
+                       if (!FD_ISSET(ttyfd, &rfd) && !FD_ISSET(xfd, &rfd)) {

                                if (blinkset) {
                                        if (TIMEDIFF(now, lastblink) \
                                                        > blinktimeout) {
                                if (blinkset) {
                                        if (TIMEDIFF(now, lastblink) \
                                                        > blinktimeout) {


@@ -1698,6 +1867,19 @@ run(void)
        }
 }
 
        }
 }
 

+void
+usage(void)
+{
+       die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
+           " [-n name] [-o file]\n"
+           "          [-T title] [-t title] [-w windowid]"
+           " [[-e] command [args ...]]\n"
+           "       %s [-aiv] [-c class] [-f font] [-g geometry]"
+           " [-n name] [-o file]\n"
+           "          [-T title] [-t title] [-w windowid] -l line"
+           " [stty_args ...]\n", argv0, argv0);
+}
+

 int
 main(int argc, char *argv[])
 {
 int
 main(int argc, char *argv[])
 {


@@ -1750,16 +1932,19 @@ main(int argc, char *argv[])
        } ARGEND;
 
 run:
        } ARGEND;
 
 run:

-       if (argc > 0) {
-               /* eat all remaining arguments */
+       if (argc > 0) /* eat all remaining arguments */

                opt_cmd = argv;
                opt_cmd = argv;

-               if (!opt_title && !opt_line)
-                       opt_title = basename(xstrdup(argv[0]));
-       }
+
+       if (!opt_title)
+               opt_title = (opt_line || !opt_cmd) ? "st" : opt_cmd[0];
+

        setlocale(LC_CTYPE, "");
        XSetLocaleModifiers("");
        setlocale(LC_CTYPE, "");
        XSetLocaleModifiers("");

-       tnew(MAX(cols, 1), MAX(rows, 1));
-       xinit();
+       cols = MAX(cols, 1);
+       rows = MAX(rows, 1);
+       tnew(cols, rows);
+       xinit(cols, rows);
+       xsetenv();

        selinit();
        run();
 
        selinit();
        run();