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

unhide hidden i3bar when mode is active 

This patch also handles unhiding of i3bar in case the i3bar modifier key is
pressed for activating a new binding mode.
This commit is contained in:
haptix@web.de 2013-04-12 00:09:40 +02:00 committed by Michael Stapelberg
parent adc16f0e90
commit a9aad872ee
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
i3bar/src/xcb.c
View File

@ -80,6 +80,9 @@ ev_io *xkb_io;
/* The name of current binding mode */ /* The name of current binding mode */
static mode binding; static mode binding;
/* Indicates whether a new binding mode was recently activated */
bool activated_mode = false;
/* The parsed colors */ /* The parsed colors */
struct xcb_colors_t { struct xcb_colors_t {
uint32_t bar_fg; uint32_t bar_fg;
@ -843,7 +846,7 @@ void xkb_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
modstate = mods & config.modifier; modstate = mods & config.modifier;
} }
#define DLOGMOD(modmask, status, barfunc) \ #define DLOGMOD(modmask, status) \
do { \ do { \
switch (modmask) { \ switch (modmask) { \
case ShiftMask: \ case ShiftMask: \
@ -868,14 +871,17 @@ void xkb_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
DLOG("Mod5Mask got " #status "!\n"); \ DLOG("Mod5Mask got " #status "!\n"); \
break; \ break; \
} \ } \
barfunc(); \
} while (0) } while (0)
if (modstate != mod_pressed) { if (modstate != mod_pressed) {
if (modstate == 0) { if (modstate == 0) {
DLOGMOD(config.modifier, released, hide_bars); DLOGMOD(config.modifier, released);
if (!activated_mode)
hide_bars();
} else { } else {
DLOGMOD(config.modifier, pressed, unhide_bars); DLOGMOD(config.modifier, pressed);
activated_mode = false;
unhide_bars();
} }
mod_pressed = modstate; mod_pressed = modstate;
} }
@ -1752,5 +1758,6 @@ void redraw_bars(void) {
void set_current_mode(struct mode *current) { void set_current_mode(struct mode *current) {
I3STRING_FREE(binding.name); I3STRING_FREE(binding.name);
binding = *current; binding = *current;
activated_mode = binding.name != NULL;
return; return;
} }