156 lines
5.3 KiB
Diff
156 lines
5.3 KiB
Diff
diff '--color=auto' -Nu a/config.def.h b/config.def.h
|
|
--- a/config.def.h 2024-12-28 23:51:30.003295812 -0600
|
|
+++ b/config.def.h 2024-12-28 23:53:26.293299467 -0600
|
|
@@ -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 = "JetBrainsMono:size=10";
|
|
#if FONT2_PATCH
|
|
/* Spare fonts */
|
|
static char *font2[] = {
|
|
@@ -178,27 +178,31 @@
|
|
/* Terminal colors (16 first used in escape sequence) */
|
|
static const char *colorname[] = {
|
|
/* 8 normal colors */
|
|
- "black",
|
|
- "red3",
|
|
- "green3",
|
|
- "yellow3",
|
|
- "blue2",
|
|
- "magenta3",
|
|
- "cyan3",
|
|
- "gray90",
|
|
+ [0] = "#414b50", /* black */
|
|
+ [1] = "#e67e80", /* red */
|
|
+ [2] = "#a7c080", /* green */
|
|
+ [3] = "#dbbc7f", /* yellow */
|
|
+ [4] = "#7fbbb3", /* blue */
|
|
+ [5] = "#d699b6", /* magenta */
|
|
+ [6] = "#83c092", /* cyan */
|
|
+ [7] = "#d3c6aa", /* white */
|
|
|
|
/* 8 bright colors */
|
|
- "gray50",
|
|
- "red",
|
|
- "green",
|
|
- "yellow",
|
|
- "#5c5cff",
|
|
- "magenta",
|
|
- "cyan",
|
|
- "white",
|
|
+ [8] = "#475258", /* black */
|
|
+ [9] = "#e67e80", /* red */
|
|
+ [10] = "#a7c080", /* green */
|
|
+ [11] = "#dbbc7f", /* yellow */
|
|
+ [12] = "#7fbbb3", /* blue */
|
|
+ [13] = "#d699b6", /* magenta */
|
|
+ [14] = "#83c092", /* cyan */
|
|
+ [15] = "#d3c6aa", /* white */
|
|
|
|
[255] = 0,
|
|
|
|
+ /* special colors */
|
|
+ [256] = "#272e33", /* background */
|
|
+ [257] = "#d3c6aa", /* foreground */
|
|
+
|
|
/* more colors can be added after 255 to use with DefaultXX */
|
|
"#add8e6", /* 256 -> cursor */
|
|
"#555555", /* 257 -> rev cursor*/
|
|
@@ -215,10 +219,10 @@
|
|
unsigned int defaultbg = 0;
|
|
unsigned int bg = 17, bgUnfocused = 16;
|
|
#else
|
|
-unsigned int defaultbg = 258;
|
|
+unsigned int defaultbg = 256;
|
|
#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
|
|
-unsigned int defaultfg = 259;
|
|
-unsigned int defaultcs = 256;
|
|
+unsigned int defaultfg = 257;
|
|
+unsigned int defaultcs = 257;
|
|
unsigned int defaultrcs = 257;
|
|
#if SELECTION_COLORS_PATCH
|
|
unsigned int selectionfg = 258;
|
|
@@ -413,6 +417,8 @@
|
|
{ TERMMOD, XK_Prior, zoom, {.f = +1} },
|
|
{ TERMMOD, XK_Next, zoom, {.f = -1} },
|
|
{ TERMMOD, XK_Home, zoomreset, {.f = 0} },
|
|
+ { TERMMOD, XK_L, zoom, {.f = +1} },
|
|
+ { TERMMOD, XK_H, zoom, {.f = -1} },
|
|
{ TERMMOD, XK_C, clipcopy, {.i = 0} },
|
|
{ TERMMOD, XK_V, clippaste, {.i = 0} },
|
|
#if ALPHA_PATCH
|
|
@@ -428,8 +434,8 @@
|
|
{ MODKEY, XK_Return, fullscreen, {.i = 0} },
|
|
#endif // FULLSCREEN_PATCH
|
|
#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} },
|
|
diff '--color=auto' -Nu a/config.mk b/config.mk
|
|
--- a/config.mk 2024-12-28 23:51:30.003295812 -0600
|
|
+++ b/config.mk 2024-12-28 23:51:42.343296202 -0600
|
|
@@ -27,8 +27,8 @@
|
|
#LIGATURES_LIBS = `$(PKG_CONFIG) --libs harfbuzz`
|
|
|
|
# Uncomment this for the SIXEL patch / SIXEL_PATCH
|
|
-#SIXEL_C = sixel.c sixel_hls.c
|
|
-#SIXEL_LIBS = `$(PKG_CONFIG) --libs imlib2`
|
|
+SIXEL_C = sixel.c sixel_hls.c
|
|
+SIXEL_LIBS = `$(PKG_CONFIG) --libs imlib2`
|
|
|
|
# Uncomment for the netwmicon patch / NETWMICON_PATCH
|
|
#NETWMICON_LIBS = `$(PKG_CONFIG) --libs gdlib`
|
|
Common subdirectories: a/.git and b/.git
|
|
Common subdirectories: a/patch and b/patch
|
|
diff '--color=auto' -Nu a/patches.def.h b/patches.def.h
|
|
--- a/patches.def.h 2024-12-28 23:51:30.006629148 -0600
|
|
+++ b/patches.def.h 2024-12-28 23:51:42.343296202 -0600
|
|
@@ -44,7 +44,7 @@
|
|
/* 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.
|
|
@@ -321,7 +321,7 @@
|
|
* Text wraps when the terminal window is made smaller.
|
|
* Comes with scrollback.
|
|
*/
|
|
-#define REFLOW_PATCH 0
|
|
+#define REFLOW_PATCH 1
|
|
|
|
/* This patch allows you to specify a border that is relative in size to the width of a cell
|
|
* in the terminal.
|
|
@@ -338,13 +338,13 @@
|
|
/* 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.
|
|
* 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.
|
|
@@ -378,7 +378,7 @@
|
|
*
|
|
* https://gist.github.com/saitoha/70e0fdf22e3e8f63ce937c7f7da71809
|
|
*/
|
|
-#define SIXEL_PATCH 0
|
|
+#define SIXEL_PATCH 1
|
|
|
|
/* This patch allows clients to embed into the st window and is useful if you tend to
|
|
* start X applications from the terminal. For example:
|