diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6a7f15e --- /dev/null +++ b/.gitignore @@ -0,0 +1,21 @@ +/* +/*/ +!/.gitignore + +!/arg.h +!/config.def.h +!/config.mk +!/FAQ +!/LEGACY +!/LICENSE +!/Makefile +!/README +!/st +!/st.c +!/st.h +!/st.info +!/TODO +!/win.h +!/x.c +!/ +!/st-dracula-0.8.2.diff diff --git a/config.def.h b/config.def.h index 6f05dce..398d2c4 100644 --- a/config.def.h +++ b/config.def.h @@ -95,43 +95,48 @@ 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", + /* 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 */ - [255] = 0, + /* 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 */ - /* more colors can be added after 255 to use with DefaultXX */ - "#cccccc", - "#555555", + /* 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 ("█") diff --git a/st b/st new file mode 100755 index 0000000..a8597dd Binary files /dev/null and b/st differ 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 ("_")