194 lines
5.6 KiB
Diff
194 lines
5.6 KiB
Diff
From e8918b17414a267c2b79b9a4458c92f552ec87e9 Mon Sep 17 00:00:00 2001
|
|
From: odrling <florianbadie@odrling.xyz>
|
|
Date: Sun, 7 Mar 2021 16:12:13 +0100
|
|
Subject: [PATCH 01/13] move config to st-flexipatch
|
|
|
|
---
|
|
config.def.h | 59 +++++++++++++++++++++++----------------------------
|
|
patches.def.h | 14 ++++++------
|
|
2 files changed, 34 insertions(+), 39 deletions(-)
|
|
|
|
diff --git a/config.def.h b/config.def.h
|
|
index 8e36213..aaf74c1 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -5,7 +5,7 @@
|
|
*
|
|
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
|
*/
|
|
-static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
|
|
+static char *font = "monospace:pixelsize=14:antialias=true:autohint=true";
|
|
#if FONT2_PATCH
|
|
/* Spare fonts */
|
|
static char *font2[] = {
|
|
@@ -116,11 +116,11 @@ static unsigned int cursorthickness = 2;
|
|
* Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
|
|
* 0: disable (render all U25XX glyphs normally from the font).
|
|
*/
|
|
-const int boxdraw = 0;
|
|
+const int boxdraw = 1;
|
|
const int boxdraw_bold = 0;
|
|
|
|
/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */
|
|
-const int boxdraw_braille = 0;
|
|
+const int boxdraw_braille = 1;
|
|
#endif // BOXDRAW_PATCH
|
|
|
|
/*
|
|
@@ -164,32 +164,32 @@ float alphaUnfocused = 0.6;
|
|
/* Terminal colors (16 first used in escape sequence) */
|
|
static const char *colorname[] = {
|
|
/* 8 normal colors */
|
|
- "black",
|
|
- "red3",
|
|
- "green3",
|
|
- "yellow3",
|
|
- "blue2",
|
|
- "magenta3",
|
|
- "cyan3",
|
|
- "gray90",
|
|
+ "#403E41",
|
|
+ "#FF6188",
|
|
+ "#A9DC76",
|
|
+ "#FFD876",
|
|
+ "#FC9867",
|
|
+ "#AB9DF2",
|
|
+ "#78DCE8",
|
|
+ "#FCFCFA",
|
|
|
|
/* 8 bright colors */
|
|
- "gray50",
|
|
- "red",
|
|
- "green",
|
|
- "yellow",
|
|
- "#5c5cff",
|
|
- "magenta",
|
|
- "cyan",
|
|
- "white",
|
|
+ "#727072",
|
|
+ "#FF6188",
|
|
+ "#A9DC76",
|
|
+ "#FFD866",
|
|
+ "#FC9867",
|
|
+ "#AB9DF2",
|
|
+ "#78DCE8",
|
|
+ "#FCFCFA",
|
|
|
|
[255] = 0,
|
|
|
|
/* more colors can be added after 255 to use with DefaultXX */
|
|
- "#add8e6", /* 256 -> cursor */
|
|
- "#555555", /* 257 -> rev cursor*/
|
|
- "#000000", /* 258 -> bg */
|
|
- "#e5e5e5", /* 259 -> fg */
|
|
+ "#cccccc",
|
|
+ "#555555",
|
|
+ "black",
|
|
+ "#222222"
|
|
};
|
|
|
|
|
|
@@ -197,13 +197,8 @@ static const char *colorname[] = {
|
|
* Default colors (colorname index)
|
|
* foreground, background, cursor, reverse cursor
|
|
*/
|
|
-#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH
|
|
-unsigned int defaultbg = 0;
|
|
-unsigned int bg = 17, bgUnfocused = 16;
|
|
-#else
|
|
-unsigned int defaultbg = 258;
|
|
-#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
|
|
-unsigned int defaultfg = 259;
|
|
+unsigned int defaultfg = 7;
|
|
+unsigned int defaultbg = 259;
|
|
unsigned int defaultcs = 256;
|
|
unsigned int defaultrcs = 257;
|
|
|
|
@@ -239,7 +234,7 @@ Glyph style[] = {{' ',ATTR_ITALIC|ATTR_FAINT,15,16}, {' ',ATTR_ITALIC,232,11},
|
|
* 7: Blinking st cursor
|
|
* 8: Steady st cursor
|
|
*/
|
|
-static unsigned int cursorstyle = 1;
|
|
+static unsigned int cursorstyle = 4;
|
|
static Rune stcursor = 0x2603; /* snowman (U+2603) */
|
|
#else
|
|
/*
|
|
@@ -249,7 +244,7 @@ static Rune stcursor = 0x2603; /* snowman (U+2603) */
|
|
* 6: Bar ("|")
|
|
* 7: Snowman ("☃")
|
|
*/
|
|
-static unsigned int cursorshape = 2;
|
|
+static unsigned int cursorshape = 4;
|
|
#endif // BLINKING_CURSOR_PATCH
|
|
|
|
/*
|
|
diff --git a/patches.def.h b/patches.def.h
|
|
index 4345a4a..36a6b57 100644
|
|
--- a/patches.def.h
|
|
+++ b/patches.def.h
|
|
@@ -32,7 +32,7 @@
|
|
/* This patch allows st to resize to any pixel size rather than snapping to character width/height.
|
|
* https://st.suckless.org/patches/anysize/
|
|
*/
|
|
-#define ANYSIZE_PATCH 0
|
|
+#define ANYSIZE_PATCH 1
|
|
|
|
/* A simple variant of the anysize patch that only changes the resize hints to allow the window to
|
|
* be resized to any size.
|
|
@@ -68,7 +68,7 @@
|
|
/* This patch adds custom rendering of lines/blocks/braille characters for gapless alignment.
|
|
* https://st.suckless.org/patches/boxdraw/
|
|
*/
|
|
-#define BOXDRAW_PATCH 0
|
|
+#define BOXDRAW_PATCH 1
|
|
|
|
/* By default st only sets PRIMARY on selection.
|
|
* This patch makes st set CLIPBOARD on selection.
|
|
@@ -141,7 +141,7 @@
|
|
/* This patch makes the cursor color the inverse of the current cell color.
|
|
* https://st.suckless.org/patches/dynamic-cursor-color/
|
|
*/
|
|
-#define DYNAMIC_CURSOR_COLOR_PATCH 0
|
|
+#define DYNAMIC_CURSOR_COLOR_PATCH 1
|
|
|
|
/* Reading and writing st's screen through a pipe, e.g. pass info to dmenu.
|
|
* https://st.suckless.org/patches/externalpipe/
|
|
@@ -264,7 +264,7 @@
|
|
/* Scroll back through terminal output using Shift+{PageUp, PageDown}.
|
|
* https://st.suckless.org/patches/scrollback/
|
|
*/
|
|
-#define SCROLLBACK_PATCH 0
|
|
+#define SCROLLBACK_PATCH 1
|
|
|
|
/* Scroll back through terminal output using Shift+MouseWheel.
|
|
* This variant depends on SCROLLBACK_PATCH being enabled.
|
|
@@ -368,7 +368,7 @@
|
|
/* Vertically center lines in the space available if you have set a larger chscale in config.h
|
|
* https://st.suckless.org/patches/vertcenter/
|
|
*/
|
|
-#define VERTCENTER_PATCH 0
|
|
+#define VERTCENTER_PATCH 1
|
|
|
|
/* The vim-browse patch offers the possibility to move through the terminal history-buffer,
|
|
* search for strings using VIM-like motions, operations and quantifiers. It overlays the
|
|
@@ -388,14 +388,14 @@
|
|
/* Adds support for w3m images.
|
|
* https://st.suckless.org/patches/w3m/
|
|
*/
|
|
-#define W3M_PATCH 0
|
|
+#define W3M_PATCH 1
|
|
|
|
/* Adds proper glyphs rendering in st allowing wide glyphs to be drawn as-is as opposed to
|
|
* smaller or cut glyphs being rendered.
|
|
* https://github.com/Dreomite/st/commit/e3b821dcb3511d60341dec35ee05a4a0abfef7f2
|
|
* https://www.reddit.com/r/suckless/comments/jt90ai/update_support_for_proper_glyph_rendering_in_st/
|
|
*/
|
|
-#define WIDE_GLYPHS_PATCH 0
|
|
+#define WIDE_GLYPHS_PATCH 1
|
|
|
|
/* There is a known issue that Google's Variable Fonts (VF) can end up with letter spacing
|
|
* that is too wide in programs that use Xft, for example Inconsolata v3.000.
|
|
--
|
|
2.37.2
|
|
|