Added support for single indicators
And indicator configuration
This commit is contained in:
parent
fe3654cde3
commit
41b2b04121
49
src/bar.cpp
49
src/bar.cpp
@ -251,19 +251,49 @@ void Bar::render()
|
|||||||
void Bar::renderTags()
|
void Bar::renderTags()
|
||||||
{
|
{
|
||||||
for (auto &tag : _tags) {
|
for (auto &tag : _tags) {
|
||||||
setColorScheme(
|
setTagColorScheme(tag);
|
||||||
tag.state & TagState::Active ? colorActive : colorInactive,
|
|
||||||
tag.state & TagState::Urgent);
|
|
||||||
renderComponent(tag.component);
|
renderComponent(tag.component);
|
||||||
auto indicators = std::min(tag.numClients, static_cast<int>(_bufs->height/2));
|
auto indicators = std::min(tag.numClients, static_cast<int>(_bufs->height/2));
|
||||||
for (auto ind = 0; ind < indicators; ind++) {
|
if (showIndicators == 1) {
|
||||||
auto w = ind == tag.focusedClient ? 7 : 3;
|
renderSingleIndicator(tag, indicators);
|
||||||
cairo_move_to(_painter, tag.component.x, ind*2+0.5);
|
} else if (showIndicators == 2) {
|
||||||
|
renderMultiIndicators(tag, indicators);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Bar::renderMultiIndicators(const Tag& t, int inds)
|
||||||
|
{
|
||||||
|
for (auto ind = 0; ind < inds; ind++) {
|
||||||
|
auto w = ind == t.focusedClient ? 7 : 3;
|
||||||
|
cairo_move_to(_painter, t.component.x, ind*2+0.5);
|
||||||
cairo_rel_line_to(_painter, w, 0);
|
cairo_rel_line_to(_painter, w, 0);
|
||||||
cairo_close_path(_painter);
|
cairo_close_path(_painter);
|
||||||
cairo_set_line_width(_painter, 3);
|
cairo_set_line_width(_painter, 3);
|
||||||
cairo_stroke(_painter);
|
cairo_stroke(_painter);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Bar::renderSingleIndicator(const Tag& t, int inds)
|
||||||
|
{
|
||||||
|
if (inds > 0) {
|
||||||
|
auto w = 4;
|
||||||
|
setColorScheme(colorIndicator);
|
||||||
|
cairo_move_to(_painter, t.component.x+1, 1);
|
||||||
|
cairo_rel_line_to(_painter, w, 0);
|
||||||
|
cairo_rel_line_to(_painter, 0, w);
|
||||||
|
cairo_rel_line_to(_painter, -w, 0);
|
||||||
|
cairo_close_path(_painter);
|
||||||
|
cairo_set_line_width(_painter, 1);
|
||||||
|
beginFg();
|
||||||
|
cairo_stroke_preserve(_painter);
|
||||||
|
if (t.state == TagState::Active) {
|
||||||
|
beginBg();
|
||||||
|
} else {
|
||||||
|
setTagColorScheme(t);
|
||||||
|
beginBg();
|
||||||
|
}
|
||||||
|
cairo_fill(_painter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -279,6 +309,13 @@ void Bar::renderStatus()
|
|||||||
renderComponent(_statusCmp);
|
renderComponent(_statusCmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Bar::setTagColorScheme(const Tag& t)
|
||||||
|
{
|
||||||
|
setColorScheme(
|
||||||
|
t.state & TagState::Active ? colorActive : colorInactive,
|
||||||
|
t.state & TagState::Urgent);
|
||||||
|
}
|
||||||
|
|
||||||
void Bar::setColorScheme(const ColorScheme& scheme, bool invert)
|
void Bar::setColorScheme(const ColorScheme& scheme, bool invert)
|
||||||
{
|
{
|
||||||
_colorScheme = invert
|
_colorScheme = invert
|
||||||
|
@ -50,9 +50,12 @@ class Bar {
|
|||||||
void layerSurfaceConfigure(uint32_t serial, uint32_t width, uint32_t height);
|
void layerSurfaceConfigure(uint32_t serial, uint32_t width, uint32_t height);
|
||||||
void render();
|
void render();
|
||||||
void renderTags();
|
void renderTags();
|
||||||
|
void renderMultiIndicators(const Tag& t, int inds);
|
||||||
|
void renderSingleIndicator(const Tag& t, int inds);
|
||||||
void renderStatus();
|
void renderStatus();
|
||||||
|
|
||||||
// low-level rendering
|
// low-level rendering
|
||||||
|
void setTagColorScheme(const Tag& t);
|
||||||
void setColorScheme(const ColorScheme& scheme, bool invert = false);
|
void setColorScheme(const ColorScheme& scheme, bool invert = false);
|
||||||
void beginFg();
|
void beginFg();
|
||||||
void beginBg();
|
void beginBg();
|
||||||
|
@ -14,8 +14,11 @@ constexpr const char* font = "Iosevka 11";
|
|||||||
|
|
||||||
constexpr ColorScheme colorInactive = {Color(0xff, 0xff, 0xff), Color(0x88, 0x88, 0x88)};
|
constexpr ColorScheme colorInactive = {Color(0xff, 0xff, 0xff), Color(0x88, 0x88, 0x88)};
|
||||||
constexpr ColorScheme colorActive = {Color(0xff, 0xff, 0xff), Color(0xaa, 0x44, 0x44)};
|
constexpr ColorScheme colorActive = {Color(0xff, 0xff, 0xff), Color(0xaa, 0x44, 0x44)};
|
||||||
|
constexpr ColorScheme colorIndicator = {Color(0xff, 0xff, 0xff), Color(0xff, 0xff, 0xff)};
|
||||||
constexpr const char* termcmd[] = {"dwl_term", nullptr};
|
constexpr const char* termcmd[] = {"dwl_term", nullptr};
|
||||||
|
constexpr int showIndicators = 1; // 0 = no indicators
|
||||||
|
// 1 = single indicator
|
||||||
|
// 2 = multiple indicators
|
||||||
constexpr Button buttons[] = {
|
constexpr Button buttons[] = {
|
||||||
{ ClkTagBar, BTN_LEFT, view, {0} },
|
{ ClkTagBar, BTN_LEFT, view, {0} },
|
||||||
{ ClkTagBar, BTN_RIGHT, tag, {0} },
|
{ ClkTagBar, BTN_RIGHT, tag, {0} },
|
||||||
|
Loading…
Reference in New Issue
Block a user