mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-03-01 01:40:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add bar colours for focused_(workspace|statusline|separator)

Browse source 
If these aren't defined in config, color settings without 'focused_'
prefix are used as a fallback.
This commit is contained in:
D.B 2016-11-02 18:48:43 +01:00
parent 39ee0ec552
commit ad4d21d60b
9 changed files with 124 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
swaybar/render.c
View file

@ -49,7 +49,7 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color, double x, double y
}
}
static void render_block(struct window *window, struct config *config, struct status_block *block, double *x, bool edge) {
static void render_block(struct window *window, struct config *config, struct status_block *block, double *x, bool edge, bool is_focused) {
int width, height, sep_width;
get_text_size(window->cairo, window->font, &width, &height,
window->scale, block->markup, "%s", block->full_text);
@ -159,7 +159,11 @@ static void render_block(struct window *window, struct config *config, struct st
// render separator
if (!edge && block->separator) {
cairo_set_source_u32(window->cairo, config->colors.separator);
if (is_focused) {
cairo_set_source_u32(window->cairo, config->colors.focused_separator);
} else {
cairo_set_source_u32(window->cairo, config->colors.separator);
}
if (config->sep_symbol) {
offset = pos + (block->separator_block_width - sep_width) / 2;
cairo_move_to(window->cairo, offset, margin);
@ -275,6 +279,7 @@ void render(struct output *output, struct config *config, struct status_line *li
struct window *window = output->window;
cairo_t *cairo = window->cairo;
bool is_focused = output->focused;
// Clear
cairo_save(cairo);
@ -285,11 +290,20 @@ void render(struct output *output, struct config *config, struct status_line *li
cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
// Background
cairo_set_source_u32(cairo, config->colors.background);
if (is_focused) {
cairo_set_source_u32(cairo, config->colors.focused_background);
} else {
cairo_set_source_u32(cairo, config->colors.background);
}
cairo_paint(cairo);
// Command output
cairo_set_source_u32(cairo, config->colors.statusline);
if (is_focused) {
cairo_set_source_u32(cairo, config->colors.focused_statusline);
} else {
cairo_set_source_u32(cairo, config->colors.statusline);
}
int width, height;
if (line->protocol == TEXT) {
@ -305,7 +319,7 @@ void render(struct output *output, struct config *config, struct status_line *li
for (i = line->block_line->length - 1; i >= 0; --i) {
struct status_block *block = line->block_line->items[i];
if (block->full_text && block->full_text[0]) {
render_block(window, config, block, &pos, edge);
render_block(window, config, block, &pos, edge, is_focused);
edge = false;
}
}