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 5f82eaba0438e6c0ab52d2a410ad53923afef3b7 /git/st-sdk/commit/5f82eaba0438e6c0ab52d2a410ad53923afef3b7.gph codevoid.de 70 1parent 3077ca5b97b60df520fdc6eb9c17cb895b77a4fa /git/st-sdk/commit/3077ca5b97b60df520fdc6eb9c17cb895b77a4fa.gph codevoid.de 70 hAuthor: Stefan Hagen URL:mailto:sh+git[at]codevoid[dot]de codevoid.de 70 iDate: Thu, 14 Nov 2019 21:46:18 +0100 Err codevoid.de 70 i Err codevoid.de 70 ifont+fix-colors Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M config.h | 28 ++++++++++++++-------------- Err codevoid.de 70 i M st.c | 14 ++++++++++++-- Err codevoid.de 70 i Err codevoid.de 70 i2 files changed, 26 insertions(+), 16 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,13 +5,13 @@ 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 = "GoMono-12"; Err codevoid.de 70 i+static char *font = "Terminus-12"; Err codevoid.de 70 i static int borderpx = 2; Err codevoid.de 70 i static int borderperc = 20; Err codevoid.de 70 i 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+int disablebold = 1; Err codevoid.de 70 i+int disableitalic = 1; Err codevoid.de 70 i+int disableroman = 1; Err codevoid.de 70 i Err codevoid.de 70 i #define histsize 2000 Err codevoid.de 70 i Err codevoid.de 70 it@@ -105,29 +105,29 @@ unsigned int tabspaces = 8; Err codevoid.de 70 i Err codevoid.de 70 i /* Terminal colors (16 first used in escape sequence) */ Err codevoid.de 70 i static const char *colorname[] = { Err codevoid.de 70 i- /* solarized dark */ Err codevoid.de 70 i- "#000000", /* 0: black */ Err codevoid.de 70 i+ /* c0dev0id custom */ Err codevoid.de 70 i+ "#181818", /* 0: black */ Err codevoid.de 70 i "#dc322f", /* 1: red */ Err codevoid.de 70 i "#859900", /* 2: green */ Err codevoid.de 70 i "#b58900", /* 3: yellow */ Err codevoid.de 70 i "#268bd2", /* 4: blue */ Err codevoid.de 70 i "#d33682", /* 5: magenta */ Err codevoid.de 70 i "#2aa198", /* 6: cyan */ Err codevoid.de 70 i- "#eee8d5", /* 7: white */ Err codevoid.de 70 i+ "#D6D5D3", /* 7: white */ Err codevoid.de 70 i "#000000", /* 8: brblack */ Err codevoid.de 70 i "#cb4b16", /* 9: brred */ Err codevoid.de 70 i- "#586e75", /* 10: brgreen */ Err codevoid.de 70 i- "#657b83", /* 11: bryellow */ Err codevoid.de 70 i- "#839496", /* 12: brblue */ Err codevoid.de 70 i- "#6c71c4", /* 13: brmagenta*/ Err codevoid.de 70 i- "#93a1a1", /* 14: brcyan */ Err codevoid.de 70 i- "#fdf6e3", /* 15: brwhite */ Err codevoid.de 70 i+ "#5B6900", /* 10: brgreen */ Err codevoid.de 70 i+ "#7E6000", /* 11: bryellow */ Err codevoid.de 70 i+ "#045E9D", /* 12: brblue */ Err codevoid.de 70 i+ "#A62E68", /* 13: brmagenta*/ Err codevoid.de 70 i+ "#127E76", /* 14: brcyan */ Err codevoid.de 70 i+ "#eee8d5", /* 15: brwhite */ Err codevoid.de 70 i Err codevoid.de 70 i [255] = 0, 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 "#990000", Err codevoid.de 70 i- "#111111", 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 1diff --git a/st.c b/st.c /git/st-sdk/file/st.c.gph codevoid.de 70 it@@ -739,8 +739,10 @@ sigchld(int a) Err codevoid.de 70 i if (pid != p) Err codevoid.de 70 i return; Err codevoid.de 70 i Err codevoid.de 70 i- if (!WIFEXITED(stat) || WEXITSTATUS(stat)) Err codevoid.de 70 i- die("child finished with error '%d'\n", stat); Err codevoid.de 70 i+ if (WIFEXITED(stat) && WEXITSTATUS(stat)) Err codevoid.de 70 i+ die("child exited with status %d\n", WEXITSTATUS(stat)); Err codevoid.de 70 i+ else if (WIFSIGNALED(stat)) Err codevoid.de 70 i+ die("child terminated due to signal %d\n", WTERMSIG(stat)); Err codevoid.de 70 i exit(0); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 it@@ -810,9 +812,17 @@ ttynew(char *line, char *cmd, char *out, char **args) Err codevoid.de 70 i die("ioctl TIOCSCTTY failed: %s\n", strerror(errno)); Err codevoid.de 70 i close(s); Err codevoid.de 70 i close(m); Err codevoid.de 70 i+#ifdef __OpenBSD__ Err codevoid.de 70 i+ if (pledge("stdio getpw proc exec", NULL) == -1) Err codevoid.de 70 i+ die("pledge\n"); Err codevoid.de 70 i+#endif Err codevoid.de 70 i execsh(cmd, args); Err codevoid.de 70 i break; Err codevoid.de 70 i default: Err codevoid.de 70 i+#ifdef __OpenBSD__ Err codevoid.de 70 i+ if (pledge("stdio rpath tty proc", NULL) == -1) Err codevoid.de 70 i+ die("pledge\n"); Err codevoid.de 70 i+#endif Err codevoid.de 70 i close(s); Err codevoid.de 70 i cmdfd = m; Err codevoid.de 70 i signal(SIGCHLD, sigchld); Err codevoid.de 70 .