diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2022-02-08 19:12:05 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2022-02-09 16:51:05 +0000 |
| commit | 757768dbe5a61a5fbfc628ad554f26add0397e42 (patch) | |
| tree | 7b100acca663f7ff28f7c431e8c755610957000f | |
| parent | input/search/url: pass pointer-to key-binding struct to execute() (diff) | |
config: rename csd.color.close -> quit
This fixes a compilation error on FreeBSD:
../../foot/render.c:2055:45: error: no member named 'epoll_shim_close' in 'struct config::(anonymous at ../../foot/config.h:254:9)'
conf_color = &term->conf->csd.color.close;
~~~~~~~~~~~~~~~~~~~~~ ^
/usr/local/include/libepoll-shim/epoll-shim/detail/common.h:8:15:
note: expanded from macro 'close': #define close epoll_shim_close
| -rw-r--r-- | config.c | 2 | ||||
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | render.c | 2 | ||||
| -rw-r--r-- | tests/test-config.c | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -1451,7 +1451,7 @@ parse_section_csd(struct context *ctx) } else if (strcmp(key, "button-close-color") == 0) { - if (!value_to_color(ctx, &conf->csd.color.close, true)) + if (!value_to_color(ctx, &conf->csd.color.quit, true)) return false; conf->csd.color.close_set = true; @@ -262,7 +262,7 @@ struct config { uint32_t buttons; uint32_t minimize; uint32_t maximize; - uint32_t close; + uint32_t quit; /* ‘close’ collides with #define in epoll-shim */ uint32_t border; } color; @@ -2052,7 +2052,7 @@ render_csd_button(struct terminal *term, enum csd_surface surf_idx, case CSD_SURF_CLOSE: _color = term->conf->colors.table[1]; /* red */ is_set = term->conf->csd.color.close_set; - conf_color = &term->conf->csd.color.close; + conf_color = &term->conf->csd.color.quit; is_active = term->active_surface == TERM_SURF_BUTTON_CLOSE; break; diff --git a/tests/test-config.c b/tests/test-config.c index be18a593..04149a59 100644 --- a/tests/test-config.c +++ b/tests/test-config.c @@ -665,7 +665,7 @@ test_section_csd(void) test_color(&ctx, &parse_section_csd, "button-maximize-color", true, &conf.csd.color.maximize); test_color(&ctx, &parse_section_csd, "button-close-color", true, - &conf.csd.color.close); + &conf.csd.color.quit); /* TODO: verify the ‘set’ bit is actually set for colors */ /* TODO: font */ |
