undercurl: upgrading patch with curly, spiky and capped options
Ref. https://git.suckless.org/sites/commit/9bb304a974185cbd9fa48c890450c6582d3e0546.html
This commit is contained in:
bakkeby
parent
390735695e
commit
f0e4dc3bd5
26
config.def.h
26
config.def.h
|
|
@ -717,3 +717,29 @@ static char ascii_printable[] =
|
||||||
*/
|
*/
|
||||||
static char *plumb_cmd = "plumb";
|
static char *plumb_cmd = "plumb";
|
||||||
#endif // RIGHTCLICKTOPLUMB_PATCH
|
#endif // RIGHTCLICKTOPLUMB_PATCH
|
||||||
|
|
||||||
|
#if UNDERCURL_PATCH
|
||||||
|
/**
|
||||||
|
* Undercurl style. Set UNDERCURL_STYLE to one of the available styles.
|
||||||
|
*
|
||||||
|
* Curly: Dunno how to draw it *shrug*
|
||||||
|
* _ _ _ _
|
||||||
|
* ( ) ( ) ( ) ( )
|
||||||
|
* (_) (_) (_) (_)
|
||||||
|
*
|
||||||
|
* Spiky:
|
||||||
|
* /\ /\ /\ /\
|
||||||
|
* \/ \/ \/
|
||||||
|
*
|
||||||
|
* Capped:
|
||||||
|
* _ _ _
|
||||||
|
* / \ / \ / \
|
||||||
|
* \_/ \_/
|
||||||
|
*/
|
||||||
|
// Available styles
|
||||||
|
#define UNDERCURL_CURLY 0
|
||||||
|
#define UNDERCURL_SPIKY 1
|
||||||
|
#define UNDERCURL_CAPPED 2
|
||||||
|
// Active style
|
||||||
|
#define UNDERCURL_STYLE UNDERCURL_SPIKY
|
||||||
|
#endif // UNDERCURL_PATCH
|
||||||
321
x.c
321
x.c
|
|
@ -27,6 +27,16 @@ char *argv0;
|
||||||
#include <X11/Xcursor/Xcursor.h>
|
#include <X11/Xcursor/Xcursor.h>
|
||||||
#endif // THEMED_CURSOR_PATCH
|
#endif // THEMED_CURSOR_PATCH
|
||||||
|
|
||||||
|
#if UNDERCURL_PATCH
|
||||||
|
/* Undercurl slope types */
|
||||||
|
enum undercurl_slope_type {
|
||||||
|
UNDERCURL_SLOPE_ASCENDING = 0,
|
||||||
|
UNDERCURL_SLOPE_TOP_CAP = 1,
|
||||||
|
UNDERCURL_SLOPE_DESCENDING = 2,
|
||||||
|
UNDERCURL_SLOPE_BOTTOM_CAP = 3
|
||||||
|
};
|
||||||
|
#endif // UNDERCURL_PATCH
|
||||||
|
|
||||||
/* X modifiers */
|
/* X modifiers */
|
||||||
#define XK_ANY_MOD UINT_MAX
|
#define XK_ANY_MOD UINT_MAX
|
||||||
#define XK_NO_MOD 0
|
#define XK_NO_MOD 0
|
||||||
|
|
@ -1658,6 +1668,53 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||||
return numspecs;
|
return numspecs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if UNDERCURL_PATCH
|
||||||
|
static int isSlopeRising (int x, int iPoint, int waveWidth)
|
||||||
|
{
|
||||||
|
// . . . .
|
||||||
|
// / \ / \ / \ / \
|
||||||
|
// / \ / \ / \ / \
|
||||||
|
// . . . . .
|
||||||
|
|
||||||
|
// Find absolute `x` of point
|
||||||
|
x += iPoint * (waveWidth/2);
|
||||||
|
|
||||||
|
// Find index of absolute wave
|
||||||
|
int absSlope = x / ((float)waveWidth/2);
|
||||||
|
|
||||||
|
return (absSlope % 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int getSlope (int x, int iPoint, int waveWidth)
|
||||||
|
{
|
||||||
|
// Sizes: Caps are half width of slopes
|
||||||
|
// 1_2 1_2 1_2 1_2
|
||||||
|
// / \ / \ / \ / \
|
||||||
|
// / \ / \ / \ / \
|
||||||
|
// 0 3_0 3_0 3_0 3_
|
||||||
|
// <2-> <1> <---6---->
|
||||||
|
|
||||||
|
// Find type of first point
|
||||||
|
int firstType;
|
||||||
|
x -= (x / waveWidth) * waveWidth;
|
||||||
|
if (x < (waveWidth * (2.f/6.f)))
|
||||||
|
firstType = UNDERCURL_SLOPE_ASCENDING;
|
||||||
|
else if (x < (waveWidth * (3.f/6.f)))
|
||||||
|
firstType = UNDERCURL_SLOPE_TOP_CAP;
|
||||||
|
else if (x < (waveWidth * (5.f/6.f)))
|
||||||
|
firstType = UNDERCURL_SLOPE_DESCENDING;
|
||||||
|
else
|
||||||
|
firstType = UNDERCURL_SLOPE_BOTTOM_CAP;
|
||||||
|
|
||||||
|
// Find type of given point
|
||||||
|
int pointType = (iPoint % 4);
|
||||||
|
pointType += firstType;
|
||||||
|
pointType %= 4;
|
||||||
|
|
||||||
|
return pointType;
|
||||||
|
}
|
||||||
|
#endif // UNDERCURL_PATCH
|
||||||
|
|
||||||
void
|
void
|
||||||
#if WIDE_GLYPHS_PATCH
|
#if WIDE_GLYPHS_PATCH
|
||||||
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y, int dmode)
|
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y, int dmode)
|
||||||
|
|
@ -1857,7 +1914,8 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||||
if (base.mode & ATTR_UNDERLINE) {
|
if (base.mode & ATTR_UNDERLINE) {
|
||||||
#if UNDERCURL_PATCH
|
#if UNDERCURL_PATCH
|
||||||
// Underline Color
|
// Underline Color
|
||||||
int wlw = 1; // Wave Line Width
|
const int widthThreshold = 28; // +1 width every widthThreshold px of font
|
||||||
|
int wlw = (win.ch / widthThreshold) + 1; // Wave Line Width
|
||||||
int linecolor;
|
int linecolor;
|
||||||
if ((base.ucolor[0] >= 0) &&
|
if ((base.ucolor[0] >= 0) &&
|
||||||
!(base.mode & ATTR_BLINK && win.mode & MODE_BLINK) &&
|
!(base.mode & ATTR_BLINK && win.mode & MODE_BLINK) &&
|
||||||
|
|
@ -1908,6 +1966,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||||
wy -= win.cyo;
|
wy -= win.cyo;
|
||||||
#endif // VERTCENTER_PATCH
|
#endif // VERTCENTER_PATCH
|
||||||
|
|
||||||
|
#if UNDERCURL_STYLE == UNDERCURL_CURLY
|
||||||
// Draw waves
|
// Draw waves
|
||||||
int narcs = charlen * 2 + 1;
|
int narcs = charlen * 2 + 1;
|
||||||
XArc *arcs = xmalloc(sizeof(XArc) * narcs);
|
XArc *arcs = xmalloc(sizeof(XArc) * narcs);
|
||||||
|
|
@ -1945,6 +2004,266 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||||
XDrawArcs(xw.dpy, XftDrawDrawable(xw.draw), ugc, arcs, narcs);
|
XDrawArcs(xw.dpy, XftDrawDrawable(xw.draw), ugc, arcs, narcs);
|
||||||
|
|
||||||
free(arcs);
|
free(arcs);
|
||||||
|
#elif UNDERCURL_STYLE == UNDERCURL_SPIKY
|
||||||
|
// Make the underline corridor larger
|
||||||
|
/*
|
||||||
|
wy -= wh;
|
||||||
|
*/
|
||||||
|
wh *= 2;
|
||||||
|
|
||||||
|
// Set the angle of the slope to 45°
|
||||||
|
ww = wh;
|
||||||
|
|
||||||
|
// Position of wave is independent of word, it's absolute
|
||||||
|
wx = (wx / (ww/2)) * (ww/2);
|
||||||
|
|
||||||
|
int marginStart = winx - wx;
|
||||||
|
|
||||||
|
// Calculate number of points with floating precision
|
||||||
|
float n = width; // Width of word in pixels
|
||||||
|
n = (n / ww) * 2; // Number of slopes (/ or \)
|
||||||
|
n += 2; // Add two last points
|
||||||
|
int npoints = n; // Convert to int
|
||||||
|
|
||||||
|
// Total length of underline
|
||||||
|
float waveLength = 0;
|
||||||
|
|
||||||
|
if (npoints >= 3) {
|
||||||
|
// We add an aditional slot in case we use a bonus point
|
||||||
|
XPoint *points = xmalloc(sizeof(XPoint) * (npoints + 1));
|
||||||
|
|
||||||
|
// First point (Starts with the word bounds)
|
||||||
|
points[0] = (XPoint) {
|
||||||
|
.x = wx + marginStart,
|
||||||
|
.y = (isSlopeRising(wx, 0, ww))
|
||||||
|
? (wy - marginStart + ww/2.f)
|
||||||
|
: (wy + marginStart)
|
||||||
|
};
|
||||||
|
|
||||||
|
// Second point (Goes back to the absolute point coordinates)
|
||||||
|
points[1] = (XPoint) {
|
||||||
|
.x = (ww/2.f) - marginStart,
|
||||||
|
.y = (isSlopeRising(wx, 1, ww))
|
||||||
|
? (ww/2.f - marginStart)
|
||||||
|
: (-ww/2.f + marginStart)
|
||||||
|
};
|
||||||
|
waveLength += (ww/2.f) - marginStart;
|
||||||
|
|
||||||
|
// The rest of the points
|
||||||
|
for (int i = 2; i < npoints-1; i++) {
|
||||||
|
points[i] = (XPoint) {
|
||||||
|
.x = ww/2,
|
||||||
|
.y = (isSlopeRising(wx, i, ww))
|
||||||
|
? wh/2
|
||||||
|
: -wh/2
|
||||||
|
};
|
||||||
|
waveLength += ww/2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Last point
|
||||||
|
points[npoints-1] = (XPoint) {
|
||||||
|
.x = ww/2,
|
||||||
|
.y = (isSlopeRising(wx, npoints-1, ww))
|
||||||
|
? wh/2
|
||||||
|
: -wh/2
|
||||||
|
};
|
||||||
|
waveLength += ww/2;
|
||||||
|
|
||||||
|
// End
|
||||||
|
if (waveLength < width) { // Add a bonus point?
|
||||||
|
int marginEnd = width - waveLength;
|
||||||
|
points[npoints] = (XPoint) {
|
||||||
|
.x = marginEnd,
|
||||||
|
.y = (isSlopeRising(wx, npoints, ww))
|
||||||
|
? (marginEnd)
|
||||||
|
: (-marginEnd)
|
||||||
|
};
|
||||||
|
|
||||||
|
npoints++;
|
||||||
|
} else if (waveLength > width) { // Is last point too far?
|
||||||
|
int marginEnd = waveLength - width;
|
||||||
|
points[npoints-1].x -= marginEnd;
|
||||||
|
if (isSlopeRising(wx, npoints-1, ww))
|
||||||
|
points[npoints-1].y -= (marginEnd);
|
||||||
|
else
|
||||||
|
points[npoints-1].y += (marginEnd);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw the lines
|
||||||
|
XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points, npoints,
|
||||||
|
CoordModePrevious);
|
||||||
|
|
||||||
|
// Draw a second underline with an offset of 1 pixel
|
||||||
|
if ( ((win.ch / (widthThreshold/2)) % 2)) {
|
||||||
|
points[0].x++;
|
||||||
|
|
||||||
|
XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points,
|
||||||
|
npoints, CoordModePrevious);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Free resources
|
||||||
|
free(points);
|
||||||
|
}
|
||||||
|
#else // UNDERCURL_CAPPED
|
||||||
|
// Cap is half of wave width
|
||||||
|
float capRatio = 0.5f;
|
||||||
|
|
||||||
|
// Make the underline corridor larger
|
||||||
|
wh *= 2;
|
||||||
|
|
||||||
|
// Set the angle of the slope to 45°
|
||||||
|
ww = wh;
|
||||||
|
ww *= 1 + capRatio; // Add a bit of width for the cap
|
||||||
|
|
||||||
|
// Position of wave is independent of word, it's absolute
|
||||||
|
wx = (wx / ww) * ww;
|
||||||
|
|
||||||
|
float marginStart;
|
||||||
|
switch(getSlope(winx, 0, ww)) {
|
||||||
|
case UNDERCURL_SLOPE_ASCENDING:
|
||||||
|
marginStart = winx - wx;
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_TOP_CAP:
|
||||||
|
marginStart = winx - (wx + (ww * (2.f/6.f)));
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_DESCENDING:
|
||||||
|
marginStart = winx - (wx + (ww * (3.f/6.f)));
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_BOTTOM_CAP:
|
||||||
|
marginStart = winx - (wx + (ww * (5.f/6.f)));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculate number of points with floating precision
|
||||||
|
float n = width; // Width of word in pixels
|
||||||
|
// ._.
|
||||||
|
n = (n / ww) * 4; // Number of points (./ \.)
|
||||||
|
n += 2; // Add two last points
|
||||||
|
int npoints = n; // Convert to int
|
||||||
|
|
||||||
|
// Position of the pen to draw the lines
|
||||||
|
float penX = 0;
|
||||||
|
float penY = 0;
|
||||||
|
|
||||||
|
if (npoints >= 3) {
|
||||||
|
XPoint *points = xmalloc(sizeof(XPoint) * (npoints + 1));
|
||||||
|
|
||||||
|
// First point (Starts with the word bounds)
|
||||||
|
penX = winx;
|
||||||
|
switch (getSlope(winx, 0, ww)) {
|
||||||
|
case UNDERCURL_SLOPE_ASCENDING:
|
||||||
|
penY = wy + wh/2.f - marginStart;
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_TOP_CAP:
|
||||||
|
penY = wy;
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_DESCENDING:
|
||||||
|
penY = wy + marginStart;
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_BOTTOM_CAP:
|
||||||
|
penY = wy + wh/2.f;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
points[0].x = penX;
|
||||||
|
points[0].y = penY;
|
||||||
|
|
||||||
|
// Second point (Goes back to the absolute point coordinates)
|
||||||
|
switch (getSlope(winx, 1, ww)) {
|
||||||
|
case UNDERCURL_SLOPE_ASCENDING:
|
||||||
|
penX += ww * (1.f/6.f) - marginStart;
|
||||||
|
penY += 0;
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_TOP_CAP:
|
||||||
|
penX += ww * (2.f/6.f) - marginStart;
|
||||||
|
penY += -wh/2.f + marginStart;
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_DESCENDING:
|
||||||
|
penX += ww * (1.f/6.f) - marginStart;
|
||||||
|
penY += 0;
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_BOTTOM_CAP:
|
||||||
|
penX += ww * (2.f/6.f) - marginStart;
|
||||||
|
penY += -marginStart + wh/2.f;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
points[1].x = penX;
|
||||||
|
points[1].y = penY;
|
||||||
|
|
||||||
|
// The rest of the points
|
||||||
|
for (int i = 2; i < npoints; i++) {
|
||||||
|
switch (getSlope(winx, i, ww)) {
|
||||||
|
case UNDERCURL_SLOPE_ASCENDING:
|
||||||
|
case UNDERCURL_SLOPE_DESCENDING:
|
||||||
|
penX += ww * (1.f/6.f);
|
||||||
|
penY += 0;
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_TOP_CAP:
|
||||||
|
penX += ww * (2.f/6.f);
|
||||||
|
penY += -wh / 2.f;
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_BOTTOM_CAP:
|
||||||
|
penX += ww * (2.f/6.f);
|
||||||
|
penY += wh / 2.f;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
points[i].x = penX;
|
||||||
|
points[i].y = penY;
|
||||||
|
}
|
||||||
|
|
||||||
|
// End
|
||||||
|
float waveLength = penX - winx;
|
||||||
|
if (waveLength < width) { // Add a bonus point?
|
||||||
|
int marginEnd = width - waveLength;
|
||||||
|
penX += marginEnd;
|
||||||
|
switch(getSlope(winx, npoints, ww)) {
|
||||||
|
case UNDERCURL_SLOPE_ASCENDING:
|
||||||
|
case UNDERCURL_SLOPE_DESCENDING:
|
||||||
|
//penY += 0;
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_TOP_CAP:
|
||||||
|
penY += -marginEnd;
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_BOTTOM_CAP:
|
||||||
|
penY += marginEnd;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
points[npoints].x = penX;
|
||||||
|
points[npoints].y = penY;
|
||||||
|
|
||||||
|
npoints++;
|
||||||
|
} else if (waveLength > width) { // Is last point too far?
|
||||||
|
int marginEnd = waveLength - width;
|
||||||
|
points[npoints-1].x -= marginEnd;
|
||||||
|
switch(getSlope(winx, npoints-1, ww)) {
|
||||||
|
case UNDERCURL_SLOPE_TOP_CAP:
|
||||||
|
points[npoints-1].y += marginEnd;
|
||||||
|
break;
|
||||||
|
case UNDERCURL_SLOPE_BOTTOM_CAP:
|
||||||
|
points[npoints-1].y -= marginEnd;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw the lines
|
||||||
|
XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points, npoints,
|
||||||
|
CoordModeOrigin);
|
||||||
|
|
||||||
|
// Draw a second underline with an offset of 1 pixel
|
||||||
|
if ( ((win.ch / (widthThreshold/2)) % 2)) {
|
||||||
|
for (int i = 0; i < npoints; i++)
|
||||||
|
points[i].x++;
|
||||||
|
|
||||||
|
XDrawLines(xw.dpy, XftDrawDrawable(xw.draw), ugc, points,
|
||||||
|
npoints, CoordModeOrigin);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Free resources
|
||||||
|
free(points);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
XFreeGC(xw.dpy, ugc);
|
XFreeGC(xw.dpy, ugc);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue