diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-02-06 10:12:22 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-02-07 15:33:33 +0000 |
| commit | ee1d179b8f147e6314e4823e4c66a35030ab2a0f (patch) | |
| tree | fbfb8847e18db87c31b8f02c558fb4987d78591f | |
| parent | config: add colors.jump_labels and colors.urls (diff) | |
config: use a bitfield for flags tracking whether to use custom colors for CSD or not
| -rw-r--r-- | config.h | 8 | ||||
| -rw-r--r-- | render.c | 10 |
2 files changed, 9 insertions, 9 deletions
@@ -192,10 +192,10 @@ struct config { int button_width; struct { - bool title_set; - bool minimize_set; - bool maximize_set; - bool close_set; + bool title_set:1; + bool minimize_set:1; + bool maximize_set:1; + bool close_set:1; uint32_t title; uint32_t minimize; uint32_t maximize; @@ -1605,27 +1605,27 @@ render_csd_button(struct terminal *term, enum csd_surface surf_idx) uint32_t _color; uint16_t alpha = 0xffff; bool is_active = false; - const bool *is_set = NULL; + bool is_set = false; const uint32_t *conf_color = NULL; switch (surf_idx) { case CSD_SURF_MINIMIZE: _color = term->colors.default_table[4]; /* blue */ - is_set = &term->conf->csd.color.minimize_set; + is_set = term->conf->csd.color.minimize_set; conf_color = &term->conf->csd.color.minimize; is_active = term->active_surface == TERM_SURF_BUTTON_MINIMIZE; break; case CSD_SURF_MAXIMIZE: _color = term->colors.default_table[2]; /* green */ - is_set = &term->conf->csd.color.maximize_set; + is_set = term->conf->csd.color.maximize_set; conf_color = &term->conf->csd.color.maximize; is_active = term->active_surface == TERM_SURF_BUTTON_MAXIMIZE; break; case CSD_SURF_CLOSE: _color = term->colors.default_table[1]; /* red */ - is_set = &term->conf->csd.color.close_set; + is_set = term->conf->csd.color.close_set; conf_color = &term->conf->csd.color.close; is_active = term->active_surface == TERM_SURF_BUTTON_CLOSE; break; @@ -1636,7 +1636,7 @@ render_csd_button(struct terminal *term, enum csd_surface surf_idx) } if (is_active) { - if (*is_set) { + if (is_set) { _color = *conf_color; alpha = _color >> 24 | (_color >> 24 << 8); } |
