Remade st build with new patches

1 files changed, 26 insertions, 45 deletions

diff --git a/config.h b/config.h
index e48afd2..e5648db 100644
--- a/config.h
+++ b/config.h
@@ -5,7 +5,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "mono:pixelsize=16:antialias=true:autohint=true";
+static char *font = "mono:pixelsize=17:antialias=true:autohint=true";
 static int borderpx = 2;
 
 /*
@@ -93,55 +93,38 @@ char *termname = "xterm-256color";
  */
 unsigned int tabspaces = 8;
 
-/* bg opacity */
-float alpha = 0.95;
-
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
-    /* 8 normal colors */
-    "#3b4252", /* black   */
-    "#bf616a", /* red     */
-    "#a3be8c", /* green   */
-    "#ebcb8b", /* yellow  */
-    "#81a1c1", /* blue    */
-    "#b48ead", /* magenta */
-    "#88c0d0", /* cyan    */
-    "#e5e9f0", /* white   */
-
-    /* 8 bright colors */
-    "#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 */
-    "#2e3440", /* background */
-    "#d8dee9", /* foreground */
-};
 
+  /* 8 normal colors */
+  [0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
+  [1] = "#cc241d", /* red     */
+  [2] = "#98971a", /* green   */
+  [3] = "#d79921", /* yellow  */
+  [4] = "#458588", /* blue    */
+  [5] = "#b16286", /* magenta */
+  [6] = "#689d6a", /* cyan    */
+  [7] = "#a89984", /* white   */
+
+  /* 8 bright colors */
+  [8]  = "#928374", /* black   */
+  [9]  = "#fb4934", /* red     */
+  [10] = "#b8bb26", /* green   */
+  [11] = "#fabd2f", /* yellow  */
+  [12] = "#83a598", /* blue    */
+  [13] = "#d3869b", /* magenta */
+  [14] = "#8ec07c", /* cyan    */
+  [15] = "#ebdbb2", /* white   */
+};
 
 /*
  * Default colors (colorname index)
- * foreground, background, cursor, reverse cursor
- */
-unsigned int defaultfg = 257;
-unsigned int defaultbg = 256;
-static unsigned int defaultcs = 257;
-static unsigned int defaultrcs = 256;
-
-/*
- * 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.
+ * foreground, background, cursor
  */
-unsigned int defaultitalic = 7;
-unsigned int defaultunderline = 7;
+unsigned int defaultfg = 15;
+unsigned int defaultbg = 0;
+static unsigned int defaultcs = 15;
+static unsigned int defaultrcs = 257;
 
 /*
  * Default shape of cursor
@@ -185,8 +168,6 @@ static uint forcemousemod = ShiftMask;
  */
 static MouseShortcut mshortcuts[] = {
 	/* mask                 button   function        argument       release */
-	{ ShiftMask,            Button4, kscrollup,      {.i = 1} },
-	{ ShiftMask,            Button5, kscrolldown,    {.i = 1} },
 	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
 	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
 	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },