nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i3bar: Simplify hide mode logic 

When determining whether to hide or unhide the bar on redraw in hide
mode, use simpler rules. When the config specifies the 'show' state or a
workspace is urgent, or if the caller requests it, or the modifier is
pressed, show the bar. Otherwise, hide the bar.
This commit is contained in:
Tony Crisci 2013-10-30 00:16:13 -04:00 committed by Michael Stapelberg
parent 9ee26a608e
commit e08215896e
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
i3bar/src/xcb.c
View File

@ -1626,9 +1626,6 @@ void draw_bars(bool unhide) {
refresh_statusline(); refresh_statusline();
static char *last_urgent_ws = NULL;
bool walks_away = true;
i3_output *outputs_walk; i3_output *outputs_walk;
SLIST_FOREACH(outputs_walk, outputs, slist) { SLIST_FOREACH(outputs_walk, outputs, slist) {
if (!outputs_walk->active) { if (!outputs_walk->active) {
@ -1697,9 +1694,6 @@ void draw_bars(bool unhide) {
fg_color = colors.focus_ws_fg; fg_color = colors.focus_ws_fg;
bg_color = colors.focus_ws_bg; bg_color = colors.focus_ws_bg;
border_color = colors.focus_ws_border; border_color = colors.focus_ws_border;
if (last_urgent_ws && strcmp(i3string_as_utf8(ws_walk->name),
last_urgent_ws) == 0)
walks_away = false;
} }
} }
if (ws_walk->urgent) { if (ws_walk->urgent) {
@ -1708,10 +1702,6 @@ void draw_bars(bool unhide) {
bg_color = colors.urgent_ws_bg; bg_color = colors.urgent_ws_bg;
border_color = colors.urgent_ws_border; border_color = colors.urgent_ws_border;
unhide = true; unhide = true;
if (!ws_walk->focused) {
FREE(last_urgent_ws);
last_urgent_ws = sstrdup(i3string_as_utf8(ws_walk->name));
}
} }
uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND; uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND;
uint32_t vals_border[] = { border_color, border_color }; uint32_t vals_border[] = { border_color, border_color };
@ -1783,13 +1773,11 @@ void draw_bars(bool unhide) {
} }
/* Assure the bar is hidden/unhidden according to the specified hidden_state and mode */ /* Assure the bar is hidden/unhidden according to the specified hidden_state and mode */
bool should_unhide = (config.hidden_state == S_SHOW || (unhide && config.hidden_state == S_HIDE)); if (mod_pressed ||
bool should_hide = (config.hide_on_modifier == M_INVISIBLE); config.hidden_state == S_SHOW ||
unhide) {
if (mod_pressed || (should_unhide && !should_hide)) {
unhide_bars(); unhide_bars();
} else if (!mod_pressed && (walks_away || should_hide)) { } else if (config.hide_on_modifier == M_HIDE) {
FREE(last_urgent_ws);
hide_bars(); hide_bars();
} }