X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/2bd6afd1c9eb341d9e2c5d89bc16bb7758691e1f..011c0f9e5bb87838afa90f2a33ba68920681e3ce:/st.c?ds=sidebyside

diff --git a/st.c b/st.c
index f593302..8e9e895 100644
--- a/st.c
+++ b/st.c
@@ -36,6 +36,7 @@ char *argv0;
 #define Draw XftDraw *
 #define Colour XftColor
 #define Colourmap Colormap
+#define Rectangle XRectangle
 
 #if   defined(__linux)
  #include <pty.h>
@@ -1409,7 +1410,7 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
 
 void
 tclearregion(int x1, int y1, int x2, int y2) {
-	int x, y, temp;
+	int x, y, temp, mask;
 
 	if(x1 > x2)
 		temp = x1, x1 = x2, x2 = temp;
@@ -1424,7 +1425,9 @@ tclearregion(int x1, int y1, int x2, int y2) {
 	for(y = y1; y <= y2; y++) {
 		term.dirty[y] = 1;
 		for(x = x1; x <= x2; x++) {
+			mask = selected(x, y) ? ATTR_REVERSE : 0;
 			term.line[y][x] = term.c.attr;
+			term.line[y][x].mode ^= mask;
 			memcpy(term.line[y][x].c, " ", 2);
 		}
 	}
@@ -2764,6 +2767,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 	FcCharSet *fccharset;
 	Colour *fg, *bg, *temp, revfg, revbg;
 	XRenderColor colfg, colbg;
+	Rectangle r;
 
 	frcflags = FRC_NORMAL;
 
@@ -2852,6 +2856,13 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 	/* Clean up the region we want to draw to. */
 	XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch);
 
+	/* Set the clip region because Xft is sometimes dirty. */
+	r.x = 0;
+	r.y = 0;
+	r.height = xw.ch;
+	r.width = width;
+	XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
+
 	fcsets[0] = font->set;
 	for(xp = winx; bytelen > 0;) {
 		/*
@@ -2885,6 +2896,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 							(FcChar8 *)u8fs,
 							u8fblen);
 					xp += font->width * u8fl;
+
 				}
 				break;
 			}
@@ -2969,6 +2981,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 		XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
 				width, 1);
 	}
+
+	/* Reset clip to none. */
+	XftDrawSetClip(xw.draw, 0);
 }
 
 void
@@ -3081,7 +3096,7 @@ drawregion(int x1, int y1, int x2, int y2) {
 		ic = ib = ox = 0;
 		for(x = x1; x < x2; x++) {
 			new = term.line[y][x];
-			if(ena_sel && *(new.c) && selected(x, y))
+			if(ena_sel && selected(x, y))
 				new.mode ^= ATTR_REVERSE;
 			if(ib > 0 && (ATTRCMP(base, new)
 					|| ib >= DRAW_BUF_SIZ-UTF_SIZ)) {