nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a more efficient struct for storing colors, validate/parse them more easily

This commit is contained in:
Michael Stapelberg 2009-05-30 22:20:32 +02:00
parent 65bcf170ed
commit cbc3880007
3 changed files with 67 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/config.h
View File

@ -4,24 +4,26 @@
typedef struct Config Config; typedef struct Config Config;
extern Config config; extern Config config;
struct Colortriple {
char border[8];
char background[8];
char text[8];
};
struct Config { struct Config {
const char *terminal; const char *terminal;
const char *font; const char *font;
/* Color codes are stored here */ /* Color codes are stored here */
char *client_focused_background_active; struct config_client {
char *client_focused_background_inactive; struct Colortriple focused;
char *client_focused_text; struct Colortriple focused_inactive;
char *client_focused_border; struct Colortriple unfocused;
char *client_unfocused_background; } client;
char *client_unfocused_text; struct config_bar {
char *client_unfocused_border; struct Colortriple focused;
char *bar_focused_background; struct Colortriple unfocused;
char *bar_focused_text; } bar;
char *bar_focused_border;
char *bar_unfocused_background;
char *bar_unfocused_text;
char *bar_unfocused_border;
}; };
/** /**

92
src/config.c
View File

@ -52,24 +52,45 @@ void load_configuration(const char *override_configpath) {
if (config.name == NULL) \ if (config.name == NULL) \
die("You did not specify required configuration option " #name "\n"); die("You did not specify required configuration option " #name "\n");
#define OPTION_COLOR(opt, name) \ #define OPTION_COLORTRIPLE(opt, name) \
if (strcasecmp(key, opt) == 0) { \ if (strcasecmp(key, opt) == 0) { \
config.name = sstrdup(value); \ struct Colortriple buffer; \
memset(&buffer, 0, sizeof(struct Colortriple)); \
buffer.border[0] = buffer.background[0] = buffer.text[0] = '#'; \
if (sscanf(value, "#%06[0-9a-fA-F] #%06[0-9a-fA-F] #%06[0-9a-fA-F]", \
buffer.border + 1, buffer.background + 1, buffer.text + 1) != 3 || \
strlen(buffer.border) != 7 || \
strlen(buffer.background) != 7 || \
strlen(buffer.text) != 7) \
die("invalid color code line: %s\n", value); \
memcpy(&config.name, &buffer, sizeof(struct Colortriple)); \
continue; \ continue; \
} }
#define VERIFY_COLOR(name, def) \
if (config.name == NULL) { \
config.name = (char *)malloc(7); \
memset(config.name, 0, 7); \
} \
if ((strlen(config.name) != 7) || (config.name[0] != '#')) { \
strncpy(config.name, def, 7); \
}
/* Clear the old config or initialize the data structure */ /* Clear the old config or initialize the data structure */
memset(&config, 0, sizeof(config)); memset(&config, 0, sizeof(config));
/* Initialize default colors */
strcpy(config.client.focused.border, "#4c7899");
strcpy(config.client.focused.background, "#285577");
strcpy(config.client.focused.text, "#ffffff");
strcpy(config.client.focused_inactive.border, "#4c7899");
strcpy(config.client.focused_inactive.background, "#555555");
strcpy(config.client.focused_inactive.text, "#ffffff");
strcpy(config.client.unfocused.border, "#333333");
strcpy(config.client.unfocused.background, "#222222");
strcpy(config.client.unfocused.text, "#888888");
strcpy(config.bar.focused.border, "#4c7899");
strcpy(config.bar.focused.background, "#285577");
strcpy(config.bar.focused.text, "#ffffff");
strcpy(config.bar.unfocused.border, "#333333");
strcpy(config.bar.unfocused.background, "#222222");
strcpy(config.bar.unfocused.text, "#888888");
FILE *handle; FILE *handle;
if (override_configpath != NULL) { if (override_configpath != NULL) {
if ((handle = fopen(override_configpath, "r")) == NULL) if ((handle = fopen(override_configpath, "r")) == NULL)
@ -101,32 +122,12 @@ void load_configuration(const char *override_configpath) {
OPTION_STRING(font); OPTION_STRING(font);
/* Colors */ /* Colors */
OPTION_COLOR("client.focused.background.active", OPTION_COLORTRIPLE("client.focused", client.focused);
client_focused_background_active); OPTION_COLORTRIPLE("client.focused_inactive", client.focused_inactive);
OPTION_COLOR("client.focused.background.inactive", OPTION_COLORTRIPLE("client.unfocused", client.unfocused);
client_focused_background_inactive); OPTION_COLORTRIPLE("client.focused", client.focused);
OPTION_COLOR("client.focused.text", OPTION_COLORTRIPLE("bar.focused", bar.focused);
client_focused_text); OPTION_COLORTRIPLE("bar.unfocused", bar.unfocused);
OPTION_COLOR("client.focused.border",
client_focused_border);
OPTION_COLOR("client.unfocused.background",
client_unfocused_background);
OPTION_COLOR("client.unfocused.text",
client_unfocused_text);
OPTION_COLOR("client.unfocused.border",
client_unfocused_border);
OPTION_COLOR("bar.focused.background",
bar_focused_background);
OPTION_COLOR("bar.focused.text",
bar_focused_text);
OPTION_COLOR("bar.focused.border",
bar_focused_border);
OPTION_COLOR("bar.unfocused.background",
bar_unfocused_background);
OPTION_COLOR("bar.unfocused.text",
bar_unfocused_text);
OPTION_COLOR("bar.unfocused.border",
bar_unfocused_border);
/* exec-lines (autostart) */ /* exec-lines (autostart) */
if (strcasecmp(key, "exec") == 0) { if (strcasecmp(key, "exec") == 0) {
@ -214,25 +215,10 @@ void load_configuration(const char *override_configpath) {
continue; continue;
} }
fprintf(stderr, "Unknown configfile option: %s\n", key); die("Unknown configfile option: %s\n", key);
exit(1);
} }
fclose(handle); fclose(handle);
VERIFY_COLOR(client_focused_background_active, "#285577");
VERIFY_COLOR(client_focused_background_inactive, "#555555");
VERIFY_COLOR(client_focused_text, "#ffffff");
VERIFY_COLOR(client_focused_border, "#4c7899");
VERIFY_COLOR(client_unfocused_background,"#222222");
VERIFY_COLOR(client_unfocused_text, "#888888");
VERIFY_COLOR(client_unfocused_border, "#333333");
VERIFY_COLOR(bar_focused_background, "#285577");
VERIFY_COLOR(bar_focused_text, "#ffffff");
VERIFY_COLOR(bar_focused_border, "#4c7899");
VERIFY_COLOR(bar_unfocused_background, "#222222");
VERIFY_COLOR(bar_unfocused_text, "#888888");
VERIFY_COLOR(bar_unfocused_border, "#333333");
REQUIRED_OPTION(terminal); REQUIRED_OPTION(terminal);
REQUIRED_OPTION(font); REQUIRED_OPTION(font);

26
src/layout.c
View File

@ -112,16 +112,16 @@ void decorate_window(xcb_connection_t *conn, Client *client, xcb_drawable_t draw
if (client->floating || client->container->currently_focused == client) { if (client->floating || client->container->currently_focused == client) {
/* Distinguish if the window is currently focused… */ /* Distinguish if the window is currently focused… */
if (client->floating || CUR_CELL->currently_focused == client) if (client->floating || CUR_CELL->currently_focused == client)
background_color = get_colorpixel(conn, config.client_focused_background_active); background_color = get_colorpixel(conn, config.client.focused.background);
/* …or if it is the focused window in a not focused container */ /* …or if it is the focused window in a not focused container */
else background_color = get_colorpixel(conn, config.client_focused_background_inactive); else background_color = get_colorpixel(conn, config.client.focused_inactive.background);
text_color = get_colorpixel(conn, config.client_focused_text); text_color = get_colorpixel(conn, config.client.focused.text);
border_color = get_colorpixel(conn, config.client_focused_border); border_color = get_colorpixel(conn, config.client.focused.border);
} else { } else {
background_color = get_colorpixel(conn, config.client_unfocused_background); background_color = get_colorpixel(conn, config.client.unfocused.background);
text_color = get_colorpixel(conn, config.client_unfocused_text); text_color = get_colorpixel(conn, config.client.unfocused.text);
border_color = get_colorpixel(conn, config.client_unfocused_border); border_color = get_colorpixel(conn, config.client.unfocused.border);
} }
/* Our plan is the following: /* Our plan is the following:
@ -409,13 +409,13 @@ static void render_internal_bar(xcb_connection_t *conn, Workspace *r_ws, int wid
black = get_colorpixel(conn, "#000000"); black = get_colorpixel(conn, "#000000");
background_color[SET_NORMAL] = get_colorpixel(conn, config.bar_unfocused_background); background_color[SET_NORMAL] = get_colorpixel(conn, config.bar.unfocused.background);
text_color[SET_NORMAL] = get_colorpixel(conn, config.bar_unfocused_text); text_color[SET_NORMAL] = get_colorpixel(conn, config.bar.unfocused.text);
border_color[SET_NORMAL] = get_colorpixel(conn, config.bar_unfocused_border); border_color[SET_NORMAL] = get_colorpixel(conn, config.bar.unfocused.border);
background_color[SET_FOCUSED] = get_colorpixel(conn, config.bar_focused_background); background_color[SET_FOCUSED] = get_colorpixel(conn, config.bar.focused.background);
text_color[SET_FOCUSED] = get_colorpixel(conn, config.bar_focused_text); text_color[SET_FOCUSED] = get_colorpixel(conn, config.bar.focused.text);
border_color[SET_FOCUSED] = get_colorpixel(conn, config.bar_focused_border); border_color[SET_FOCUSED] = get_colorpixel(conn, config.bar.focused.border);
/* Fill the whole bar in black */ /* Fill the whole bar in black */
xcb_change_gc_single(conn, screen->bargc, XCB_GC_FOREGROUND, black); xcb_change_gc_single(conn, screen->bargc, XCB_GC_FOREGROUND, black);