set sel.alt in selstart instead of selextend

[st.git] / x.c

diff --git a/x.c b/x.c
index f7b0528..c343ba2 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>
@@ -150,8 +150,8 @@ 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 *);
@@ -245,8 +245,8 @@ clipcopy(const Arg *dummy)
 {
        Atom clipboard;
 
-       if (xsel.clipboard != NULL)
-               free(xsel.clipboard);
+       free(xsel.clipboard);
+       xsel.clipboard = NULL;
 
        if (xsel.primary != NULL) {
                xsel.clipboard = xstrdup(xsel.primary);
@@ -309,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;
 }
@@ -336,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);
 }
@@ -344,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;
 
@@ -441,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);
        }
 }
 
@@ -465,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;
 
@@ -621,12 +618,15 @@ selrequest(XEvent *e)
 void
 setsel(char *str, Time t)
 {
+       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)
-               selclear_(NULL);
+               selclear();
 }
 
 void
@@ -784,7 +784,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();
 
@@ -905,7 +905,6 @@ xloadfonts(char *fontstr, double fontsize)
 {
        FcPattern *pattern;
        double fontval;
-       float ceilf(float);
 
        if (fontstr[0] == '-') {
                pattern = XftXlfdParse(fontstr, False, False);
@@ -1408,12 +1407,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;
@@ -1427,17 +1427,15 @@ 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) {
@@ -1497,7 +1495,7 @@ void
 xsettitle(char *p)
 {
        XTextProperty prop;
-       DEFAULT(p, "st");
+       DEFAULT(p, opt_title);
 
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);
@@ -1934,12 +1932,12 @@ main(int argc, char *argv[])
        } ARGEND;
 
 run:
-       if (argc > 0) {
-               /* eat all remaining arguments */
+       if (argc > 0) /* eat all remaining arguments */
                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("");
        cols = MAX(cols, 1);