diff options
| author | Von Random <von@vdrandom.org> | 2019-04-19 15:08:04 +0300 |
|---|---|---|
| committer | Von Random <von@vdrandom.org> | 2019-04-19 15:08:04 +0300 |
| commit | 89e4ee144e9fcf44dd7adb84e19df9c5712d56ec (patch) | |
| tree | fda9ff1aa4675841807ddfb471bf547f5dfa13c2 | |
| parent | 0d88911a9b9230abce8465132505b107d7e02860 (diff) | |
Revert "actually properly use the original disable-bold-italic-fonts patch, apparently I have been doing it wrong"
This reverts commit 14ad67f639b8cbb4d062eb3556879b7f9f008164.
| -rw-r--r-- | config.h | 3 | ||||
| -rw-r--r-- | st-disable-bold-italic-fonts.patch | 67 |
2 files changed, 27 insertions, 43 deletions
@@ -9,9 +9,8 @@ static char *font = "xos4 Terminus:bold:pixelsize=14"; static int borderpx = 1; /* disable bold and italic font styles */ -int disablebold = 0; +int disablebold = 1; int disableitalic = 1; -int disableroman = 1; /* * What program is execed by st depends of these precedence rules: diff --git a/st-disable-bold-italic-fonts.patch b/st-disable-bold-italic-fonts.patch index 026dbe8..a19584e 100644 --- a/st-disable-bold-italic-fonts.patch +++ b/st-disable-bold-italic-fonts.patch @@ -1,60 +1,45 @@ -# based on Alex Kozadaev's st-disable-bold-italic-fonts.diff -# https://st.suckless.org/patches/disable_bold_italic_fonts/ - -diff --git a/config.def.h b/config.def.h -index 482901e..50a4896 100644 --- a/config.def.h +++ b/config.def.h -@@ -6,6 +6,12 @@ - * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html - */ +@@ -8,6 +8,10 @@ static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; -+ -+/* disable bold, italic and roman fonts globally */ + static int borderpx = 2; + ++/* disable bold and italic font styles */ +int disablebold = 0; +int disableitalic = 0; -+int disableroman = 0; + - static int borderpx = 2; - /* -diff --git a/x.c b/x.c -index 5828a3b..ad65501 100644 + * What program is execed by st depends of these precedence rules: + * 1: program passed with -e --- a/x.c +++ b/x.c -@@ -244,6 +244,11 @@ static char *opt_title = NULL; +@@ -240,6 +240,10 @@ static char *opt_title = NULL; static int oldbutton = 3; /* button event on startup: 3 = release */ +/* declared in config.h */ +extern int disablebold; +extern int disableitalic; -+extern int disableroman; + void clipcopy(const Arg *dummy) { -@@ -960,17 +965,20 @@ xloadfonts(char *fontstr, double fontsize) - win.ch = ceilf(dc.font.height * chscale); - - FcPatternDel(pattern, FC_SLANT); -- FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); -+ if (!disableitalic) -+ FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); - if (xloadfont(&dc.ifont, pattern)) - die("can't open font %s\n", fontstr); - - FcPatternDel(pattern, FC_WEIGHT); -- FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); -+ if (!disablebold) -+ FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); - if (xloadfont(&dc.ibfont, pattern)) - die("can't open font %s\n", fontstr); - - FcPatternDel(pattern, FC_SLANT); -- FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); -+ if (!disableroman) -+ FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); - if (xloadfont(&dc.bfont, pattern)) - die("can't open font %s\n", fontstr); - +@@ -1152,13 +1156,15 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x + frcflags = FRC_NORMAL; + runewidth = win.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f); + if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) { +- font = &dc.ibfont; ++ if (!disableitalic && !disablebold) font = &dc.ibfont; ++ if (disableitalic && !disablebold) font = &dc.bfont; ++ if (!disableitalic && disablebold) font = &dc.ifont; + frcflags = FRC_ITALICBOLD; + } else if (mode & ATTR_ITALIC) { +- font = &dc.ifont; ++ if (!disableitalic) font = &dc.ifont; + frcflags = FRC_ITALIC; + } else if (mode & ATTR_BOLD) { +- font = &dc.bfont; ++ if (!disablebold) font = &dc.bfont; + frcflags = FRC_BOLD; + } + yp = winy + font->ascent; |