From f72e6cc250dd175217a2eb266a827253be4d5482 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Wed, 17 Apr 2024 22:57:36 +0200 Subject: [PATCH] rework st --- config.h | 101 ++++++++++++++++-------------------------------------- patches.h | 10 +++--- 2 files changed, 35 insertions(+), 76 deletions(-) diff --git a/config.h b/config.h index 8023f5c..465a328 100644 --- a/config.h +++ b/config.h @@ -120,19 +120,25 @@ char *termname = "st-256color"; */ unsigned int tabspaces = 8; -/* bg opacity */ -float alpha = 0.9; -float alphaUnfocused = 0.8; +#define BLACK "#15161E" +#define RED "#f7768e" +#define GREEN "#9ece6a" +#define ORANGE "#e0af68" +#define BLUE "#7aa2f7" +#define MAGENTA "#bb9af7" +#define CYAN "#7dcfff" +#define LIGHT_GRAY "#a9b1d6" +#define GRAY "#414868" +#define WHITE "#c0caf5" +#define UNDEFINED "#ff0000" /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { /* 8 normal colors */ - "#1d202f", "#f7768e", "#9ece6a", "#e0af68", "#7aa2f7", "#bb9af7", "#7dcfff", - "#a9b1d6", + BLACK, RED, GREEN, ORANGE, BLUE, MAGENTA, CYAN, LIGHT_GRAY, /* 8 bright colors */ - "#414868", "#f7768e", "#9ece6a", "#e0af68", "#7aa2f7", "#bb9af7", "#7dcfff", - "#c0caf5", + GRAY, RED, GREEN, ORANGE, BLUE, MAGENTA, CYAN, WHITE, [255] = 0, @@ -141,10 +147,8 @@ static const char *colorname[] = { "#1a1b26", /* 257 -> default inverted cursor colour */ "#c0caf5", /* 258 -> default foreground colour */ "#1a1b26", /* 259 -> default background colour */ - "#c0caf5", /* 260 -> unfocused foreground colour */ - "#1a1b26", /* 261 -> unfocused background colour */ - "#c0caf5", /* 262 -> default selection foreground colour */ - "#33467C", /* 263 -> default selection background colour */ + "#c0caf5", /* 260 -> default selection foreground colour */ + "#33467C", /* 261 -> default selection background colour */ }; /* @@ -156,9 +160,8 @@ unsigned int defaultrcs = 257; unsigned int defaultfg = 258; unsigned int defaultbg = 0; unsigned int bg = 259; -unsigned int bgUnfocused = 261; -unsigned int selectionfg = 262; -unsigned int selectionbg = 263; +unsigned int selectionfg = 260; +unsigned int selectionbg = 261; static int ignoreselfg = 0; /* @@ -195,37 +198,6 @@ static char *mouseshape = "xterm"; */ static unsigned int defaultattr = 11; -/* - * Xresources preferences to load at startup - */ -ResourcePref resources[] = { - {"color0", STRING, &colorname[0]}, - {"color1", STRING, &colorname[1]}, - {"color2", STRING, &colorname[2]}, - {"color3", STRING, &colorname[3]}, - {"color4", STRING, &colorname[4]}, - {"color5", STRING, &colorname[5]}, - {"color6", STRING, &colorname[6]}, - {"color7", STRING, &colorname[7]}, - {"color8", STRING, &colorname[8]}, - {"color9", STRING, &colorname[9]}, - {"color10", STRING, &colorname[10]}, - {"color11", STRING, &colorname[11]}, - {"color12", STRING, &colorname[12]}, - {"color13", STRING, &colorname[13]}, - {"color14", STRING, &colorname[14]}, - {"color15", STRING, &colorname[15]}, - {"cursorColor", STRING, &colorname[256]}, - {"foreground", STRING, &colorname[258]}, - {"background", STRING, &colorname[259]}, - {"unfocusedForeground", STRING, &colorname[260]}, - {"unfocusedBackground", STRING, &colorname[261]}, - {"selectionForeground", STRING, &colorname[262]}, - {"selectionBackground", STRING, &colorname[263]}, - {"alpha", FLOAT, &alpha}, - {"alphaUnfocused", FLOAT, &alphaUnfocused}, -}; - /* * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set). * Note that if you want to use ShiftMask with selmasks, set this to an other @@ -259,26 +231,19 @@ static char *setbgcolorcmd[] = {"/bin/sh", "-c", "printf '\033]11;#008000\007'", "externalpipein", NULL}; static Shortcut shortcuts[] = { - /* mask keysym function argument screen - */ - {XK_ANY_MOD, XK_Break, sendbreak, {.i = 0}}, - {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 = +3}}, - {TERMMOD, XK_Next, zoom, {.f = -3}}, - {TERMMOD, XK_Home, zoomreset, {.f = 0}}, - {TERMMOD, XK_C, clipcopy, {.i = 0}}, - {TERMMOD, XK_V, clippaste, {.i = 0}}, - {TERMMOD, XK_O, changealpha, {.f = +0.05}}, - {TERMMOD, XK_P, changealpha, {.f = -0.05}}, - //{ TERMMOD, XK_, changealphaunfocused, {.f = +0.05} - //}, { TERMMOD, XK_, changealphaunfocused, {.f = - //-0.05} }, - {TERMMOD, XK_Y, selpaste, {.i = 0}}, - {ShiftMask, XK_Insert, selpaste, {.i = 0}}, - {TERMMOD, XK_Num_Lock, numlock, {.i = 0}}, - {TERMMOD, XK_I, iso14755, {.i = 0}}, + /* mask keysym function argument screen */ + {XK_ANY_MOD, XK_Break, sendbreak, {.i = 0}}, + {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 = +3}}, + {TERMMOD, XK_Next, zoom, {.f = -3}}, + {TERMMOD, XK_Home, zoomreset, {.f = 0}}, + {TERMMOD, XK_C, clipcopy, {.i = 0}}, + {TERMMOD, XK_V, clippaste, {.i = 0}}, + {TERMMOD, XK_Y, selpaste, {.i = 0}}, + {ShiftMask, XK_Insert, selpaste, {.i = 0}}, + {TERMMOD, XK_Num_Lock, numlock, {.i = 0}}, }; /* @@ -327,12 +292,6 @@ static char ascii_printable[] = " !\"#$%&'()*+,-./0123456789:;<=>?" "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" "`abcdefghijklmnopqrstuvwxyz{|}~"; -/* - * plumb_cmd is run on mouse button 3 click, with argument set to - * current selection and with cwd set to the cwd of the active shell - */ -static char *plumb_cmd = "plumb"; - /** * Undercurl style. Set UNDERCURL_STYLE to one of the available styles. * diff --git a/patches.h b/patches.h index 7d5c80b..255e556 100644 --- a/patches.h +++ b/patches.h @@ -14,7 +14,7 @@ * when including this patch. * https://st.suckless.org/patches/alpha/ */ -#define ALPHA_PATCH 1 +#define ALPHA_PATCH 0 /* The alpha focus highlight patch allows the user to specify two distinct opacity values or * background colors in order to easily differentiate between focused and unfocused terminal @@ -22,7 +22,7 @@ * https://github.com/juliusHuelsmann/st-focus/ * https://st.suckless.org/patches/alpha_focus_highlight/ */ -#define ALPHA_FOCUS_HIGHLIGHT_PATCH 1 +#define ALPHA_FOCUS_HIGHLIGHT_PATCH 0 /* Adds gradient transparency to st, depends on the alpha patch. * https://st.suckless.org/patches/gradient/ @@ -210,7 +210,7 @@ * codepoint that will be converted to a glyph and then pushed to st. * https://st.suckless.org/patches/iso14755/ */ -#define ISO14755_PATCH 1 +#define ISO14755_PATCH 0 /* This patch allows you to select text on the terminal using keyboard shortcuts. * https://st.suckless.org/patches/keyboard_select/ @@ -445,10 +445,10 @@ * apply the resources named in the resources[] array in config.h. * https://st.suckless.org/patches/xresources/ */ -#define XRESOURCES_PATCH 1 +#define XRESOURCES_PATCH 0 /* This patch adds the ability to reload the Xresources config when a SIGUSR1 signal is received * e.g.: killall -USR1 st * Depends on the XRESOURCES_PATCH. */ -#define XRESOURCES_RELOAD_PATCH 1 +#define XRESOURCES_RELOAD_PATCH 0