feat: undercurl thickness control, fix: win.cyo

gnotclub · Dec 7, 2021 · 38cf9f3 · 38cf9f3
1 parent 62bad7a
commit 38cf9f3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.Xresources b/.Xresources
@@ -89,6 +89,8 @@ st.disable_alpha_correction: 0
 ! / \   / \   / \
 !    \_/   \_/
 st.undercurl_shape: 1
+! adds 1 pixel of thickness to the undercurl for every undercurl_thickness_threshold pixels of font size
+st.undercurl_thickness_threshold: 28
 
 ! colors -- this is the base16-twilight colorscheme.
 st.foreground:   #a7a7a7

diff --git a/config.def.h b/config.def.h
@@ -537,3 +537,4 @@ static char ascii_printable[] =
  * render method of undercurls
  */
 static unsigned int undercurl_shape = 1;
+static unsigned int undercurl_thickness_threshold = 28;
diff --git a/x.c b/x.c
@@ -1595,7 +1595,7 @@ drawundercurlcurly(GC ugc, int winx, int winy, int wlw, int width, int widthThre
 	int ww = win.cw;//width;
 	int wh = dc.font.descent - wlw/2 - 1;//r.height/7;
 	int wx = winx;
-	int wy = winy + win.cyo + win.ch - dc.font.descent;
+	int wy = winy + win.ch - dc.font.descent + win.cyo;
 	// Draw waves
 	int narcs = charlen * 2 + 1;
 	XArc *arcs = xmalloc(sizeof(XArc) * narcs);
@@ -1641,7 +1641,7 @@ drawundercurlspiky(GC ugc, int winx, int winy, int wlw, int width, int widthThre
 	int ww = win.cw;//width;
 	int wh = dc.font.descent - wlw/2 - 1;//r.height/7;
 	int wx = winx;
-	int wy = winy + win.ch - dc.font.descent;
+	int wy = winy + win.ch - dc.font.descent + win.cyo;
 	// Make the underline corridor larger
 	/*
 	wy -= wh;
@@ -1750,7 +1750,7 @@ drawundercurlcapped(GC ugc, int winx, int winy, int wlw, int width, int widthThr
 	int ww = win.cw;//width;
 	int wh = dc.font.descent - wlw/2 - 1;//r.height/7;
 	int wx = winx;
-	int wy = winy + win.cyo + win.ch - dc.font.descent;
+	int wy = winy + win.cyo + win.ch - dc.font.descent + win.cyo;
 
 	// Cap is half of wave width
 	float capRatio = 0.5f;
@@ -2071,7 +2071,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
 			XftDrawRect(xw.draw, fg, winx, winy + win.cyo + dc.font.ascent + 1, width, 1);
 		// Undercurl
 		} else if (base.ustyle == 3) {
-			const int widthThreshold = 28;				// +1 width every widthThreshold px of font
+			const int widthThreshold = undercurl_thickness_threshold;				// +1 width every widthThreshold px of font
 			int wlw = (win.ch / widthThreshold) + 1;	// Wave Line Width
 			XGCValues ugcv = {
 				.foreground = selectlinecolor(base, fg),

diff --git a/xst.c b/xst.c
@@ -125,6 +125,7 @@ xrdb_load(void)
 
 		XRESOURCE_LOAD_INTEGER("depth", opt_depth);
 		XRESOURCE_LOAD_INTEGER("undercurl_shape", undercurl_shape);
+		XRESOURCE_LOAD_INTEGER("undercurl_thickness_threshold", undercurl_thickness_threshold);
 	}
 	XFlush(dpy);
 }