diff options
| author | kolunmi <113054217+kolunmi@users.noreply.github.com> | 2023-07-22 07:55:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-22 07:55:08 -0700 |
| commit | 4201fabb83997018febd8d5f2e7e66c3c2b9de33 (patch) | |
| tree | bad32081e32ed46dc369e6097e9a163d827eefbc | |
| parent | ce4361b28b77cd9c89250ec4e1d76a9792682a09 (diff) | |
| parent | 6860db2e5efc508948b891a2351ca3614c83db0a (diff) | |
| download | dwlb-4201fabb83997018febd8d5f2e7e66c3c2b9de33.tar.gz | |
Merge pull request #16 from NikitaIvanovV/occupied-color
Add occupied color
| -rw-r--r-- | config.def.h | 2 | ||||
| -rw-r--r-- | dwlb.c | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/config.def.h b/config.def.h index 5b8b71d..920717e 100644 --- a/config.def.h +++ b/config.def.h @@ -26,6 +26,8 @@ static char *tags_names[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; // 0x55 -> 0x5555, 0xf1 -> 0xf1f1 static pixman_color_t active_fg_color = { .red = 0xeeee, .green = 0xeeee, .blue = 0xeeee, .alpha = 0xffff, }; static pixman_color_t active_bg_color = { .red = 0x0000, .green = 0x5555, .blue = 0x7777, .alpha = 0xffff, }; +static pixman_color_t occupied_fg_color = { .red = 0xeeee, .green = 0xeeee, .blue = 0xeeee, .alpha = 0xffff, }; +static pixman_color_t occupied_bg_color = { .red = 0x0000, .green = 0x5555, .blue = 0x7777, .alpha = 0xffff, }; static pixman_color_t inactive_fg_color = { .red = 0xbbbb, .green = 0xbbbb, .blue = 0xbbbb, .alpha = 0xffff, }; static pixman_color_t inactive_bg_color = { .red = 0x2222, .green = 0x2222, .blue = 0x2222, .alpha = 0xffff, }; static pixman_color_t urgent_fg_color = { .red = 0x2222, .green = 0x2222, .blue = 0x2222, .alpha = 0xffff, }; @@ -89,6 +89,8 @@ " -vertical-padding [PIXELS] specify vertical pixel padding above and below text\n" \ " -active-fg-color [COLOR] specify text color of active tags or monitors\n" \ " -active-bg-color [COLOR] specify background color of active tags or monitors\n" \ + " -occupied-fg-color [COLOR] specify text color of occupied tags\n" \ + " -occupied-bg-color [COLOR] specify background color of occupied tags\n" \ " -inactive-fg-color [COLOR] specify text color of inactive tags or monitors\n" \ " -inactive-bg-color [COLOR] specify background color of inactive tags or monitors\n" \ " -urgent-fg-color [COLOR] specify text color of urgent tags\n" \ @@ -396,8 +398,8 @@ draw_frame(Bar *bar) if (hide_vacant && !active && !occupied && !urgent) continue; - pixman_color_t *fg_color = urgent ? &urgent_fg_color : (active ? &active_fg_color : &inactive_fg_color); - pixman_color_t *bg_color = urgent ? &urgent_bg_color : (active ? &active_bg_color : &inactive_bg_color); + pixman_color_t *fg_color = urgent ? &urgent_fg_color : (active ? &active_fg_color : (occupied ? &occupied_fg_color : &inactive_fg_color)); + pixman_color_t *bg_color = urgent ? &urgent_bg_color : (active ? &active_bg_color : (occupied ? &occupied_bg_color : &inactive_bg_color)); if (!hide_vacant && occupied) { pixman_image_fill_boxes(PIXMAN_OP_SRC, foreground, @@ -1705,6 +1707,16 @@ main(int argc, char **argv) DIE("Option -active-bg-color requires an argument"); if (parse_color(argv[i], &active_bg_color) == -1) DIE("malformed color string"); + } else if (!strcmp(argv[i], "-occupied-fg-color")) { + if (++i >= argc) + DIE("Option -occupied-fg-color requires an argument"); + if (parse_color(argv[i], &occupied_fg_color) == -1) + DIE("malformed color string"); + } else if (!strcmp(argv[i], "-occupied-bg-color")) { + if (++i >= argc) + DIE("Option -occupied-bg-color requires an argument"); + if (parse_color(argv[i], &occupied_bg_color) == -1) + DIE("malformed color string"); } else if (!strcmp(argv[i], "-inactive-fg-color")) { if (++i >= argc) DIE("Option -inactive-fg-color requires an argument"); |