If the selection is cleared, draw() and do it on button press too.

[st.git] / st.c

diff --git a/st.c b/st.c
index 655d5a3..a2f4f46 100644 (file)
--- a/st.c
+++ b/st.c
@@ -291,7 +291,7 @@ static void ttywrite(const char *, size_t);
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);
-static void xcopy();
+static void xcopy(void);
 static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
@@ -311,12 +311,13 @@ static void brelease(XEvent *);
 static void bpress(XEvent *);
 static void bmotion(XEvent *);
 static void selnotify(XEvent *);
+static void selclear(XEvent *);
 static void selrequest(XEvent *);
 
 static void selinit(void);
 static inline bool selected(int, int);
 static void selcopy(void);
-static void selpaste();
+static void selpaste(void);
 static void selscroll(int, int);
 
 static int utf8decode(char *, long *);
@@ -336,6 +337,7 @@ static void (*handler[LASTEvent])(XEvent *) = {
        [MotionNotify] = bmotion,
        [ButtonPress] = bpress,
        [ButtonRelease] = brelease,
+       [SelectionClear] = selclear,
        [SelectionNotify] = selnotify,
        [SelectionRequest] = selrequest,
 };
@@ -549,6 +551,7 @@ bpress(XEvent *e) {
                sel.mode = 1;
                sel.ex = sel.bx = X2COL(e->xbutton.x);
                sel.ey = sel.by = Y2ROW(e->xbutton.y);
+               draw();
        }
 }
 
@@ -612,6 +615,14 @@ selpaste() {
        XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
 }
 
+void selclear(XEvent *e) {
+       if(sel.bx == -1)
+               return;
+       sel.bx = -1;
+       tsetdirt(sel.b.y, sel.e.y);
+       draw();
+}
+
 void
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
@@ -2059,7 +2070,7 @@ xdrawcursor(void) {
        } else
                xclear(oldx, oldy, oldx, oldy);
 
-       xcopy(oldx, oldy, 1, 1);
+       xcopy();
 
        /* draw the new one */
        if(!(term.c.state & CURSOR_HIDE)) {
@@ -2074,7 +2085,7 @@ xdrawcursor(void) {
                oldx = term.c.x, oldy = term.c.y;
        }
 
-       xcopy(term.c.x, term.c.y, 1, 1);
+       xcopy();
 }
 
 void