Move terminal echo logic into st.c

[st.git] / x.c

diff --git a/x.c b/x.c
index e3e5451..49a22e4 100644 (file)
--- a/x.c
+++ b/x.c
@@ -94,6 +94,9 @@ typedef struct {
 
 typedef struct {
        Atom xtarget;
+       char *primary, *clipboard;
+       struct timespec tclick1;
+       struct timespec tclick2;
 } XSelection;
 
 /* Font structure */
@@ -154,7 +157,7 @@ static void selnotify(XEvent *);
 static void selclear_(XEvent *);
 static void selrequest(XEvent *);
 static void setsel(char *, Time);
-static void getbuttoninfo(XEvent *);
+static void mousesel(XEvent *, int);
 static void mousereport(XEvent *);
 static char *kmap(KeySym, uint);
 static int match(uint, uint);
@@ -234,11 +237,11 @@ clipcopy(const Arg *dummy)
 {
        Atom clipboard;
 
-       if (sel.clipboard != NULL)
-               free(sel.clipboard);
+       if (xsel.clipboard != NULL)
+               free(xsel.clipboard);
 
-       if (sel.primary != NULL) {
-               sel.clipboard = xstrdup(sel.primary);
+       if (xsel.primary != NULL) {
+               xsel.clipboard = xstrdup(xsel.primary);
                clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
                XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
        }
@@ -310,24 +313,20 @@ y2row(int y)
 }
 
 void
-getbuttoninfo(XEvent *e)
+mousesel(XEvent *e, int done)
 {
-       int type;
+       int type, seltype = SEL_REGULAR;
        uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
 
-       sel.alt = IS_SET(MODE_ALTSCREEN);
-
-       sel.oe.x = x2col(e->xbutton.x);
-       sel.oe.y = y2row(e->xbutton.y);
-       selnormalize();
-
-       sel.type = SEL_REGULAR;
        for (type = 1; type < LEN(selmasks); ++type) {
                if (match(selmasks[type], state)) {
-                       sel.type = type;
+                       seltype = type;
                        break;
                }
        }
+       selextend(x2col(e->xbutton.x), y2row(e->xbutton.y), seltype, done);
+       if (done)
+               setsel(getsel(), e->xbutton.time);
 }
 
 void
@@ -391,7 +390,7 @@ mousereport(XEvent *e)
                return;
        }
 
-       ttywrite(buf, len);
+       ttywrite(buf, len, 0);
 }
 
 void
@@ -399,6 +398,7 @@ bpress(XEvent *e)
 {
        struct timespec now;
        MouseShortcut *ms;
+       int snap;
 
        if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
@@ -408,39 +408,28 @@ bpress(XEvent *e)
        for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
                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) {
-               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 (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 {
-                       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(x2col(e->xbutton.x), y2row(e->xbutton.y), snap);
        }
 }
 
@@ -531,10 +520,10 @@ selnotify(XEvent *e)
                }
 
                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)
-                       ttywrite("\033[201~", 6);
+                       ttywrite("\033[201~", 6, 0);
                XFree(data);
                /* number of 32-bit chunks returned */
                ofs += nitems * format / 32;
@@ -594,9 +583,9 @@ selrequest(XEvent *e)
                 */
                clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
                if (xsre->selection == XA_PRIMARY) {
-                       seltext = sel.primary;
+                       seltext = xsel.primary;
                } else if (xsre->selection == clipboard) {
-                       seltext = sel.clipboard;
+                       seltext = xsel.clipboard;
                } else {
                        fprintf(stderr,
                                "Unhandled clipboard selection 0x%lx\n",
@@ -620,8 +609,8 @@ selrequest(XEvent *e)
 void
 setsel(char *str, Time t)
 {
-       free(sel.primary);
-       sel.primary = str;
+       free(xsel.primary);
+       xsel.primary = str;
 
        XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
        if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
@@ -642,41 +631,21 @@ brelease(XEvent *e)
                return;
        }
 
-       if (e->xbutton.button == Button2) {
+       if (e->xbutton.button == Button2)
                selpaste(NULL);
-       } else if (e->xbutton.button == Button1) {
-               if (sel.mode == SEL_READY) {
-                       getbuttoninfo(e);
-                       setsel(getsel(), e->xbutton.time);
-               } else
-                       selclear_(NULL);
-               sel.mode = SEL_IDLE;
-               tsetdirt(sel.nb.y, sel.ne.y);
-       }
+       else if (e->xbutton.button == Button1)
+               mousesel(e, 1);
 }
 
 void
 bmotion(XEvent *e)
 {
-       int oldey, oldex, oldsby, oldsey;
-
        if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
 
-       if (!sel.mode)
-               return;
-
-       sel.mode = SEL_READY;
-       oldey = sel.oe.y;
-       oldex = sel.oe.x;
-       oldsby = sel.nb.y;
-       oldsey = sel.ne.y;
-       getbuttoninfo(e);
-
-       if (oldey != sel.oe.y || oldex != sel.oe.x)
-               tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
+       mousesel(e, 0);
 }
 
 void
@@ -1127,6 +1096,10 @@ xinit(void)
        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;
@@ -1661,12 +1634,12 @@ focus(XEvent *ev)
                win.state |= WIN_FOCUSED;
                xseturgency(0);
                if (IS_SET(MODE_FOCUS))
-                       ttywrite("\033[I", 3);
+                       ttywrite("\033[I", 3, 0);
        } else {
                XUnsetICFocus(xw.xic);
                win.state &= ~WIN_FOCUSED;
                if (IS_SET(MODE_FOCUS))
-                       ttywrite("\033[O", 3);
+                       ttywrite("\033[O", 3, 0);
        }
 }
 
@@ -1741,7 +1714,7 @@ kpress(XEvent *ev)
 
        /* 2. custom keys from config.h */
        if ((customkey = kmap(ksym, e->state))) {
-               ttysend(customkey, strlen(customkey));
+               ttywrite(customkey, strlen(customkey), 1);
                return;
        }
 
@@ -1760,7 +1733,7 @@ kpress(XEvent *ev)
                        len = 2;
                }
        }
-       ttysend(buf, len);
+       ttywrite(buf, len, 1);
 }