From 1b61c439706105e69e679cc0e38643bb97421827 Mon Sep 17 00:00:00 2001 From: odrling Date: Fri, 9 Sep 2022 02:18:54 +0200 Subject: [PATCH] x11-terms/st: merge patches in a single file --- .../0001-move-config-to-st-flexipatch.patch | 193 ----- .../files/0002-disable-dynamic-colors.patch | 25 - .../st/files/0003-update-color-theme.patch | 85 --- .../st/files/0004-dynamic-cursor-color.patch | 25 - .../st/files/0005-move-with-termmod-j-k.patch | 25 - .../files/0006-enable-more-patches-ig.patch | 43 -- .../st/files/0007-scroll-mouse-patch.patch | 25 - x11-terms/st/files/0008-st-sync-patch.patch | 25 - x11-terms/st/files/0009-undercurl.patch | 37 - x11-terms/st/files/0010-anysize-simple.patch | 31 - .../0011-set-new-font-scale-binding.patch | 27 - x11-terms/st/files/0012-swapmouse.patch | 25 - x11-terms/st/files/0013-relative-border.patch | 39 - x11-terms/st/files/odrling.patch | 688 ++++++++++++++++++ x11-terms/st/st-9999.ebuild | 14 +- 15 files changed, 689 insertions(+), 618 deletions(-) delete mode 100644 x11-terms/st/files/0001-move-config-to-st-flexipatch.patch delete mode 100644 x11-terms/st/files/0002-disable-dynamic-colors.patch delete mode 100644 x11-terms/st/files/0003-update-color-theme.patch delete mode 100644 x11-terms/st/files/0004-dynamic-cursor-color.patch delete mode 100644 x11-terms/st/files/0005-move-with-termmod-j-k.patch delete mode 100644 x11-terms/st/files/0006-enable-more-patches-ig.patch delete mode 100644 x11-terms/st/files/0007-scroll-mouse-patch.patch delete mode 100644 x11-terms/st/files/0008-st-sync-patch.patch delete mode 100644 x11-terms/st/files/0009-undercurl.patch delete mode 100644 x11-terms/st/files/0010-anysize-simple.patch delete mode 100644 x11-terms/st/files/0011-set-new-font-scale-binding.patch delete mode 100644 x11-terms/st/files/0012-swapmouse.patch delete mode 100644 x11-terms/st/files/0013-relative-border.patch create mode 100644 x11-terms/st/files/odrling.patch diff --git a/x11-terms/st/files/0001-move-config-to-st-flexipatch.patch b/x11-terms/st/files/0001-move-config-to-st-flexipatch.patch deleted file mode 100644 index 79a481f..0000000 --- a/x11-terms/st/files/0001-move-config-to-st-flexipatch.patch +++ /dev/null @@ -1,193 +0,0 @@ -From 8a4e81bd4b454561ffa6b2911308784011e919f6 Mon Sep 17 00:00:00 2001 -From: odrling -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 02fa4ca..9ee9c38 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 26ae7e6..2e79d14 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/ -@@ -272,7 +272,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. -@@ -390,7 +390,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 -@@ -410,14 +410,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.3 - diff --git a/x11-terms/st/files/0002-disable-dynamic-colors.patch b/x11-terms/st/files/0002-disable-dynamic-colors.patch deleted file mode 100644 index 3e3d146..0000000 --- a/x11-terms/st/files/0002-disable-dynamic-colors.patch +++ /dev/null @@ -1,25 +0,0 @@ -From def3f653fc2a6d4b48c7014d0a9a5dc3458e6ea4 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 25 Mar 2021 17:47:16 +0100 -Subject: [PATCH 02/13] disable dynamic colors - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index 2e79d14..3457532 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -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 1 -+#define DYNAMIC_CURSOR_COLOR_PATCH 0 - - /* Reading and writing st's screen through a pipe, e.g. pass info to dmenu. - * https://st.suckless.org/patches/externalpipe/ --- -2.37.3 - diff --git a/x11-terms/st/files/0003-update-color-theme.patch b/x11-terms/st/files/0003-update-color-theme.patch deleted file mode 100644 index 5703eb7..0000000 --- a/x11-terms/st/files/0003-update-color-theme.patch +++ /dev/null @@ -1,85 +0,0 @@ -From d48d583c388f298793e8833339deeb188ba0b3d8 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 26 May 2022 22:43:52 +0200 -Subject: [PATCH 03/13] update color theme - ---- - config.def.h | 46 +++++++++++++++++++++++++--------------------- - 1 file changed, 25 insertions(+), 21 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 9ee9c38..e43f2ab 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -164,32 +164,36 @@ float alphaUnfocused = 0.6; - /* Terminal colors (16 first used in escape sequence) */ - static const char *colorname[] = { - /* 8 normal colors */ -- "#403E41", -- "#FF6188", -- "#A9DC76", -- "#FFD876", -- "#FC9867", -- "#AB9DF2", -- "#78DCE8", -- "#FCFCFA", -+ "#24292e", -+ "#d73a49", -+ "#28a745", -+ "#dbab09", -+ "#0366d6", -+ "#5a32a3", -+ "#0598bc", -+ "#6a737d", - - /* 8 bright colors */ -- "#727072", -- "#FF6188", -- "#A9DC76", -- "#FFD866", -- "#FC9867", -- "#AB9DF2", -- "#78DCE8", -- "#FCFCFA", -+ "#959da5", -+ "#cb2431", -+ "#22863a", -+ "#b08800", -+ "#005cc5", -+ "#5a32a3", -+ "#3192aa", -+ "#d1d5da", -+ -+ /* extra */ -+ "#d18616", -+ "#cb2431", - - [255] = 0, - - /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", -- "#555555", -+ "#333333", - "black", -- "#222222" -+ "#ffffff" - }; - - -@@ -197,10 +201,10 @@ static const char *colorname[] = { - * Default colors (colorname index) - * foreground, background, cursor, reverse cursor - */ --unsigned int defaultfg = 7; -+unsigned int defaultfg = 0; - unsigned int defaultbg = 259; --unsigned int defaultcs = 256; --unsigned int defaultrcs = 257; -+unsigned int defaultcs = 257; -+unsigned int defaultrcs = 256; - - #if VIM_BROWSE_PATCH - unsigned int const currentBg = 6, buffSize = 2048; --- -2.37.3 - diff --git a/x11-terms/st/files/0004-dynamic-cursor-color.patch b/x11-terms/st/files/0004-dynamic-cursor-color.patch deleted file mode 100644 index 66a9920..0000000 --- a/x11-terms/st/files/0004-dynamic-cursor-color.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5be338e6298340e24018f63d64dffd296fdd2684 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 26 May 2022 22:51:03 +0200 -Subject: [PATCH 04/13] dynamic cursor color - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index 3457532..2e79d14 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -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/ --- -2.37.3 - diff --git a/x11-terms/st/files/0005-move-with-termmod-j-k.patch b/x11-terms/st/files/0005-move-with-termmod-j-k.patch deleted file mode 100644 index b3a612c..0000000 --- a/x11-terms/st/files/0005-move-with-termmod-j-k.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4463e7367fbc980d3fe43e5f0489d794c1974fc9 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 26 May 2022 23:01:04 +0200 -Subject: [PATCH 05/13] move with termmod + j/k - ---- - config.def.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config.def.h b/config.def.h -index e43f2ab..9dc4968 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -395,6 +395,8 @@ static Shortcut shortcuts[] = { - #if SCROLLBACK_PATCH - { ShiftMask, XK_Page_Up, kscrollup, {.i = -1}, S_PRI }, - { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1}, S_PRI }, -+ { TERMMOD, XK_K, kscrollup, {.i = 1}, S_PRI }, -+ { TERMMOD, XK_J, kscrolldown, {.i = 1}, S_PRI }, - #endif // SCROLLBACK_PATCH - #if CLIPBOARD_PATCH - { TERMMOD, XK_Y, clippaste, {.i = 0} }, --- -2.37.3 - diff --git a/x11-terms/st/files/0006-enable-more-patches-ig.patch b/x11-terms/st/files/0006-enable-more-patches-ig.patch deleted file mode 100644 index e23e185..0000000 --- a/x11-terms/st/files/0006-enable-more-patches-ig.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 21b61362d4a6db5252281756b9d170078fe6cdce Mon Sep 17 00:00:00 2001 -From: odrling -Date: Thu, 26 May 2022 23:08:37 +0200 -Subject: [PATCH 06/13] enable more patches ig - ---- - patches.def.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/patches.def.h b/patches.def.h -index 2e79d14..c7009b8 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -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/ - */ --#define BOLD_IS_NOT_BRIGHT_PATCH 0 -+#define BOLD_IS_NOT_BRIGHT_PATCH 1 - - /* This patch adds custom rendering of lines/blocks/braille characters for gapless alignment. - * https://st.suckless.org/patches/boxdraw/ -@@ -83,7 +83,7 @@ - * - * https://github.com/bakkeby/st-flexipatch/issues/34 - */ --#define COLUMNS_PATCH 0 -+#define COLUMNS_PATCH 1 - - /* Select and copy the last URL displayed with Mod+l. Multiple invocations cycle through the - * available URLs. -@@ -235,7 +235,7 @@ - * same CWD (current working directory) as the original st instance. - * https://st.suckless.org/patches/newterm/ - */ --#define NEWTERM_PATCH 0 -+#define NEWTERM_PATCH 1 - - /* This patch will set the _MOTIF_WM_HINTS property for the st window which, if the window manager - * respects it, will show the st window without window decorations. --- -2.37.3 - diff --git a/x11-terms/st/files/0007-scroll-mouse-patch.patch b/x11-terms/st/files/0007-scroll-mouse-patch.patch deleted file mode 100644 index efd1dd4..0000000 --- a/x11-terms/st/files/0007-scroll-mouse-patch.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c1dc6a219659fd88419f44a37097ab70ea4e875e Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 00:35:49 +0200 -Subject: [PATCH 07/13] scroll mouse patch - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index c7009b8..020bc59 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -278,7 +278,7 @@ - * This variant depends on SCROLLBACK_PATCH being enabled. - * https://st.suckless.org/patches/scrollback/ - */ --#define SCROLLBACK_MOUSE_PATCH 0 -+#define SCROLLBACK_MOUSE_PATCH 1 - - /* Scroll back through terminal output using mouse wheel (when not in MODE_ALTSCREEN). - * This variant depends on SCROLLBACK_PATCH being enabled. --- -2.37.3 - diff --git a/x11-terms/st/files/0008-st-sync-patch.patch b/x11-terms/st/files/0008-st-sync-patch.patch deleted file mode 100644 index 065d1a1..0000000 --- a/x11-terms/st/files/0008-st-sync-patch.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fc4a4356fc50085858ed304d340f405b8d47e264 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 00:37:18 +0200 -Subject: [PATCH 08/13] st sync patch - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index 020bc59..c406975 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -340,7 +340,7 @@ - * - * https://st.suckless.org/patches/sync/ - */ --#define SYNC_PATCH 0 -+#define SYNC_PATCH 1 - - /* Instead of a default X cursor, use the xterm cursor from your cursor theme. - * You need to uncomment the corresponding line in config.mk to use the -lXcursor library --- -2.37.3 - diff --git a/x11-terms/st/files/0009-undercurl.patch b/x11-terms/st/files/0009-undercurl.patch deleted file mode 100644 index b5e6921..0000000 --- a/x11-terms/st/files/0009-undercurl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ec07e072f4605cb8b5be02486d55f89cb144bf76 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 00:38:36 +0200 -Subject: [PATCH 09/13] undercurl - ---- - config.def.h | 2 +- - patches.def.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 9dc4968..3071936 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -748,5 +748,5 @@ static char *plumb_cmd = "plumb"; - #define UNDERCURL_SPIKY 1 - #define UNDERCURL_CAPPED 2 - // Active style --#define UNDERCURL_STYLE UNDERCURL_SPIKY -+#define UNDERCURL_STYLE UNDERCURL_CAPPED - #endif // UNDERCURL_PATCH -diff --git a/patches.def.h b/patches.def.h -index c406975..837b904 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -365,7 +365,7 @@ - * - * https://st.suckless.org/patches/undercurl/ - */ --#define UNDERCURL_PATCH 0 -+#define UNDERCURL_PATCH 1 - - /* Allows mouse scroll without modifier keys for regardless of alt screen using the external - * scroll program. --- -2.37.3 - diff --git a/x11-terms/st/files/0010-anysize-simple.patch b/x11-terms/st/files/0010-anysize-simple.patch deleted file mode 100644 index c03436e..0000000 --- a/x11-terms/st/files/0010-anysize-simple.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0e7b872a1cd79ad01cdd23515c7453eeaedd451d Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 02:09:19 +0200 -Subject: [PATCH 10/13] anysize simple - ---- - patches.def.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/patches.def.h b/patches.def.h -index 837b904..5c6d41b 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -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 - - /* A simple variant of the anysize patch that only changes the resize hints to allow the window to - * be resized to any size. - */ --#define ANYSIZE_SIMPLE_PATCH 0 -+#define ANYSIZE_SIMPLE_PATCH 1 - - /* Draws a background image in farbfeld format in place of the defaultbg color allowing for pseudo - * transparency. --- -2.37.3 - diff --git a/x11-terms/st/files/0011-set-new-font-scale-binding.patch b/x11-terms/st/files/0011-set-new-font-scale-binding.patch deleted file mode 100644 index fc8eb4e..0000000 --- a/x11-terms/st/files/0011-set-new-font-scale-binding.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fef1701dfca816c3afb66813c46261955a5cbfaa Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 02:09:49 +0200 -Subject: [PATCH 11/13] set new font scale binding - ---- - config.def.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 3071936..c8e6208 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -387,8 +387,8 @@ static Shortcut shortcuts[] = { - { ControlMask, XK_Print, toggleprinter, {.i = 0} }, - { ShiftMask, XK_Print, printscreen, {.i = 0} }, - { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, -- { TERMMOD, XK_Prior, zoom, {.f = +1} }, -- { TERMMOD, XK_Next, zoom, {.f = -1} }, -+ { TERMMOD, XK_Up, zoom, {.f = +1} }, -+ { TERMMOD, XK_Down, zoom, {.f = -1} }, - { TERMMOD, XK_Home, zoomreset, {.f = 0} }, - { TERMMOD, XK_C, clipcopy, {.i = 0} }, - { TERMMOD, XK_V, clippaste, {.i = 0} }, --- -2.37.3 - diff --git a/x11-terms/st/files/0012-swapmouse.patch b/x11-terms/st/files/0012-swapmouse.patch deleted file mode 100644 index 2424552..0000000 --- a/x11-terms/st/files/0012-swapmouse.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4e4383504cf3d47599ac1d38af3631b2dd947c25 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 02:29:39 +0200 -Subject: [PATCH 12/13] swapmouse - ---- - patches.def.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/patches.def.h b/patches.def.h -index 5c6d41b..56854ec 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -327,7 +327,7 @@ - * shown by vte terminals like termite. - * https://st.suckless.org/patches/swapmouse/ - */ --#define SWAPMOUSE_PATCH 0 -+#define SWAPMOUSE_PATCH 1 - - /* This patch adds synchronized-updates/application-sync support in st. - * This will have no effect except when an application uses the synchronized-update escape --- -2.37.3 - diff --git a/x11-terms/st/files/0013-relative-border.patch b/x11-terms/st/files/0013-relative-border.patch deleted file mode 100644 index d75f7a9..0000000 --- a/x11-terms/st/files/0013-relative-border.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 2f49ed98f7506e036d5ab0e9446ea548ad55d7f2 Mon Sep 17 00:00:00 2001 -From: odrling -Date: Fri, 27 May 2022 02:39:03 +0200 -Subject: [PATCH 13/13] relative border - ---- - config.def.h | 2 +- - patches.def.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config.def.h b/config.def.h -index c8e6208..06ec158 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -27,7 +27,7 @@ static const int pseudotransparency = 0; - #if RELATIVEBORDER_PATCH - /* borderperc: percentage of cell width to use as a border - * 0 = no border, 100 = border width is same as cell width */ --int borderperc = 20; -+int borderperc = 40; - #else - static int borderpx = 2; - #endif // RELATIVEBORDER_PATCH -diff --git a/patches.def.h b/patches.def.h -index 56854ec..78b2320 100644 ---- a/patches.def.h -+++ b/patches.def.h -@@ -261,7 +261,7 @@ - * in the terminal. - * https://st.suckless.org/patches/relativeborder/ - */ --#define RELATIVEBORDER_PATCH 0 -+#define RELATIVEBORDER_PATCH 1 - - /* This patch allows you to right-click on some selected text to send it to the plumbing - * program of choice, e.g. open a file, view an image, open a URL. --- -2.37.3 - diff --git a/x11-terms/st/files/odrling.patch b/x11-terms/st/files/odrling.patch new file mode 100644 index 0000000..45c932a --- /dev/null +++ b/x11-terms/st/files/odrling.patch @@ -0,0 +1,688 @@ +From 51640b3d139b1b510dd02de3f3e32a20ab98c730 Mon Sep 17 00:00:00 2001 +From: odrling +Date: Sun, 7 Mar 2021 16:12:13 +0100 +Subject: [PATCH 01/14] 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 02fa4ca..9ee9c38 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 26ae7e6..2e79d14 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/ +@@ -272,7 +272,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. +@@ -390,7 +390,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 +@@ -410,14 +410,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.3 + + +From 3c0df29f0282406a3cabd06d08a225ba2672832d Mon Sep 17 00:00:00 2001 +From: odrling +Date: Thu, 25 Mar 2021 17:47:16 +0100 +Subject: [PATCH 02/14] disable dynamic colors + +--- + patches.def.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/patches.def.h b/patches.def.h +index 2e79d14..3457532 100644 +--- a/patches.def.h ++++ b/patches.def.h +@@ -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 1 ++#define DYNAMIC_CURSOR_COLOR_PATCH 0 + + /* Reading and writing st's screen through a pipe, e.g. pass info to dmenu. + * https://st.suckless.org/patches/externalpipe/ +-- +2.37.3 + + +From 4101750fce7178e8f280269a96eb11b20cf39a5c Mon Sep 17 00:00:00 2001 +From: odrling +Date: Thu, 26 May 2022 22:43:52 +0200 +Subject: [PATCH 03/14] update color theme + +--- + config.def.h | 46 +++++++++++++++++++++++++--------------------- + 1 file changed, 25 insertions(+), 21 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 9ee9c38..e43f2ab 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -164,32 +164,36 @@ float alphaUnfocused = 0.6; + /* Terminal colors (16 first used in escape sequence) */ + static const char *colorname[] = { + /* 8 normal colors */ +- "#403E41", +- "#FF6188", +- "#A9DC76", +- "#FFD876", +- "#FC9867", +- "#AB9DF2", +- "#78DCE8", +- "#FCFCFA", ++ "#24292e", ++ "#d73a49", ++ "#28a745", ++ "#dbab09", ++ "#0366d6", ++ "#5a32a3", ++ "#0598bc", ++ "#6a737d", + + /* 8 bright colors */ +- "#727072", +- "#FF6188", +- "#A9DC76", +- "#FFD866", +- "#FC9867", +- "#AB9DF2", +- "#78DCE8", +- "#FCFCFA", ++ "#959da5", ++ "#cb2431", ++ "#22863a", ++ "#b08800", ++ "#005cc5", ++ "#5a32a3", ++ "#3192aa", ++ "#d1d5da", ++ ++ /* extra */ ++ "#d18616", ++ "#cb2431", + + [255] = 0, + + /* more colors can be added after 255 to use with DefaultXX */ + "#cccccc", +- "#555555", ++ "#333333", + "black", +- "#222222" ++ "#ffffff" + }; + + +@@ -197,10 +201,10 @@ static const char *colorname[] = { + * Default colors (colorname index) + * foreground, background, cursor, reverse cursor + */ +-unsigned int defaultfg = 7; ++unsigned int defaultfg = 0; + unsigned int defaultbg = 259; +-unsigned int defaultcs = 256; +-unsigned int defaultrcs = 257; ++unsigned int defaultcs = 257; ++unsigned int defaultrcs = 256; + + #if VIM_BROWSE_PATCH + unsigned int const currentBg = 6, buffSize = 2048; +-- +2.37.3 + + +From 68600fd1a5ff220bf35ba1df3679d55b9fa991c7 Mon Sep 17 00:00:00 2001 +From: odrling +Date: Thu, 26 May 2022 22:51:03 +0200 +Subject: [PATCH 04/14] dynamic cursor color + +--- + patches.def.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/patches.def.h b/patches.def.h +index 3457532..2e79d14 100644 +--- a/patches.def.h ++++ b/patches.def.h +@@ -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/ +-- +2.37.3 + + +From e37637c02b19130e79138f6c9a8ce8f842f411ba Mon Sep 17 00:00:00 2001 +From: odrling +Date: Thu, 26 May 2022 23:01:04 +0200 +Subject: [PATCH 05/14] move with termmod + j/k + +--- + config.def.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/config.def.h b/config.def.h +index e43f2ab..9dc4968 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -395,6 +395,8 @@ static Shortcut shortcuts[] = { + #if SCROLLBACK_PATCH + { ShiftMask, XK_Page_Up, kscrollup, {.i = -1}, S_PRI }, + { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1}, S_PRI }, ++ { TERMMOD, XK_K, kscrollup, {.i = 1}, S_PRI }, ++ { TERMMOD, XK_J, kscrolldown, {.i = 1}, S_PRI }, + #endif // SCROLLBACK_PATCH + #if CLIPBOARD_PATCH + { TERMMOD, XK_Y, clippaste, {.i = 0} }, +-- +2.37.3 + + +From 161f0ffaa692a80e5c24f9f78bb46515bc4354bb Mon Sep 17 00:00:00 2001 +From: odrling +Date: Thu, 26 May 2022 23:08:37 +0200 +Subject: [PATCH 06/14] enable more patches ig + +--- + patches.def.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/patches.def.h b/patches.def.h +index 2e79d14..c7009b8 100644 +--- a/patches.def.h ++++ b/patches.def.h +@@ -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/ + */ +-#define BOLD_IS_NOT_BRIGHT_PATCH 0 ++#define BOLD_IS_NOT_BRIGHT_PATCH 1 + + /* This patch adds custom rendering of lines/blocks/braille characters for gapless alignment. + * https://st.suckless.org/patches/boxdraw/ +@@ -83,7 +83,7 @@ + * + * https://github.com/bakkeby/st-flexipatch/issues/34 + */ +-#define COLUMNS_PATCH 0 ++#define COLUMNS_PATCH 1 + + /* Select and copy the last URL displayed with Mod+l. Multiple invocations cycle through the + * available URLs. +@@ -235,7 +235,7 @@ + * same CWD (current working directory) as the original st instance. + * https://st.suckless.org/patches/newterm/ + */ +-#define NEWTERM_PATCH 0 ++#define NEWTERM_PATCH 1 + + /* This patch will set the _MOTIF_WM_HINTS property for the st window which, if the window manager + * respects it, will show the st window without window decorations. +-- +2.37.3 + + +From 8227ff8c5b2152f5a713483990afd5f033c5e11c Mon Sep 17 00:00:00 2001 +From: odrling +Date: Fri, 27 May 2022 00:35:49 +0200 +Subject: [PATCH 07/14] scroll mouse patch + +--- + patches.def.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/patches.def.h b/patches.def.h +index c7009b8..020bc59 100644 +--- a/patches.def.h ++++ b/patches.def.h +@@ -278,7 +278,7 @@ + * This variant depends on SCROLLBACK_PATCH being enabled. + * https://st.suckless.org/patches/scrollback/ + */ +-#define SCROLLBACK_MOUSE_PATCH 0 ++#define SCROLLBACK_MOUSE_PATCH 1 + + /* Scroll back through terminal output using mouse wheel (when not in MODE_ALTSCREEN). + * This variant depends on SCROLLBACK_PATCH being enabled. +-- +2.37.3 + + +From de3b9a05da4fa1417854b1b17e822a6cd612b9c0 Mon Sep 17 00:00:00 2001 +From: odrling +Date: Fri, 27 May 2022 00:37:18 +0200 +Subject: [PATCH 08/14] st sync patch + +--- + patches.def.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/patches.def.h b/patches.def.h +index 020bc59..c406975 100644 +--- a/patches.def.h ++++ b/patches.def.h +@@ -340,7 +340,7 @@ + * + * https://st.suckless.org/patches/sync/ + */ +-#define SYNC_PATCH 0 ++#define SYNC_PATCH 1 + + /* Instead of a default X cursor, use the xterm cursor from your cursor theme. + * You need to uncomment the corresponding line in config.mk to use the -lXcursor library +-- +2.37.3 + + +From fe645f978376f90d21d1d0a6d1002631a2b72b2a Mon Sep 17 00:00:00 2001 +From: odrling +Date: Fri, 27 May 2022 00:38:36 +0200 +Subject: [PATCH 09/14] undercurl + +--- + config.def.h | 2 +- + patches.def.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 9dc4968..3071936 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -748,5 +748,5 @@ static char *plumb_cmd = "plumb"; + #define UNDERCURL_SPIKY 1 + #define UNDERCURL_CAPPED 2 + // Active style +-#define UNDERCURL_STYLE UNDERCURL_SPIKY ++#define UNDERCURL_STYLE UNDERCURL_CAPPED + #endif // UNDERCURL_PATCH +diff --git a/patches.def.h b/patches.def.h +index c406975..837b904 100644 +--- a/patches.def.h ++++ b/patches.def.h +@@ -365,7 +365,7 @@ + * + * https://st.suckless.org/patches/undercurl/ + */ +-#define UNDERCURL_PATCH 0 ++#define UNDERCURL_PATCH 1 + + /* Allows mouse scroll without modifier keys for regardless of alt screen using the external + * scroll program. +-- +2.37.3 + + +From ac7832c076a0fd80b827b5289edae85d64e8f70c Mon Sep 17 00:00:00 2001 +From: odrling +Date: Fri, 27 May 2022 02:09:19 +0200 +Subject: [PATCH 10/14] anysize simple + +--- + patches.def.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/patches.def.h b/patches.def.h +index 837b904..5c6d41b 100644 +--- a/patches.def.h ++++ b/patches.def.h +@@ -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 + + /* A simple variant of the anysize patch that only changes the resize hints to allow the window to + * be resized to any size. + */ +-#define ANYSIZE_SIMPLE_PATCH 0 ++#define ANYSIZE_SIMPLE_PATCH 1 + + /* Draws a background image in farbfeld format in place of the defaultbg color allowing for pseudo + * transparency. +-- +2.37.3 + + +From 44bfd072dbb9274c9e0843e7d8b03ee89795ab17 Mon Sep 17 00:00:00 2001 +From: odrling +Date: Fri, 27 May 2022 02:09:49 +0200 +Subject: [PATCH 11/14] set new font scale binding + +--- + config.def.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 3071936..c8e6208 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -387,8 +387,8 @@ static Shortcut shortcuts[] = { + { ControlMask, XK_Print, toggleprinter, {.i = 0} }, + { ShiftMask, XK_Print, printscreen, {.i = 0} }, + { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, +- { TERMMOD, XK_Prior, zoom, {.f = +1} }, +- { TERMMOD, XK_Next, zoom, {.f = -1} }, ++ { TERMMOD, XK_Up, zoom, {.f = +1} }, ++ { TERMMOD, XK_Down, zoom, {.f = -1} }, + { TERMMOD, XK_Home, zoomreset, {.f = 0} }, + { TERMMOD, XK_C, clipcopy, {.i = 0} }, + { TERMMOD, XK_V, clippaste, {.i = 0} }, +-- +2.37.3 + + +From 9aba963eb6a2710fc4a7f75cd4afdcf95830071f Mon Sep 17 00:00:00 2001 +From: odrling +Date: Fri, 27 May 2022 02:29:39 +0200 +Subject: [PATCH 12/14] swapmouse + +--- + patches.def.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/patches.def.h b/patches.def.h +index 5c6d41b..56854ec 100644 +--- a/patches.def.h ++++ b/patches.def.h +@@ -327,7 +327,7 @@ + * shown by vte terminals like termite. + * https://st.suckless.org/patches/swapmouse/ + */ +-#define SWAPMOUSE_PATCH 0 ++#define SWAPMOUSE_PATCH 1 + + /* This patch adds synchronized-updates/application-sync support in st. + * This will have no effect except when an application uses the synchronized-update escape +-- +2.37.3 + + +From b021093d62861a094e3d0464f60c44a1e5f14250 Mon Sep 17 00:00:00 2001 +From: odrling +Date: Fri, 27 May 2022 02:39:03 +0200 +Subject: [PATCH 13/14] relative border + +--- + config.def.h | 2 +- + patches.def.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config.def.h b/config.def.h +index c8e6208..06ec158 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -27,7 +27,7 @@ static const int pseudotransparency = 0; + #if RELATIVEBORDER_PATCH + /* borderperc: percentage of cell width to use as a border + * 0 = no border, 100 = border width is same as cell width */ +-int borderperc = 20; ++int borderperc = 40; + #else + static int borderpx = 2; + #endif // RELATIVEBORDER_PATCH +diff --git a/patches.def.h b/patches.def.h +index 56854ec..78b2320 100644 +--- a/patches.def.h ++++ b/patches.def.h +@@ -261,7 +261,7 @@ + * in the terminal. + * https://st.suckless.org/patches/relativeborder/ + */ +-#define RELATIVEBORDER_PATCH 0 ++#define RELATIVEBORDER_PATCH 1 + + /* This patch allows you to right-click on some selected text to send it to the plumbing + * program of choice, e.g. open a file, view an image, open a URL. +-- +2.37.3 + + +From 03a33f82a5a93c12900914e1173cf0730bd14f4e Mon Sep 17 00:00:00 2001 +From: odrling +Date: Fri, 9 Sep 2022 02:13:28 +0200 +Subject: [PATCH 14/14] update enabled patches + +--- + patches.def.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/patches.def.h b/patches.def.h +index 78b2320..1f79bbf 100644 +--- a/patches.def.h ++++ b/patches.def.h +@@ -101,7 +101,7 @@ + * restores the window title (for instance nvim does this when opening and closing). + * https://st.suckless.org/patches/csi_22_23/ + */ +-#define CSI_22_23_PATCH 0 ++#define CSI_22_23_PATCH 1 + + /* According to the specification (see link in BLINKING_CURSOR_PATCH) the "Set cursor style + * (DECSCUSR), VT520." escape sequences define both values of 0 and 1 as a blinking block, +@@ -170,7 +170,7 @@ + * that are available to GUI applications. + * https://st.suckless.org/patches/fix_keyboard_input/ + */ +-#define FIXKEYBOARDINPUT_PATCH 0 ++#define FIXKEYBOARDINPUT_PATCH 1 + + /* This patch allows you to add spare font besides the default. Some glyphs can be not present in + * the default font. For this glyphs st uses font-config and try to find them in font cache first. +@@ -320,7 +320,7 @@ + /* Use inverted defaultbg/fg for selection when bg/fg are the same. + * https://st.suckless.org/patches/spoiler/ + */ +-#define SPOILER_PATCH 0 ++#define SPOILER_PATCH 1 + + /* This patch changes the mouse shape to the global default when the running program subscribes + * for mouse events, for instance, in programs like ranger and fzf. It emulates the behaviour +@@ -371,7 +371,7 @@ + * scroll program. + * https://st.suckless.org/patches/universcroll/ + */ +-#define UNIVERSCROLL_PATCH 0 ++#define UNIVERSCROLL_PATCH 1 + + /* Use XftFontMatch in place of FcFontMatch. + * +@@ -385,7 +385,7 @@ + * + * https://git.suckless.org/st/commit/528241aa3835e2f1f052abeeaf891737712955a0.html + */ +-#define USE_XFTFONTMATCH_PATCH 0 ++#define USE_XFTFONTMATCH_PATCH 1 + + /* Vertically center lines in the space available if you have set a larger chscale in config.h + * https://st.suckless.org/patches/vertcenter/ +@@ -410,7 +410,7 @@ + /* Adds support for w3m images. + * https://st.suckless.org/patches/w3m/ + */ +-#define W3M_PATCH 1 ++#define W3M_PATCH 0 + + /* Adds proper glyphs rendering in st allowing wide glyphs to be drawn as-is as opposed to + * smaller or cut glyphs being rendered. +-- +2.37.3 + diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild index 2190dad..bb2d094 100644 --- a/x11-terms/st/st-9999.ebuild +++ b/x11-terms/st/st-9999.ebuild @@ -26,19 +26,7 @@ DEPEND=" x11-base/xorg-proto " PATCHES=( - "${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 + "${FILESDIR}"/odrling.patch ) src_prepare() {