Compare commits
2 Commits
e6d4170a84
...
feat/anysi
| Author | SHA1 | Date | |
|---|---|---|---|
| 30dfe46914 | |||
| a8d62fe07b |
27
config.def.h
27
config.def.h
@ -93,6 +93,9 @@ char *termname = "st-256color";
|
||||
*/
|
||||
unsigned int tabspaces = 8;
|
||||
|
||||
/* bg opacity */
|
||||
float alpha = 0.8;
|
||||
|
||||
/* Terminal colors (16 first used in escape sequence) */
|
||||
static const char *colorname[] = {
|
||||
/* 8 normal colors */
|
||||
@ -472,27 +475,3 @@ static char ascii_printable[] =
|
||||
" !\"#$%&'()*+,-./0123456789:;<=>?"
|
||||
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
|
||||
"`abcdefghijklmnopqrstuvwxyz{|}~";
|
||||
|
||||
/**
|
||||
* 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
|
||||
|
||||
@ -16,7 +16,7 @@ PKG_CONFIG = pkg-config
|
||||
INCS = -I$(X11INC) \
|
||||
`$(PKG_CONFIG) --cflags fontconfig` \
|
||||
`$(PKG_CONFIG) --cflags freetype2`
|
||||
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
|
||||
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
|
||||
`$(PKG_CONFIG) --libs fontconfig` \
|
||||
`$(PKG_CONFIG) --libs freetype2`
|
||||
|
||||
|
||||
49
st.c
49
st.c
@ -33,7 +33,6 @@
|
||||
#define UTF_SIZ 4
|
||||
#define ESC_BUF_SIZ (128*UTF_SIZ)
|
||||
#define ESC_ARG_SIZ 16
|
||||
#define CAR_PER_ARG 4
|
||||
#define STR_BUF_SIZ ESC_BUF_SIZ
|
||||
#define STR_ARG_SIZ ESC_ARG_SIZ
|
||||
|
||||
@ -140,7 +139,6 @@ typedef struct {
|
||||
int arg[ESC_ARG_SIZ];
|
||||
int narg; /* nb of args */
|
||||
char mode[2];
|
||||
int carg[ESC_ARG_SIZ][CAR_PER_ARG]; /* colon args */
|
||||
} CSIEscape;
|
||||
|
||||
/* STR Escape sequence structs */
|
||||
@ -161,7 +159,6 @@ static void ttywriteraw(const char *, size_t);
|
||||
|
||||
static void csidump(void);
|
||||
static void csihandle(void);
|
||||
static void readcolonargs(char **, int, int[][CAR_PER_ARG]);
|
||||
static void csiparse(void);
|
||||
static void csireset(void);
|
||||
static void osc_color_response(int, int, int);
|
||||
@ -1130,28 +1127,6 @@ tnewline(int first_col)
|
||||
tmoveto(first_col ? 0 : term.c.x, y);
|
||||
}
|
||||
|
||||
void
|
||||
readcolonargs(char **p, int cursor, int params[][CAR_PER_ARG])
|
||||
{
|
||||
int i = 0;
|
||||
for (; i < CAR_PER_ARG; i++)
|
||||
params[cursor][i] = -1;
|
||||
|
||||
if (**p != ':')
|
||||
return;
|
||||
|
||||
char *np = NULL;
|
||||
i = 0;
|
||||
|
||||
while (**p == ':' && i < CAR_PER_ARG) {
|
||||
while (**p == ':')
|
||||
(*p)++;
|
||||
params[cursor][i] = strtol(*p, &np, 10);
|
||||
*p = np;
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
csiparse(void)
|
||||
{
|
||||
@ -1174,7 +1149,6 @@ csiparse(void)
|
||||
v = -1;
|
||||
csiescseq.arg[csiescseq.narg++] = v;
|
||||
p = np;
|
||||
readcolonargs(&p, csiescseq.narg-1, csiescseq.carg);
|
||||
if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
|
||||
break;
|
||||
p++;
|
||||
@ -1391,10 +1365,6 @@ tsetattr(const int *attr, int l)
|
||||
ATTR_STRUCK );
|
||||
term.c.attr.fg = defaultfg;
|
||||
term.c.attr.bg = defaultbg;
|
||||
term.c.attr.ustyle = -1;
|
||||
term.c.attr.ucolor[0] = -1;
|
||||
term.c.attr.ucolor[1] = -1;
|
||||
term.c.attr.ucolor[2] = -1;
|
||||
break;
|
||||
case 1:
|
||||
term.c.attr.mode |= ATTR_BOLD;
|
||||
@ -1406,14 +1376,7 @@ tsetattr(const int *attr, int l)
|
||||
term.c.attr.mode |= ATTR_ITALIC;
|
||||
break;
|
||||
case 4:
|
||||
term.c.attr.ustyle = csiescseq.carg[i][0];
|
||||
|
||||
if (term.c.attr.ustyle != 0)
|
||||
term.c.attr.mode |= ATTR_UNDERLINE;
|
||||
else
|
||||
term.c.attr.mode &= ~ATTR_UNDERLINE;
|
||||
|
||||
term.c.attr.mode ^= ATTR_DIRTYUNDERLINE;
|
||||
break;
|
||||
case 5: /* slow blink */
|
||||
/* FALLTHROUGH */
|
||||
@ -1464,18 +1427,6 @@ tsetattr(const int *attr, int l)
|
||||
case 49:
|
||||
term.c.attr.bg = defaultbg;
|
||||
break;
|
||||
case 58:
|
||||
term.c.attr.ucolor[0] = csiescseq.carg[i][1];
|
||||
term.c.attr.ucolor[1] = csiescseq.carg[i][2];
|
||||
term.c.attr.ucolor[2] = csiescseq.carg[i][3];
|
||||
term.c.attr.mode ^= ATTR_DIRTYUNDERLINE;
|
||||
break;
|
||||
case 59:
|
||||
term.c.attr.ucolor[0] = -1;
|
||||
term.c.attr.ucolor[1] = -1;
|
||||
term.c.attr.ucolor[2] = -1;
|
||||
term.c.attr.mode ^= ATTR_DIRTYUNDERLINE;
|
||||
break;
|
||||
default:
|
||||
if (BETWEEN(attr[i], 30, 37)) {
|
||||
term.c.attr.fg = attr[i] - 30;
|
||||
|
||||
4
st.h
4
st.h
@ -34,7 +34,6 @@ enum glyph_attribute {
|
||||
ATTR_WIDE = 1 << 9,
|
||||
ATTR_WDUMMY = 1 << 10,
|
||||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
||||
ATTR_DIRTYUNDERLINE = 1 << 15,
|
||||
};
|
||||
|
||||
enum selection_mode {
|
||||
@ -66,8 +65,6 @@ typedef struct {
|
||||
ushort mode; /* attribute flags */
|
||||
uint32_t fg; /* foreground */
|
||||
uint32_t bg; /* background */
|
||||
int ustyle; /* underline style */
|
||||
int ucolor[3]; /* underline color */
|
||||
} Glyph;
|
||||
|
||||
typedef Glyph *Line;
|
||||
@ -127,3 +124,4 @@ extern unsigned int tabspaces;
|
||||
extern unsigned int defaultfg;
|
||||
extern unsigned int defaultbg;
|
||||
extern unsigned int defaultcs;
|
||||
extern float alpha;
|
||||
|
||||
1
st.info
1
st.info
@ -1,5 +1,4 @@
|
||||
st-mono| simpleterm monocolor,
|
||||
Su,
|
||||
acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
|
||||
am,
|
||||
bce,
|
||||
|
||||
502
x.c
502
x.c
@ -45,14 +45,6 @@ typedef struct {
|
||||
signed char appcursor; /* application cursor */
|
||||
} Key;
|
||||
|
||||
/* 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
|
||||
};
|
||||
|
||||
/* X modifiers */
|
||||
#define XK_ANY_MOD UINT_MAX
|
||||
#define XK_NO_MOD 0
|
||||
@ -89,6 +81,7 @@ typedef XftGlyphFontSpec GlyphFontSpec;
|
||||
typedef struct {
|
||||
int tw, th; /* tty width and height */
|
||||
int w, h; /* window width and height */
|
||||
int hborderpx, vborderpx;
|
||||
int ch; /* char height */
|
||||
int cw; /* char width */
|
||||
int mode; /* window state/mode flags */
|
||||
@ -113,6 +106,7 @@ typedef struct {
|
||||
XSetWindowAttributes attrs;
|
||||
int scr;
|
||||
int isfixed; /* is fixed geometry? */
|
||||
int depth; /* bit depth */
|
||||
int l, t; /* left and top offset */
|
||||
int gm; /* geometry mask */
|
||||
} XWindow;
|
||||
@ -251,6 +245,7 @@ static char *usedfont = NULL;
|
||||
static double usedfontsize = 0;
|
||||
static double defaultfontsize = 0;
|
||||
|
||||
static char *opt_alpha = NULL;
|
||||
static char *opt_class = NULL;
|
||||
static char **opt_cmd = NULL;
|
||||
static char *opt_embed = NULL;
|
||||
@ -339,7 +334,7 @@ ttysend(const Arg *arg)
|
||||
int
|
||||
evcol(XEvent *e)
|
||||
{
|
||||
int x = e->xbutton.x - borderpx;
|
||||
int x = e->xbutton.x - win.hborderpx;
|
||||
LIMIT(x, 0, win.tw - 1);
|
||||
return x / win.cw;
|
||||
}
|
||||
@ -347,7 +342,7 @@ evcol(XEvent *e)
|
||||
int
|
||||
evrow(XEvent *e)
|
||||
{
|
||||
int y = e->xbutton.y - borderpx;
|
||||
int y = e->xbutton.y - win.vborderpx;
|
||||
LIMIT(y, 0, win.th - 1);
|
||||
return y / win.ch;
|
||||
}
|
||||
@ -747,6 +742,9 @@ cresize(int width, int height)
|
||||
col = MAX(1, col);
|
||||
row = MAX(1, row);
|
||||
|
||||
win.hborderpx = (win.w - col * win.cw) / 2;
|
||||
win.vborderpx = (win.h - row * win.ch) / 2;
|
||||
|
||||
tresize(col, row);
|
||||
xresize(col, row);
|
||||
ttyresize(win.tw, win.th);
|
||||
@ -760,7 +758,7 @@ xresize(int col, int row)
|
||||
|
||||
XFreePixmap(xw.dpy, xw.buf);
|
||||
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
||||
DefaultDepth(xw.dpy, xw.scr));
|
||||
xw.depth);
|
||||
XftDrawChange(xw.draw, xw.buf);
|
||||
xclear(0, 0, win.w, win.h);
|
||||
|
||||
@ -820,6 +818,13 @@ xloadcols(void)
|
||||
else
|
||||
die("could not allocate color %d\n", i);
|
||||
}
|
||||
|
||||
/* set alpha value of bg color */
|
||||
if (opt_alpha)
|
||||
alpha = strtof(opt_alpha, NULL);
|
||||
dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
|
||||
dc.col[defaultbg].pixel &= 0x00FFFFFF;
|
||||
dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
|
||||
loaded = 1;
|
||||
}
|
||||
|
||||
@ -877,8 +882,8 @@ xhints(void)
|
||||
sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
|
||||
sizeh->height = win.h;
|
||||
sizeh->width = win.w;
|
||||
sizeh->height_inc = win.ch;
|
||||
sizeh->width_inc = win.cw;
|
||||
sizeh->height_inc = 1;
|
||||
sizeh->width_inc = 1;
|
||||
sizeh->base_height = 2 * borderpx;
|
||||
sizeh->base_width = 2 * borderpx;
|
||||
sizeh->min_height = win.ch + 2 * borderpx;
|
||||
@ -1142,11 +1147,23 @@ xinit(int cols, int rows)
|
||||
Window parent;
|
||||
pid_t thispid = getpid();
|
||||
XColor xmousefg, xmousebg;
|
||||
XWindowAttributes attr;
|
||||
XVisualInfo vis;
|
||||
|
||||
if (!(xw.dpy = XOpenDisplay(NULL)))
|
||||
die("can't open display\n");
|
||||
xw.scr = XDefaultScreen(xw.dpy);
|
||||
xw.vis = XDefaultVisual(xw.dpy, xw.scr);
|
||||
|
||||
if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) {
|
||||
parent = XRootWindow(xw.dpy, xw.scr);
|
||||
xw.depth = 32;
|
||||
} else {
|
||||
XGetWindowAttributes(xw.dpy, parent, &attr);
|
||||
xw.depth = attr.depth;
|
||||
}
|
||||
|
||||
XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis);
|
||||
xw.vis = vis.visual;
|
||||
|
||||
/* font */
|
||||
if (!FcInit())
|
||||
@ -1156,12 +1173,12 @@ xinit(int cols, int rows)
|
||||
xloadfonts(usedfont, 0);
|
||||
|
||||
/* colors */
|
||||
xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
||||
xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
|
||||
xloadcols();
|
||||
|
||||
/* adjust fixed window geometry */
|
||||
win.w = 2 * borderpx + cols * win.cw;
|
||||
win.h = 2 * borderpx + rows * win.ch;
|
||||
win.w = 2 * win.hborderpx + 2 * borderpx + cols * win.cw;
|
||||
win.h = 2 * win.vborderpx + 2 * borderpx + rows * win.ch;
|
||||
if (xw.gm & XNegative)
|
||||
xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
|
||||
if (xw.gm & YNegative)
|
||||
@ -1176,19 +1193,15 @@ xinit(int cols, int rows)
|
||||
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
|
||||
xw.attrs.colormap = xw.cmap;
|
||||
|
||||
if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
|
||||
parent = XRootWindow(xw.dpy, xw.scr);
|
||||
xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
|
||||
win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
|
||||
win.w, win.h, 0, xw.depth, InputOutput,
|
||||
xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
|
||||
| CWEventMask | CWColormap, &xw.attrs);
|
||||
|
||||
memset(&gcvalues, 0, sizeof(gcvalues));
|
||||
gcvalues.graphics_exposures = False;
|
||||
dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
|
||||
&gcvalues);
|
||||
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
||||
DefaultDepth(xw.dpy, xw.scr));
|
||||
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
|
||||
dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
|
||||
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
||||
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
||||
|
||||
@ -1250,7 +1263,7 @@ xinit(int cols, int rows)
|
||||
int
|
||||
xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
|
||||
{
|
||||
float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp;
|
||||
float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp;
|
||||
ushort mode, prevmode = USHRT_MAX;
|
||||
Font *font = &dc.font;
|
||||
int frcflags = FRC_NORMAL;
|
||||
@ -1379,56 +1392,11 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||
return numspecs;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
void
|
||||
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
|
||||
{
|
||||
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
|
||||
int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
|
||||
int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch,
|
||||
width = charlen * win.cw;
|
||||
Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
|
||||
XRenderColor colfg, colbg;
|
||||
@ -1518,17 +1486,17 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||
|
||||
/* Intelligent cleaning up of the borders. */
|
||||
if (x == 0) {
|
||||
xclear(0, (y == 0)? 0 : winy, borderpx,
|
||||
xclear(0, (y == 0)? 0 : winy, win.hborderpx,
|
||||
winy + win.ch +
|
||||
((winy + win.ch >= borderpx + win.th)? win.h : 0));
|
||||
((winy + win.ch >= win.vborderpx + win.th)? win.h : 0));
|
||||
}
|
||||
if (winx + width >= borderpx + win.tw) {
|
||||
if (winx + width >= win.hborderpx + win.tw) {
|
||||
xclear(winx + width, (y == 0)? 0 : winy, win.w,
|
||||
((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));
|
||||
((winy + win.ch >= win.vborderpx + win.th)? win.h : (winy + win.ch)));
|
||||
}
|
||||
if (y == 0)
|
||||
xclear(winx, 0, winx + width, borderpx);
|
||||
if (winy + win.ch >= borderpx + win.th)
|
||||
xclear(winx, 0, winx + width, win.vborderpx);
|
||||
if (winy + win.ch >= win.vborderpx + win.th)
|
||||
xclear(winx, winy + win.ch, winx + width, win.h);
|
||||
|
||||
/* Clean up the region we want to draw to. */
|
||||
@ -1546,357 +1514,8 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||
|
||||
/* Render underline and strikethrough. */
|
||||
if (base.mode & ATTR_UNDERLINE) {
|
||||
// Underline Color
|
||||
const int widthThreshold = 28; // +1 width every widthThreshold px of font
|
||||
int wlw = (win.ch / widthThreshold) + 1; // Wave Line Width
|
||||
int linecolor;
|
||||
if ((base.ucolor[0] >= 0) &&
|
||||
!(base.mode & ATTR_BLINK && win.mode & MODE_BLINK) &&
|
||||
!(base.mode & ATTR_INVISIBLE)
|
||||
) {
|
||||
// Special color for underline
|
||||
// Index
|
||||
if (base.ucolor[1] < 0) {
|
||||
linecolor = dc.col[base.ucolor[0]].pixel;
|
||||
}
|
||||
// RGB
|
||||
else {
|
||||
XColor lcolor;
|
||||
lcolor.red = base.ucolor[0] * 257;
|
||||
lcolor.green = base.ucolor[1] * 257;
|
||||
lcolor.blue = base.ucolor[2] * 257;
|
||||
lcolor.flags = DoRed | DoGreen | DoBlue;
|
||||
XAllocColor(xw.dpy, xw.cmap, &lcolor);
|
||||
linecolor = lcolor.pixel;
|
||||
}
|
||||
} else {
|
||||
// Foreground color for underline
|
||||
linecolor = fg->pixel;
|
||||
}
|
||||
|
||||
XGCValues ugcv = {
|
||||
.foreground = linecolor,
|
||||
.line_width = wlw,
|
||||
.line_style = LineSolid,
|
||||
.cap_style = CapNotLast
|
||||
};
|
||||
|
||||
GC ugc = XCreateGC(xw.dpy, XftDrawDrawable(xw.draw),
|
||||
GCForeground | GCLineWidth | GCLineStyle | GCCapStyle,
|
||||
&ugcv);
|
||||
|
||||
// Underline Style
|
||||
if (base.ustyle != 3) {
|
||||
//XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1, width, 1);
|
||||
XFillRectangle(xw.dpy, XftDrawDrawable(xw.draw), ugc, winx,
|
||||
winy + dc.font.ascent + 1, width, wlw);
|
||||
} else if (base.ustyle == 3) {
|
||||
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;
|
||||
|
||||
#if UNDERCURL_STYLE == UNDERCURL_CURLY
|
||||
// Draw waves
|
||||
int narcs = charlen * 2 + 1;
|
||||
XArc *arcs = xmalloc(sizeof(XArc) * narcs);
|
||||
|
||||
int i = 0;
|
||||
for (i = 0; i < charlen-1; i++) {
|
||||
arcs[i*2] = (XArc) {
|
||||
.x = wx + win.cw * i + ww / 4,
|
||||
.y = wy,
|
||||
.width = win.cw / 2,
|
||||
.height = wh,
|
||||
.angle1 = 0,
|
||||
.angle2 = 180 * 64
|
||||
};
|
||||
arcs[i*2+1] = (XArc) {
|
||||
.x = wx + win.cw * i + ww * 0.75,
|
||||
.y = wy,
|
||||
.width = win.cw/2,
|
||||
.height = wh,
|
||||
.angle1 = 180 * 64,
|
||||
.angle2 = 180 * 64
|
||||
};
|
||||
}
|
||||
// Last wave
|
||||
arcs[i*2] = (XArc) {wx + ww * i + ww / 4, wy, ww / 2, wh,
|
||||
0, 180 * 64 };
|
||||
// Last wave tail
|
||||
arcs[i*2+1] = (XArc) {wx + ww * i + ww * 0.75, wy, ceil(ww / 2.),
|
||||
wh, 180 * 64, 90 * 64};
|
||||
// First wave tail
|
||||
i++;
|
||||
arcs[i*2] = (XArc) {wx - ww/4 - 1, wy, ceil(ww / 2.), wh, 270 * 64,
|
||||
90 * 64 };
|
||||
|
||||
XDrawArcs(xw.dpy, XftDrawDrawable(xw.draw), ugc, arcs, narcs);
|
||||
|
||||
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);
|
||||
XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1,
|
||||
width, 1);
|
||||
}
|
||||
|
||||
if (base.mode & ATTR_STRUCK) {
|
||||
@ -1971,35 +1590,35 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||
case 3: /* Blinking Underline */
|
||||
case 4: /* Steady Underline */
|
||||
XftDrawRect(xw.draw, &drawcol,
|
||||
borderpx + cx * win.cw,
|
||||
borderpx + (cy + 1) * win.ch - \
|
||||
win.hborderpx + cx * win.cw,
|
||||
win.vborderpx + (cy + 1) * win.ch - \
|
||||
cursorthickness,
|
||||
win.cw, cursorthickness);
|
||||
break;
|
||||
case 5: /* Blinking bar */
|
||||
case 6: /* Steady bar */
|
||||
XftDrawRect(xw.draw, &drawcol,
|
||||
borderpx + cx * win.cw,
|
||||
borderpx + cy * win.ch,
|
||||
win.hborderpx + cx * win.cw,
|
||||
win.vborderpx + cy * win.ch,
|
||||
cursorthickness, win.ch);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
XftDrawRect(xw.draw, &drawcol,
|
||||
borderpx + cx * win.cw,
|
||||
borderpx + cy * win.ch,
|
||||
win.hborderpx + cx * win.cw,
|
||||
win.vborderpx + cy * win.ch,
|
||||
win.cw - 1, 1);
|
||||
XftDrawRect(xw.draw, &drawcol,
|
||||
borderpx + cx * win.cw,
|
||||
borderpx + cy * win.ch,
|
||||
win.hborderpx + cx * win.cw,
|
||||
win.vborderpx + cy * win.ch,
|
||||
1, win.ch - 1);
|
||||
XftDrawRect(xw.draw, &drawcol,
|
||||
borderpx + (cx + 1) * win.cw - 1,
|
||||
borderpx + cy * win.ch,
|
||||
win.hborderpx + (cx + 1) * win.cw - 1,
|
||||
win.vborderpx + cy * win.ch,
|
||||
1, win.ch - 1);
|
||||
XftDrawRect(xw.draw, &drawcol,
|
||||
borderpx + cx * win.cw,
|
||||
borderpx + (cy + 1) * win.ch - 1,
|
||||
win.hborderpx + cx * win.cw,
|
||||
win.vborderpx + (cy + 1) * win.ch - 1,
|
||||
win.cw, 1);
|
||||
}
|
||||
}
|
||||
@ -2440,6 +2059,9 @@ main(int argc, char *argv[])
|
||||
case 'a':
|
||||
allowaltscreen = 0;
|
||||
break;
|
||||
case 'A':
|
||||
opt_alpha = EARGF(usage());
|
||||
break;
|
||||
case 'c':
|
||||
opt_class = EARGF(usage());
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user