it* st + patches and config Err codevoid.de 70 i Err codevoid.de 70 hgit clone git://git.codevoid.de/st-sdk URL:git://git.codevoid.de/st-sdk codevoid.de 70 1Log /git/st-sdk/log.gph codevoid.de 70 1Files /git/st-sdk/files.gph codevoid.de 70 1Refs /git/st-sdk/refs.gph codevoid.de 70 1README /git/st-sdk/file/README.gph codevoid.de 70 1LICENSE /git/st-sdk/file/LICENSE.gph codevoid.de 70 i--- Err codevoid.de 70 1commit 0394c6390b5fd979cda515b3fefb5ede556861a8 /git/st-sdk/commit/0394c6390b5fd979cda515b3fefb5ede556861a8.gph codevoid.de 70 1parent 0b5c2b0108624c1a91d4ef781674cd9cfbce716c /git/st-sdk/commit/0b5c2b0108624c1a91d4ef781674cd9cfbce716c.gph codevoid.de 70 hAuthor: Stefan Hagen URL:mailto:sh+git[at]codevoid[dot]de codevoid.de 70 iDate: Sun, 7 Apr 2019 11:50:59 +0200 Err codevoid.de 70 i Err codevoid.de 70 iadd disable italic bold patch Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M config.h | 10 +++++----- Err codevoid.de 70 i M config.mk | 2 +- Err codevoid.de 70 i A patches/st-disable-bold-italic-fon… | 70 +++++++++++++++++++++++++++++++ Err codevoid.de 70 i Err codevoid.de 70 i3 files changed, 76 insertions(+), 6 deletions(-) Err codevoid.de 70 i--- Err codevoid.de 70 1diff --git a/config.h b/config.h /git/st-sdk/file/config.h.gph codevoid.de 70 it@@ -5,7 +5,7 @@ Err codevoid.de 70 i * Err codevoid.de 70 i * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html Err codevoid.de 70 i */ Err codevoid.de 70 i-static char *font = "Fira Mono:pixelsize=22"; Err codevoid.de 70 i+static char *font = "DejaVu Sans Mono-24"; Err codevoid.de 70 i static int borderpx = 2; Err codevoid.de 70 i static int borderperc = 20; Err codevoid.de 70 i #define histsize 2000 Err codevoid.de 70 it@@ -26,8 +26,8 @@ char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; Err codevoid.de 70 i char *vtiden = "\033[?6c"; Err codevoid.de 70 i Err codevoid.de 70 i /* Kerning / character bounding-box multipliers */ Err codevoid.de 70 i-static float cwscale = 0.95; Err codevoid.de 70 i-static float chscale = 0.95; Err codevoid.de 70 i+static float cwscale = 1; Err codevoid.de 70 i+static float chscale = 1; Err codevoid.de 70 i Err codevoid.de 70 i /* Err codevoid.de 70 i * word delimiter string Err codevoid.de 70 it@@ -110,7 +110,7 @@ static const char *colorname[] = { Err codevoid.de 70 i Err codevoid.de 70 i /* more colors can be added after 255 to use with DefaultXX */ Err codevoid.de 70 i "#FF0000", Err codevoid.de 70 i- "#000000", Err codevoid.de 70 i+ "#181818", Err codevoid.de 70 i }; Err codevoid.de 70 i Err codevoid.de 70 i Err codevoid.de 70 it@@ -130,7 +130,7 @@ static unsigned int defaultrcs = 257; Err codevoid.de 70 i * 6: Bar ("|") Err codevoid.de 70 i * 7: Snowman ("☃") Err codevoid.de 70 i */ Err codevoid.de 70 i-static unsigned int cursorshape = 6; Err codevoid.de 70 i+static unsigned int cursorshape = 2; Err codevoid.de 70 i Err codevoid.de 70 i /* Err codevoid.de 70 i * Default columns and rows numbers Err codevoid.de 70 1diff --git a/config.mk b/config.mk /git/st-sdk/file/config.mk.gph codevoid.de 70 it@@ -14,7 +14,7 @@ X11LIB = /usr/X11R6/lib Err codevoid.de 70 i INCS = -I$(X11INC) \ Err codevoid.de 70 i `pkg-config --cflags fontconfig` \ Err codevoid.de 70 i `pkg-config --cflags freetype2` Err codevoid.de 70 i-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \ Err codevoid.de 70 i+LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \ Err codevoid.de 70 i `pkg-config --libs fontconfig` \ Err codevoid.de 70 i `pkg-config --libs freetype2` Err codevoid.de 70 i Err codevoid.de 70 1diff --git a/patches/st-disable-bold-italic-fonts.diff b/patches/st-disable-bold-italic-fonts.diff /git/st-sdk/file/patches/st-disable-bold-italic-fonts.diff.gph codevoid.de 70 it@@ -0,0 +1,70 @@ Err codevoid.de 70 i+From 1e932656e6ca3a50ec67cafabdb08d711635c504 Mon Sep 17 00:00:00 2001 Err codevoid.de 70 i+From: Alex Kozadaev Err codevoid.de 70 i+Date: Fri, 24 Mar 2017 12:11:47 +0000 Err codevoid.de 70 i+Subject: [PATCH] disable bold, italic and roman fonts globally Err codevoid.de 70 i+ Err codevoid.de 70 i+--- Err codevoid.de 70 i+ config.def.h | 6 ++++++ Err codevoid.de 70 i+ x.c | 14 +++++++++++--- Err codevoid.de 70 i+ 2 files changed, 17 insertions(+), 3 deletions(-) Err codevoid.de 70 i+ Err codevoid.de 70 i+diff --git a/config.def.h b/config.def.h Err codevoid.de 70 i+index 877afab..87c4534 100644 Err codevoid.de 70 i+--- a/config.def.h Err codevoid.de 70 i++++ b/config.def.h Err codevoid.de 70 i+@@ -6,6 +6,12 @@ Err codevoid.de 70 i+ * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html Err codevoid.de 70 i+ */ Err codevoid.de 70 i+ char font[] = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; Err codevoid.de 70 i++ Err codevoid.de 70 i++/* disable bold, italic and roman fonts globally */ Err codevoid.de 70 i++int disablebold = 0; Err codevoid.de 70 i++int disableitalic = 0; Err codevoid.de 70 i++int disableroman = 0; Err codevoid.de 70 i++ Err codevoid.de 70 i+ int borderpx = 2; Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* Err codevoid.de 70 i+diff --git a/x.c b/x.c Err codevoid.de 70 i+index 743b084..23e4f0a 100644 Err codevoid.de 70 i+--- a/x.c Err codevoid.de 70 i++++ b/x.c Err codevoid.de 70 i+@@ -158,6 +158,11 @@ typedef struct { Err codevoid.de 70 i+ static Fontcache frc[16]; Err codevoid.de 70 i+ static int frclen = 0; Err codevoid.de 70 i+ Err codevoid.de 70 i++/* declared in config.h */ Err codevoid.de 70 i++extern int disablebold; Err codevoid.de 70 i++extern int disableitalic; Err codevoid.de 70 i++extern int disableroman; Err codevoid.de 70 i++ Err codevoid.de 70 i+ void Err codevoid.de 70 i+ getbuttoninfo(XEvent *e) Err codevoid.de 70 i+ { Err codevoid.de 70 i+@@ -828,17 +833,20 @@ xloadfonts(char *fontstr, double fontsize) Err codevoid.de 70 i+ win.ch = ceilf(dc.font.height * chscale); Err codevoid.de 70 i+ Err codevoid.de 70 i+ FcPatternDel(pattern, FC_SLANT); Err codevoid.de 70 i+- FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); Err codevoid.de 70 i++ if (!disableitalic) Err codevoid.de 70 i++ FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); Err codevoid.de 70 i+ if (xloadfont(&dc.ifont, pattern)) Err codevoid.de 70 i+ die("st: can't open font %s\n", fontstr); Err codevoid.de 70 i+ Err codevoid.de 70 i+ FcPatternDel(pattern, FC_WEIGHT); Err codevoid.de 70 i+- FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); Err codevoid.de 70 i++ if (!disablebold) Err codevoid.de 70 i++ FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); Err codevoid.de 70 i+ if (xloadfont(&dc.ibfont, pattern)) Err codevoid.de 70 i+ die("st: can't open font %s\n", fontstr); Err codevoid.de 70 i+ Err codevoid.de 70 i+ FcPatternDel(pattern, FC_SLANT); Err codevoid.de 70 i+- FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); Err codevoid.de 70 i++ if (!disableroman) Err codevoid.de 70 i++ FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); Err codevoid.de 70 i+ if (xloadfont(&dc.bfont, pattern)) Err codevoid.de 70 i+ die("st: can't open font %s\n", fontstr); Err codevoid.de 70 i+ Err codevoid.de 70 i+-- Err codevoid.de 70 i+2.1.4 Err codevoid.de 70 i+ Err codevoid.de 70 .