From 811ff07b8ef42aaa73d82952496e6bd73474d66d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ingo=20B=C3=BCrk?= Date: Sat, 9 Jan 2016 16:47:33 -0500 Subject: [PATCH] Rename decoration_border to child_border. fixes #2154 --- docs/userguide | 14 +++++++------- include/config.h | 2 +- include/config_directives.h | 2 +- parser-specs/config.spec | 8 ++++---- src/config.c | 14 +++++++------- src/config_directives.c | 32 ++++++++++++++++---------------- src/x.c | 10 ++++------ 7 files changed, 40 insertions(+), 42 deletions(-) diff --git a/docs/userguide b/docs/userguide index e8dee103..55568b65 100644 --- a/docs/userguide +++ b/docs/userguide @@ -836,9 +836,9 @@ workspace "2: vim" output VGA1 You can change all colors which i3 uses to draw the window decorations. *Syntax*: -------------------------------------------------------------------------- - -------------------------------------------------------------------------- +-------------------------------------------------------------------- + +-------------------------------------------------------------------- Where colorclass can be one of: @@ -863,8 +863,8 @@ client.background:: Colors are in HTML hex format (#rrggbb), see the following example: *Examples (default colors)*: ---------------------------------------------------------- -# class border backgr. text indicator decoration_border +---------------------------------------------------------------------- +# class border backgr. text indicator child_border client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577 client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a client.unfocused #333333 #222222 #888888 #292d2e #222222 @@ -872,10 +872,10 @@ client.urgent #2f343a #900000 #ffffff #900000 #900000 client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c client.background #ffffff ---------------------------------------------------------- +---------------------------------------------------------------------- Note that for the window decorations, the color around the child window is the -"decoration_border", and "border" color is only the two thin lines around the +"child_border", and "border" color is only the two thin lines around the titlebar. The indicator color is used for indicating where a new window will be opened. diff --git a/include/config.h b/include/config.h index d5465c3f..acdd2c89 100644 --- a/include/config.h +++ b/include/config.h @@ -54,7 +54,7 @@ struct Colortriple { color_t background; color_t text; color_t indicator; - color_t decoration_border; + color_t child_border; }; /** diff --git a/include/config_directives.h b/include/config_directives.h index fd8a4208..bcbea111 100644 --- a/include/config_directives.h +++ b/include/config_directives.h @@ -59,7 +59,7 @@ CFGFUN(no_focus); CFGFUN(ipc_socket, const char *path); CFGFUN(restart_state, const char *path); CFGFUN(popup_during_fullscreen, const char *value); -CFGFUN(color, const char *colorclass, const char *border, const char *background, const char *text, const char *indicator, const char *decoration_border); +CFGFUN(color, const char *colorclass, const char *border, const char *background, const char *text, const char *indicator, const char *child_border); CFGFUN(color_single, const char *colorclass, const char *color); CFGFUN(floating_modifier, const char *modifiers); CFGFUN(new_window, const char *windowtype, const char *border, const long width); diff --git a/parser-specs/config.spec b/parser-specs/config.spec index 1e1b52e2..f5275028 100644 --- a/parser-specs/config.spec +++ b/parser-specs/config.spec @@ -282,13 +282,13 @@ state COLOR_TEXT: state COLOR_INDICATOR: indicator = word - -> COLOR_DECORATION_BORDER + -> COLOR_CHILD_BORDER end -> call cfg_color($colorclass, $border, $background, $text, NULL, NULL) -state COLOR_DECORATION_BORDER: - decoration_border = word - -> call cfg_color($colorclass, $border, $background, $text, $indicator, $decoration_border) +state COLOR_CHILD_BORDER: + child_border = word + -> call cfg_color($colorclass, $border, $background, $text, $indicator, $child_border) end -> call cfg_color($colorclass, $border, $background, $text, $indicator, NULL) diff --git a/src/config.c b/src/config.c index a1111463..fb2feda8 100644 --- a/src/config.c +++ b/src/config.c @@ -193,13 +193,13 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, memset(&config, 0, sizeof(config)); /* Initialize default colors */ -#define INIT_COLOR(x, cborder, cbackground, ctext, cindicator) \ - do { \ - x.border = draw_util_hex_to_color(cborder); \ - x.background = draw_util_hex_to_color(cbackground); \ - x.text = draw_util_hex_to_color(ctext); \ - x.indicator = draw_util_hex_to_color(cindicator); \ - x.decoration_border = draw_util_hex_to_color(cbackground); \ +#define INIT_COLOR(x, cborder, cbackground, ctext, cindicator) \ + do { \ + x.border = draw_util_hex_to_color(cborder); \ + x.background = draw_util_hex_to_color(cbackground); \ + x.text = draw_util_hex_to_color(ctext); \ + x.indicator = draw_util_hex_to_color(cindicator); \ + x.child_border = draw_util_hex_to_color(cbackground); \ } while (0) config.client.background = draw_util_hex_to_color("#000000"); diff --git a/src/config_directives.c b/src/config_directives.c index 0d4b3d31..e92ef1d9 100644 --- a/src/config_directives.c +++ b/src/config_directives.c @@ -338,22 +338,22 @@ CFGFUN(color_single, const char *colorclass, const char *color) { config.client.background = draw_util_hex_to_color(color); } -CFGFUN(color, const char *colorclass, const char *border, const char *background, const char *text, const char *indicator, const char *decoration_border) { -#define APPLY_COLORS(classname) \ - do { \ - if (strcmp(colorclass, "client." #classname) == 0) { \ - config.client.classname.border = draw_util_hex_to_color(border); \ - config.client.classname.background = draw_util_hex_to_color(background); \ - config.client.classname.text = draw_util_hex_to_color(text); \ - if (indicator != NULL) { \ - config.client.classname.indicator = draw_util_hex_to_color(indicator); \ - } \ - if (decoration_border != NULL) { \ - config.client.classname.decoration_border = draw_util_hex_to_color(decoration_border); \ - } else { \ - config.client.classname.decoration_border = config.client.classname.background; \ - } \ - } \ +CFGFUN(color, const char *colorclass, const char *border, const char *background, const char *text, const char *indicator, const char *child_border) { +#define APPLY_COLORS(classname) \ + do { \ + if (strcmp(colorclass, "client." #classname) == 0) { \ + config.client.classname.border = draw_util_hex_to_color(border); \ + config.client.classname.background = draw_util_hex_to_color(background); \ + config.client.classname.text = draw_util_hex_to_color(text); \ + if (indicator != NULL) { \ + config.client.classname.indicator = draw_util_hex_to_color(indicator); \ + } \ + if (child_border != NULL) { \ + config.client.classname.child_border = draw_util_hex_to_color(child_border); \ + } else { \ + config.client.classname.child_border = config.client.classname.background; \ + } \ + } \ } while (0) APPLY_COLORS(focused_inactive); diff --git a/src/x.c b/src/x.c index a14c25fa..f44bc37a 100644 --- a/src/x.c +++ b/src/x.c @@ -464,24 +464,22 @@ void x_draw_decoration(Con *con) { * rectangle because some childs are not freely resizable and we want * their background color to "shine through". */ if (!(borders_to_hide & ADJ_LEFT_SCREEN_EDGE)) { - draw_util_rectangle(conn, &(con->frame_buffer), p->color->decoration_border, 0, 0, br.x, r->height); + draw_util_rectangle(conn, &(con->frame_buffer), p->color->child_border, 0, 0, br.x, r->height); } if (!(borders_to_hide & ADJ_RIGHT_SCREEN_EDGE)) { draw_util_rectangle(conn, &(con->frame_buffer), - p->color->decoration_border, r->width + (br.width + br.x), 0, + p->color->child_border, r->width + (br.width + br.x), 0, -(br.width + br.x), r->height); } if (!(borders_to_hide & ADJ_LOWER_SCREEN_EDGE)) { draw_util_rectangle(conn, &(con->frame_buffer), - p->color->decoration_border, br.x, r->height + (br.height + - br.y), + p->color->child_border, br.x, r->height + (br.height + br.y), r->width + br.width, -(br.height + br.y)); } /* pixel border needs an additional line at the top */ if (p->border_style == BS_PIXEL && !(borders_to_hide & ADJ_UPPER_SCREEN_EDGE)) { draw_util_rectangle(conn, &(con->frame_buffer), - p->color->decoration_border, br.x, 0, r->width + br.width, - br.y); + p->color->child_border, br.x, 0, r->width + br.width, br.y); } /* Highlight the side of the border at which the next window will be -- 2.39.5