Move terminal echo logic into st.c

[st.git] / x.c

diff --git a/x.c b/x.c
index ddae6b6..49a22e4 100644 (file)
--- a/x.c
+++ b/x.c
@@ -157,7 +157,7 @@ static void selnotify(XEvent *);
 static void selclear_(XEvent *);
 static void selrequest(XEvent *);
 static void setsel(char *, Time);
-static void mousesel(XEvent *);
+static void mousesel(XEvent *, int);
 static void mousereport(XEvent *);
 static char *kmap(KeySym, uint);
 static int match(uint, uint);
@@ -313,7 +313,7 @@ y2row(int y)
 }
 
 void
-mousesel(XEvent *e)
+mousesel(XEvent *e, int done)
 {
        int type, seltype = SEL_REGULAR;
        uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
@@ -324,8 +324,9 @@ mousesel(XEvent *e)
                        break;
                }
        }
-
-       selextend(x2col(e->xbutton.x), y2row(e->xbutton.y), seltype);
+       selextend(x2col(e->xbutton.x), y2row(e->xbutton.y), seltype, done);
+       if (done)
+               setsel(getsel(), e->xbutton.time);
 }
 
 void
@@ -389,7 +390,7 @@ mousereport(XEvent *e)
                return;
        }
 
-       ttywrite(buf, len);
+       ttywrite(buf, len, 0);
 }
 
 void
@@ -407,7 +408,7 @@ 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;
                }
        }
@@ -519,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;
@@ -630,16 +631,10 @@ 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) {
-                       mousesel(e);
-                       setsel(getsel(), e->xbutton.time);
-               } else
-                       selclear_(NULL);
-               sel.mode = SEL_IDLE;
-       }
+       else if (e->xbutton.button == Button1)
+               mousesel(e, 1);
 }
 
 void
@@ -650,11 +645,7 @@ bmotion(XEvent *e)
                return;
        }
 
-       if (!sel.mode)
-               return;
-
-       sel.mode = SEL_READY;
-       mousesel(e);
+       mousesel(e, 0);
 }
 
 void
@@ -1643,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);
        }
 }
 
@@ -1723,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;
        }
 
@@ -1742,7 +1733,7 @@ kpress(XEvent *ev)
                        len = 2;
                }
        }
-       ttysend(buf, len);
+       ttywrite(buf, len, 1);
 }