x11-term/st: update patches

This commit is contained in:
odrling 2022-07-20 15:26:46 +02:00
parent 31f77ff345
commit be8b0cc517
No known key found for this signature in database
GPG Key ID: A0145F975F9F8B75
13 changed files with 43 additions and 61 deletions

View File

@ -1,12 +1,12 @@
From 92c25807b4728f3fbc0b9a248db9227e7f87c714 Mon Sep 17 00:00:00 2001
From 191c8ca669c1b75b993cb6918bc41c2ba44675fc 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(-)
patches.def.h | 14 ++++++------
2 files changed, 35 insertions(+), 40 deletions(-)
diff --git a/config.def.h b/config.def.h
index 5b0f055..b6ee43d 100644
@ -130,7 +130,7 @@ index 5b0f055..b6ee43d 100644
\ No newline at end of file
+#endif // UNDERCURL_PATCH
diff --git a/patches.def.h b/patches.def.h
index d14548f..d773562 100644
index 4345a4a..36a6b57 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -32,7 +32,7 @@
@ -140,18 +140,9 @@ index d14548f..d773562 100644
-#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 @@
@@ -68,7 +68,7 @@
/* This patch adds custom rendering of lines/blocks/braille characters for gapless alignment.
* https://st.suckless.org/patches/boxdraw/
*/
@ -160,7 +151,7 @@ index d14548f..d773562 100644
/* By default st only sets PRIMARY on selection.
* This patch makes st set CLIPBOARD on selection.
@@ -150,7 +150,7 @@
@@ -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/
*/
@ -169,7 +160,7 @@ index d14548f..d773562 100644
/* 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 @@
@@ -264,7 +264,7 @@
/* Scroll back through terminal output using Shift+{PageUp, PageDown}.
* https://st.suckless.org/patches/scrollback/
*/
@ -178,7 +169,7 @@ index d14548f..d773562 100644
/* Scroll back through terminal output using Shift+MouseWheel.
* This variant depends on SCROLLBACK_PATCH being enabled.
@@ -377,7 +377,7 @@
@@ -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/
*/
@ -187,7 +178,7 @@ index d14548f..d773562 100644
/* 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 @@
@@ -388,14 +388,14 @@
/* Adds support for w3m images.
* https://st.suckless.org/patches/w3m/
*/

View File

@ -1,4 +1,4 @@
From 9cd7ac4b9cbe771f5bbb58bd6f7de7df6b9cd0df Mon Sep 17 00:00:00 2001
From 2bf4587ca7ab32eb262183cb89a31c79aeafab81 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Thu, 25 Mar 2021 17:47:16 +0100
Subject: [PATCH 02/13] disable dynamic colors
@ -8,10 +8,10 @@ Subject: [PATCH 02/13] disable dynamic colors
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/patches.def.h b/patches.def.h
index d773562..0d01b33 100644
index 36a6b57..efca5f5 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -150,7 +150,7 @@
@@ -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/
*/

View File

@ -1,4 +1,4 @@
From 838e2c4e7a8729737654ca200b9b192420c1bf56 Mon Sep 17 00:00:00 2001
From 3cbf9c47e3c249ab2d1f10b7cfde03c4a6ce6c31 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Thu, 26 May 2022 22:43:52 +0200
Subject: [PATCH 03/13] update color theme

View File

@ -1,4 +1,4 @@
From 7fd4224bb1e1f0589976c8d4ac2f94a657d187ba Mon Sep 17 00:00:00 2001
From c68e7a0a41c8d2ab03117f4faf80cbfc84902a91 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Thu, 26 May 2022 22:51:03 +0200
Subject: [PATCH 04/13] dynamic cursor color
@ -8,10 +8,10 @@ Subject: [PATCH 04/13] dynamic cursor color
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/patches.def.h b/patches.def.h
index 0d01b33..d773562 100644
index efca5f5..36a6b57 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -150,7 +150,7 @@
@@ -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/
*/

View File

@ -1,4 +1,4 @@
From 100a56cd574595bab1144f37caf8712a7fc8a2fe Mon Sep 17 00:00:00 2001
From 611fad8eadb06848e9356b7fd2d77c850d35637c Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Thu, 26 May 2022 23:01:04 +0200
Subject: [PATCH 05/13] move with termmod + j/k

View File

@ -1,4 +1,4 @@
From f010d98d1c96a9ba1892bf9c3deaf219d77c6dd2 Mon Sep 17 00:00:00 2001
From 5c62a55bba91069509ae649c3ee0016951f58834 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Thu, 26 May 2022 23:08:37 +0200
Subject: [PATCH 06/13] enable more patches ig
@ -8,10 +8,10 @@ Subject: [PATCH 06/13] enable more patches ig
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/patches.def.h b/patches.def.h
index d773562..ecee58d 100644
index 36a6b57..6799455 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -72,7 +72,7 @@
@@ -63,7 +63,7 @@
* This patch makes bold text rendered simply as bold, leaving the color unaffected.
* https://st.suckless.org/patches/bold-is-not-bright/
*/
@ -20,7 +20,7 @@ index d773562..ecee58d 100644
/* This patch adds custom rendering of lines/blocks/braille characters for gapless alignment.
* https://st.suckless.org/patches/boxdraw/
@@ -92,7 +92,7 @@
@@ -83,7 +83,7 @@
*
* https://github.com/bakkeby/st-flexipatch/issues/34
*/
@ -29,7 +29,7 @@ index d773562..ecee58d 100644
/* Select and copy the last URL displayed with Mod+l. Multiple invocations cycle through the
* available URLs.
@@ -244,7 +244,7 @@
@@ -235,7 +235,7 @@
* same CWD (current working directory) as the original st instance.
* https://st.suckless.org/patches/newterm/
*/

View File

@ -1,4 +1,4 @@
From 42af1542487e17bcf4d28819f4eeabbd79f70472 Mon Sep 17 00:00:00 2001
From 0a194cf2e817805ed4558a6ed1f70a8f2134d124 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Fri, 27 May 2022 00:35:49 +0200
Subject: [PATCH 07/13] scroll mouse patch
@ -8,10 +8,10 @@ Subject: [PATCH 07/13] scroll mouse patch
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/patches.def.h b/patches.def.h
index ecee58d..90ca000 100644
index 6799455..0ceb5c4 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -279,7 +279,7 @@
@@ -270,7 +270,7 @@
* This variant depends on SCROLLBACK_PATCH being enabled.
* https://st.suckless.org/patches/scrollback/
*/

View File

@ -1,4 +1,4 @@
From 4ced631df44426f2c6205da15fb71cf090f29d27 Mon Sep 17 00:00:00 2001
From 767d2313d38dcff641637cc0d144c5d38c360fc5 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Fri, 27 May 2022 00:37:18 +0200
Subject: [PATCH 08/13] st sync patch
@ -8,10 +8,10 @@ Subject: [PATCH 08/13] st sync patch
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/patches.def.h b/patches.def.h
index 90ca000..a7fc6ff 100644
index 0ceb5c4..0e650b0 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -341,7 +341,7 @@
@@ -332,7 +332,7 @@
*
* https://st.suckless.org/patches/sync/
*/

View File

@ -1,4 +1,4 @@
From 6bb93b5bf111bc57640f991ff90028c41dcef26e Mon Sep 17 00:00:00 2001
From 3b0b0f6177576d9f589ea3fc088c992449678428 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Fri, 27 May 2022 00:38:36 +0200
Subject: [PATCH 09/13] undercurl
@ -20,10 +20,10 @@ index 042fbcc..0da8375 100644
+#define UNDERCURL_STYLE UNDERCURL_CAPPED
#endif // UNDERCURL_PATCH
diff --git a/patches.def.h b/patches.def.h
index a7fc6ff..623f4d7 100644
index 0e650b0..aaed7d2 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -366,7 +366,7 @@
@@ -357,7 +357,7 @@
*
* https://st.suckless.org/patches/undercurl/
*/

View File

@ -1,32 +1,23 @@
From 49b39d81b0a0ba4b50fa0ac597eb50608577b69e Mon Sep 17 00:00:00 2001
From 0ae511fa7a321d16f9aaaa3585309214786968e9 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Fri, 27 May 2022 02:09:19 +0200
Subject: [PATCH 10/13] anysize simple
---
patches.def.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
patches.def.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/patches.def.h b/patches.def.h
index 623f4d7..3423b11 100644
index aaed7d2..a046b4d 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -32,7 +32,7 @@
@@ -32,12 +32,12 @@
/* 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 1
+#define ANYSIZE_PATCH 0
/* 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,12 +41,12 @@
* terminal resizes.)
* https://github.com/connor-brooks/st-anysize-nobar
*/
-#define ANYSIZE_NOBAR_PATCH 1
+#define ANYSIZE_NOBAR_PATCH 0
/* A simple variant of the anysize patch that only changes the resize hints to allow the window to
* be resized to any size.
*/

View File

@ -1,4 +1,4 @@
From 8fb46d009e1693796a20199102fde0dc2a62566b Mon Sep 17 00:00:00 2001
From 1d3a493f1fbc61cc0365f1846af3a16ebd78efae Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Fri, 27 May 2022 02:09:49 +0200
Subject: [PATCH 11/13] set new font scale binding

View File

@ -1,4 +1,4 @@
From 434a897fa86b642d9e90c603d86266570b5debee Mon Sep 17 00:00:00 2001
From 939afa675cbaed38620d509fb9473382b6fa9762 Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Fri, 27 May 2022 02:29:39 +0200
Subject: [PATCH 12/13] swapmouse
@ -8,10 +8,10 @@ Subject: [PATCH 12/13] swapmouse
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/patches.def.h b/patches.def.h
index 3423b11..59d0980 100644
index a046b4d..7e31539 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -328,7 +328,7 @@
@@ -319,7 +319,7 @@
* shown by vte terminals like termite.
* https://st.suckless.org/patches/swapmouse/
*/

View File

@ -1,4 +1,4 @@
From 14a236002f50e1707a10ff74b3914d3b86d18bdb Mon Sep 17 00:00:00 2001
From 9d19e925cb82a6d9dccf0341215e7a718211b8ee Mon Sep 17 00:00:00 2001
From: odrling <florianbadie@odrling.xyz>
Date: Fri, 27 May 2022 02:39:03 +0200
Subject: [PATCH 13/13] relative border
@ -22,10 +22,10 @@ index 2fe66ff..a3f0afb 100644
static int borderpx = 2;
#endif // RELATIVEBORDER_PATCH
diff --git a/patches.def.h b/patches.def.h
index 59d0980..f1d89c1 100644
index 7e31539..e8bc45b 100644
--- a/patches.def.h
+++ b/patches.def.h
@@ -262,7 +262,7 @@
@@ -253,7 +253,7 @@
* in the terminal.
* https://st.suckless.org/patches/relativeborder/
*/