Compare commits
3 Commits
e6d4170a84
...
feat/boxdr
| Author | SHA1 | Date | |
|---|---|---|---|
| be27b47a83 | |||
| a91b4c0c80 | |||
| 0252e4a965 |
6
Makefile
6
Makefile
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
include config.mk
|
include config.mk
|
||||||
|
|
||||||
SRC = st.c x.c
|
SRC = st.c x.c boxdraw.c hb.c
|
||||||
OBJ = $(SRC:.c=.o)
|
OBJ = $(SRC:.c=.o)
|
||||||
|
|
||||||
all: options st
|
all: options st
|
||||||
@ -22,7 +22,9 @@ config.h:
|
|||||||
$(CC) $(STCFLAGS) -c $<
|
$(CC) $(STCFLAGS) -c $<
|
||||||
|
|
||||||
st.o: config.h st.h win.h
|
st.o: config.h st.h win.h
|
||||||
x.o: arg.h config.h st.h win.h
|
x.o: arg.h config.h st.h win.h hb.h
|
||||||
|
boxdraw.o: config.h st.h boxdraw_data.h
|
||||||
|
hb.o: st.h
|
||||||
|
|
||||||
$(OBJ): config.h config.mk
|
$(OBJ): config.h config.mk
|
||||||
|
|
||||||
|
|||||||
194
boxdraw.c
Normal file
194
boxdraw.c
Normal file
@ -0,0 +1,194 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
|
||||||
|
* MIT/X Consortium License
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <X11/Xft/Xft.h>
|
||||||
|
#include "st.h"
|
||||||
|
#include "boxdraw_data.h"
|
||||||
|
|
||||||
|
/* Rounded non-negative integers division of n / d */
|
||||||
|
#define DIV(n, d) (((n) + (d) / 2) / (d))
|
||||||
|
|
||||||
|
static Display *xdpy;
|
||||||
|
static Colormap xcmap;
|
||||||
|
static XftDraw *xd;
|
||||||
|
static Visual *xvis;
|
||||||
|
|
||||||
|
static void drawbox(int, int, int, int, XftColor *, XftColor *, ushort);
|
||||||
|
static void drawboxlines(int, int, int, int, XftColor *, ushort);
|
||||||
|
|
||||||
|
/* public API */
|
||||||
|
|
||||||
|
void
|
||||||
|
boxdraw_xinit(Display *dpy, Colormap cmap, XftDraw *draw, Visual *vis)
|
||||||
|
{
|
||||||
|
xdpy = dpy; xcmap = cmap; xd = draw, xvis = vis;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
isboxdraw(Rune u)
|
||||||
|
{
|
||||||
|
Rune block = u & ~0xff;
|
||||||
|
return (boxdraw && block == 0x2500 && boxdata[(uint8_t)u]) ||
|
||||||
|
(boxdraw_braille && block == 0x2800);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* the "index" is actually the entire shape data encoded as ushort */
|
||||||
|
ushort
|
||||||
|
boxdrawindex(const Glyph *g)
|
||||||
|
{
|
||||||
|
if (boxdraw_braille && (g->u & ~0xff) == 0x2800)
|
||||||
|
return BRL | (uint8_t)g->u;
|
||||||
|
if (boxdraw_bold && (g->mode & ATTR_BOLD))
|
||||||
|
return BDB | boxdata[(uint8_t)g->u];
|
||||||
|
return boxdata[(uint8_t)g->u];
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
drawboxes(int x, int y, int cw, int ch, XftColor *fg, XftColor *bg,
|
||||||
|
const XftGlyphFontSpec *specs, int len)
|
||||||
|
{
|
||||||
|
for ( ; len-- > 0; x += cw, specs++)
|
||||||
|
drawbox(x, y, cw, ch, fg, bg, (ushort)specs->glyph);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* implementation */
|
||||||
|
|
||||||
|
void
|
||||||
|
drawbox(int x, int y, int w, int h, XftColor *fg, XftColor *bg, ushort bd)
|
||||||
|
{
|
||||||
|
ushort cat = bd & ~(BDB | 0xff); /* mask out bold and data */
|
||||||
|
if (bd & (BDL | BDA)) {
|
||||||
|
/* lines (light/double/heavy/arcs) */
|
||||||
|
drawboxlines(x, y, w, h, fg, bd);
|
||||||
|
|
||||||
|
} else if (cat == BBD) {
|
||||||
|
/* lower (8-X)/8 block */
|
||||||
|
int d = DIV((uint8_t)bd * h, 8);
|
||||||
|
XftDrawRect(xd, fg, x, y + d, w, h - d);
|
||||||
|
|
||||||
|
} else if (cat == BBU) {
|
||||||
|
/* upper X/8 block */
|
||||||
|
XftDrawRect(xd, fg, x, y, w, DIV((uint8_t)bd * h, 8));
|
||||||
|
|
||||||
|
} else if (cat == BBL) {
|
||||||
|
/* left X/8 block */
|
||||||
|
XftDrawRect(xd, fg, x, y, DIV((uint8_t)bd * w, 8), h);
|
||||||
|
|
||||||
|
} else if (cat == BBR) {
|
||||||
|
/* right (8-X)/8 block */
|
||||||
|
int d = DIV((uint8_t)bd * w, 8);
|
||||||
|
XftDrawRect(xd, fg, x + d, y, w - d, h);
|
||||||
|
|
||||||
|
} else if (cat == BBQ) {
|
||||||
|
/* Quadrants */
|
||||||
|
int w2 = DIV(w, 2), h2 = DIV(h, 2);
|
||||||
|
if (bd & TL)
|
||||||
|
XftDrawRect(xd, fg, x, y, w2, h2);
|
||||||
|
if (bd & TR)
|
||||||
|
XftDrawRect(xd, fg, x + w2, y, w - w2, h2);
|
||||||
|
if (bd & BL)
|
||||||
|
XftDrawRect(xd, fg, x, y + h2, w2, h - h2);
|
||||||
|
if (bd & BR)
|
||||||
|
XftDrawRect(xd, fg, x + w2, y + h2, w - w2, h - h2);
|
||||||
|
|
||||||
|
} else if (bd & BBS) {
|
||||||
|
/* Shades - data is 1/2/3 for 25%/50%/75% alpha, respectively */
|
||||||
|
int d = (uint8_t)bd;
|
||||||
|
XftColor xfc;
|
||||||
|
XRenderColor xrc = { .alpha = 0xffff };
|
||||||
|
|
||||||
|
xrc.red = DIV(fg->color.red * d + bg->color.red * (4 - d), 4);
|
||||||
|
xrc.green = DIV(fg->color.green * d + bg->color.green * (4 - d), 4);
|
||||||
|
xrc.blue = DIV(fg->color.blue * d + bg->color.blue * (4 - d), 4);
|
||||||
|
|
||||||
|
XftColorAllocValue(xdpy, xvis, xcmap, &xrc, &xfc);
|
||||||
|
XftDrawRect(xd, &xfc, x, y, w, h);
|
||||||
|
XftColorFree(xdpy, xvis, xcmap, &xfc);
|
||||||
|
|
||||||
|
} else if (cat == BRL) {
|
||||||
|
/* braille, each data bit corresponds to one dot at 2x4 grid */
|
||||||
|
int w1 = DIV(w, 2);
|
||||||
|
int h1 = DIV(h, 4), h2 = DIV(h, 2), h3 = DIV(3 * h, 4);
|
||||||
|
|
||||||
|
if (bd & 1) XftDrawRect(xd, fg, x, y, w1, h1);
|
||||||
|
if (bd & 2) XftDrawRect(xd, fg, x, y + h1, w1, h2 - h1);
|
||||||
|
if (bd & 4) XftDrawRect(xd, fg, x, y + h2, w1, h3 - h2);
|
||||||
|
if (bd & 8) XftDrawRect(xd, fg, x + w1, y, w - w1, h1);
|
||||||
|
if (bd & 16) XftDrawRect(xd, fg, x + w1, y + h1, w - w1, h2 - h1);
|
||||||
|
if (bd & 32) XftDrawRect(xd, fg, x + w1, y + h2, w - w1, h3 - h2);
|
||||||
|
if (bd & 64) XftDrawRect(xd, fg, x, y + h3, w1, h - h3);
|
||||||
|
if (bd & 128) XftDrawRect(xd, fg, x + w1, y + h3, w - w1, h - h3);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
drawboxlines(int x, int y, int w, int h, XftColor *fg, ushort bd)
|
||||||
|
{
|
||||||
|
/* s: stem thickness. width/8 roughly matches underscore thickness. */
|
||||||
|
/* We draw bold as 1.5 * normal-stem and at least 1px thicker. */
|
||||||
|
/* doubles draw at least 3px, even when w or h < 3. bold needs 6px. */
|
||||||
|
int mwh = MIN(w, h);
|
||||||
|
int base_s = MAX(1, DIV(mwh, 8));
|
||||||
|
int bold = (bd & BDB) && mwh >= 6; /* possibly ignore boldness */
|
||||||
|
int s = bold ? MAX(base_s + 1, DIV(3 * base_s, 2)) : base_s;
|
||||||
|
int w2 = DIV(w - s, 2), h2 = DIV(h - s, 2);
|
||||||
|
/* the s-by-s square (x + w2, y + h2, s, s) is the center texel. */
|
||||||
|
/* The base length (per direction till edge) includes this square. */
|
||||||
|
|
||||||
|
int light = bd & (LL | LU | LR | LD);
|
||||||
|
int double_ = bd & (DL | DU | DR | DD);
|
||||||
|
|
||||||
|
if (light) {
|
||||||
|
/* d: additional (negative) length to not-draw the center */
|
||||||
|
/* texel - at arcs and avoid drawing inside (some) doubles */
|
||||||
|
int arc = bd & BDA;
|
||||||
|
int multi_light = light & (light - 1);
|
||||||
|
int multi_double = double_ & (double_ - 1);
|
||||||
|
/* light crosses double only at DH+LV, DV+LH (ref. shapes) */
|
||||||
|
int d = arc || (multi_double && !multi_light) ? -s : 0;
|
||||||
|
|
||||||
|
if (bd & LL)
|
||||||
|
XftDrawRect(xd, fg, x, y + h2, w2 + s + d, s);
|
||||||
|
if (bd & LU)
|
||||||
|
XftDrawRect(xd, fg, x + w2, y, s, h2 + s + d);
|
||||||
|
if (bd & LR)
|
||||||
|
XftDrawRect(xd, fg, x + w2 - d, y + h2, w - w2 + d, s);
|
||||||
|
if (bd & LD)
|
||||||
|
XftDrawRect(xd, fg, x + w2, y + h2 - d, s, h - h2 + d);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* double lines - also align with light to form heavy when combined */
|
||||||
|
if (double_) {
|
||||||
|
/*
|
||||||
|
* going clockwise, for each double-ray: p is additional length
|
||||||
|
* to the single-ray nearer to the previous direction, and n to
|
||||||
|
* the next. p and n adjust from the base length to lengths
|
||||||
|
* which consider other doubles - shorter to avoid intersections
|
||||||
|
* (p, n), or longer to draw the far-corner texel (n).
|
||||||
|
*/
|
||||||
|
int dl = bd & DL, du = bd & DU, dr = bd & DR, dd = bd & DD;
|
||||||
|
if (dl) {
|
||||||
|
int p = dd ? -s : 0, n = du ? -s : dd ? s : 0;
|
||||||
|
XftDrawRect(xd, fg, x, y + h2 + s, w2 + s + p, s);
|
||||||
|
XftDrawRect(xd, fg, x, y + h2 - s, w2 + s + n, s);
|
||||||
|
}
|
||||||
|
if (du) {
|
||||||
|
int p = dl ? -s : 0, n = dr ? -s : dl ? s : 0;
|
||||||
|
XftDrawRect(xd, fg, x + w2 - s, y, s, h2 + s + p);
|
||||||
|
XftDrawRect(xd, fg, x + w2 + s, y, s, h2 + s + n);
|
||||||
|
}
|
||||||
|
if (dr) {
|
||||||
|
int p = du ? -s : 0, n = dd ? -s : du ? s : 0;
|
||||||
|
XftDrawRect(xd, fg, x + w2 - p, y + h2 - s, w - w2 + p, s);
|
||||||
|
XftDrawRect(xd, fg, x + w2 - n, y + h2 + s, w - w2 + n, s);
|
||||||
|
}
|
||||||
|
if (dd) {
|
||||||
|
int p = dr ? -s : 0, n = dl ? -s : dr ? s : 0;
|
||||||
|
XftDrawRect(xd, fg, x + w2 + s, y + h2 - p, s, h - h2 + p);
|
||||||
|
XftDrawRect(xd, fg, x + w2 - s, y + h2 - n, s, h - h2 + n);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
214
boxdraw_data.h
Normal file
214
boxdraw_data.h
Normal file
@ -0,0 +1,214 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
|
||||||
|
* MIT/X Consortium License
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* U+25XX codepoints data
|
||||||
|
*
|
||||||
|
* References:
|
||||||
|
* http://www.unicode.org/charts/PDF/U2500.pdf
|
||||||
|
* http://www.unicode.org/charts/PDF/U2580.pdf
|
||||||
|
*
|
||||||
|
* Test page:
|
||||||
|
* https://github.com/GNOME/vte/blob/master/doc/boxes.txt
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Each shape is encoded as 16-bits. Higher bits are category, lower are data */
|
||||||
|
/* Categories (mutually exclusive except BDB): */
|
||||||
|
/* For convenience, BDL/BDA/BBS/BDB are 1 bit each, the rest are enums */
|
||||||
|
#define BDL (1<<8) /* Box Draw Lines (light/double/heavy) */
|
||||||
|
#define BDA (1<<9) /* Box Draw Arc (light) */
|
||||||
|
|
||||||
|
#define BBD (1<<10) /* Box Block Down (lower) X/8 */
|
||||||
|
#define BBL (2<<10) /* Box Block Left X/8 */
|
||||||
|
#define BBU (3<<10) /* Box Block Upper X/8 */
|
||||||
|
#define BBR (4<<10) /* Box Block Right X/8 */
|
||||||
|
#define BBQ (5<<10) /* Box Block Quadrants */
|
||||||
|
#define BRL (6<<10) /* Box Braille (data is lower byte of U28XX) */
|
||||||
|
|
||||||
|
#define BBS (1<<14) /* Box Block Shades */
|
||||||
|
#define BDB (1<<15) /* Box Draw is Bold */
|
||||||
|
|
||||||
|
/* (BDL/BDA) Light/Double/Heavy x Left/Up/Right/Down/Horizontal/Vertical */
|
||||||
|
/* Heavy is light+double (literally drawing light+double align to form heavy) */
|
||||||
|
#define LL (1<<0)
|
||||||
|
#define LU (1<<1)
|
||||||
|
#define LR (1<<2)
|
||||||
|
#define LD (1<<3)
|
||||||
|
#define LH (LL+LR)
|
||||||
|
#define LV (LU+LD)
|
||||||
|
|
||||||
|
#define DL (1<<4)
|
||||||
|
#define DU (1<<5)
|
||||||
|
#define DR (1<<6)
|
||||||
|
#define DD (1<<7)
|
||||||
|
#define DH (DL+DR)
|
||||||
|
#define DV (DU+DD)
|
||||||
|
|
||||||
|
#define HL (LL+DL)
|
||||||
|
#define HU (LU+DU)
|
||||||
|
#define HR (LR+DR)
|
||||||
|
#define HD (LD+DD)
|
||||||
|
#define HH (HL+HR)
|
||||||
|
#define HV (HU+HD)
|
||||||
|
|
||||||
|
/* (BBQ) Quadrants Top/Bottom x Left/Right */
|
||||||
|
#define TL (1<<0)
|
||||||
|
#define TR (1<<1)
|
||||||
|
#define BL (1<<2)
|
||||||
|
#define BR (1<<3)
|
||||||
|
|
||||||
|
/* Data for U+2500 - U+259F except dashes/diagonals */
|
||||||
|
static const unsigned short boxdata[256] = {
|
||||||
|
/* light lines */
|
||||||
|
[0x00] = BDL + LH, /* light horizontal */
|
||||||
|
[0x02] = BDL + LV, /* light vertical */
|
||||||
|
[0x0c] = BDL + LD + LR, /* light down and right */
|
||||||
|
[0x10] = BDL + LD + LL, /* light down and left */
|
||||||
|
[0x14] = BDL + LU + LR, /* light up and right */
|
||||||
|
[0x18] = BDL + LU + LL, /* light up and left */
|
||||||
|
[0x1c] = BDL + LV + LR, /* light vertical and right */
|
||||||
|
[0x24] = BDL + LV + LL, /* light vertical and left */
|
||||||
|
[0x2c] = BDL + LH + LD, /* light horizontal and down */
|
||||||
|
[0x34] = BDL + LH + LU, /* light horizontal and up */
|
||||||
|
[0x3c] = BDL + LV + LH, /* light vertical and horizontal */
|
||||||
|
[0x74] = BDL + LL, /* light left */
|
||||||
|
[0x75] = BDL + LU, /* light up */
|
||||||
|
[0x76] = BDL + LR, /* light right */
|
||||||
|
[0x77] = BDL + LD, /* light down */
|
||||||
|
|
||||||
|
/* heavy [+light] lines */
|
||||||
|
[0x01] = BDL + HH,
|
||||||
|
[0x03] = BDL + HV,
|
||||||
|
[0x0d] = BDL + HR + LD,
|
||||||
|
[0x0e] = BDL + HD + LR,
|
||||||
|
[0x0f] = BDL + HD + HR,
|
||||||
|
[0x11] = BDL + HL + LD,
|
||||||
|
[0x12] = BDL + HD + LL,
|
||||||
|
[0x13] = BDL + HD + HL,
|
||||||
|
[0x15] = BDL + HR + LU,
|
||||||
|
[0x16] = BDL + HU + LR,
|
||||||
|
[0x17] = BDL + HU + HR,
|
||||||
|
[0x19] = BDL + HL + LU,
|
||||||
|
[0x1a] = BDL + HU + LL,
|
||||||
|
[0x1b] = BDL + HU + HL,
|
||||||
|
[0x1d] = BDL + HR + LV,
|
||||||
|
[0x1e] = BDL + HU + LD + LR,
|
||||||
|
[0x1f] = BDL + HD + LR + LU,
|
||||||
|
[0x20] = BDL + HV + LR,
|
||||||
|
[0x21] = BDL + HU + HR + LD,
|
||||||
|
[0x22] = BDL + HD + HR + LU,
|
||||||
|
[0x23] = BDL + HV + HR,
|
||||||
|
[0x25] = BDL + HL + LV,
|
||||||
|
[0x26] = BDL + HU + LD + LL,
|
||||||
|
[0x27] = BDL + HD + LU + LL,
|
||||||
|
[0x28] = BDL + HV + LL,
|
||||||
|
[0x29] = BDL + HU + HL + LD,
|
||||||
|
[0x2a] = BDL + HD + HL + LU,
|
||||||
|
[0x2b] = BDL + HV + HL,
|
||||||
|
[0x2d] = BDL + HL + LD + LR,
|
||||||
|
[0x2e] = BDL + HR + LL + LD,
|
||||||
|
[0x2f] = BDL + HH + LD,
|
||||||
|
[0x30] = BDL + HD + LH,
|
||||||
|
[0x31] = BDL + HD + HL + LR,
|
||||||
|
[0x32] = BDL + HR + HD + LL,
|
||||||
|
[0x33] = BDL + HH + HD,
|
||||||
|
[0x35] = BDL + HL + LU + LR,
|
||||||
|
[0x36] = BDL + HR + LU + LL,
|
||||||
|
[0x37] = BDL + HH + LU,
|
||||||
|
[0x38] = BDL + HU + LH,
|
||||||
|
[0x39] = BDL + HU + HL + LR,
|
||||||
|
[0x3a] = BDL + HU + HR + LL,
|
||||||
|
[0x3b] = BDL + HH + HU,
|
||||||
|
[0x3d] = BDL + HL + LV + LR,
|
||||||
|
[0x3e] = BDL + HR + LV + LL,
|
||||||
|
[0x3f] = BDL + HH + LV,
|
||||||
|
[0x40] = BDL + HU + LH + LD,
|
||||||
|
[0x41] = BDL + HD + LH + LU,
|
||||||
|
[0x42] = BDL + HV + LH,
|
||||||
|
[0x43] = BDL + HU + HL + LD + LR,
|
||||||
|
[0x44] = BDL + HU + HR + LD + LL,
|
||||||
|
[0x45] = BDL + HD + HL + LU + LR,
|
||||||
|
[0x46] = BDL + HD + HR + LU + LL,
|
||||||
|
[0x47] = BDL + HH + HU + LD,
|
||||||
|
[0x48] = BDL + HH + HD + LU,
|
||||||
|
[0x49] = BDL + HV + HL + LR,
|
||||||
|
[0x4a] = BDL + HV + HR + LL,
|
||||||
|
[0x4b] = BDL + HV + HH,
|
||||||
|
[0x78] = BDL + HL,
|
||||||
|
[0x79] = BDL + HU,
|
||||||
|
[0x7a] = BDL + HR,
|
||||||
|
[0x7b] = BDL + HD,
|
||||||
|
[0x7c] = BDL + HR + LL,
|
||||||
|
[0x7d] = BDL + HD + LU,
|
||||||
|
[0x7e] = BDL + HL + LR,
|
||||||
|
[0x7f] = BDL + HU + LD,
|
||||||
|
|
||||||
|
/* double [+light] lines */
|
||||||
|
[0x50] = BDL + DH,
|
||||||
|
[0x51] = BDL + DV,
|
||||||
|
[0x52] = BDL + DR + LD,
|
||||||
|
[0x53] = BDL + DD + LR,
|
||||||
|
[0x54] = BDL + DR + DD,
|
||||||
|
[0x55] = BDL + DL + LD,
|
||||||
|
[0x56] = BDL + DD + LL,
|
||||||
|
[0x57] = BDL + DL + DD,
|
||||||
|
[0x58] = BDL + DR + LU,
|
||||||
|
[0x59] = BDL + DU + LR,
|
||||||
|
[0x5a] = BDL + DU + DR,
|
||||||
|
[0x5b] = BDL + DL + LU,
|
||||||
|
[0x5c] = BDL + DU + LL,
|
||||||
|
[0x5d] = BDL + DL + DU,
|
||||||
|
[0x5e] = BDL + DR + LV,
|
||||||
|
[0x5f] = BDL + DV + LR,
|
||||||
|
[0x60] = BDL + DV + DR,
|
||||||
|
[0x61] = BDL + DL + LV,
|
||||||
|
[0x62] = BDL + DV + LL,
|
||||||
|
[0x63] = BDL + DV + DL,
|
||||||
|
[0x64] = BDL + DH + LD,
|
||||||
|
[0x65] = BDL + DD + LH,
|
||||||
|
[0x66] = BDL + DD + DH,
|
||||||
|
[0x67] = BDL + DH + LU,
|
||||||
|
[0x68] = BDL + DU + LH,
|
||||||
|
[0x69] = BDL + DH + DU,
|
||||||
|
[0x6a] = BDL + DH + LV,
|
||||||
|
[0x6b] = BDL + DV + LH,
|
||||||
|
[0x6c] = BDL + DH + DV,
|
||||||
|
|
||||||
|
/* (light) arcs */
|
||||||
|
[0x6d] = BDA + LD + LR,
|
||||||
|
[0x6e] = BDA + LD + LL,
|
||||||
|
[0x6f] = BDA + LU + LL,
|
||||||
|
[0x70] = BDA + LU + LR,
|
||||||
|
|
||||||
|
/* Lower (Down) X/8 block (data is 8 - X) */
|
||||||
|
[0x81] = BBD + 7, [0x82] = BBD + 6, [0x83] = BBD + 5, [0x84] = BBD + 4,
|
||||||
|
[0x85] = BBD + 3, [0x86] = BBD + 2, [0x87] = BBD + 1, [0x88] = BBD + 0,
|
||||||
|
|
||||||
|
/* Left X/8 block (data is X) */
|
||||||
|
[0x89] = BBL + 7, [0x8a] = BBL + 6, [0x8b] = BBL + 5, [0x8c] = BBL + 4,
|
||||||
|
[0x8d] = BBL + 3, [0x8e] = BBL + 2, [0x8f] = BBL + 1,
|
||||||
|
|
||||||
|
/* upper 1/2 (4/8), 1/8 block (X), right 1/2, 1/8 block (8-X) */
|
||||||
|
[0x80] = BBU + 4, [0x94] = BBU + 1,
|
||||||
|
[0x90] = BBR + 4, [0x95] = BBR + 7,
|
||||||
|
|
||||||
|
/* Quadrants */
|
||||||
|
[0x96] = BBQ + BL,
|
||||||
|
[0x97] = BBQ + BR,
|
||||||
|
[0x98] = BBQ + TL,
|
||||||
|
[0x99] = BBQ + TL + BL + BR,
|
||||||
|
[0x9a] = BBQ + TL + BR,
|
||||||
|
[0x9b] = BBQ + TL + TR + BL,
|
||||||
|
[0x9c] = BBQ + TL + TR + BR,
|
||||||
|
[0x9d] = BBQ + TR,
|
||||||
|
[0x9e] = BBQ + BL + TR,
|
||||||
|
[0x9f] = BBQ + BL + TR + BR,
|
||||||
|
|
||||||
|
/* Shades, data is an alpha value in 25% units (1/4, 1/2, 3/4) */
|
||||||
|
[0x91] = BBS + 1, [0x92] = BBS + 2, [0x93] = BBS + 3,
|
||||||
|
|
||||||
|
/* U+2504 - U+250B, U+254C - U+254F: unsupported (dashes) */
|
||||||
|
/* U+2571 - U+2573: unsupported (diagonals) */
|
||||||
|
};
|
||||||
36
config.def.h
36
config.def.h
@ -67,6 +67,18 @@ static unsigned int blinktimeout = 800;
|
|||||||
*/
|
*/
|
||||||
static unsigned int cursorthickness = 2;
|
static unsigned int cursorthickness = 2;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 1: render most of the lines/blocks characters without using the font for
|
||||||
|
* perfect alignment between cells (U2500 - U259F except dashes/diagonals).
|
||||||
|
* Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
|
||||||
|
* 0: disable (render all U25XX glyphs normally from the font).
|
||||||
|
*/
|
||||||
|
const int boxdraw = 0;
|
||||||
|
const int boxdraw_bold = 0;
|
||||||
|
|
||||||
|
/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */
|
||||||
|
const int boxdraw_braille = 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
|
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
|
||||||
* it
|
* it
|
||||||
@ -472,27 +484,3 @@ static char ascii_printable[] =
|
|||||||
" !\"#$%&'()*+,-./0123456789:;<=>?"
|
" !\"#$%&'()*+,-./0123456789:;<=>?"
|
||||||
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
|
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
|
||||||
"`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
|
|
||||||
|
|||||||
@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config
|
|||||||
# includes and libs
|
# includes and libs
|
||||||
INCS = -I$(X11INC) \
|
INCS = -I$(X11INC) \
|
||||||
`$(PKG_CONFIG) --cflags fontconfig` \
|
`$(PKG_CONFIG) --cflags fontconfig` \
|
||||||
`$(PKG_CONFIG) --cflags freetype2`
|
`$(PKG_CONFIG) --cflags freetype2` \
|
||||||
|
`$(PKG_CONFIG) --cflags harfbuzz`
|
||||||
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
|
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
|
||||||
`$(PKG_CONFIG) --libs fontconfig` \
|
`$(PKG_CONFIG) --libs fontconfig` \
|
||||||
`$(PKG_CONFIG) --libs freetype2`
|
`$(PKG_CONFIG) --libs freetype2` \
|
||||||
|
`$(PKG_CONFIG) --libs harfbuzz`
|
||||||
|
|
||||||
# flags
|
# flags
|
||||||
STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
|
STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
|
||||||
|
|||||||
124
hb.c
Normal file
124
hb.c
Normal file
@ -0,0 +1,124 @@
|
|||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <math.h>
|
||||||
|
#include <X11/Xft/Xft.h>
|
||||||
|
#include <X11/cursorfont.h>
|
||||||
|
#include <hb.h>
|
||||||
|
#include <hb-ft.h>
|
||||||
|
|
||||||
|
#include "st.h"
|
||||||
|
#include "hb.h"
|
||||||
|
|
||||||
|
#define FEATURE(c1,c2,c3,c4) { .tag = HB_TAG(c1,c2,c3,c4), .value = 1, .start = HB_FEATURE_GLOBAL_START, .end = HB_FEATURE_GLOBAL_END }
|
||||||
|
#define BUFFER_STEP 256
|
||||||
|
|
||||||
|
hb_font_t *hbfindfont(XftFont *match);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
XftFont *match;
|
||||||
|
hb_font_t *font;
|
||||||
|
} HbFontMatch;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
size_t capacity;
|
||||||
|
HbFontMatch *fonts;
|
||||||
|
} HbFontCache;
|
||||||
|
|
||||||
|
static HbFontCache hbfontcache = { 0, NULL };
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
size_t capacity;
|
||||||
|
Rune *runes;
|
||||||
|
} RuneBuffer;
|
||||||
|
|
||||||
|
static RuneBuffer hbrunebuffer = { 0, NULL };
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Poplulate the array with a list of font features, wrapped in FEATURE macro,
|
||||||
|
* e. g.
|
||||||
|
* FEATURE('c', 'a', 'l', 't'), FEATURE('d', 'l', 'i', 'g')
|
||||||
|
*/
|
||||||
|
hb_feature_t features[] = { };
|
||||||
|
|
||||||
|
void
|
||||||
|
hbunloadfonts()
|
||||||
|
{
|
||||||
|
for (int i = 0; i < hbfontcache.capacity; i++) {
|
||||||
|
hb_font_destroy(hbfontcache.fonts[i].font);
|
||||||
|
XftUnlockFace(hbfontcache.fonts[i].match);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hbfontcache.fonts != NULL) {
|
||||||
|
free(hbfontcache.fonts);
|
||||||
|
hbfontcache.fonts = NULL;
|
||||||
|
}
|
||||||
|
hbfontcache.capacity = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
hb_font_t *
|
||||||
|
hbfindfont(XftFont *match)
|
||||||
|
{
|
||||||
|
for (int i = 0; i < hbfontcache.capacity; i++) {
|
||||||
|
if (hbfontcache.fonts[i].match == match)
|
||||||
|
return hbfontcache.fonts[i].font;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Font not found in cache, caching it now. */
|
||||||
|
hbfontcache.fonts = realloc(hbfontcache.fonts, sizeof(HbFontMatch) * (hbfontcache.capacity + 1));
|
||||||
|
FT_Face face = XftLockFace(match);
|
||||||
|
hb_font_t *font = hb_ft_font_create(face, NULL);
|
||||||
|
if (font == NULL)
|
||||||
|
die("Failed to load Harfbuzz font.");
|
||||||
|
|
||||||
|
hbfontcache.fonts[hbfontcache.capacity].match = match;
|
||||||
|
hbfontcache.fonts[hbfontcache.capacity].font = font;
|
||||||
|
hbfontcache.capacity += 1;
|
||||||
|
|
||||||
|
return font;
|
||||||
|
}
|
||||||
|
|
||||||
|
void hbtransform(HbTransformData *data, XftFont *xfont, const Glyph *glyphs, int start, int length) {
|
||||||
|
ushort mode = USHRT_MAX;
|
||||||
|
unsigned int glyph_count;
|
||||||
|
int rune_idx, glyph_idx, end = start + length;
|
||||||
|
|
||||||
|
hb_font_t *font = hbfindfont(xfont);
|
||||||
|
if (font == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
hb_buffer_t *buffer = hb_buffer_create();
|
||||||
|
hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
|
||||||
|
|
||||||
|
/* Resize the buffer if required length is larger. */
|
||||||
|
if (hbrunebuffer.capacity < length) {
|
||||||
|
hbrunebuffer.capacity = (length / BUFFER_STEP + 1) * BUFFER_STEP;
|
||||||
|
hbrunebuffer.runes = realloc(hbrunebuffer.runes, hbrunebuffer.capacity * sizeof(Rune));
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fill buffer with codepoints. */
|
||||||
|
for (rune_idx = 0, glyph_idx = start; glyph_idx < end; glyph_idx++, rune_idx++) {
|
||||||
|
hbrunebuffer.runes[rune_idx] = glyphs[glyph_idx].u;
|
||||||
|
mode = glyphs[glyph_idx].mode;
|
||||||
|
if (mode & ATTR_WDUMMY)
|
||||||
|
hbrunebuffer.runes[rune_idx] = 0x0020;
|
||||||
|
}
|
||||||
|
hb_buffer_add_codepoints(buffer, hbrunebuffer.runes, length, 0, length);
|
||||||
|
|
||||||
|
/* Shape the segment. */
|
||||||
|
hb_shape(font, buffer, features, sizeof(features)/sizeof(hb_feature_t));
|
||||||
|
|
||||||
|
/* Get new glyph info. */
|
||||||
|
hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, &glyph_count);
|
||||||
|
hb_glyph_position_t *pos = hb_buffer_get_glyph_positions(buffer, &glyph_count);
|
||||||
|
|
||||||
|
/* Fill the output. */
|
||||||
|
data->buffer = buffer;
|
||||||
|
data->glyphs = info;
|
||||||
|
data->positions = pos;
|
||||||
|
data->count = glyph_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
void hbcleanup(HbTransformData *data) {
|
||||||
|
hb_buffer_destroy(data->buffer);
|
||||||
|
memset(data, 0, sizeof(HbTransformData));
|
||||||
|
}
|
||||||
14
hb.h
Normal file
14
hb.h
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
#include <X11/Xft/Xft.h>
|
||||||
|
#include <hb.h>
|
||||||
|
#include <hb-ft.h>
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
hb_buffer_t *buffer;
|
||||||
|
hb_glyph_info_t *glyphs;
|
||||||
|
hb_glyph_position_t *positions;
|
||||||
|
unsigned int count;
|
||||||
|
} HbTransformData;
|
||||||
|
|
||||||
|
void hbunloadfonts();
|
||||||
|
void hbtransform(HbTransformData *, XftFont *, const Glyph *, int, int);
|
||||||
|
void hbcleanup(HbTransformData *);
|
||||||
57
st.c
57
st.c
@ -33,7 +33,6 @@
|
|||||||
#define UTF_SIZ 4
|
#define UTF_SIZ 4
|
||||||
#define ESC_BUF_SIZ (128*UTF_SIZ)
|
#define ESC_BUF_SIZ (128*UTF_SIZ)
|
||||||
#define ESC_ARG_SIZ 16
|
#define ESC_ARG_SIZ 16
|
||||||
#define CAR_PER_ARG 4
|
|
||||||
#define STR_BUF_SIZ ESC_BUF_SIZ
|
#define STR_BUF_SIZ ESC_BUF_SIZ
|
||||||
#define STR_ARG_SIZ ESC_ARG_SIZ
|
#define STR_ARG_SIZ ESC_ARG_SIZ
|
||||||
|
|
||||||
@ -140,7 +139,6 @@ typedef struct {
|
|||||||
int arg[ESC_ARG_SIZ];
|
int arg[ESC_ARG_SIZ];
|
||||||
int narg; /* nb of args */
|
int narg; /* nb of args */
|
||||||
char mode[2];
|
char mode[2];
|
||||||
int carg[ESC_ARG_SIZ][CAR_PER_ARG]; /* colon args */
|
|
||||||
} CSIEscape;
|
} CSIEscape;
|
||||||
|
|
||||||
/* STR Escape sequence structs */
|
/* STR Escape sequence structs */
|
||||||
@ -161,7 +159,6 @@ static void ttywriteraw(const char *, size_t);
|
|||||||
|
|
||||||
static void csidump(void);
|
static void csidump(void);
|
||||||
static void csihandle(void);
|
static void csihandle(void);
|
||||||
static void readcolonargs(char **, int, int[][CAR_PER_ARG]);
|
|
||||||
static void csiparse(void);
|
static void csiparse(void);
|
||||||
static void csireset(void);
|
static void csireset(void);
|
||||||
static void osc_color_response(int, int, int);
|
static void osc_color_response(int, int, int);
|
||||||
@ -1130,28 +1127,6 @@ tnewline(int first_col)
|
|||||||
tmoveto(first_col ? 0 : term.c.x, y);
|
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
|
void
|
||||||
csiparse(void)
|
csiparse(void)
|
||||||
{
|
{
|
||||||
@ -1174,7 +1149,6 @@ csiparse(void)
|
|||||||
v = -1;
|
v = -1;
|
||||||
csiescseq.arg[csiescseq.narg++] = v;
|
csiescseq.arg[csiescseq.narg++] = v;
|
||||||
p = np;
|
p = np;
|
||||||
readcolonargs(&p, csiescseq.narg-1, csiescseq.carg);
|
|
||||||
if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
|
if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
|
||||||
break;
|
break;
|
||||||
p++;
|
p++;
|
||||||
@ -1241,6 +1215,9 @@ tsetchar(Rune u, const Glyph *attr, int x, int y)
|
|||||||
term.dirty[y] = 1;
|
term.dirty[y] = 1;
|
||||||
term.line[y][x] = *attr;
|
term.line[y][x] = *attr;
|
||||||
term.line[y][x].u = u;
|
term.line[y][x].u = u;
|
||||||
|
|
||||||
|
if (isboxdraw(u))
|
||||||
|
term.line[y][x].mode |= ATTR_BOXDRAW;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -1391,10 +1368,6 @@ tsetattr(const int *attr, int l)
|
|||||||
ATTR_STRUCK );
|
ATTR_STRUCK );
|
||||||
term.c.attr.fg = defaultfg;
|
term.c.attr.fg = defaultfg;
|
||||||
term.c.attr.bg = defaultbg;
|
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;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
term.c.attr.mode |= ATTR_BOLD;
|
term.c.attr.mode |= ATTR_BOLD;
|
||||||
@ -1406,14 +1379,7 @@ tsetattr(const int *attr, int l)
|
|||||||
term.c.attr.mode |= ATTR_ITALIC;
|
term.c.attr.mode |= ATTR_ITALIC;
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
term.c.attr.ustyle = csiescseq.carg[i][0];
|
term.c.attr.mode |= ATTR_UNDERLINE;
|
||||||
|
|
||||||
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;
|
break;
|
||||||
case 5: /* slow blink */
|
case 5: /* slow blink */
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
@ -1464,18 +1430,6 @@ tsetattr(const int *attr, int l)
|
|||||||
case 49:
|
case 49:
|
||||||
term.c.attr.bg = defaultbg;
|
term.c.attr.bg = defaultbg;
|
||||||
break;
|
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:
|
default:
|
||||||
if (BETWEEN(attr[i], 30, 37)) {
|
if (BETWEEN(attr[i], 30, 37)) {
|
||||||
term.c.attr.fg = attr[i] - 30;
|
term.c.attr.fg = attr[i] - 30;
|
||||||
@ -2701,7 +2655,8 @@ draw(void)
|
|||||||
|
|
||||||
drawregion(0, 0, term.col, term.row);
|
drawregion(0, 0, term.col, term.row);
|
||||||
xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
||||||
term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
term.ocx, term.ocy, term.line[term.ocy][term.ocx],
|
||||||
|
term.line[term.ocy], term.col);
|
||||||
term.ocx = cx;
|
term.ocx = cx;
|
||||||
term.ocy = term.c.y;
|
term.ocy = term.c.y;
|
||||||
xfinishdraw();
|
xfinishdraw();
|
||||||
|
|||||||
22
st.h
22
st.h
@ -11,7 +11,8 @@
|
|||||||
#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d))
|
#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d))
|
||||||
#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
|
#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
|
||||||
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
|
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
|
||||||
#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \
|
#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP)) != ((b).mode & (~ATTR_WRAP)) || \
|
||||||
|
(a).fg != (b).fg || \
|
||||||
(a).bg != (b).bg)
|
(a).bg != (b).bg)
|
||||||
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \
|
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \
|
||||||
(t1.tv_nsec-t2.tv_nsec)/1E6)
|
(t1.tv_nsec-t2.tv_nsec)/1E6)
|
||||||
@ -33,8 +34,14 @@ enum glyph_attribute {
|
|||||||
ATTR_WRAP = 1 << 8,
|
ATTR_WRAP = 1 << 8,
|
||||||
ATTR_WIDE = 1 << 9,
|
ATTR_WIDE = 1 << 9,
|
||||||
ATTR_WDUMMY = 1 << 10,
|
ATTR_WDUMMY = 1 << 10,
|
||||||
|
ATTR_BOXDRAW = 1 << 11,
|
||||||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
||||||
ATTR_DIRTYUNDERLINE = 1 << 15,
|
};
|
||||||
|
|
||||||
|
enum drawing_mode {
|
||||||
|
DRAW_NONE = 0,
|
||||||
|
DRAW_BG = 1 << 0,
|
||||||
|
DRAW_FG = 1 << 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum selection_mode {
|
enum selection_mode {
|
||||||
@ -66,8 +73,6 @@ typedef struct {
|
|||||||
ushort mode; /* attribute flags */
|
ushort mode; /* attribute flags */
|
||||||
uint32_t fg; /* foreground */
|
uint32_t fg; /* foreground */
|
||||||
uint32_t bg; /* background */
|
uint32_t bg; /* background */
|
||||||
int ustyle; /* underline style */
|
|
||||||
int ucolor[3]; /* underline color */
|
|
||||||
} Glyph;
|
} Glyph;
|
||||||
|
|
||||||
typedef Glyph *Line;
|
typedef Glyph *Line;
|
||||||
@ -114,6 +119,14 @@ void *xmalloc(size_t);
|
|||||||
void *xrealloc(void *, size_t);
|
void *xrealloc(void *, size_t);
|
||||||
char *xstrdup(const char *);
|
char *xstrdup(const char *);
|
||||||
|
|
||||||
|
int isboxdraw(Rune);
|
||||||
|
ushort boxdrawindex(const Glyph *);
|
||||||
|
#ifdef XFT_VERSION
|
||||||
|
/* only exposed to x.c, otherwise we'll need Xft.h for the types */
|
||||||
|
void boxdraw_xinit(Display *, Colormap, XftDraw *, Visual *);
|
||||||
|
void drawboxes(int, int, int, int, XftColor *, XftColor *, const XftGlyphFontSpec *, int);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* config.h globals */
|
/* config.h globals */
|
||||||
extern char *utmp;
|
extern char *utmp;
|
||||||
extern char *scroll;
|
extern char *scroll;
|
||||||
@ -127,3 +140,4 @@ extern unsigned int tabspaces;
|
|||||||
extern unsigned int defaultfg;
|
extern unsigned int defaultfg;
|
||||||
extern unsigned int defaultbg;
|
extern unsigned int defaultbg;
|
||||||
extern unsigned int defaultcs;
|
extern unsigned int defaultcs;
|
||||||
|
extern const int boxdraw, boxdraw_bold, boxdraw_braille;
|
||||||
|
|||||||
1
st.info
1
st.info
@ -1,5 +1,4 @@
|
|||||||
st-mono| simpleterm monocolor,
|
st-mono| simpleterm monocolor,
|
||||||
Su,
|
|
||||||
acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
|
acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
|
||||||
am,
|
am,
|
||||||
bce,
|
bce,
|
||||||
|
|||||||
2
win.h
2
win.h
@ -25,7 +25,7 @@ enum win_mode {
|
|||||||
|
|
||||||
void xbell(void);
|
void xbell(void);
|
||||||
void xclipcopy(void);
|
void xclipcopy(void);
|
||||||
void xdrawcursor(int, int, Glyph, int, int, Glyph);
|
void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
|
||||||
void xdrawline(Line, int, int, int);
|
void xdrawline(Line, int, int, int);
|
||||||
void xfinishdraw(void);
|
void xfinishdraw(void);
|
||||||
void xloadcols(void);
|
void xloadcols(void);
|
||||||
|
|||||||
800
x.c
800
x.c
@ -19,6 +19,7 @@ char *argv0;
|
|||||||
#include "arg.h"
|
#include "arg.h"
|
||||||
#include "st.h"
|
#include "st.h"
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
|
#include "hb.h"
|
||||||
|
|
||||||
/* types used in config.h */
|
/* types used in config.h */
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@ -45,14 +46,6 @@ typedef struct {
|
|||||||
signed char appcursor; /* application cursor */
|
signed char appcursor; /* application cursor */
|
||||||
} Key;
|
} 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 */
|
/* X modifiers */
|
||||||
#define XK_ANY_MOD UINT_MAX
|
#define XK_ANY_MOD UINT_MAX
|
||||||
#define XK_NO_MOD 0
|
#define XK_NO_MOD 0
|
||||||
@ -149,8 +142,9 @@ typedef struct {
|
|||||||
} DC;
|
} DC;
|
||||||
|
|
||||||
static inline ushort sixd_to_16bit(int);
|
static inline ushort sixd_to_16bit(int);
|
||||||
|
static void xresetfontsettings(ushort mode, Font **font, int *frcflags);
|
||||||
static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int);
|
static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int);
|
||||||
static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
|
static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int, int);
|
||||||
static void xdrawglyph(Glyph, int, int);
|
static void xdrawglyph(Glyph, int, int);
|
||||||
static void xclear(int, int, int, int);
|
static void xclear(int, int, int, int);
|
||||||
static int xgeommasktogravity(int);
|
static int xgeommasktogravity(int);
|
||||||
@ -765,7 +759,7 @@ xresize(int col, int row)
|
|||||||
xclear(0, 0, win.w, win.h);
|
xclear(0, 0, win.w, win.h);
|
||||||
|
|
||||||
/* resize to new width */
|
/* resize to new width */
|
||||||
xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec));
|
xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec) * 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
ushort
|
ushort
|
||||||
@ -1070,6 +1064,9 @@ xunloadfont(Font *f)
|
|||||||
void
|
void
|
||||||
xunloadfonts(void)
|
xunloadfonts(void)
|
||||||
{
|
{
|
||||||
|
/* Clear Harfbuzz font cache. */
|
||||||
|
hbunloadfonts();
|
||||||
|
|
||||||
/* Free the loaded fonts in the font cache. */
|
/* Free the loaded fonts in the font cache. */
|
||||||
while (frclen > 0)
|
while (frclen > 0)
|
||||||
XftFontClose(xw.dpy, frc[--frclen].font);
|
XftFontClose(xw.dpy, frc[--frclen].font);
|
||||||
@ -1193,7 +1190,7 @@ xinit(int cols, int rows)
|
|||||||
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
||||||
|
|
||||||
/* font spec buffer */
|
/* font spec buffer */
|
||||||
xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec));
|
xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec) * 4);
|
||||||
|
|
||||||
/* Xft rendering context */
|
/* Xft rendering context */
|
||||||
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
|
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
|
||||||
@ -1245,6 +1242,24 @@ xinit(int cols, int rows)
|
|||||||
xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
|
xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
|
||||||
if (xsel.xtarget == None)
|
if (xsel.xtarget == None)
|
||||||
xsel.xtarget = XA_STRING;
|
xsel.xtarget = XA_STRING;
|
||||||
|
|
||||||
|
boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
xresetfontsettings(ushort mode, Font **font, int *frcflags)
|
||||||
|
{
|
||||||
|
*font = &dc.font;
|
||||||
|
if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
|
||||||
|
*font = &dc.ibfont;
|
||||||
|
*frcflags = FRC_ITALICBOLD;
|
||||||
|
} else if (mode & ATTR_ITALIC) {
|
||||||
|
*font = &dc.ifont;
|
||||||
|
*frcflags = FRC_ITALIC;
|
||||||
|
} else if (mode & ATTR_BOLD) {
|
||||||
|
*font = &dc.bfont;
|
||||||
|
*frcflags = FRC_BOLD;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
@ -1261,171 +1276,163 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
|||||||
FcPattern *fcpattern, *fontpattern;
|
FcPattern *fcpattern, *fontpattern;
|
||||||
FcFontSet *fcsets[] = { NULL };
|
FcFontSet *fcsets[] = { NULL };
|
||||||
FcCharSet *fccharset;
|
FcCharSet *fccharset;
|
||||||
int i, f, numspecs = 0;
|
int i, f, length = 0, start = 0, numspecs = 0;
|
||||||
|
float cluster_xp = xp, cluster_yp = yp;
|
||||||
|
HbTransformData shaped = { 0 };
|
||||||
|
|
||||||
|
/* Initial values. */
|
||||||
|
mode = prevmode = glyphs[0].mode;
|
||||||
|
xresetfontsettings(mode, &font, &frcflags);
|
||||||
|
|
||||||
for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
|
for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
|
||||||
/* Fetch rune and mode for current glyph. */
|
|
||||||
rune = glyphs[i].u;
|
|
||||||
mode = glyphs[i].mode;
|
mode = glyphs[i].mode;
|
||||||
|
|
||||||
/* Skip dummy wide-character spacing. */
|
/* Skip dummy wide-character spacing. */
|
||||||
if (mode == ATTR_WDUMMY)
|
if (mode & ATTR_WDUMMY && i < (len - 1))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* Determine font for glyph if different from previous glyph. */
|
if (
|
||||||
if (prevmode != mode) {
|
prevmode != mode
|
||||||
prevmode = mode;
|
|| ATTRCMP(glyphs[start], glyphs[i])
|
||||||
font = &dc.font;
|
|| selected(x + i, y) != selected(x + start, y)
|
||||||
frcflags = FRC_NORMAL;
|
|| i == (len - 1)
|
||||||
runewidth = win.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f);
|
) {
|
||||||
if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
|
/* Handle 1-character wide segments and end of line */
|
||||||
font = &dc.ibfont;
|
length = i - start;
|
||||||
frcflags = FRC_ITALICBOLD;
|
if (i == start) {
|
||||||
} else if (mode & ATTR_ITALIC) {
|
length = 1;
|
||||||
font = &dc.ifont;
|
} else if (i == (len - 1)) {
|
||||||
frcflags = FRC_ITALIC;
|
length = (i - start + 1);
|
||||||
} else if (mode & ATTR_BOLD) {
|
|
||||||
font = &dc.bfont;
|
|
||||||
frcflags = FRC_BOLD;
|
|
||||||
}
|
|
||||||
yp = winy + font->ascent;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Lookup character index with default font. */
|
|
||||||
glyphidx = XftCharIndex(xw.dpy, font->match, rune);
|
|
||||||
if (glyphidx) {
|
|
||||||
specs[numspecs].font = font->match;
|
|
||||||
specs[numspecs].glyph = glyphidx;
|
|
||||||
specs[numspecs].x = (short)xp;
|
|
||||||
specs[numspecs].y = (short)yp;
|
|
||||||
xp += runewidth;
|
|
||||||
numspecs++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Fallback on font cache, search the font cache for match. */
|
|
||||||
for (f = 0; f < frclen; f++) {
|
|
||||||
glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
|
|
||||||
/* Everything correct. */
|
|
||||||
if (glyphidx && frc[f].flags == frcflags)
|
|
||||||
break;
|
|
||||||
/* We got a default font for a not found glyph. */
|
|
||||||
if (!glyphidx && frc[f].flags == frcflags
|
|
||||||
&& frc[f].unicodep == rune) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Nothing was found. Use fontconfig to find matching font. */
|
|
||||||
if (f >= frclen) {
|
|
||||||
if (!font->set)
|
|
||||||
font->set = FcFontSort(0, font->pattern,
|
|
||||||
1, 0, &fcres);
|
|
||||||
fcsets[0] = font->set;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Nothing was found in the cache. Now use
|
|
||||||
* some dozen of Fontconfig calls to get the
|
|
||||||
* font for one single character.
|
|
||||||
*
|
|
||||||
* Xft and fontconfig are design failures.
|
|
||||||
*/
|
|
||||||
fcpattern = FcPatternDuplicate(font->pattern);
|
|
||||||
fccharset = FcCharSetCreate();
|
|
||||||
|
|
||||||
FcCharSetAddChar(fccharset, rune);
|
|
||||||
FcPatternAddCharSet(fcpattern, FC_CHARSET,
|
|
||||||
fccharset);
|
|
||||||
FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
|
|
||||||
|
|
||||||
FcConfigSubstitute(0, fcpattern,
|
|
||||||
FcMatchPattern);
|
|
||||||
FcDefaultSubstitute(fcpattern);
|
|
||||||
|
|
||||||
fontpattern = FcFontSetMatch(0, fcsets, 1,
|
|
||||||
fcpattern, &fcres);
|
|
||||||
|
|
||||||
/* Allocate memory for the new cache entry. */
|
|
||||||
if (frclen >= frccap) {
|
|
||||||
frccap += 16;
|
|
||||||
frc = xrealloc(frc, frccap * sizeof(Fontcache));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
frc[frclen].font = XftFontOpenPattern(xw.dpy,
|
/* Shape the segment. */
|
||||||
fontpattern);
|
hbtransform(&shaped, font->match, glyphs, start, length);
|
||||||
if (!frc[frclen].font)
|
runewidth = win.cw * ((glyphs[start].mode & ATTR_WIDE) ? 2.0f : 1.0f);
|
||||||
die("XftFontOpenPattern failed seeking fallback font: %s\n",
|
cluster_xp = xp; cluster_yp = yp;
|
||||||
strerror(errno));
|
for (int code_idx = 0; code_idx < shaped.count; code_idx++) {
|
||||||
frc[frclen].flags = frcflags;
|
int idx = shaped.glyphs[code_idx].cluster;
|
||||||
frc[frclen].unicodep = rune;
|
|
||||||
|
|
||||||
glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
|
if (glyphs[start + idx].mode & ATTR_WDUMMY)
|
||||||
|
continue;
|
||||||
|
|
||||||
f = frclen;
|
/* Advance the drawing cursor if we've moved to a new cluster */
|
||||||
frclen++;
|
if (code_idx > 0 && idx != shaped.glyphs[code_idx - 1].cluster) {
|
||||||
|
xp += runewidth;
|
||||||
|
cluster_xp = xp;
|
||||||
|
cluster_yp = yp;
|
||||||
|
runewidth = win.cw * ((glyphs[start + idx].mode & ATTR_WIDE) ? 2.0f : 1.0f);
|
||||||
|
}
|
||||||
|
|
||||||
FcPatternDestroy(fcpattern);
|
if (glyphs[start + code_idx].mode & ATTR_BOXDRAW) {
|
||||||
FcCharSetDestroy(fccharset);
|
/* minor shoehorning: boxdraw uses only this ushort */
|
||||||
|
specs[numspecs].font = font->match;
|
||||||
|
specs[numspecs].glyph = boxdrawindex(&glyphs[start + code_idx]);
|
||||||
|
specs[numspecs].x = xp;
|
||||||
|
specs[numspecs].y = yp;
|
||||||
|
numspecs++;
|
||||||
|
} else if (shaped.glyphs[code_idx].codepoint != 0) {
|
||||||
|
/* If symbol is found, put it into the specs. */
|
||||||
|
specs[numspecs].font = font->match;
|
||||||
|
specs[numspecs].glyph = shaped.glyphs[code_idx].codepoint;
|
||||||
|
specs[numspecs].x = cluster_xp + (short)(shaped.positions[code_idx].x_offset / 64.);
|
||||||
|
specs[numspecs].y = cluster_yp - (short)(shaped.positions[code_idx].y_offset / 64.);
|
||||||
|
cluster_xp += shaped.positions[code_idx].x_advance / 64.;
|
||||||
|
cluster_yp += shaped.positions[code_idx].y_advance / 64.;
|
||||||
|
numspecs++;
|
||||||
|
} else {
|
||||||
|
/* If it's not found, try to fetch it through the font cache. */
|
||||||
|
rune = glyphs[start + idx].u;
|
||||||
|
for (f = 0; f < frclen; f++) {
|
||||||
|
glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
|
||||||
|
/* Everything correct. */
|
||||||
|
if (glyphidx && frc[f].flags == frcflags)
|
||||||
|
break;
|
||||||
|
/* We got a default font for a not found glyph. */
|
||||||
|
if (!glyphidx && frc[f].flags == frcflags
|
||||||
|
&& frc[f].unicodep == rune) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Nothing was found. Use fontconfig to find matching font. */
|
||||||
|
if (f >= frclen) {
|
||||||
|
if (!font->set)
|
||||||
|
font->set = FcFontSort(0, font->pattern,
|
||||||
|
1, 0, &fcres);
|
||||||
|
fcsets[0] = font->set;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Nothing was found in the cache. Now use
|
||||||
|
* some dozen of Fontconfig calls to get the
|
||||||
|
* font for one single character.
|
||||||
|
*
|
||||||
|
* Xft and fontconfig are design failures.
|
||||||
|
*/
|
||||||
|
fcpattern = FcPatternDuplicate(font->pattern);
|
||||||
|
fccharset = FcCharSetCreate();
|
||||||
|
|
||||||
|
FcCharSetAddChar(fccharset, rune);
|
||||||
|
FcPatternAddCharSet(fcpattern, FC_CHARSET,
|
||||||
|
fccharset);
|
||||||
|
FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
|
||||||
|
|
||||||
|
FcConfigSubstitute(0, fcpattern,
|
||||||
|
FcMatchPattern);
|
||||||
|
FcDefaultSubstitute(fcpattern);
|
||||||
|
|
||||||
|
fontpattern = FcFontSetMatch(0, fcsets, 1,
|
||||||
|
fcpattern, &fcres);
|
||||||
|
|
||||||
|
/* Allocate memory for the new cache entry. */
|
||||||
|
if (frclen >= frccap) {
|
||||||
|
frccap += 16;
|
||||||
|
frc = xrealloc(frc, frccap * sizeof(Fontcache));
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
|
||||||
|
|
||||||
|
f = frclen;
|
||||||
|
frclen++;
|
||||||
|
|
||||||
|
FcPatternDestroy(fcpattern);
|
||||||
|
FcCharSetDestroy(fccharset);
|
||||||
|
}
|
||||||
|
|
||||||
|
specs[numspecs].font = frc[f].font;
|
||||||
|
specs[numspecs].glyph = glyphidx;
|
||||||
|
specs[numspecs].x = (short)xp;
|
||||||
|
specs[numspecs].y = (short)yp;
|
||||||
|
numspecs++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Cleanup and get ready for next segment. */
|
||||||
|
hbcleanup(&shaped);
|
||||||
|
start = i;
|
||||||
|
|
||||||
|
/* Determine font for glyph if different from previous glyph. */
|
||||||
|
if (prevmode != mode) {
|
||||||
|
prevmode = mode;
|
||||||
|
xresetfontsettings(mode, &font, &frcflags);
|
||||||
|
yp = winy + font->ascent;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
specs[numspecs].font = frc[f].font;
|
|
||||||
specs[numspecs].glyph = glyphidx;
|
|
||||||
specs[numspecs].x = (short)xp;
|
|
||||||
specs[numspecs].y = (short)yp;
|
|
||||||
xp += runewidth;
|
|
||||||
numspecs++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
hbcleanup(&shaped);
|
||||||
return numspecs;
|
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
|
void
|
||||||
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
|
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y, int dmode)
|
||||||
{
|
{
|
||||||
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
|
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
|
||||||
int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
|
int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
|
||||||
@ -1516,396 +1523,45 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
|||||||
if (base.mode & ATTR_INVISIBLE)
|
if (base.mode & ATTR_INVISIBLE)
|
||||||
fg = bg;
|
fg = bg;
|
||||||
|
|
||||||
/* Intelligent cleaning up of the borders. */
|
if (dmode & DRAW_BG) {
|
||||||
if (x == 0) {
|
/* Intelligent cleaning up of the borders. */
|
||||||
xclear(0, (y == 0)? 0 : winy, borderpx,
|
if (x == 0) {
|
||||||
winy + win.ch +
|
xclear(0, (y == 0)? 0 : winy, borderpx,
|
||||||
((winy + win.ch >= borderpx + win.th)? win.h : 0));
|
winy + win.ch +
|
||||||
}
|
((winy + win.ch >= borderpx + win.th)? win.h : 0));
|
||||||
if (winx + width >= borderpx + win.tw) {
|
}
|
||||||
xclear(winx + width, (y == 0)? 0 : winy, win.w,
|
if (winx + width >= borderpx + win.tw) {
|
||||||
((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));
|
xclear(winx + width, (y == 0)? 0 : winy, win.w,
|
||||||
}
|
((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));
|
||||||
if (y == 0)
|
}
|
||||||
xclear(winx, 0, winx + width, borderpx);
|
if (y == 0)
|
||||||
if (winy + win.ch >= borderpx + win.th)
|
xclear(winx, 0, winx + width, borderpx);
|
||||||
xclear(winx, winy + win.ch, winx + width, win.h);
|
if (winy + win.ch >= borderpx + win.th)
|
||||||
|
xclear(winx, winy + win.ch, winx + width, win.h);
|
||||||
|
/* Fill the background */
|
||||||
|
XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
|
||||||
|
}
|
||||||
|
|
||||||
/* Clean up the region we want to draw to. */
|
|
||||||
XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
|
|
||||||
|
|
||||||
/* Set the clip region because Xft is sometimes dirty. */
|
if (dmode & DRAW_FG) {
|
||||||
r.x = 0;
|
if (base.mode & ATTR_BOXDRAW) {
|
||||||
r.y = 0;
|
drawboxes(winx, winy, width / len, win.ch, fg, bg, specs, len);
|
||||||
r.height = win.ch;
|
|
||||||
r.width = width;
|
|
||||||
XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
|
|
||||||
|
|
||||||
/* Render the glyphs. */
|
|
||||||
XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
|
|
||||||
|
|
||||||
/* 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 {
|
} else {
|
||||||
// Foreground color for underline
|
/* Render the glyphs. */
|
||||||
linecolor = fg->pixel;
|
XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
XGCValues ugcv = {
|
/* Render underline and strikethrough. */
|
||||||
.foreground = linecolor,
|
if (base.mode & ATTR_UNDERLINE) {
|
||||||
.line_width = wlw,
|
XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
|
||||||
.line_style = LineSolid,
|
width, 1);
|
||||||
.cap_style = CapNotLast
|
}
|
||||||
};
|
|
||||||
|
|
||||||
GC ugc = XCreateGC(xw.dpy, XftDrawDrawable(xw.draw),
|
if (base.mode & ATTR_STRUCK) {
|
||||||
GCForeground | GCLineWidth | GCLineStyle | GCCapStyle,
|
XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3,
|
||||||
&ugcv);
|
width, 1);
|
||||||
|
}
|
||||||
// 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);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (base.mode & ATTR_STRUCK) {
|
|
||||||
XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent * chscale / 3,
|
|
||||||
width, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Reset clip to none. */
|
|
||||||
XftDrawSetClip(xw.draw, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -1915,18 +1571,21 @@ xdrawglyph(Glyph g, int x, int y)
|
|||||||
XftGlyphFontSpec spec;
|
XftGlyphFontSpec spec;
|
||||||
|
|
||||||
numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y);
|
numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y);
|
||||||
xdrawglyphfontspecs(&spec, g, numspecs, x, y);
|
xdrawglyphfontspecs(&spec, g, numspecs, x, y, DRAW_BG | DRAW_FG);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len)
|
||||||
{
|
{
|
||||||
Color drawcol;
|
Color drawcol;
|
||||||
|
|
||||||
/* remove the old cursor */
|
/* remove the old cursor */
|
||||||
if (selected(ox, oy))
|
if (selected(ox, oy))
|
||||||
og.mode ^= ATTR_REVERSE;
|
og.mode ^= ATTR_REVERSE;
|
||||||
xdrawglyph(og, ox, oy);
|
|
||||||
|
/* Redraw the line where cursor was previously.
|
||||||
|
* It will restore the ligatures broken by the cursor. */
|
||||||
|
xdrawline(line, 0, oy, len);
|
||||||
|
|
||||||
if (IS_SET(MODE_HIDE))
|
if (IS_SET(MODE_HIDE))
|
||||||
return;
|
return;
|
||||||
@ -1934,7 +1593,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
|||||||
/*
|
/*
|
||||||
* Select the right color for the right mode.
|
* Select the right color for the right mode.
|
||||||
*/
|
*/
|
||||||
g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
|
g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE|ATTR_BOXDRAW;
|
||||||
|
|
||||||
if (IS_SET(MODE_REVERSE)) {
|
if (IS_SET(MODE_REVERSE)) {
|
||||||
g.mode |= ATTR_REVERSE;
|
g.mode |= ATTR_REVERSE;
|
||||||
@ -2050,32 +1709,39 @@ xstartdraw(void)
|
|||||||
void
|
void
|
||||||
xdrawline(Line line, int x1, int y1, int x2)
|
xdrawline(Line line, int x1, int y1, int x2)
|
||||||
{
|
{
|
||||||
int i, x, ox, numspecs;
|
int i, x, ox, numspecs, numspecs_cached;
|
||||||
Glyph base, new;
|
Glyph base, new;
|
||||||
XftGlyphFontSpec *specs = xw.specbuf;
|
XftGlyphFontSpec *specs;
|
||||||
|
|
||||||
numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
|
numspecs_cached = xmakeglyphfontspecs(xw.specbuf, &line[x1], x2 - x1, x1, y1);
|
||||||
i = ox = 0;
|
|
||||||
for (x = x1; x < x2 && i < numspecs; x++) {
|
/* Draw line in 2 passes: background and foreground. This way wide glyphs
|
||||||
new = line[x];
|
won't get truncated (#223) */
|
||||||
if (new.mode == ATTR_WDUMMY)
|
for (int dmode = DRAW_BG; dmode <= DRAW_FG; dmode <<= 1) {
|
||||||
continue;
|
specs = xw.specbuf;
|
||||||
if (selected(x, y1))
|
i = ox = 0;
|
||||||
new.mode ^= ATTR_REVERSE;
|
for (x = x1; x < x2; x++) {
|
||||||
if (i > 0 && ATTRCMP(base, new)) {
|
new = line[x];
|
||||||
xdrawglyphfontspecs(specs, base, i, ox, y1);
|
if (new.mode == ATTR_WDUMMY)
|
||||||
specs += i;
|
continue;
|
||||||
numspecs -= i;
|
if (selected(x, y1))
|
||||||
i = 0;
|
new.mode ^= ATTR_REVERSE;
|
||||||
|
if ((i > 0) && ATTRCMP(base, new)) {
|
||||||
|
numspecs = xmakeglyphfontspecs(specs, &line[ox], x - ox, ox, y1);
|
||||||
|
xdrawglyphfontspecs(specs, base, numspecs, ox, y1);
|
||||||
|
i = 0;
|
||||||
|
}
|
||||||
|
if (i == 0) {
|
||||||
|
ox = x;
|
||||||
|
base = new;
|
||||||
|
}
|
||||||
|
i++;
|
||||||
}
|
}
|
||||||
if (i == 0) {
|
if (i > 0) {
|
||||||
ox = x;
|
numspecs = xmakeglyphfontspecs(specs, &line[ox], x2 - ox, ox, y1);
|
||||||
base = new;
|
xdrawglyphfontspecs(specs, base, numspecs, ox, y1);
|
||||||
}
|
}
|
||||||
i++;
|
|
||||||
}
|
}
|
||||||
if (i > 0)
|
|
||||||
xdrawglyphfontspecs(specs, base, i, ox, y1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
Reference in New Issue
Block a user