diff options
Diffstat (limited to 'sys/cmd/term/x.c')
| -rw-r--r-- | sys/cmd/term/x.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sys/cmd/term/x.c b/sys/cmd/term/x.c index ea64bff..27a2e7a 100644 --- a/sys/cmd/term/x.c +++ b/sys/cmd/term/x.c @@ -12,8 +12,10 @@ #include <X11/XKBlib.h> /* harfbuzz additions */ +#if 0 void hbunloadfonts(); void hbtransform(XftGlyphFontSpec *, const Letter*, size_t, int, int); +#endif /* types used in config.h */ typedef struct Shortcut Shortcut; @@ -1025,7 +1027,9 @@ xunloadfont(Font *f) void xunloadfonts(void) { +#if 0 hbunloadfonts(); +#endif /* Free the loaded fonts in the font cache. */ while (frclen > 0) @@ -1235,11 +1239,14 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, Letter *glyphs, int len, int x, int mode = glyphs[i].mode; /* Skip dummy wide-character spacing. */ +#if 0 if(mode & Gwdummy) +#endif + if(mode == Gwdummy) continue; /* Determine font for glyph if different from previous glyph. */ - if(prevmode != mode) { + if(prevmode != mode){ prevmode = mode; font = &dc.font; frcflags = FRC_NORMAL; @@ -1259,7 +1266,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, Letter *glyphs, int len, int x, int /* lookup character index with default font. */ glyphidx = XftCharIndex(xw.dpy, font->match, r); - if(glyphidx) { + if(glyphidx){ specs[numspecs].font = font->match; specs[numspecs].glyph = glyphidx; specs[numspecs].x = (short)xp; @@ -1342,7 +1349,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, Letter *glyphs, int len, int x, int numspecs++; } +#if 0 hbtransform(specs, glyphs, len, x, y); +#endif return numspecs; } @@ -1489,7 +1498,10 @@ xdrawcursor(int cx, int cy, Letter g, int ox, int oy, Letter og, Letter *line, i /* remove the old cursor */ if(selected(ox, oy)) og.mode ^= Greverse; + xdrawglyph(og, ox, oy); +#if 0 xdrawline(line, 0, oy, len); +#endif if(IS_SET(Whide)) return; |