filled out palette based on colors from scheakur vim color scheme. Implemented first...

diff --git a/colors.html b/colors.html
new file mode 100644 (file)
index 0000000..6326288
--- /dev/null
+++ b/colors.html
@@ -0,0 +1,39 @@
+<input type="color" value="#00695c"/>
+<input type="color" value="#008080"/>
+<input type="color" value="#04530d"/>
+<input type="color" value="#0c6cc0"/>
+<input type="color" value="#0e8ed3"/>
+<input type="color" value="#1041a8"/>
+<input type="color" value="#1177dd"/>
+<input type="color" value="#1e7b3d"/>
+<input type="color" value="#2e2e2e"/>
+<input type="color" value="#337ca3"/>
+<input type="color" value="#4a4642"/>
+<input type="color" value="#4a9f68"/>
+<input type="color" value="#4d4214"/>
+<input type="color" value="#546e7a"/>
+<input type="color" value="#567686"/>
+<input type="color" value="#666666"/>
+<input type="color" value="#6b118a"/>
+<input type="color" value="#7878ba"/>
+<input type="color" value="#7a7672"/>
+<input type="color" value="#878965"/>
+<input type="color" value="#a25a09"/>
+<input type="color" value="#aabbcc"/>
+<input type="color" value="#cb1265"/>
+<input type="color" value="#cce0ef"/>
+<input type="color" value="#d0ead0"/>
+<input type="color" value="#d1160b"/>
+<input type="color" value="#dbf2ff"/>
+<input type="color" value="#dcdcdc"/>
+<input type="color" value="#dfd6d1"/>
+<input type="color" value="#e2e2d0"/>
+<input type="color" value="#e9e7ac"/>
+<input type="color" value="#ea6042"/>
+<input type="color" value="#f0f0e5"/>
+<input type="color" value="#f39812"/>
+<input type="color" value="#f4b3c2"/>
+<input type="color" value="#f6e4e7"/>
+<input type="color" value="#fdfec9"/>
+<input type="color" value="#fed910"/>
+<input type="color" value="#ffe3e5"/>

diff --git a/config.mk b/config.mk
index 16a1cff462c99d4d814851cf57d29fb94d77b9bb..b46121fe658e9e2840a5900796dcf932f855741e 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -16,7 +16,7 @@ INCS += -I/usr/include/freetype2
 # Compiler Setup
 CC = cc
 CFLAGS = -g --std=c99 -MMD $(INCS)
-CFLAGS += -Wall -Werror
+#CFLAGS += -Wall -Werror
 
 # Linker Setup
 LD = $(CC)

diff --git a/lib/config.c b/lib/config.c
index eb5678c2165db178610b5e915955448f37743fbf..38a150264febd4e985657448b5f1b534c6b8c819 100644 (file)
--- a/lib/config.c
+++ b/lib/config.c
@@ -32,13 +32,13 @@ int /* Integer config options */
     DosLineFeed = OFF;
 
 int Palette[ClrCount] = {
-    [Red]      = 0x772222, // Red
-    [Green]    = 0x227722, // Green
-    [Blue]     = 0x222277, // Blue
-    [Yellow]   = 0x000000, // Yellow ???
-    [Purple]   = 0x000000, // Purple ???
-    [Aqua]     = 0x000000, // Aqua   ???
-    [Orange]   = 0x000000, // Orange ???
+    [Red]      = 0xd1160b, // Red
+    [Green]    = 0x1e7b3d, // Green
+    [Blue]     = 0x0c6cc0, // Blue
+    [Yellow]   = 0xfed910, // Yellow ???
+    [Purple]   = 0x7878ba, // Purple ???
+    [Aqua]     = 0x00695c, // Aqua   ???
+    [Orange]   = 0xf39812, // Orange ???
     [EditBg]   = 0xF0F0E5, // Edit region background
     [EditSel]  = 0xDFDF99, // Edit region selection
     [EditFg]   = 0x000000, // Edit region text

diff --git a/lib/x11.c b/lib/x11.c
index 64d3001e3d89b741caaa18938ac3466e1ff408e8..e2613b52a36ce6a216a9b36e928b0ebf466284a5 100644 (file)
--- a/lib/x11.c
+++ b/lib/x11.c
@@ -274,6 +274,13 @@ static void draw_rect(int color, int x, int y, int width, int height) {
     XftColorFree(X.display, X.visual, X.colormap, &clr);
 }
 
+static void draw_statbox(drawcsr* csr) {
+    View* view = win_view(EDIT);
+    int statclr = Orange; //(view->buffer.modified ? Purple : TagsBg);
+    draw_rect(VerBdr, ScrollWidth, 0, 1, X.height/4);
+    draw_rect(statclr, 0, 0, ScrollWidth, X.height/4);
+}
+
 static void draw_view(int i, size_t nrows, drawcsr* csr, int bg, int fg, int sel) {
     size_t fheight = X.font->height;
     size_t csrx = SIZE_MAX, csry = SIZE_MAX;
@@ -313,10 +320,9 @@ static void draw_view(int i, size_t nrows, drawcsr* csr, int bg, int fg, int sel
 }
 
 static void draw_hrule(drawcsr* csr) {
-    draw_rect(HorBdr, csr->x, csr->y + 1, csr->w, 1);
+    draw_rect(HorBdr, 0, csr->y + 1, X.width, 1);
     Divider = csr->y;
     csr->y += 2;
-    csr->x += ScrollWidth + 1;
 }
 
 static void draw_scroll(drawcsr* csr) {
@@ -490,6 +496,8 @@ static void xupdate(Job* job) {
     size_t editrows = maxrows - tagrows;
     /* draw the regions to the window */
     drawcsr csr = { .w = X.width, .h = X.height };
+    csr.x += ScrollWidth + 1;
+    draw_statbox(&csr);
     draw_view(TAGS, tagrows, &csr, TagsBg, TagsFg, TagsSel);
     draw_hrule(&csr);
     draw_view(EDIT, editrows, &csr, EditBg, EditFg, EditSel);