From 1865801415a7e9cca4ce4e759731595f8415538f Mon Sep 17 00:00:00 2001 From: wbmins Date: Tue, 15 Dec 2020 21:29:32 +0800 Subject: [PATCH] add st patch --- config.h | 43 +++++++++---------- patch/st-dracula-0.8.2.diff | 84 +++++++++++++++++++++++++++++++++++++ st-dracula-0.8.2.diff | 84 +++++++++++++++++++++++++++++++++++++ 3 files changed, 190 insertions(+), 21 deletions(-) create mode 100644 patch/st-dracula-0.8.2.diff create mode 100644 st-dracula-0.8.2.diff diff --git a/config.h b/config.h index ef2e323..d2865aa 100644 --- a/config.h +++ b/config.h @@ -5,8 +5,8 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char *font = "mono:pixelsize=14:antialias=true:autohint=true"; -static char *font2[] = { "JoyPixels:pixelsize=10:antialias=true:autohint=true" }; +static char *font = "Fira Code:style=Bold:pixelsize=30:antialias=true:autohint=true"; +static char *font2[] = { "思源黑体 CN HEAVY:STYLE=Heavy:pixelsize=28:antialias=true:autohint=true" }; static int borderpx = 2; /* @@ -111,29 +111,30 @@ unsigned int tabspaces = 8; float alpha = 0.8; /* Terminal colors (16 first used in escape sequence) */ -static const char *colorname[] = { - "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */ - "#cc241d", - "#98971a", - "#d79921", - "#458588", - "#b16286", - "#689d6a", - "#a89984", - "#928374", - "#fb4934", - "#b8bb26", - "#fabd2f", - "#83a598", - "#d3869b", - "#8ec07c", - "#ebdbb2", +static const char *colorname[] ={ + "#000000", /* black */ + "#ff5555", /* red */ + "#50fa7b", /* green */ + "#f1fa8c", /* yellow */ + "#bd93f9", /* blue */ + "#ff79c6", /* magenta */ + "#8be9fd", /* cyan */ + "#bbbbbb", /* white */ + /* 8 bright colors */ + "#44475a", /* black */ + "#ff5555", /* red */ + "#50fa7b", /* green */ + "#f1fa8c", /* yellow */ + "#bd93f9", /* blue */ + "#ff79c6", /* magenta */ + "#8be9fd", /* cyan */ + "#ffffff", /* white */ [255] = 0, /* more colors can be added after 255 to use with DefaultXX */ "#add8e6", /* 256 -> cursor */ "#555555", /* 257 -> rev cursor*/ - "#282828", /* 258 -> bg */ - "#ebdbb2", /* 259 -> fg */ + "#282a36", /* 258 -> bg */ + "#f8f8f2", /* 259 -> fg */ }; diff --git a/patch/st-dracula-0.8.2.diff b/patch/st-dracula-0.8.2.diff new file mode 100644 index 0000000..1f561a8 --- /dev/null +++ b/patch/st-dracula-0.8.2.diff @@ -0,0 +1,84 @@ +diff --git a/config.def.h b/config.def.h +index 877afab..6a1699f 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -84,44 +84,49 @@ static 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", +- +- /* 8 bright colors */ +- "gray50", +- "red", +- "green", +- "yellow", +- "#5c5cff", +- "magenta", +- "cyan", +- "white", +- +- [255] = 0, +- +- /* more colors can be added after 255 to use with DefaultXX */ +- "#cccccc", +- "#555555", +-}; + ++ /* 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 */ ++ ++ /* 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 */ ++ ++ /* special colors */ ++ [256] = "#282a36", /* background */ ++ [257] = "#f8f8f2", /* foreground */ ++}; + + /* + * Default colors (colorname index) +- * foreground, background, cursor, reverse cursor ++ * foreground, background, cursor + */ +-unsigned int defaultfg = 7; +-unsigned int defaultbg = 0; +-static unsigned int defaultcs = 256; ++unsigned int defaultfg = 257; ++unsigned int defaultbg = 256; ++static unsigned int defaultcs = 257; + static unsigned int defaultrcs = 257; + + /* ++ * Colors used, when the specific fg == defaultfg. So in reverse mode this ++ * will reverse too. Another logic would only make the simple feature too ++ * complex. ++ */ ++unsigned int defaultitalic = 7; ++unsigned int defaultunderline = 7; ++/* + * Default shape of cursor + * 2: Block ("█") + * 4: Underline ("_") diff --git a/st-dracula-0.8.2.diff b/st-dracula-0.8.2.diff new file mode 100644 index 0000000..1f561a8 --- /dev/null +++ b/st-dracula-0.8.2.diff @@ -0,0 +1,84 @@ +diff --git a/config.def.h b/config.def.h +index 877afab..6a1699f 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -84,44 +84,49 @@ static 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", +- +- /* 8 bright colors */ +- "gray50", +- "red", +- "green", +- "yellow", +- "#5c5cff", +- "magenta", +- "cyan", +- "white", +- +- [255] = 0, +- +- /* more colors can be added after 255 to use with DefaultXX */ +- "#cccccc", +- "#555555", +-}; + ++ /* 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 */ ++ ++ /* 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 */ ++ ++ /* special colors */ ++ [256] = "#282a36", /* background */ ++ [257] = "#f8f8f2", /* foreground */ ++}; + + /* + * Default colors (colorname index) +- * foreground, background, cursor, reverse cursor ++ * foreground, background, cursor + */ +-unsigned int defaultfg = 7; +-unsigned int defaultbg = 0; +-static unsigned int defaultcs = 256; ++unsigned int defaultfg = 257; ++unsigned int defaultbg = 256; ++static unsigned int defaultcs = 257; + static unsigned int defaultrcs = 257; + + /* ++ * Colors used, when the specific fg == defaultfg. So in reverse mode this ++ * will reverse too. Another logic would only make the simple feature too ++ * complex. ++ */ ++unsigned int defaultitalic = 7; ++unsigned int defaultunderline = 7; ++/* + * Default shape of cursor + * 2: Block ("█") + * 4: Underline ("_")