Fix colorscheme, but still not displaying graphs correctly

5 files changed, 111 insertions, 115 deletions

diff --git a/Xresources b/Xresources
index 147db04..efb623a 100644
--- a/Xresources
+++ b/Xresources
@@ -3,15 +3,15 @@ xterm*disallowedWindowOps: 20,21,SetXProp
 /* *.font:	Monospace:pixelsize=25:antialias=true:autohint=true; */
 /* *.fontalt0:Braille:pixelsize=24:antialias=true:autohint=true; */
 /* *.fontalt1:JoyPixels:pixelsize=24:antialias=true:autohint=true; */
+! *.termname: st-256color
 
 ! colors
 
 ! special
-*.foreground:   #F5F5F5
-/* background set the cursor apperently */
-*.background:   #D0D0D0   
-/* *.cursorColor:  #D0D0D0 */
-*.revCursorColor:  #151515
+
+*.background: #0A0A0A
+*.foreground: white
+*.cursorColor: white
 
 ! black
 *.color0:       #0A0A0A
diff --git a/config.def.h b/config.def.h
index 6ce5a91..de1f585 100644
--- a/config.def.h
+++ b/config.def.h
@@ -101,31 +101,28 @@ unsigned int tabspaces = 8;
 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
-	/* 8 normal colors */
-	"#0A0A0A",
+	"#151515", /* hard contrast: #1d2021 / soft contrast: #32302f */
 	"#AC4142",
 	"#A1B56C",
 	"#F4BF75",
 	"#A5D6FF",
 	"#AA759F",
-	"#75B5AA",
+	"#A1B56C",
+	"#F5F5F5",
 	"#D0D0D0",
-
-	/* 8 bright colors */
-	"gray50",
-	"red",
-	"green",
-	"yellow",
-	"#5c5cff",
-	"magenta",
-	"cyan",
-	"white",
-
+	"#AC4142",
+	"#A1B56C",
+	"#F4BF75",
+	"#A5D6FF",
+	"#AA759F",
+	"#A1B56C",
+	"#F5F5F5",
 	[255] = 0,
-
 	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
-	"#555555",
+	"#D0D0D0", /* 256 -> cursor */
+	"#353535", /* 257 -> rev cursor*/
+	"#151515", /* 258 -> bg */
+	"#F5F5F5", /* 259 -> fg */
 };
 
 
@@ -133,10 +130,11 @@ static const char *colorname[] = {
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */
-unsigned int defaultfg = 7;
-unsigned int defaultbg = 0;
-static unsigned int defaultcs = 256;
-static unsigned int defaultrcs = 257;
+unsigned int defaultfg = 259;
+unsigned int defaultbg = 258;
+unsigned int defaultcs = 256;
+unsigned int defaultrcs = 257;
+unsigned int background = 258;
 
 /*
  * Default shape of cursor
@@ -178,37 +176,37 @@ static uint forcemousemod = ShiftMask;
  * Xresources preferences to load at startup
  */
 ResourcePref resources[] = {
-		{ "font",            STRING,  &font },
-		{ "color0",          STRING,  &colorname[0] },
-		{ "color1",          STRING,  &colorname[1] },
-		{ "color2",          STRING,  &colorname[2] },
-		{ "color3",          STRING,  &colorname[3] },
-		{ "color4",          STRING,  &colorname[4] },
-		{ "color5",          STRING,  &colorname[5] },
-		{ "color6",          STRING,  &colorname[6] },
-		{ "color7",          STRING,  &colorname[7] },
-		{ "color8",          STRING,  &colorname[8] },
-		{ "color9",          STRING,  &colorname[9] },
-		{ "color10",         STRING,  &colorname[10] },
-		{ "color11",         STRING,  &colorname[11] },
-		{ "color12",         STRING,  &colorname[12] },
-		{ "color13",         STRING,  &colorname[13] },
-		{ "color14",         STRING,  &colorname[14] },
-		{ "color15",         STRING,  &colorname[15] },
-		{ "background",      STRING,  &colorname[256] },
-		{ "foreground",      STRING,  &colorname[257] },
-		{ "cursorColor",     STRING,  &colorname[258] },
-    { "revCursorColor",  STRING,  &colorname[259] },
-		{ "termname",        STRING,  &termname },
-		{ "shell",           STRING,  &shell },
-		{ "minlatency",      INTEGER, &minlatency },
-		{ "maxlatency",      INTEGER, &maxlatency },
-		{ "blinktimeout",    INTEGER, &blinktimeout },
-		{ "bellvolume",      INTEGER, &bellvolume },
-		{ "tabspaces",       INTEGER, &tabspaces },
-		{ "borderpx",        INTEGER, &borderpx },
-		{ "cwscale",         FLOAT,   &cwscale },
-		{ "chscale",         FLOAT,   &chscale },
+		{ "font",         STRING,  &font },
+		{ "fontalt0",     STRING,  &font2[0] },
+		{ "color0",       STRING,  &colorname[0] },
+		{ "color1",       STRING,  &colorname[1] },
+		{ "color2",       STRING,  &colorname[2] },
+		{ "color3",       STRING,  &colorname[3] },
+		{ "color4",       STRING,  &colorname[4] },
+		{ "color5",       STRING,  &colorname[5] },
+		{ "color6",       STRING,  &colorname[6] },
+		{ "color7",       STRING,  &colorname[7] },
+		{ "color8",       STRING,  &colorname[8] },
+		{ "color9",       STRING,  &colorname[9] },
+		{ "color10",      STRING,  &colorname[10] },
+		{ "color11",      STRING,  &colorname[11] },
+		{ "color12",      STRING,  &colorname[12] },
+		{ "color13",      STRING,  &colorname[13] },
+		{ "color14",      STRING,  &colorname[14] },
+		{ "color15",      STRING,  &colorname[15] },
+		{ "background",   STRING,  &colorname[258] },
+		{ "foreground",   STRING,  &colorname[259] },
+		{ "cursorColor",  STRING,  &colorname[256] },
+		{ "termname",     STRING,  &termname },
+		{ "shell",        STRING,  &shell },
+		{ "minlatency",   INTEGER, &minlatency },
+		{ "maxlatency",   INTEGER, &maxlatency },
+		{ "blinktimeout", INTEGER, &blinktimeout },
+		{ "bellvolume",   INTEGER, &bellvolume },
+		{ "tabspaces",    INTEGER, &tabspaces },
+		{ "borderpx",     INTEGER, &borderpx },
+		{ "cwscale",      FLOAT,   &cwscale },
+		{ "chscale",      FLOAT,   &chscale },
 };
 
 /*
diff --git a/config.h b/config.h
index 8ae6f65..de1f585 100644
--- a/config.h
+++ b/config.h
@@ -101,31 +101,28 @@ unsigned int tabspaces = 8;
 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
-	/* 8 normal colors */
-	"#0A0A0A",
-	"red3",
-	"green3",
-	"yellow3",
-	"blue2",
-	"magenta3",
-	"cyan3",
-	"gray90",
-
-	/* 8 bright colors */
-	"gray50",
-	"red",
-	"green",
-	"yellow",
-	"#5c5cff",
-	"magenta",
-	"cyan",
-	"white",
-
+	"#151515", /* hard contrast: #1d2021 / soft contrast: #32302f */
+	"#AC4142",
+	"#A1B56C",
+	"#F4BF75",
+	"#A5D6FF",
+	"#AA759F",
+	"#A1B56C",
+	"#F5F5F5",
+	"#D0D0D0",
+	"#AC4142",
+	"#A1B56C",
+	"#F4BF75",
+	"#A5D6FF",
+	"#AA759F",
+	"#A1B56C",
+	"#F5F5F5",
 	[255] = 0,
-
 	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
-	"#555555",
+	"#D0D0D0", /* 256 -> cursor */
+	"#353535", /* 257 -> rev cursor*/
+	"#151515", /* 258 -> bg */
+	"#F5F5F5", /* 259 -> fg */
 };
 
 
@@ -133,10 +130,11 @@ static const char *colorname[] = {
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */
-unsigned int defaultfg = 7;
-unsigned int defaultbg = 0;
-static unsigned int defaultcs = 256;
-static unsigned int defaultrcs = 257;
+unsigned int defaultfg = 259;
+unsigned int defaultbg = 258;
+unsigned int defaultcs = 256;
+unsigned int defaultrcs = 257;
+unsigned int background = 258;
 
 /*
  * Default shape of cursor
@@ -178,37 +176,37 @@ static uint forcemousemod = ShiftMask;
  * Xresources preferences to load at startup
  */
 ResourcePref resources[] = {
-		{ "font",            STRING,  &font },
-		{ "color0",          STRING,  &colorname[0] },
-		{ "color1",          STRING,  &colorname[1] },
-		{ "color2",          STRING,  &colorname[2] },
-		{ "color3",          STRING,  &colorname[3] },
-		{ "color4",          STRING,  &colorname[4] },
-		{ "color5",          STRING,  &colorname[5] },
-		{ "color6",          STRING,  &colorname[6] },
-		{ "color7",          STRING,  &colorname[7] },
-		{ "color8",          STRING,  &colorname[8] },
-		{ "color9",          STRING,  &colorname[9] },
-		{ "color10",         STRING,  &colorname[10] },
-		{ "color11",         STRING,  &colorname[11] },
-		{ "color12",         STRING,  &colorname[12] },
-		{ "color13",         STRING,  &colorname[13] },
-		{ "color14",         STRING,  &colorname[14] },
-		{ "color15",         STRING,  &colorname[15] },
-		{ "background",      STRING,  &colorname[256] },
-		{ "foreground",      STRING,  &colorname[257] },
-		{ "cursorColor",     STRING,  &colorname[258] },
-    { "revCursorColor",  STRING,  &colorname[259] },
-		{ "termname",        STRING,  &termname },
-		{ "shell",           STRING,  &shell },
-		{ "minlatency",      INTEGER, &minlatency },
-		{ "maxlatency",      INTEGER, &maxlatency },
-		{ "blinktimeout",    INTEGER, &blinktimeout },
-		{ "bellvolume",      INTEGER, &bellvolume },
-		{ "tabspaces",       INTEGER, &tabspaces },
-		{ "borderpx",        INTEGER, &borderpx },
-		{ "cwscale",         FLOAT,   &cwscale },
-		{ "chscale",         FLOAT,   &chscale },
+		{ "font",         STRING,  &font },
+		{ "fontalt0",     STRING,  &font2[0] },
+		{ "color0",       STRING,  &colorname[0] },
+		{ "color1",       STRING,  &colorname[1] },
+		{ "color2",       STRING,  &colorname[2] },
+		{ "color3",       STRING,  &colorname[3] },
+		{ "color4",       STRING,  &colorname[4] },
+		{ "color5",       STRING,  &colorname[5] },
+		{ "color6",       STRING,  &colorname[6] },
+		{ "color7",       STRING,  &colorname[7] },
+		{ "color8",       STRING,  &colorname[8] },
+		{ "color9",       STRING,  &colorname[9] },
+		{ "color10",      STRING,  &colorname[10] },
+		{ "color11",      STRING,  &colorname[11] },
+		{ "color12",      STRING,  &colorname[12] },
+		{ "color13",      STRING,  &colorname[13] },
+		{ "color14",      STRING,  &colorname[14] },
+		{ "color15",      STRING,  &colorname[15] },
+		{ "background",   STRING,  &colorname[258] },
+		{ "foreground",   STRING,  &colorname[259] },
+		{ "cursorColor",  STRING,  &colorname[256] },
+		{ "termname",     STRING,  &termname },
+		{ "shell",        STRING,  &shell },
+		{ "minlatency",   INTEGER, &minlatency },
+		{ "maxlatency",   INTEGER, &maxlatency },
+		{ "blinktimeout", INTEGER, &blinktimeout },
+		{ "bellvolume",   INTEGER, &bellvolume },
+		{ "tabspaces",    INTEGER, &tabspaces },
+		{ "borderpx",     INTEGER, &borderpx },
+		{ "cwscale",      FLOAT,   &cwscale },
+		{ "chscale",      FLOAT,   &chscale },
 };
 
 /*
diff --git a/st b/st
index fda69b1..95558ca 100755
--- a/st
+++ b/st
diff --git a/x.o b/x.o
index 04484ac..85114b4 100644
--- a/x.o
+++ b/x.o