On Sun, Mar 03, 2019 at 09:33:58PM +0100, Charlene Wendling wrote:
> Because of the new colorscheme algo (decoupled colors), it seems that
> it needs more contrast for "active" elements, and there is too much
> gray in our colorscheme.
Yes, currently the colors are the same so there's no contrast at all.
> I'm proposing here a diff that changes to a more appropriate color
> for active elements and blends decently with the grayish theme as
> a PoC... or we may just switch to default values.
That works, but I also prefer dropping our local patches and stick with
upstream defaults; same thing with x11/dmenu.
If users want to change a bit, they have to recompile themselves anyway,
so that won't bite those who care (and customize by now already).
Feedback? Objections? OK?
Index: x11/dmenu/Makefile
===================================================================
RCS file: /cvs/ports/x11/dmenu/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- x11/dmenu/Makefile 4 Feb 2019 21:36:55 -0000 1.24
+++ x11/dmenu/Makefile 4 Mar 2019 19:31:22 -0000
@@ -4,6 +4,7 @@ COMMENT= dynamic menu for X11
V= 4.9
DISTNAME= dmenu-${V}
+REVISION= 0
CATEGORIES= x11
Index: x11/dmenu/patches/patch-config_def_h
===================================================================
RCS file: x11/dmenu/patches/patch-config_def_h
diff -N x11/dmenu/patches/patch-config_def_h
--- x11/dmenu/patches/patch-config_def_h 10 May 2017 22:06:33 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-config_def_h,v 1.2 2017/05/10 22:06:33 jung Exp $
---- config.def.h.orig Mon May 8 19:27:54 2017
-+++ config.def.h Mon May 8 19:27:30 2017
-@@ -4,13 +4,13 @@
- static int topbar = 1; /* -b option; if 0, dmenu
appears at bottom */
- /* -fn option overrides fonts[0]; default X11 font or font set */
- static const char *fonts[] = {
-- "monospace:size=10"
-+ "terminus:size=8"
- };
- static const char *prompt = NULL; /* -p option; prompt to the left
of input field */
- static const char *colors[SchemeLast][2] = {
- /* fg bg */
-- [SchemeNorm] = { "#bbbbbb", "#222222" },
-- [SchemeSel] = { "#eeeeee", "#005577" },
-+ [SchemeNorm] = { "#c0c0c0", "#202020" },
-+ [SchemeSel] = { "#f0f0f0", "#404040" },
- [SchemeOut] = { "#000000", "#00ffff" },
- };
- /* -l option; if nonzero, dmenu uses vertical list with given number of lines
*/
Index: x11/dwm/Makefile
===================================================================
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- x11/dwm/Makefile 12 Feb 2019 17:05:03 -0000 1.32
+++ x11/dwm/Makefile 4 Mar 2019 19:32:03 -0000
@@ -4,6 +4,7 @@ COMMENT= dynamic window manager
V= 6.2
DISTNAME= dwm-${V}
+REVISION= 0
CATEGORIES= x11
Index: x11/dwm/patches/patch-config_def_h
===================================================================
RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
retrieving revision 1.14
diff -u -p -r1.14 patch-config_def_h
--- x11/dwm/patches/patch-config_def_h 12 Feb 2019 17:05:03 -0000 1.14
+++ x11/dwm/patches/patch-config_def_h 4 Mar 2019 19:37:14 -0000
@@ -2,27 +2,6 @@ $OpenBSD: patch-config_def_h,v 1.14 2019
Index: config.def.h
--- config.def.h.orig
+++ config.def.h
-@@ -5,13 +5,13 @@ static const unsigned int borderpx = 1; /* bor
- static const unsigned int snap = 32; /* snap pixel */
- static const int showbar = 1; /* 0 means no bar */
- static const int topbar = 1; /* 0 means bottom bar */
--static const char *fonts[] = { "monospace:size=10" };
--static const char dmenufont[] = "monospace:size=10";
--static const char col_gray1[] = "#222222";
--static const char col_gray2[] = "#444444";
--static const char col_gray3[] = "#bbbbbb";
--static const char col_gray4[] = "#eeeeee";
--static const char col_cyan[] = "#005577";
-+static const char *fonts[] = { "terminus:size=8" };
-+static const char dmenufont[] = "terminus:size=8";
-+static const char col_gray1[] = "#202020";
-+static const char col_gray2[] = "#404040";
-+static const char col_gray3[] = "#c0c0c0";
-+static const char col_gray4[] = "#f0f0f0";
-+static const char col_cyan[] = "#404040";
- static const char *colors[][3] = {
- /* fg bg border */
- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
@@ -29,6 +29,9 @@ static const Rule rules[] = {
/* class instance title tags mask isfloating
monitor */
{ "Gimp", NULL, NULL, 0, 1, -1 },
