LICENSE: fix a few years

[st.git] / x.c

diff --git a/x.c b/x.c
index 873ff08..d43a529 100644 (file)
--- a/x.c
+++ b/x.c
@@ -1,15 +1,15 @@
 /* See LICENSE for license details. */
 #include <errno.h>
+#include <math.h>
+#include <limits.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 <X11/Xutil.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>
@@ -75,6 +75,15 @@ typedef XftColor Color;
 typedef XftGlyphFontSpec GlyphFontSpec;
 
 /* 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;
@@ -133,14 +142,16 @@ 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 void xloadfonts(char *, double);
 static void xunloadfont(Font *);
 static void xunloadfonts(void);
 static void xsetenv(void);
 static void xseturgency(int);
-static int x2col(int);
-static int y2row(int);
+static int evcol(XEvent *);
+static int evrow(XEvent *);
 
 static void expose(XEvent *);
 static void visibility(XEvent *);
@@ -227,6 +238,8 @@ 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
 clipcopy(const Arg *dummy)
 {
@@ -296,17 +309,17 @@ zoomreset(const Arg *arg)
 }
 
 int
-x2col(int x)
+evcol(XEvent *e)
 {
-       x -= borderpx;
+       int x = e->xbutton.x - borderpx;
        LIMIT(x, 0, win.tw - 1);
        return x / win.cw;
 }
 
 int
-y2row(int y)
+evrow(XEvent *e)
 {
-       y -= borderpx;
+       int y = e->xbutton.y - borderpx;
        LIMIT(y, 0, win.th - 1);
        return y / win.ch;
 }
@@ -323,7 +336,7 @@ mousesel(XEvent *e, int done)
                        break;
                }
        }
-       selextend(x2col(e->xbutton.x), y2row(e->xbutton.y), seltype, done);
+       selextend(evcol(e), evrow(e), seltype, done);
        if (done)
                setsel(getsel(), e->xbutton.time);
 }
@@ -331,9 +344,8 @@ mousesel(XEvent *e, int done)
 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;
 
@@ -428,7 +440,7 @@ bpress(XEvent *e)
                xsel.tclick2 = xsel.tclick1;
                xsel.tclick1 = now;
 
-               selstart(x2col(e->xbutton.x), y2row(e->xbutton.y), snap);
+               selstart(evcol(e), evrow(e), snap);
        }
 }
 
@@ -452,18 +464,16 @@ selnotify(XEvent *e)
        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;
-       if (e->type == SelectionNotify) {
+       if (e->type == SelectionNotify)
                property = e->xselection.property;
-       } else if(e->type == PropertyNotify) {
+       else if (e->type == PropertyNotify)
                property = e->xproperty.atom;
-       } else {
-               return;
-       }
+
        if (property == None)
                return;
 
@@ -613,7 +623,7 @@ setsel(char *str, Time t)
 
        XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
        if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
-               selclear_(NULL);
+               selclear();
 }
 
 void
@@ -771,7 +781,7 @@ xhints(void)
        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();
 
@@ -892,7 +902,6 @@ xloadfonts(char *fontstr, double fontsize)
 {
        FcPattern *pattern;
        double fontval;
-       float ceilf(float);
 
        if (fontstr[0] == '-') {
                pattern = XftXlfdParse(fontstr, False, False);
@@ -1395,12 +1404,13 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
                og.mode ^= ATTR_REVERSE;
        xdrawglyph(og, ox, oy);
 
+       if (IS_SET(MODE_HIDE))
+               return;
+
        /*
         * Select the right color for the right mode.
         */
        g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
-       g.fg = defaultbg;
-       g.bg = defaultcs;
 
        if (IS_SET(MODE_REVERSE)) {
                g.mode |= ATTR_REVERSE;
@@ -1414,22 +1424,20 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
                }
        } else {
                if (selected(cx, cy)) {
-                       drawcol = dc.col[defaultrcs];
                        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 */
        if (IS_SET(MODE_FOCUSED)) {
                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 */
@@ -1733,8 +1741,7 @@ cmessage(XEvent *e)
                        win.mode &= ~MODE_FOCUSED;
                }
        } else if (e->xclient.data.l[0] == xw.wmdeletewin) {
-               /* Send SIGHUP to shell */
-               kill(pid, SIGHUP);
+               ttyhangup();
                exit(0);
        }
 }
@@ -1755,6 +1762,7 @@ run(void)
        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;
 
@@ -1774,7 +1782,7 @@ run(void)
                }
        } while (ev.type != MapNotify);
 
-       ttynew(opt_line, opt_io, opt_cmd);
+       ttyfd = ttynew(opt_line, shell, opt_io, opt_cmd);
        cresize(w, h);
 
        clock_gettime(CLOCK_MONOTONIC, &last);
@@ -1782,15 +1790,15 @@ run(void)
 
        for (xev = actionfps;;) {
                FD_ZERO(&rfd);
-               FD_SET(cmdfd, &rfd);
+               FD_SET(ttyfd, &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 (FD_ISSET(cmdfd, &rfd)) {
+               if (FD_ISSET(ttyfd, &rfd)) {
                        ttyread();
                        if (blinktimeout) {
                                blinkset = tattrset(ATTR_BLINK);
@@ -1834,7 +1842,7 @@ run(void)
 
                        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) {