From 7e405dd376c531d919fcfe1226e05b63e6cc73f9 Mon Sep 17 00:00:00 2001 From: thad-w541 Date: Tue, 28 Oct 2025 22:21:05 -0500 Subject: [PATCH] x --- config.def.h | 2 +- config.h | 114 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 84 insertions(+), 32 deletions(-) diff --git a/config.def.h b/config.def.h index 4e1ab68..8c2b201 100644 --- a/config.def.h +++ b/config.def.h @@ -164,7 +164,7 @@ static const ColorScheme schemes[] = { }; static const char * const * colorname; -int colorscheme = 0; +int colorscheme = 6; /* * Default colors (colorname index) diff --git a/config.h b/config.h index 2cd740a..b6d7ff5 100644 --- a/config.h +++ b/config.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 = "Noto Mono:pixelsize=12:antialias=true:autohint=true"; static int borderpx = 2; /* @@ -93,46 +93,87 @@ char *termname = "st-256color"; */ unsigned int tabspaces = 8; -/* Terminal colors (16 first used in escape sequence) */ -static const char *colorname[] = { - /* 8 normal colors */ - "black", - "red3", - "green3", - "yellow3", - "blue2", - "magenta3", - "cyan3", - "gray90", +typedef struct { + const char* const colors[258]; /* terminal colors */ + unsigned int fg; /* foreground */ + unsigned int bg; /* background */ + unsigned int cs; /* cursor */ + unsigned int rcs; /* reverse cursor */ +} ColorScheme; +/* + * Terminal colors (16 first used in escape sequence, + * 2 last for custom cursor color), + * foreground, background, cursor, reverse cursor + */ +static const ColorScheme schemes[] = { + // st (dark) + {{"black", "red3", "green3", "yellow3", + "blue2", "magenta3", "cyan3", "gray90", + "gray50", "red", "green", "yellow", + "#5c5cff", "magenta", "cyan", "white", + [256]="#cccccc", "#555555"}, 7, 0, 256, 257}, - /* 8 bright colors */ - "gray50", - "red", - "green", - "yellow", - "#5c5cff", - "magenta", - "cyan", - "white", + // Alacritty (dark) + {{"#1d1f21", "#cc6666", "#b5bd68", "#f0c674", + "#81a2be", "#b294bb", "#8abeb7", "#c5c8c6", + "#666666", "#d54e53", "#b9ca4a", "#e7c547", + "#7aa6da", "#c397d8", "#70c0b1", "#eaeaea", + [256]="#cccccc", "#555555"}, 7, 0, 256, 257}, - [255] = 0, + // One Half dark + {{"#282c34", "#e06c75", "#98c379", "#e5c07b", + "#61afef", "#c678dd", "#56b6c2", "#dcdfe4", + "#282c34", "#e06c75", "#98c379", "#e5c07b", + "#61afef", "#c678dd", "#56b6c2", "#dcdfe4", + [256]="#cccccc", "#555555"}, 7, 0, 256, 257}, - /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", - "#555555", - "gray90", /* default foreground colour */ - "black", /* default background colour */ + // One Half light + {{"#fafafa", "#e45649", "#50a14f", "#c18401", + "#0184bc", "#a626a4", "#0997b3", "#383a42", + "#fafafa", "#e45649", "#50a14f", "#c18401", + "#0184bc", "#a626a4", "#0997b3", "#383a42", + [256]="#cccccc", "#555555"}, 7, 0, 256, 257}, + + // Solarized dark + {{"#073642", "#dc322f", "#859900", "#b58900", + "#268bd2", "#d33682", "#2aa198", "#eee8d5", + "#002b36", "#cb4b16", "#586e75", "#657b83", + "#839496", "#6c71c4", "#93a1a1", "#fdf6e3", + [256]="#93a1a1", "#fdf6e3"}, 12, 8, 256, 257}, + + // Solarized light + {{"#eee8d5", "#dc322f", "#859900", "#b58900", + "#268bd2", "#d33682", "#2aa198", "#073642", + "#fdf6e3", "#cb4b16", "#93a1a1", "#839496", + "#657b83", "#6c71c4", "#586e75", "#002b36", + [256]="#586e75", "#002b36"}, 12, 8, 256, 257}, + + // Gruvbox dark + {{"#282828", "#cc241d", "#98971a", "#d79921", + "#458588", "#b16286", "#689d6a", "#a89984", + "#928374", "#fb4934", "#b8bb26", "#fabd2f", + "#83a598", "#d3869b", "#8ec07c", "#ebdbb2", + [256]="#ebdbb2", "#555555"}, 15, 0, 256, 257}, + + // Gruvbox light + {{"#fbf1c7", "#cc241d", "#98971a", "#d79921", + "#458588", "#b16286", "#689d6a", "#7c6f64", + "#928374", "#9d0006", "#79740e", "#b57614", + "#076678", "#8f3f71", "#427b58", "#3c3836", + [256]="#3c3836", "#555555"}, 15, 0, 256, 257}, }; +static const char * const * colorname; +int colorscheme = 6; /* * Default colors (colorname index) * foreground, background, cursor, reverse cursor */ -unsigned int defaultfg = 258; -unsigned int defaultbg = 259; -unsigned int defaultcs = 256; -static unsigned int defaultrcs = 257; +unsigned int defaultfg; +unsigned int defaultbg; +unsigned int defaultcs; +static unsigned int defaultrcs; /* * Default shape of cursor @@ -201,6 +242,17 @@ static Shortcut shortcuts[] = { { TERMMOD, XK_Y, selpaste, {.i = 0} }, { ShiftMask, XK_Insert, selpaste, {.i = 0} }, { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, + { MODKEY, XK_1, selectscheme, {.i = 0} }, + { MODKEY, XK_2, selectscheme, {.i = 1} }, + { MODKEY, XK_3, selectscheme, {.i = 2} }, + { MODKEY, XK_4, selectscheme, {.i = 3} }, + { MODKEY, XK_5, selectscheme, {.i = 4} }, + { MODKEY, XK_6, selectscheme, {.i = 5} }, + { MODKEY, XK_7, selectscheme, {.i = 6} }, + { MODKEY, XK_8, selectscheme, {.i = 7} }, + { MODKEY, XK_9, selectscheme, {.i = 8} }, + { MODKEY, XK_0, nextscheme, {.i = +1} }, + { MODKEY|ControlMask, XK_0, nextscheme, {.i = -1} }, }; /*