From c6991fb991e33c33d3801e5d5023901f2840a8ad Mon Sep 17 00:00:00 2001
From: =?utf8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
Date: Mon, 19 May 2014 22:27:23 +0200
Subject: [PATCH] Allow setting "FrameFocusedBorderColor" from WPrefs
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Adds separate entry in menu and draws border around focused window.

Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
---
 WPrefs.app/Appearance.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index 092ad08a..f67975d9 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -331,6 +331,7 @@ enum {
 	MDISAB_COL,
 	MHIGH_COL,
 	MHIGHT_COL,
+	FFBORDER_COL,
 	FBORDER_COL,
 	FSBORDER_COL,
 	ICONT_COL,
@@ -351,6 +352,7 @@ static const struct {
 	{ "MenuDisabledColor", "#616161" },
 	{ "HighlightColor", "white" },
 	{ "HighlightTextColor", "black" },
+	{ "FrameFocusedBorderColor", "black" },
 	{ "FrameBorderColor", "black" },
 	{ "FrameSelectedBorderColor", "white" }/* , */
 	/* { "IconTitleColor", "white" }, */
@@ -390,6 +392,7 @@ static WMRect previewColorPositions[] = {
 	{{30, 200}, {90, 20}},
 	{{0, 0}, {0, 0}},
 	{{0, 0}, {0, 0}},
+	{{0, 0}, {0, 0}},
 	{{155, 130}, {64, 64}},
 	{{155, 130}, {64, 64}},
 	{{155, 130}, {64, 64}},
@@ -790,7 +793,7 @@ static void updatePreviewBox(_Panel * panel, int elements)
 
 	if (elements & (1 << PFOCUSED)) {
 		renderPreview(panel, gc, PFOCUSED, RBEV_RAISED2);
-		colorUpdate |= 1 << FTITLE_COL | 1 << FBORDER_COL;
+		colorUpdate |= 1 << FTITLE_COL | 1 << FFBORDER_COL;
 	}
 	if (elements & (1 << PUNFOCUSED)) {
 		renderPreview(panel, gc, PUNFOCUSED, RBEV_RAISED2);
@@ -1372,6 +1375,7 @@ static void changeColorPage(WMWidget * w, void *data)
 		{5, 180},
 		{-22, -21},
 		{-22, -21},
+		{-22, -21},
 		{130, 140},
 		{130, 140},
 		{130, 140},
@@ -1494,12 +1498,6 @@ static void updateColorPreviewBox(_Panel * panel, int elements)
 	if (elements & (1 << FBORDER_COL)) {
 		XDrawRectangle(dpy, pnot,
 			       WMColorGC(panel->colors[FBORDER_COL]),
-			       29, 9, 190, 20);
-		XDrawRectangle(dpy, d,
-			       WMColorGC(panel->colors[FBORDER_COL]),
-			       29, 9, 190, 20);
-		XDrawRectangle(dpy, pnot,
-			       WMColorGC(panel->colors[FBORDER_COL]),
 			       29, 39, 190, 20);
 		XDrawRectangle(dpy, d,
 			       WMColorGC(panel->colors[FBORDER_COL]),
@@ -1548,6 +1546,15 @@ static void updateColorPreviewBox(_Panel * panel, int elements)
 			  119, 120, 119, 220);
 	}
 
+	if (elements & (1 << FFBORDER_COL)) {
+		XDrawRectangle(dpy, pnot,
+			       WMColorGC(panel->colors[FFBORDER_COL]),
+			       29, 9, 190, 20);
+		XDrawRectangle(dpy, d,
+			       WMColorGC(panel->colors[FFBORDER_COL]),
+			       29, 9, 190, 20);
+	}
+
 	/*
 	   if (elements & (1 << ICONT_COL)) {
 	   WRITE(_("Focused Window"), panel->colors[ICONT_COL],
@@ -1839,6 +1846,7 @@ static void createPanel(Panel * p)
 	WMAddPopUpButtonItem(panel->colP, _("Disabled Menu Item Text"));
 	WMAddPopUpButtonItem(panel->colP, _("Menu Highlight Color"));
 	WMAddPopUpButtonItem(panel->colP, _("Highlighted Menu Text Color"));
+	WMAddPopUpButtonItem(panel->colP, _("Focused Window Border Color"));
 	WMAddPopUpButtonItem(panel->colP, _("Window Border Color"));
 	WMAddPopUpButtonItem(panel->colP, _("Selected Window Border Color"));
 	/*
-- 
2.11.4.GIT