diff --git a/config.def.h.orig b/config.def.h.orig index 895b4dc..4f12299 100644 --- a/config.def.h.orig +++ b/config.def.h.orig @@ -184,11 +184,14 @@ static uint forcemousemod = ShiftMask; * Internal mouse shortcuts. * Beware that overloading Button1 will disable the selection. */ +const unsigned int mousescrollincrement = 1; static MouseShortcut mshortcuts[] = { /* mask button function argument release */ { XK_ANY_MOD, Button4, kscrollup, {.i = 1}, 0, /* !alt */ -1 }, { XK_ANY_MOD, Button5, kscrolldown, {.i = 1}, 0, /* !alt */ -1 }, { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, ++ { Button4, ShiftMask, kscrollup, {.i = mousescrollincrement} }, ++ { Button5, ShiftMask, kscrolldown, {.i = mousescrollincrement} }, { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} }, diff --git a/config.def.h.rej b/config.def.h.rej index 19e721d..5bf0a27 100644 --- a/config.def.h.rej +++ b/config.def.h.rej @@ -1,13 +1,64 @@ --- config.def.h +++ config.def.h -@@ -163,8 +164,8 @@ static MouseShortcut mshortcuts[] = { - - MouseKey mkeys[] = { - /* button mask function argument */ -- { Button4, ShiftMask, kscrollup, {.i = 1} }, -- { Button5, ShiftMask, kscrolldown, {.i = 1} }, -+ { Button4, ShiftMask, kscrollup, {.i = mousescrollincrement} }, -+ { Button5, ShiftMask, kscrolldown, {.i = mousescrollincrement} }, +@@ -96,32 +96,30 @@ 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", ++ "#3b4252", /* black */ ++ "#bf616a", /* red */ ++ "#a3be8c", /* green */ ++ "#ebcb8b", /* yellow */ ++ "#81a1c1", /* blue */ ++ "#b48ead", /* magenta */ ++ "#88c0d0", /* cyan */ ++ "#e5e9f0", /* white */ + + /* 8 bright colors */ +- "gray50", +- "red", +- "green", +- "yellow", +- "#5c5cff", +- "magenta", +- "cyan", +- "white", ++ "#4c566a", /* black */ ++ "#bf616a", /* red */ ++ "#a3be8c", /* green */ ++ "#ebcb8b", /* yellow */ ++ "#81a1c1", /* blue */ ++ "#b48ead", /* magenta */ ++ "#8fbcbb", /* cyan */ ++ "#eceff4", /* white */ + + [255] = 0, + + /* more colors can be added after 255 to use with DefaultXX */ +- "#cccccc", +- "#555555", +- "gray90", /* default foreground colour */ +- "black", /* default background colour */ ++ "#d8dee9", /* default foreground colour */ ++ "#2e3440", /* default background colour */ }; - /* Internal keyboard shortcuts. */ + +@@ -129,8 +127,8 @@ static const char *colorname[] = { + * Default colors (colorname index) + * foreground, background, cursor, reverse cursor + */ +-unsigned int defaultfg = 258; +-unsigned int defaultbg = 259; ++unsigned int defaultfg = 256; ++unsigned int defaultbg = 257; + unsigned int defaultcs = 256; + static unsigned int defaultrcs = 257; + diff --git a/config.h b/config.h index 43d664e..1a0558c 100644 --- a/config.h +++ b/config.h @@ -96,34 +96,34 @@ unsigned int tabspaces = 8; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { /* 8 normal colors */ - [0] = "#000000", /* black */ - [1] = "#ff5555", /* red */ - [2] = "#50fa7b", /* green */ - [3] = "#f1fa8c", /* yellow */ - [4] = "#bd93f9", /* blue */ - [5] = "#ff79c6", /* magenta */ - [6] = "#8be9fd", /* cyan */ - [7] = "#bbbbbb", /* white */ + [0] = "#3b4252", /* black */ + [1] = "#bf616a", /* red */ + [2] = "#a3be8c", /* green */ + [3] = "#ebcb8b", /* yellow */ + [4] = "#81a1c1", /* blue */ + [5] = "#b48ead", /* magenta */ + [6] = "#88c0d0", /* cyan */ + [7] = "#e5e9f0", /* white */ /* 8 bright colors */ - [8] = "#44475a", /* black */ - [9] = "#ff5555", /* red */ - [10] = "#50fa7b", /* green */ - [11] = "#f1fa8c", /* yellow */ - [12] = "#bd93f9", /* blue */ - [13] = "#ff79c6", /* magenta */ - [14] = "#8be9fd", /* cyan */ - [15] = "#ffffff", /* white */ + [8] = "#4c566a", /* black */ + [9] = "#bf616a", /* red */ + [10] = "#a3be8c", /* green */ + [11] = "#ebcb8b", /* yellow */ + [12] = "#81a1c1", /* blue */ + [13] = "#b48ead", /* magenta */ + [14] = "#8fbcbb", /* cyan */ + [15] = "#eceff4", /* white */ /* special colors */ - [256] = "#282a36", /* background */ - [257] = "#f8f8f2", /* foreground */ + [256] = "#f8f8f2", /* background */ + [257] = "#282a36", /* foreground */ /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", - "#555555", - "gray90", /* default foreground colour */ - "black", /* default background colour */ + /*"#cccccc", + "#555555",*/ + "#2e3440", /* default foreground colour */ + "#d8dee9", /* default background colour */ }; @@ -131,9 +131,9 @@ static const char *colorname[] = { * Default colors (colorname index) * foreground, background, cursor */ -unsigned int defaultfg = 257; -unsigned int defaultbg = 256; -unsigned int defaultcs = 257; +unsigned int defaultfg = 256; +unsigned int defaultbg = 257; +unsigned int defaultcs = 256; static unsigned int defaultrcs = 257; /* diff --git a/patch/st-nordtheme-0.8.5.diff b/patch/st-nordtheme-0.8.5.diff new file mode 100644 index 0000000..0afd2de --- /dev/null +++ b/patch/st-nordtheme-0.8.5.diff @@ -0,0 +1,90 @@ +From 1904cbc9af2d518a77331deb082750366aaec90b Mon Sep 17 00:00:00 2001 +From: aleks +Date: Tue, 31 May 2022 13:09:47 +0200 +Subject: [PATCH] Use nord-theme + +*"Inspired by the beauty of the arctic, the colors reflect the cold, yet +harmonious world of ice and the colorfulness of the Aurora Borealis."* - +[Nord Theme](https://www.nordtheme.com/) + +The default behaviour of st is to reverse the fore- and background +colors of each selected cell. If you don't want the selection-colors to +be reveresed but instead have fixed fore- and background colors apply on +top of this patch the [selectioncolors](../selectioncolors/)-patch. Then +set the following settings in your config.h: + +unsigned int selectionbg = 0; +unsigned int selectionfg = 256; +--- + config.def.h | 42 ++++++++++++++++++++---------------------- + 1 file changed, 20 insertions(+), 22 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 91ab8ca..afd00fd 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -96,32 +96,30 @@ 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", ++ "#3b4252", /* black */ ++ "#bf616a", /* red */ ++ "#a3be8c", /* green */ ++ "#ebcb8b", /* yellow */ ++ "#81a1c1", /* blue */ ++ "#b48ead", /* magenta */ ++ "#88c0d0", /* cyan */ ++ "#e5e9f0", /* white */ + + /* 8 bright colors */ +- "gray50", +- "red", +- "green", +- "yellow", +- "#5c5cff", +- "magenta", +- "cyan", +- "white", ++ "#4c566a", /* black */ ++ "#bf616a", /* red */ ++ "#a3be8c", /* green */ ++ "#ebcb8b", /* yellow */ ++ "#81a1c1", /* blue */ ++ "#b48ead", /* magenta */ ++ "#8fbcbb", /* cyan */ ++ "#eceff4", /* white */ + + [255] = 0, + + /* more colors can be added after 255 to use with DefaultXX */ +- "#cccccc", +- "#555555", +- "gray90", /* default foreground colour */ +- "black", /* default background colour */ ++ "#d8dee9", /* default foreground colour */ ++ "#2e3440", /* default background colour */ + }; + + +@@ -129,8 +127,8 @@ static const char *colorname[] = { + * Default colors (colorname index) + * foreground, background, cursor, reverse cursor + */ +-unsigned int defaultfg = 258; +-unsigned int defaultbg = 259; ++unsigned int defaultfg = 256; ++unsigned int defaultbg = 257; + unsigned int defaultcs = 256; + static unsigned int defaultrcs = 257; + +-- +2.36.1 + diff --git a/st b/st index b11aba8..cdbed10 100755 Binary files a/st and b/st differ diff --git a/x.o b/x.o index 1b858bf..ede5a85 100644 Binary files a/x.o and b/x.o differ