cicada update

11 files changed, 52 insertions, 63 deletions

diff --git a/dmenu/themes/veloren.def.h b/dmenu/themes/veloren.def.h
deleted file mode 100644
index 30cb06f..0000000
--- a/dmenu/themes/veloren.def.h
+++ /dev/null
@@ -1,14 +0,0 @@
-static const char *colors[SchemeLast][2] = {
-	/*     fg         bg       */
-	[SchemeNorm] = { "#bbbbbb", "#222222" },
-	[SchemeSel] = { "#eeeeee", "#862" },
-	[SchemeOut] = { "#000000", "#862" },
-};
-//static const unsigned int alpha = 0xf0;
-static const unsigned int alpha = 0xf9;
-
-static const unsigned int alphas[SchemeLast][2] = {
-	[SchemeNorm] = { OPAQUE, alpha },
-	[SchemeSel] = { OPAQUE, alpha },
-	[SchemeOut] = { OPAQUE, alpha },
-};
diff --git a/dmenu/themes/veloren.h b/dmenu/themes/veloren.h
index 99f0b0f..30cb06f 100644
--- a/dmenu/themes/veloren.h
+++ b/dmenu/themes/veloren.h
@@ -1,11 +1,11 @@
 static const char *colors[SchemeLast][2] = {
 	/*     fg         bg       */
-	[SchemeNorm] = { "#bbbbbb", "#111100" },
-	[SchemeSel] = { "#eeeeee", "#960" },
-	[SchemeOut] = { "#000000", "#960" },
+	[SchemeNorm] = { "#bbbbbb", "#222222" },
+	[SchemeSel] = { "#eeeeee", "#862" },
+	[SchemeOut] = { "#000000", "#862" },
 };
-//static const unsigned int alpha = 0xf9;
-static const unsigned int alpha = 0xff;
+//static const unsigned int alpha = 0xf0;
+static const unsigned int alpha = 0xf9;
 
 static const unsigned int alphas[SchemeLast][2] = {
 	[SchemeNorm] = { OPAQUE, alpha },
diff --git a/dwm/dwm b/dwm/dwm
index 3b9fac7..2752e5d 100755
--- a/dwm/dwm
+++ b/dwm/dwm
diff --git a/dwm/dwm.o b/dwm/dwm.o
index b712e9d..e99df0b 100644
--- a/dwm/dwm.o
+++ b/dwm/dwm.o
diff --git a/dwm/themes/cicada.h b/dwm/themes/cicada.h
index b26930d..2b386c1 100644
--- a/dwm/themes/cicada.h
+++ b/dwm/themes/cicada.h
@@ -1,15 +1,15 @@
 static const char norm_fg[] = "#fff";
-static const char norm_bg[] = "#222";
+static const char norm_bg[] = "#000";
 //static const char norm_border[] = "#860";
 static const char norm_border[] = "#444";
 
 static const char sel_fg[] = "#fff";
-static const char sel_bg[] = "#000";
+static const char sel_bg[] = "#222";
 //static const char sel_border[] = "#862";
 static const char sel_border[] = "#fff";
 
 static const char urg_fg[] = "#dcbdbd";
-static const char urg_bg[] = "#B76779";
+static const char urg_bg[] = "#000";
 static const char urg_border[] = "#B76779";
 
 static const char *colors[][3]      = {
diff --git a/dwm/themes/veloren.def.h b/dwm/themes/veloren.def.h
deleted file mode 100644
index 153aaba..0000000
--- a/dwm/themes/veloren.def.h
+++ /dev/null
@@ -1,25 +0,0 @@
-static const char norm_fg[] = "#fff";
-static const char norm_bg[] = "#000000";
-static const char norm_border[] = "#862";
-
-static const char sel_fg[] = "#fff";
-static const char sel_bg[] = "#652";
-//static const char sel_border[] = "#862";
-static const char sel_border[] = "#fff";
-
-static const char urg_fg[] = "#dcbdbd";
-static const char urg_bg[] = "#B76779";
-static const char urg_border[] = "#B76779";
-
-static const char *colors[][3]      = {
-    /*               fg           bg         border                         */
-    [SchemeNorm] = { norm_fg,     norm_bg,   norm_border }, // unfocused wins
-    [SchemeSel]  = { sel_fg,      sel_bg,    sel_border },  // the focused win
-//    [SchemeUrg] =  { urg_fg,      urg_bg,    urg_border },
-};
-
-static const char col_gray1[]		= "#000000";
-static const char col_gray2[]		= "#9a8484";
-static const char col_gray3[]		= "#dcbdbd";
-static const char col_gray4[]		= "#dcbdbd";
-static const char col_cyan[]		= "#C16A7F";
diff --git a/dwm/themes/veloren.h b/dwm/themes/veloren.h
index b26930d..153aaba 100644
--- a/dwm/themes/veloren.h
+++ b/dwm/themes/veloren.h
@@ -1,10 +1,9 @@
 static const char norm_fg[] = "#fff";
-static const char norm_bg[] = "#222";
-//static const char norm_border[] = "#860";
-static const char norm_border[] = "#444";
+static const char norm_bg[] = "#000000";
+static const char norm_border[] = "#862";
 
 static const char sel_fg[] = "#fff";
-static const char sel_bg[] = "#000";
+static const char sel_bg[] = "#652";
 //static const char sel_border[] = "#862";
 static const char sel_border[] = "#fff";
 
@@ -19,14 +18,8 @@ static const char *colors[][3]      = {
 //    [SchemeUrg] =  { urg_fg,      urg_bg,    urg_border },
 };
 
-//static const char col_gray1[]		= "#000000";
-//static const char col_gray2[]		= "#9a8484";
-//static const char col_gray3[]		= "#dcbdbd";
-//static const char col_gray4[]		= "#dcbdbd";
-//static const char col_cyan[]		= "#C16A7F";
-//
-static const char col_gray1[]		= "#000";
-static const char col_gray2[]		= "#000";
-static const char col_gray3[]		= "#000";
-static const char col_gray4[]		= "#000";
-static const char col_cyan[]		= "#000";
+static const char col_gray1[]		= "#000000";
+static const char col_gray2[]		= "#9a8484";
+static const char col_gray3[]		= "#dcbdbd";
+static const char col_gray4[]		= "#dcbdbd";
+static const char col_cyan[]		= "#C16A7F";
diff --git a/st/config.h b/st/config.h
index ca15b57..c9e057d 100755
--- a/st/config.h
+++ b/st/config.h
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "themes/default.h"
+#include "themes/cicada.h"
 
 /*
  * appearance
diff --git a/st/st b/st/st
index e5c844e..fdb3b1d 100755
--- a/st/st
+++ b/st/st
diff --git a/st/themes/cicada.h b/st/themes/cicada.h
new file mode 100644
index 0000000..a69aa51
--- /dev/null
+++ b/st/themes/cicada.h
@@ -0,0 +1,35 @@
+static const char *colorname[] = {
+	/* 8 normal colors */
+	"black",
+	"red3",
+	"green3",
+	"yellow3",
+	"purple",
+	"magenta3",
+	"cyan3",
+	"gray80",
+
+	/* 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",
+	"gray90", /* default foreground colour */
+	"#0c0c0c", /* default background colour */
+};
+
+
+unsigned int defaultfg = 258;
+unsigned int defaultbg = 259;
+unsigned int defaultcs = 256;
+static unsigned int defaultrcs = 257;
diff --git a/st/x.o b/st/x.o
index 34ec519..23ab174 100644
--- a/st/x.o
+++ b/st/x.o