zymon/st
1
0
Fork 0
mirror of https://github.com/LukeSmithxyz/st.git synced 2024-11-24 16:05:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

patched in st-glyph-wide-support

Browse source
This commit is contained in:
iStagnant 2023-01-05 21:07:32 +02:00
parent 36d225d71d
commit 212609048b
2 changed files with 79 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
st.h
View file

@ -39,6 +39,12 @@ enum glyph_attribute {
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT, ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
}; };
enum drawing_mode {
DRAW_NONE = 0,
DRAW_BG = 1 << 0,
DRAW_FG = 1 << 1,
};
enum selection_mode { enum selection_mode {
SEL_IDLE = 0, SEL_IDLE = 0,
SEL_EMPTY = 1, SEL_EMPTY = 1,

145
x.c
View file

@ -159,7 +159,7 @@ typedef struct {
static inline ushort sixd_to_16bit(int); static inline ushort sixd_to_16bit(int);
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);
@ -1538,11 +1538,11 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
} }
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,
width = charlen * win.cw; width = charlen * win.cw;
Color *fg, *bg, *temp, revfg, revbg, truefg, truebg; Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
XRenderColor colfg, colbg; XRenderColor colfg, colbg;
XRectangle r; XRectangle r;
@ -1552,7 +1552,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
if (dc.ibfont.badslant || dc.ibfont.badweight) if (dc.ibfont.badslant || dc.ibfont.badweight)
base.fg = defaultattr; base.fg = defaultattr;
} else if ((base.mode & ATTR_ITALIC && dc.ifont.badslant) || } else if ((base.mode & ATTR_ITALIC && dc.ifont.badslant) ||
(base.mode & ATTR_BOLD && dc.bfont.badweight)) { (base.mode & ATTR_BOLD && dc.bfont.badweight)) {
base.fg = defaultattr; base.fg = defaultattr;
} }
@ -1591,7 +1591,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
colfg.blue = ~fg->color.blue; colfg.blue = ~fg->color.blue;
colfg.alpha = fg->color.alpha; colfg.alpha = fg->color.alpha;
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg,
&revfg); &revfg);
fg = &revfg; fg = &revfg;
} }
@ -1603,7 +1603,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
colbg.blue = ~bg->color.blue; colbg.blue = ~bg->color.blue;
colbg.alpha = bg->color.alpha; colbg.alpha = bg->color.alpha;
XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg,
&revbg); &revbg);
bg = &revbg; bg = &revbg;
} }
} }
@ -1624,56 +1624,50 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
} }
if (base.mode & ATTR_BLINK && win.mode & MODE_BLINK) if (base.mode & ATTR_BLINK && win.mode & MODE_BLINK)
fg = bg; fg = bg;
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);
/* Clean up the region we want to draw to. */ /* Fill the background */
XftDrawRect(xw.draw, bg, winx, winy, width, win.ch); XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
/* Set the clip region because Xft is sometimes dirty. */
r.x = 0;
r.y = 0;
r.height = win.ch;
r.width = width;
XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
if (base.mode & ATTR_BOXDRAW) {
drawboxes(winx, winy, width / len, win.ch, fg, bg, specs, len);
} else {
/* Render the glyphs. */
XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
} }
/* Render underline and strikethrough. */
if (base.mode & ATTR_UNDERLINE) {
XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
width, 1);
}
if (base.mode & ATTR_STRUCK) { if (dmode & DRAW_FG) {
XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent * chscale / 3, if (base.mode & ATTR_BOXDRAW) {
width, 1); drawboxes(winx, winy, width / len, win.ch, fg, bg, specs, len);
} } else {
/* Render the glyphs. */
XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
}
/* Reset clip to none. */ /* Render underline and strikethrough. */
XftDrawSetClip(xw.draw, 0); if (base.mode & ATTR_UNDERLINE) {
XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
width, 1);
}
if (base.mode & ATTR_STRUCK) {
XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3,
width, 1);
}
}
} }
void void
@ -1683,7 +1677,7 @@ 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
@ -1821,32 +1815,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)) numspecs = numspecs_cached;
new.mode ^= ATTR_REVERSE; i = ox = 0;
if (i > 0 && ATTRCMP(base, new)) { for (x = x1; x < x2 && i < numspecs; x++) {
xdrawglyphfontspecs(specs, base, i, ox, y1); new = line[x];
specs += i; if (new.mode == ATTR_WDUMMY)
numspecs -= i; continue;
i = 0; if (selected(x, y1))
new.mode ^= ATTR_REVERSE;
if (i > 0 && ATTRCMP(base, new)) {
xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
specs += i;
numspecs -= i;
i = 0;
}
if (i == 0) {
ox = x;
base = new;
}
i++;
} }
if (i == 0) { if (i > 0)
ox = x; xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
base = new;
}
i++;
} }
if (i > 0)
xdrawglyphfontspecs(specs, base, i, ox, y1);
} }
void void