dpy is now computed
(https://git.suckless.org/st/commit/528241aa3835e2f1f052abeeaf891737712955a0.html#h0-0-4)
This commit is contained in:
parent
186cf03d68
commit
99dfaf066f
|
@ -12,8 +12,9 @@
|
||||||
*/
|
*/
|
||||||
static char *font[] = {
|
static char *font[] = {
|
||||||
"Fantasque Sans Mono:size=8:style=Bold:antialias=true:autohint=true",
|
"Fantasque Sans Mono:size=8:style=Bold:antialias=true:autohint=true",
|
||||||
|
"Terminus:size=8:style=Bold:antialias=true:autohint=true",
|
||||||
"DejaVu Sans Mono:size=8:antialias=true:autohint=true",
|
"DejaVu Sans Mono:size=8:antialias=true:autohint=true",
|
||||||
"Noto Color Emoji:size=8:antialias=true:autohint=true",
|
"Noto Color Emoji:size=7:antialias=true:autohint=true",
|
||||||
"fontawesome:size=8:antialias=true:autohint=true",
|
"fontawesome:size=8:antialias=true:autohint=true",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -62,8 +63,8 @@ static unsigned int cursorthickness = 2; /* Cursor thickness in pixels */
|
||||||
* Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
|
* Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
|
||||||
* 0: Disable boxdraw (render all U25XX glyphs normally from the font).
|
* 0: Disable boxdraw (render all U25XX glyphs normally from the font).
|
||||||
*/
|
*/
|
||||||
int boxdraw = 0; /* Enable boxdraw */
|
int boxdraw = 1; /* Enable boxdraw */
|
||||||
int boxdraw_bold = 0; /* Draw boxdraw bold */
|
int boxdraw_bold = 1; /* Draw boxdraw bold */
|
||||||
int boxdraw_braille = 0; /* Render braille as adjecent pixels */
|
int boxdraw_braille = 0; /* Render braille as adjecent pixels */
|
||||||
|
|
||||||
/* Undercurl options
|
/* Undercurl options
|
||||||
|
|
6
x.c
6
x.c
|
@ -1144,7 +1144,7 @@ xloadsparefont(FcPattern *pattern, int flags)
|
||||||
FcPattern *match;
|
FcPattern *match;
|
||||||
FcResult result;
|
FcResult result;
|
||||||
|
|
||||||
match = FcFontMatch(NULL, pattern, &result);
|
match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
|
||||||
if (!match) {
|
if (!match) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -1574,10 +1574,6 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||||
fccharset);
|
fccharset);
|
||||||
FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
|
FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
|
||||||
|
|
||||||
FcConfigSubstitute(0, fcpattern,
|
|
||||||
FcMatchPattern);
|
|
||||||
FcDefaultSubstitute(fcpattern);
|
|
||||||
|
|
||||||
fontpattern = FcFontSetMatch(0, fcsets, 1,
|
fontpattern = FcFontSetMatch(0, fcsets, 1,
|
||||||
fcpattern, &fcres);
|
fcpattern, &fcres);
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@ ResourcePref resources[] = {
|
||||||
{ "background", STRING, &colorname[256] },
|
{ "background", STRING, &colorname[256] },
|
||||||
{ "foreground", STRING, &colorname[257] },
|
{ "foreground", STRING, &colorname[257] },
|
||||||
{ "curcolor", STRING, &colorname[258] },
|
{ "curcolor", STRING, &colorname[258] },
|
||||||
|
{ "cursorColor", STRING, &colorname[258] },
|
||||||
{ "termname", STRING, &termname },
|
{ "termname", STRING, &termname },
|
||||||
{ "shell", STRING, &shell },
|
{ "shell", STRING, &shell },
|
||||||
{ "understyle", STRING, &understyle },
|
{ "understyle", STRING, &understyle },
|
||||||
|
|
Loading…
Reference in a new issue