Attachment #5171 for bug #15667

View | Details | Raw Unified | Return to bug 15667
Collapse All | Expand All

Lines 338-343 static char *colorOptions[] = { Link Here

(-)a/WPrefs.app/Appearance.c (-2 / +12 lines)
338	"IconTitleBack", "black",	338	"IconTitleBack", "black",
339	"ClipTitleColor", "black",	339	"ClipTitleColor", "black",
340	"CClipTitleColor", "#454045"	340	"CClipTitleColor", "#454045"
		341	"FrameBorderColor", "cyan",
341	};	342	};
342		343
343	static WMRect previewPositions[] = {	344	static WMRect previewPositions[] = {
Lines 347-352 static WMRect previewPositions[] = { Link Here
347	{{30, 40}, {190, 20}},	348	{{30, 40}, {190, 20}},
348	#define POWNER 2	349	#define POWNER 2
349	{{30, 70}, {190, 20}},	350	{{30, 70}, {190, 20}},
		351	/*
		352	#define PBORDER 3
		353	{{30, 100}, {190, 9}},
		354	(and shift the below items)
		355	*/
350	#define PRESIZEBAR 3	356	#define PRESIZEBAR 3
351	{{30, 100}, {190, 9}},	357	{{30, 100}, {190, 9}},
352	#define PMTITLE 4	358	#define PMTITLE 4
Lines 371-377 static WMRect previewColorPositions[] = { Link Here
371	{{155, 130}, {64, 64}},	377	{{155, 130}, {64, 64}},
372	{{155, 130}, {64, 64}},	378	{{155, 130}, {64, 64}},
373	{{155, 130}, {64, 64}},	379	{{155, 130}, {64, 64}},
374	{{155, 130}, {64, 64}}	380	{{155, 130}, {64, 64}},
		381	{{30, 90}, {190, 9}}
375	};	382	};
376		383
377	static void str2rcolor(RContext * rc, char name, RColor color)	384	static void str2rcolor(RContext * rc, char name, RColor color)
Lines 1343-1349 static void changeColorPage(WMWidget * w, void *data) Link Here
1343	{130, 140},	1350	{130, 140},
1344	{130, 140},	1351	{130, 140},
1345	{130, 140},	1352	{130, 140},
1346	{130, 140}	1353	{130, 140},
		1354	{5, 95}
1347	};	1355	};
1348		1356
1349	if (panel->preview) {	1357	if (panel->preview) {
Lines 1715-1725 static void createPanel(Panel * p) Link Here
1715	WMAddPopUpButtonItem(panel->colP, _("Focused Window Title"));	1723	WMAddPopUpButtonItem(panel->colP, _("Focused Window Title"));
1716	WMAddPopUpButtonItem(panel->colP, _("Unfocused Window Title"));	1724	WMAddPopUpButtonItem(panel->colP, _("Unfocused Window Title"));
1717	WMAddPopUpButtonItem(panel->colP, _("Owner of Focused Window Title"));	1725	WMAddPopUpButtonItem(panel->colP, _("Owner of Focused Window Title"));
		1726	/* WMAddPopUpButtonItem(panel->colP, _("Frame Border Color")); --> breaks menu order */
1718	WMAddPopUpButtonItem(panel->colP, _("Menu Title"));	1727	WMAddPopUpButtonItem(panel->colP, _("Menu Title"));
1719	WMAddPopUpButtonItem(panel->colP, _("Menu Item Text"));	1728	WMAddPopUpButtonItem(panel->colP, _("Menu Item Text"));
1720	WMAddPopUpButtonItem(panel->colP, _("Disabled Menu Item Text"));	1729	WMAddPopUpButtonItem(panel->colP, _("Disabled Menu Item Text"));
1721	WMAddPopUpButtonItem(panel->colP, _("Menu Highlight Color"));	1730	WMAddPopUpButtonItem(panel->colP, _("Menu Highlight Color"));
1722	WMAddPopUpButtonItem(panel->colP, _("Highlighted Menu Text Color"));	1731	WMAddPopUpButtonItem(panel->colP, _("Highlighted Menu Text Color"));
		1732	WMAddPopUpButtonItem(panel->colP, _("Frame Border Color"));
1723	/*	1733	/*
1724	WMAddPopUpButtonItem(panel->colP, _("Miniwindow Title"));	1734	WMAddPopUpButtonItem(panel->colP, _("Miniwindow Title"));
1725	WMAddPopUpButtonItem(panel->colP, _("Miniwindow Title Back"));	1735	WMAddPopUpButtonItem(panel->colP, _("Miniwindow Title Back"));

Lines 127-132 static int setWTitleColor(); Link Here

(-)a/src/defaults.c (+22 lines)
127	static int setFTitleBack();	127	static int setFTitleBack();
128	static int setPTitleBack();	128	static int setPTitleBack();
129	static int setUTitleBack();	129	static int setUTitleBack();
		130	static int setFrameBorder();
130	static int setResizebarBack();	131	static int setResizebarBack();
131	static int setWorkspaceBack();	132	static int setWorkspaceBack();
132	static int setWorkspaceSpecificBack();	133	static int setWorkspaceSpecificBack();
Lines 180-185 static int setCursor(); Link Here
180		181
181	#define REFRESH_ICON_TITLE_COLOR (1<<13)	182	#define REFRESH_ICON_TITLE_COLOR (1<<13)
182	#define REFRESH_ICON_TITLE_BACK (1<<14)	183	#define REFRESH_ICON_TITLE_BACK (1<<14)
		184	#define REFRESH_BORDER_COLOR (1<<15)
183		185
184	static WOptionEnumeration seFocusModes[] = {	186	static WOptionEnumeration seFocusModes[] = {
185	{"Manual", WKF_CLICK, 0}, {"ClickToFocus", WKF_CLICK, 1},	187	{"Manual", WKF_CLICK, 0}, {"ClickToFocus", WKF_CLICK, 1},
Lines 505-510 WDefaultEntry optionList[] = { Link Here
505	NULL, getColor, setWTitleColor, NULL, NULL},	507	NULL, getColor, setWTitleColor, NULL, NULL},
506	{"UTitleColor", "black", (void *)WS_UNFOCUSED,	508	{"UTitleColor", "black", (void *)WS_UNFOCUSED,
507	NULL, getColor, setWTitleColor, NULL, NULL},	509	NULL, getColor, setWTitleColor, NULL, NULL},
		510	{"FrameBorderColor", "cyan", NULL,
		511	NULL, getColor, setFrameBorder, NULL, NULL},
508	{"FTitleBack", "(solid, black)", NULL,	512	{"FTitleBack", "(solid, black)", NULL,
509	NULL, getTexture, setFTitleBack, NULL, NULL},	513	NULL, getTexture, setFTitleBack, NULL, NULL},
510	{"PTitleBack", "(solid, \"#616161\")", NULL,	514	{"PTitleBack", "(solid, \"#616161\")", NULL,
Lines 1093-1098 void wReadDefaults(WScreen * scr, WMPropList * new_dict) Link Here
1093	int foo;	1097	int foo;
1094		1098
1095	foo = 0;	1099	foo = 0;
		1100	if (needs_refresh & REFRESH_BORDER_COLOR)
		1101	foo \|= WColorSettings;
		1102	if (foo)
		1103	WMPostNotificationName(WNMenuAppearanceSettingsChanged, NULL, (void *)(uintptr_t) foo);
		1104
		1105	foo = 0;
1096	if (needs_refresh & REFRESH_MENU_TITLE_TEXTURE)	1106	if (needs_refresh & REFRESH_MENU_TITLE_TEXTURE)
1097	foo \|= WTextureSettings;	1107	foo \|= WTextureSettings;
1098	if (needs_refresh & REFRESH_MENU_TITLE_FONT)	1108	if (needs_refresh & REFRESH_MENU_TITLE_FONT)
Lines 2554-2559 static int setClipTitleColor(WScreen * scr, WDefaultEntry * entry, XColor * colo Link Here
2554	return REFRESH_ICON_TITLE_COLOR;	2564	return REFRESH_ICON_TITLE_COLOR;
2555	}	2565	}
2556		2566
		2567	static int setFrameBorder(WScreen * scr, WDefaultEntry * entry, XColor * color, void *foo)
		2568	{
		2569	if (scr->select_border_color)
		2570	WMReleaseColor(scr->select_border_color);
		2571
		2572	scr->select_border_color = WMCreateRGBColor(scr->wmscreen, color->red, color->green, color->blue, True);
		2573
		2574	wFreeColor(scr, color->pixel);
		2575
		2576	return REFRESH_BORDER_COLOR;
		2577	}
		2578
2557	static int setWTitleColor(WScreen * scr, WDefaultEntry * entry, XColor * color, long widx)	2579	static int setWTitleColor(WScreen * scr, WDefaultEntry * entry, XColor * color, long widx)
2558	{	2580	{
2559	if (scr->window_title_color[widx])	2581	if (scr->window_title_color[widx])

Lines 723-732 WScreen *wScreenInit(int screen_number) Link Here

(-)a/src/screen.c (-3 / +4 lines)
723	scr->dark_pixel = WMColorPixel(scr->darkGray);	723	scr->dark_pixel = WMColorPixel(scr->darkGray);
724		724
725	{	725	{
726	XColor xcol;	726	/* XColor xcol; */
727	/* frame boder color */	727	/* frame boder color */
728	wGetColor(scr, FRAME_BORDER_COLOR, &xcol);	728	/* wGetColor(scr, FRAME_BORDER_COLOR, &xcol); */
729	scr->frame_border_pixel = xcol.pixel;	729	/* scr->frame_border_pixel = xcol.pixel; */
		730	scr->frame_border_pixel = WMColorPixel(scr->select_border_color);
730	}	731	}
731		732
732	/* create GCs with default values */	733	/* create GCs with default values */

Lines 163-168 typedef struct _WScreen { Link Here

(-)a/src/screen.h (+2 lines)
163	WMColor mtext_color; / menu item text */	163	WMColor mtext_color; / menu item text */
164	WMColor dtext_color; / disabled menu item text */	164	WMColor dtext_color; / disabled menu item text */
165		165
		166	WMColor select_border_color; / window frame border */
		167
166	WMPixel line_pixel;	168	WMPixel line_pixel;
167	WMPixel frame_border_pixel; /* frame border */	169	WMPixel frame_border_pixel; /* frame border */
168		170

Lines 74-79 static char *options[] = { Link Here

(-)a/util/getstyle.c (-1 / +1 lines)
74	"FTitleColor",	74	"FTitleColor",
75	"PTitleColor",	75	"PTitleColor",
76	"UTitleColor",	76	"UTitleColor",
		77	"FrameBorderColor",
77	"FTitleBack",	78	"FTitleBack",
78	"PTitleBack",	79	"PTitleBack",
79	"UTitleBack",	80	"UTitleBack",
80	-

Return to bug 15667