diff options
| author | xAlpharax <42233094+xAlpharax@users.noreply.github.com> | 2023-08-14 03:02:26 +0300 |
|---|---|---|
| committer | xAlpharax <42233094+xAlpharax@users.noreply.github.com> | 2023-08-14 03:02:26 +0300 |
| commit | 8d06917df748f961943870eb102d5f283737ce19 (patch) | |
| tree | 13c4d42318a697f2173c3745cda77f1ea9b94f93 /x.c | |
| parent | b40ce8559698d1442ced6e537fb18091f1343fb8 (diff) | |
Cleaned up the repository and patched boxdraw successfully.0.9-Mainline
Changes to be committed:
modified: Makefile
new file: Makefile.orig
deleted: boxdraw.c
deleted: boxdraw_data.h
modified: config.def.h.orig
deleted: config.def.h.rej
modified: st.c
modified: st.c.orig
deleted: st.c.rej
modified: st.h
modified: st.h.orig
deleted: st.h.rej
deleted: st.o
modified: x.c
modified: x.c.orig
deleted: x.o
Diffstat (limited to 'x.c')
| -rw-r--r-- | x.c | 21 |
1 files changed, 5 insertions, 16 deletions
@@ -1360,8 +1360,6 @@ xinit(int cols, int rows) xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0); if (xsel.xtarget == None) xsel.xtarget = XA_STRING; - - boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis); } int @@ -1408,13 +1406,8 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x yp = winy + font->ascent; } - if (mode & ATTR_BOXDRAW) { - /* minor shoehorning: boxdraw uses only this ushort */ - glyphidx = boxdrawindex(&glyphs[i]); - } else { - /* Lookup character index with default font. */ - glyphidx = XftCharIndex(xw.dpy, font->match, rune); - } + /* Lookup character index with default font. */ + glyphidx = XftCharIndex(xw.dpy, font->match, rune); if (glyphidx) { specs[numspecs].font = font->match; specs[numspecs].glyph = glyphidx; @@ -1618,12 +1611,8 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i 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 the glyphs. */ + XftDrawGlyphFontSpec(xw.draw, fg, specs, len); /* Render underline and strikethrough. */ if (base.mode & ATTR_UNDERLINE) { @@ -1666,7 +1655,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) /* * Select the right color for the right mode. */ - g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE|ATTR_BOXDRAW; + g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE; if (IS_SET(MODE_REVERSE)) { g.mode |= ATTR_REVERSE; |