x11-terms/st: fix patches
This commit is contained in:
parent
8fffd8a309
commit
aeeccd4cad
|
|
@ -0,0 +1,209 @@
|
|||
From 92c25807b4728f3fbc0b9a248db9227e7f87c714 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 | 61 +++++++++++++++++++++++----------------------------
|
||||
patches.def.h | 16 +++++++-------
|
||||
2 files changed, 36 insertions(+), 41 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 5b0f055..b6ee43d 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[] = {
|
||||
@@ -114,11 +114,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
|
||||
|
||||
/*
|
||||
@@ -162,32 +162,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"
|
||||
};
|
||||
|
||||
|
||||
@@ -195,13 +195,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;
|
||||
|
||||
@@ -237,7 +232,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
|
||||
/*
|
||||
@@ -247,7 +242,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
|
||||
|
||||
/*
|
||||
@@ -752,4 +747,4 @@ static char *plumb_cmd = "plumb";
|
||||
#define UNDERCURL_CAPPED 2
|
||||
// Active style
|
||||
#define UNDERCURL_STYLE UNDERCURL_SPIKY
|
||||
-#endif // UNDERCURL_PATCH
|
||||
\ No newline at end of file
|
||||
+#endif // UNDERCURL_PATCH
|
||||
diff --git a/patches.def.h b/patches.def.h
|
||||
index d14548f..d773562 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
|
||||
|
||||
/* This patch aims to prevent black bars being drawn on the edges of st terminals using the anysize
|
||||
* patch. This generally only occurs when the terminal background color doesn't match the colors
|
||||
@@ -41,7 +41,7 @@
|
||||
* terminal resizes.)
|
||||
* https://github.com/connor-brooks/st-anysize-nobar
|
||||
*/
|
||||
-#define ANYSIZE_NOBAR_PATCH 0
|
||||
+#define ANYSIZE_NOBAR_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.
|
||||
@@ -77,7 +77,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.
|
||||
@@ -150,7 +150,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/
|
||||
@@ -273,7 +273,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.
|
||||
@@ -377,7 +377,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
|
||||
@@ -397,14 +397,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.35.1
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 990a72db8abee6c8fa38e9ad2770f9a246f8dfd0 Mon Sep 17 00:00:00 2001
|
||||
From 9cd7ac4b9cbe771f5bbb58bd6f7de7df6b9cd0df Mon Sep 17 00:00:00 2001
|
||||
From: odrling <florianbadie@odrling.xyz>
|
||||
Date: Thu, 25 Mar 2021 17:47:16 +0100
|
||||
Subject: [PATCH 01/12] disable dynamic colors
|
||||
Subject: [PATCH 02/13] disable dynamic colors
|
||||
|
||||
---
|
||||
patches.def.h | 2 +-
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From e1196ddd323d35a57435498b9d27f2c76b93b770 Mon Sep 17 00:00:00 2001
|
||||
From 838e2c4e7a8729737654ca200b9b192420c1bf56 Mon Sep 17 00:00:00 2001
|
||||
From: odrling <florianbadie@odrling.xyz>
|
||||
Date: Thu, 26 May 2022 22:43:52 +0200
|
||||
Subject: [PATCH 02/12] update color theme
|
||||
Subject: [PATCH 03/13] update color theme
|
||||
|
||||
---
|
||||
config.def.h | 46 +++++++++++++++++++++++++---------------------
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 3bd204f01145282228f46721093e4b6cc7c161c4 Mon Sep 17 00:00:00 2001
|
||||
From 7fd4224bb1e1f0589976c8d4ac2f94a657d187ba Mon Sep 17 00:00:00 2001
|
||||
From: odrling <florianbadie@odrling.xyz>
|
||||
Date: Thu, 26 May 2022 22:51:03 +0200
|
||||
Subject: [PATCH 03/12] dynamic cursor color
|
||||
Subject: [PATCH 04/13] dynamic cursor color
|
||||
|
||||
---
|
||||
patches.def.h | 2 +-
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 829c3dcfaf24b9267d15171f438a3c0541ff57f2 Mon Sep 17 00:00:00 2001
|
||||
From 100a56cd574595bab1144f37caf8712a7fc8a2fe Mon Sep 17 00:00:00 2001
|
||||
From: odrling <florianbadie@odrling.xyz>
|
||||
Date: Thu, 26 May 2022 23:01:04 +0200
|
||||
Subject: [PATCH 04/12] move with termmod + j/k
|
||||
Subject: [PATCH 05/13] move with termmod + j/k
|
||||
|
||||
---
|
||||
config.def.h | 2 ++
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From bef743e084564f9c6087474a10b3769cdab23520 Mon Sep 17 00:00:00 2001
|
||||
From f010d98d1c96a9ba1892bf9c3deaf219d77c6dd2 Mon Sep 17 00:00:00 2001
|
||||
From: odrling <florianbadie@odrling.xyz>
|
||||
Date: Thu, 26 May 2022 23:08:37 +0200
|
||||
Subject: [PATCH 05/12] enable more patches ig
|
||||
Subject: [PATCH 06/13] enable more patches ig
|
||||
|
||||
---
|
||||
patches.def.h | 6 +++---
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 631a03f7ac0dca52ed793dd0995fd51fd39d34d1 Mon Sep 17 00:00:00 2001
|
||||
From 42af1542487e17bcf4d28819f4eeabbd79f70472 Mon Sep 17 00:00:00 2001
|
||||
From: odrling <florianbadie@odrling.xyz>
|
||||
Date: Fri, 27 May 2022 00:35:49 +0200
|
||||
Subject: [PATCH 06/12] scroll mouse patch
|
||||
Subject: [PATCH 07/13] scroll mouse patch
|
||||
|
||||
---
|
||||
patches.def.h | 2 +-
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From adb0625b27f3530a915a99d346fd322bafa5363a Mon Sep 17 00:00:00 2001
|
||||
From 4ced631df44426f2c6205da15fb71cf090f29d27 Mon Sep 17 00:00:00 2001
|
||||
From: odrling <florianbadie@odrling.xyz>
|
||||
Date: Fri, 27 May 2022 00:37:18 +0200
|
||||
Subject: [PATCH 07/12] st sync patch
|
||||
Subject: [PATCH 08/13] st sync patch
|
||||
|
||||
---
|
||||
patches.def.h | 2 +-
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From bdb6f6bd105c437765e4427d295b60e2c0c1c010 Mon Sep 17 00:00:00 2001
|
||||
From 6bb93b5bf111bc57640f991ff90028c41dcef26e Mon Sep 17 00:00:00 2001
|
||||
From: odrling <florianbadie@odrling.xyz>
|
||||
Date: Fri, 27 May 2022 00:38:36 +0200
|
||||
Subject: [PATCH 08/12] undercurl
|
||||
Subject: [PATCH 09/13] undercurl
|
||||
|
||||
---
|
||||
config.def.h | 2 +-
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From da155815b3b1022e8205e2670788ba8d0b41591a Mon Sep 17 00:00:00 2001
|
||||
From 49b39d81b0a0ba4b50fa0ac597eb50608577b69e Mon Sep 17 00:00:00 2001
|
||||
From: odrling <florianbadie@odrling.xyz>
|
||||
Date: Fri, 27 May 2022 02:09:19 +0200
|
||||
Subject: [PATCH 09/12] anysize simple
|
||||
Subject: [PATCH 10/13] anysize simple
|
||||
|
||||
---
|
||||
patches.def.h | 6 +++---
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 85771ecd90f5a581bd0cfeff593b93631dd930b3 Mon Sep 17 00:00:00 2001
|
||||
From 8fb46d009e1693796a20199102fde0dc2a62566b Mon Sep 17 00:00:00 2001
|
||||
From: odrling <florianbadie@odrling.xyz>
|
||||
Date: Fri, 27 May 2022 02:09:49 +0200
|
||||
Subject: [PATCH 10/12] set new font scale binding
|
||||
Subject: [PATCH 11/13] set new font scale binding
|
||||
|
||||
---
|
||||
config.def.h | 4 ++--
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 8cf0bb3ab453cc66dbe71cf0d42ced160378ece2 Mon Sep 17 00:00:00 2001
|
||||
From 434a897fa86b642d9e90c603d86266570b5debee Mon Sep 17 00:00:00 2001
|
||||
From: odrling <florianbadie@odrling.xyz>
|
||||
Date: Fri, 27 May 2022 02:29:39 +0200
|
||||
Subject: [PATCH 11/12] swapmouse
|
||||
Subject: [PATCH 12/13] swapmouse
|
||||
|
||||
---
|
||||
patches.def.h | 2 +-
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From deddf4340a6556f20933d12fff2a345cdeba68d2 Mon Sep 17 00:00:00 2001
|
||||
From 14a236002f50e1707a10ff74b3914d3b86d18bdb Mon Sep 17 00:00:00 2001
|
||||
From: odrling <florianbadie@odrling.xyz>
|
||||
Date: Fri, 27 May 2022 02:39:03 +0200
|
||||
Subject: [PATCH 12/12] relative border
|
||||
Subject: [PATCH 13/13] relative border
|
||||
|
||||
---
|
||||
config.def.h | 2 +-
|
||||
|
|
@ -26,18 +26,19 @@ DEPEND="
|
|||
x11-base/xorg-proto
|
||||
"
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/0001-disable-dynamic-colors.patch
|
||||
"${FILESDIR}"/0002-update-color-theme.patch
|
||||
"${FILESDIR}"/0003-dynamic-cursor-color.patch
|
||||
"${FILESDIR}"/0004-move-with-termmod-j-k.patch
|
||||
"${FILESDIR}"/0005-enable-more-patches-ig.patch
|
||||
"${FILESDIR}"/0006-scroll-mouse-patch.patch
|
||||
"${FILESDIR}"/0007-st-sync-patch.patch
|
||||
"${FILESDIR}"/0008-undercurl.patch
|
||||
"${FILESDIR}"/0009-anysize-simple.patch
|
||||
"${FILESDIR}"/0010-set-new-font-scale-binding.patch
|
||||
"${FILESDIR}"/0011-swapmouse.patch
|
||||
"${FILESDIR}"/0012-relative-border.patch
|
||||
"${FILESDIR}"/0001-move-config-to-st-flexipatch.patch
|
||||
"${FILESDIR}"/0002-disable-dynamic-colors.patch
|
||||
"${FILESDIR}"/0003-update-color-theme.patch
|
||||
"${FILESDIR}"/0004-dynamic-cursor-color.patch
|
||||
"${FILESDIR}"/0005-move-with-termmod-j-k.patch
|
||||
"${FILESDIR}"/0006-enable-more-patches-ig.patch
|
||||
"${FILESDIR}"/0007-scroll-mouse-patch.patch
|
||||
"${FILESDIR}"/0008-st-sync-patch.patch
|
||||
"${FILESDIR}"/0009-undercurl.patch
|
||||
"${FILESDIR}"/0010-anysize-simple.patch
|
||||
"${FILESDIR}"/0011-set-new-font-scale-binding.patch
|
||||
"${FILESDIR}"/0012-swapmouse.patch
|
||||
"${FILESDIR}"/0013-relative-border.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue