X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=x.c;h=191e5dc7a4652088c878dab30375ff33b08cf93d;hb=b1338e91ed632adbcd08388de37e46cf25326e01;hp=6474a01b29d716c967443e00e47885c0f9701e1a;hpb=e2ee5ee6114eb74bb08cb9abe5a3020203e92688;p=st.git

diff --git a/x.c b/x.c
index 6474a01..191e5dc 100644
--- a/x.c
+++ b/x.c
@@ -88,7 +88,6 @@ static void xclear(int, int, int, int);
 static void xdrawcursor(void);
 static int xgeommasktogravity(int);
 static int xloadfont(Font *, FcPattern *);
-static void xsetsel(char *, Time);
 static void xunloadfont(Font *);
 
 static void expose(XEvent *);
@@ -1093,6 +1092,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
 
 			frc[frclen].font = XftFontOpenPattern(xw.dpy,
 					fontpattern);
+			if (!frc[frclen].font)
+				die("XftFontOpenPattern failed seeking fallback font: %s\n",
+					strerror(errno));
 			frc[frclen].flags = frcflags;
 			frc[frclen].unicodep = rune;
 
@@ -1286,6 +1288,8 @@ xdrawcursor(void)
 	xdrawglyph(og, oldx, oldy);
 
 	g.u = term.line[term.c.y][term.c.x].u;
+	g.mode |= term.line[term.c.y][term.c.x].mode &
+	          (ATTR_BOLD | ATTR_ITALIC | ATTR_UNDERLINE | ATTR_STRUCK);
 
 	/*
 	 * Select the right color for the right mode.