X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=b2a4fff18d17c3a952adad0358cb5ee17e040ca5;hb=f56c58a968c1b3ddae76864bc9e27e5b9cc055c4;hp=457f266a75831562bd4a9e186dbb9090c936aac0;hpb=594a25983639847ed063a3d181893dba54825f5a;p=st.git

diff --git a/st.c b/st.c
index 457f266..b2a4fff 100644
--- a/st.c
+++ b/st.c
@@ -695,9 +695,10 @@ utf8validate(Rune *u, size_t i)
 void
 selinit(void)
 {
-	memset(&sel.tclick1, 0, sizeof(sel.tclick1));
-	memset(&sel.tclick2, 0, sizeof(sel.tclick2));
+	clock_gettime(CLOCK_MONOTONIC, &sel.tclick1);
+	clock_gettime(CLOCK_MONOTONIC, &sel.tclick2);
 	sel.mode = SEL_IDLE;
+	sel.snap = 0;
 	sel.ob.x = -1;
 	sel.primary = NULL;
 	sel.clipboard = NULL;
@@ -3831,7 +3832,6 @@ xdrawcursor(void)
 	Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og;
 	int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
 	Color drawcol;
-	XRenderColor dccol;
 
 	LIMIT(oldx, 0, term.col-1);
 	LIMIT(oldy, 0, term.row-1);
@@ -3851,20 +3851,28 @@ xdrawcursor(void)
 	xdrawglyph(og, oldx, oldy);
 
 	g.u = term.line[term.c.y][term.c.x].u;
-	if (ena_sel && selected(term.c.x, term.c.y)) {
-		/*
-		 * Allocate the drawing color which is the reverse of
-		 * defaultcs, if we are selected.
-		 */
-		dccol.red = ~dc.col[defaultcs].color.red;
-		dccol.green = ~dc.col[defaultcs].color.green;
-		dccol.blue = ~dc.col[defaultcs].color.blue;
-		dccol.alpha = ~dc.col[defaultcs].color.alpha;
-		XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &dccol, &drawcol);
 
-		g.mode ^= ATTR_REVERSE;
+	/*
+	 * Select the right color for the right mode.
+	 */
+	if (IS_SET(MODE_REVERSE)) {
+		g.mode |= ATTR_REVERSE;
+		g.bg = defaultfg;
+		if (ena_sel && selected(term.c.x, term.c.y)) {
+			drawcol = dc.col[defaultcs];
+			g.fg = defaultrcs;
+		} else {
+			drawcol = dc.col[defaultrcs];
+			g.fg = defaultcs;
+		}
 	} else {
-		drawcol = dc.col[defaultcs];
+		if (ena_sel && selected(term.c.x, term.c.y)) {
+			drawcol = dc.col[defaultrcs];
+			g.fg = defaultfg;
+			g.bg = defaultrcs;
+		} else {
+			drawcol = dc.col[defaultcs];
+		}
 	}
 
 	if (IS_SET(MODE_HIDE))
@@ -3873,15 +3881,11 @@ xdrawcursor(void)
 	/* draw the new one */
 	if (xw.state & WIN_FOCUSED) {
 		switch (xw.cursor) {
+		case 7: /* st extension: snowman */
+			utf8decode("☃", &g.u, UTF_SIZ);
 		case 0: /* Blinking Block */
 		case 1: /* Blinking Block (Default) */
 		case 2: /* Steady Block */
-			if (IS_SET(MODE_REVERSE)) {
-				g.mode |= ATTR_REVERSE;
-				g.fg = defaultcs;
-				g.bg = defaultfg;
-			}
-
 			g.mode |= term.line[term.c.y][curx].mode & ATTR_WIDE;
 			xdrawglyph(g, term.c.x, term.c.y);
 			break;
@@ -3889,7 +3893,8 @@ xdrawcursor(void)
 		case 4: /* Steady Underline */
 			XftDrawRect(xw.draw, &drawcol,
 					borderpx + curx * xw.cw,
-					borderpx + (term.c.y + 1) * xw.ch - cursorthickness,
+					borderpx + (term.c.y + 1) * xw.ch - \
+						cursorthickness,
 					xw.cw, cursorthickness);
 			break;
 		case 5: /* Blinking bar */