X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3bar%2Fsrc%2Fxcb.c;h=0c8de65ec5baeb5a8025deaee577f951ca3118b5;hb=d3beff23395356ec71fcc35a3b802163e12df73e;hp=405eefdb0f6f58de196430a3ed28379a1c4decb7;hpb=13147978c50b4efa5b4eb0b65d8175aa596a76fe;p=i3%2Fi3 diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c index 405eefdb..0c8de65e 100644 --- a/i3bar/src/xcb.c +++ b/i3bar/src/xcb.c @@ -9,7 +9,6 @@ */ #include #include -#include #include #ifdef XCB_COMPAT @@ -50,12 +49,19 @@ int screen; xcb_screen_t *root_screen; xcb_window_t xcb_root; +/* selection window for tray support */ +static xcb_window_t selwin = XCB_NONE; +static xcb_intern_atom_reply_t *tray_reply = NULL; + /* This is needed for integration with libi3 */ xcb_connection_t *conn; /* The font we'll use */ static i3Font font; +/* Overall height of the bar (based on font size) */ +int bar_height; + /* These are only relevant for XKB, which we only need for grabbing modifiers */ Display *xkb_dpy; int xkb_event_base; @@ -74,10 +80,17 @@ ev_check *xcb_chk; ev_io *xcb_io; ev_io *xkb_io; +/* The name of current binding mode */ +static mode binding; + +/* Indicates whether a new binding mode was recently activated */ +bool activated_mode = false; + /* The parsed colors */ struct xcb_colors_t { uint32_t bar_fg; uint32_t bar_bg; + uint32_t sep_fg; uint32_t active_ws_fg; uint32_t active_ws_bg; uint32_t active_ws_border; @@ -120,10 +133,32 @@ void refresh_statusline(void) { continue; block->width = predict_text_width(block->full_text); + + /* Compute offset and append for text aligment in min_width. */ + if (block->min_width <= block->width) { + block->x_offset = 0; + block->x_append = 0; + } else { + uint32_t padding_width = block->min_width - block->width; + switch (block->align) { + case ALIGN_LEFT: + block->x_append = padding_width; + break; + case ALIGN_RIGHT: + block->x_offset = padding_width; + break; + case ALIGN_CENTER: + block->x_offset = padding_width / 2; + block->x_append = padding_width / 2 + padding_width % 2; + break; + } + } + /* If this is not the last block, add some pixels for a separator. */ if (TAILQ_NEXT(block, blocks) != NULL) - block->width += 9; - statusline_width += block->width; + block->width += block->sep_block_width; + + statusline_width += block->width + block->x_offset + block->x_append; } /* If the statusline is bigger than our screen we need to make sure that @@ -133,7 +168,7 @@ void refresh_statusline(void) { realloc_sl_buffer(); /* Clear the statusline pixmap. */ - xcb_rectangle_t rect = { 0, 0, root_screen->width_in_pixels, font.height }; + xcb_rectangle_t rect = { 0, 0, root_screen->width_in_pixels, font.height + 2 }; xcb_poly_fill_rectangle(xcb_connection, statusline_pm, statusline_clear, 1, &rect); /* Draw the text of each block. */ @@ -144,15 +179,19 @@ void refresh_statusline(void) { uint32_t colorpixel = (block->color ? get_colorpixel(block->color) : colors.bar_fg); set_font_colors(statusline_ctx, colorpixel, colors.bar_bg); - draw_text(block->full_text, statusline_pm, statusline_ctx, x, 0, block->width); - x += block->width; + draw_text(block->full_text, statusline_pm, statusline_ctx, x + block->x_offset, 1, block->width); + x += block->width + block->x_offset + block->x_append; - if (TAILQ_NEXT(block, blocks) != NULL) { + if (TAILQ_NEXT(block, blocks) != NULL && !block->no_separator && block->sep_block_width > 0) { /* This is not the last block, draw a separator. */ - set_font_colors(statusline_ctx, get_colorpixel("#666666"), colors.bar_bg); + uint32_t sep_offset = block->sep_block_width/2 + block->sep_block_width % 2; + uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND; + uint32_t values[] = { colors.sep_fg, colors.bar_bg }; + xcb_change_gc(xcb_connection, statusline_ctx, mask, values); xcb_poly_line(xcb_connection, XCB_COORD_MODE_ORIGIN, statusline_pm, statusline_ctx, 2, - (xcb_point_t[]){ { x - 5, 2 }, { x - 5, font.height - 2 } }); + (xcb_point_t[]){ { x - sep_offset, 2 }, + { x - sep_offset, font.height - 2 } }); } } } @@ -162,7 +201,7 @@ void refresh_statusline(void) { * */ void hide_bars(void) { - if (!config.hide_on_modifier) { + if ((config.hide_on_modifier == M_DOCK) || (config.hidden_state == S_SHOW && config.hide_on_modifier == M_HIDE)) { return; } @@ -181,7 +220,7 @@ void hide_bars(void) { * */ void unhide_bars(void) { - if (!config.hide_on_modifier) { + if (config.hide_on_modifier != M_HIDE) { return; } @@ -204,9 +243,9 @@ void unhide_bars(void) { values[0] = walk->rect.x; if (config.position == POS_TOP) values[1] = walk->rect.y; - else values[1] = walk->rect.y + walk->rect.h - font.height - 6; + else values[1] = walk->rect.y + walk->rect.h - bar_height; values[2] = walk->rect.w; - values[3] = font.height + 6; + values[3] = bar_height; values[4] = XCB_STACK_MODE_ABOVE; DLOG("Reconfiguring Window for output %s to %d,%d\n", walk->name, values[0], values[1]); cookie = xcb_configure_window_checked(xcb_connection, @@ -232,6 +271,7 @@ void init_colors(const struct xcb_color_strings_t *new_colors) { } while (0) PARSE_COLOR(bar_fg, "#FFFFFF"); PARSE_COLOR(bar_bg, "#000000"); + PARSE_COLOR(sep_fg, "#666666"); PARSE_COLOR(active_ws_fg, "#FFFFFF"); PARSE_COLOR(active_ws_bg, "#333333"); PARSE_COLOR(active_ws_border, "#333333"); @@ -245,6 +285,9 @@ void init_colors(const struct xcb_color_strings_t *new_colors) { PARSE_COLOR(focus_ws_bg, "#285577"); PARSE_COLOR(focus_ws_border, "#4c7899"); #undef PARSE_COLOR + + init_tray_colors(); + xcb_flush(xcb_connection); } /* @@ -283,13 +326,33 @@ void handle_button(xcb_button_press_event_t *event) { } int32_t x = event->event_x >= 0 ? event->event_x : 0; + int32_t original_x = x; DLOG("Got Button %d\n", event->detail); switch (event->detail) { - case 1: - /* Left Mousbutton. We determine, which button was clicked - * and set cur_ws accordingly */ + case 4: + /* Mouse wheel up. We select the previous ws, if any. + * If there is no more workspace, don’t even send the workspace + * command, otherwise (with workspace auto_back_and_forth) we’d end + * up on the wrong workspace. */ + if (cur_ws == TAILQ_FIRST(walk->workspaces)) + return; + + cur_ws = TAILQ_PREV(cur_ws, ws_head, tailq); + break; + case 5: + /* Mouse wheel down. We select the next ws, if any. + * If there is no more workspace, don’t even send the workspace + * command, otherwise (with workspace auto_back_and_forth) we’d end + * up on the wrong workspace. */ + if (cur_ws == TAILQ_LAST(walk->workspaces, ws_head)) + return; + + cur_ws = TAILQ_NEXT(cur_ws, tailq); + break; + default: + /* Check if this event regards a workspace button */ TAILQ_FOREACH(cur_ws, walk->workspaces, tailq) { DLOG("x = %d\n", x); if (x >= 0 && x < cur_ws->name_width + 10) { @@ -298,21 +361,42 @@ void handle_button(xcb_button_press_event_t *event) { x -= cur_ws->name_width + 11; } if (cur_ws == NULL) { + /* No workspace button was pressed. + * Check if a status block has been clicked. + * This of course only has an effect, + * if the child reported bidirectional protocol usage. */ + + /* First calculate width of tray area */ + trayclient *trayclient; + int tray_width = 0; + TAILQ_FOREACH_REVERSE(trayclient, walk->trayclients, tc_head, tailq) { + if (!trayclient->mapped) + continue; + tray_width += (font.height + 2); + } + + int block_x = 0, last_block_x; + int offset = (walk->rect.w - (statusline_width + tray_width)) - 10; + + x = original_x - offset; + if (x < 0) + return; + + struct status_block *block; + + TAILQ_FOREACH(block, &statusline_head, blocks) { + last_block_x = block_x; + block_x += block->width + block->x_offset + block->x_append; + + if (x <= block_x && x >= last_block_x) { + send_block_clicked(event->detail, block->name, block->instance, event->root_x, event->root_y); + return; + } + } return; } - break; - case 4: - /* Mouse wheel down. We select the next ws */ - if (cur_ws != TAILQ_FIRST(walk->workspaces)) { - cur_ws = TAILQ_PREV(cur_ws, ws_head, tailq); - } - break; - case 5: - /* Mouse wheel up. We select the previos ws */ - if (cur_ws != TAILQ_LAST(walk->workspaces, ws_head)) { - cur_ws = TAILQ_NEXT(cur_ws, tailq); - } - break; + if (event->detail != 1) + return; } /* To properly handle workspace names with double quotes in them, we need @@ -460,7 +544,9 @@ static void handle_client_message(xcb_client_message_event_t* event) { } /* In case of tray_output == primary and there is no primary output * configured, we fall back to the first available output. */ - if (output == NULL && strcasecmp("primary", config.tray_output) == 0) { + if (output == NULL && + config.tray_output && + strcasecmp("primary", config.tray_output) == 0) { SLIST_FOREACH(walk, outputs, slist) { if (!walk->active) continue; @@ -765,7 +851,7 @@ void xkb_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) { modstate = mods & config.modifier; } -#define DLOGMOD(modmask, status, barfunc) \ +#define DLOGMOD(modmask, status) \ do { \ switch (modmask) { \ case ShiftMask: \ @@ -790,14 +876,17 @@ void xkb_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) { DLOG("Mod5Mask got " #status "!\n"); \ break; \ } \ - barfunc(); \ } while (0) if (modstate != mod_pressed) { if (modstate == 0) { - DLOGMOD(config.modifier, released, hide_bars); + DLOGMOD(config.modifier, released); + if (!activated_mode) + hide_bars(); } else { - DLOGMOD(config.modifier, pressed, unhide_bars); + DLOGMOD(config.modifier, pressed); + activated_mode = false; + unhide_bars(); } mod_pressed = modstate; } @@ -871,26 +960,7 @@ char *init_xcb_early() { /* Now we get the atoms and save them in a nice data structure */ get_atoms(); - xcb_get_property_cookie_t path_cookie; - path_cookie = xcb_get_property_unchecked(xcb_connection, - 0, - xcb_root, - atoms[I3_SOCKET_PATH], - XCB_GET_PROPERTY_TYPE_ANY, - 0, PATH_MAX); - - /* We check, if i3 set its socket-path */ - xcb_get_property_reply_t *path_reply = xcb_get_property_reply(xcb_connection, - path_cookie, - NULL); - char *path = NULL; - if (path_reply) { - int len = xcb_get_property_value_length(path_reply); - if (len != 0) { - path = strndup(xcb_get_property_value(path_reply), len); - } - } - + char *path = root_atom_contents("I3_SOCKET_PATH", xcb_connection, screen); if (xcb_request_failed(sl_pm_cookie, "Could not allocate statusline-buffer") || xcb_request_failed(clear_ctx_cookie, "Could not allocate statusline-buffer-clearcontext") || @@ -902,25 +972,13 @@ char *init_xcb_early() { } /* - * Initialization which depends on 'config' being usable. Called after the - * configuration has arrived. + * Register for xkb keyevents. To grab modifiers without blocking other applications from receiving key-events + * involving that modifier, we sadly have to use xkb which is not yet fully supported + * in xcb. * */ -void init_xcb_late(char *fontname) { - if (fontname == NULL) - fontname = "-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; - - /* Load the font */ - font = load_font(fontname, true); - set_font(&font); - DLOG("Calculated Font-height: %d\n", font.height); - - xcb_flush(xcb_connection); - - /* To grab modifiers without blocking other applications from receiving key-events - * involving that modifier, we sadly have to use xkb which is not yet fully supported - * in xcb */ - if (config.hide_on_modifier) { +void register_xkb_keyevents() { + if (xkb_dpy == NULL) { int xkb_major, xkb_minor, xkb_errbase, xkb_err; xkb_major = XkbMajorVersion; xkb_minor = XkbMinorVersion; @@ -960,6 +1018,66 @@ void init_xcb_late(char *fontname) { } } +/* + * Deregister from xkb keyevents. + * + */ +void deregister_xkb_keyevents() { + if (xkb_dpy != NULL) { + ev_io_stop (main_loop, xkb_io); + XCloseDisplay(xkb_dpy); + close(xkb_io->fd); + FREE(xkb_io); + xkb_dpy = NULL; + } +} + +/* + * Initialization which depends on 'config' being usable. Called after the + * configuration has arrived. + * + */ +void init_xcb_late(char *fontname) { + if (fontname == NULL) + fontname = "-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"; + + /* Load the font */ + font = load_font(fontname, true); + set_font(&font); + DLOG("Calculated Font-height: %d\n", font.height); + bar_height = font.height + 6; + + xcb_flush(xcb_connection); + + if (config.hide_on_modifier == M_HIDE) + register_xkb_keyevents(); +} + +/* + * Inform clients waiting for a new _NET_SYSTEM_TRAY that we took the + * selection. + * + */ +static void send_tray_clientmessage(void) { + uint8_t buffer[32] = { 0 }; + xcb_client_message_event_t *ev = (xcb_client_message_event_t*)buffer; + + ev->response_type = XCB_CLIENT_MESSAGE; + ev->window = xcb_root; + ev->type = atoms[MANAGER]; + ev->format = 32; + ev->data.data32[0] = XCB_CURRENT_TIME; + ev->data.data32[1] = tray_reply->atom; + ev->data.data32[2] = selwin; + + xcb_send_event(xcb_connection, + 0, + xcb_root, + 0xFFFFFF, + (char*)buffer); +} + + /* * Initializes tray support by requesting the appropriate _NET_SYSTEM_TRAY atom * for the X11 display we are running on, then acquiring the selection for this @@ -972,11 +1090,11 @@ void init_tray(void) { char atomname[strlen("_NET_SYSTEM_TRAY_S") + 11]; snprintf(atomname, strlen("_NET_SYSTEM_TRAY_S") + 11, "_NET_SYSTEM_TRAY_S%d", screen); xcb_intern_atom_cookie_t tray_cookie; - xcb_intern_atom_reply_t *tray_reply; - tray_cookie = xcb_intern_atom(xcb_connection, 0, strlen(atomname), atomname); + if (tray_reply == NULL) + tray_cookie = xcb_intern_atom(xcb_connection, 0, strlen(atomname), atomname); /* tray support: we need a window to own the selection */ - xcb_window_t selwin = xcb_generate_id(xcb_connection); + selwin = xcb_generate_id(xcb_connection); uint32_t selmask = XCB_CW_OVERRIDE_REDIRECT; uint32_t selval[] = { 1 }; xcb_create_window(xcb_connection, @@ -985,7 +1103,7 @@ void init_tray(void) { xcb_root, -1, -1, 1, 1, - 1, + 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, root_screen->root_visual, selmask, @@ -1002,9 +1120,13 @@ void init_tray(void) { 1, &orientation); - if (!(tray_reply = xcb_intern_atom_reply(xcb_connection, tray_cookie, NULL))) { - ELOG("Could not get atom %s\n", atomname); - exit(EXIT_FAILURE); + init_tray_colors(); + + if (tray_reply == NULL) { + if (!(tray_reply = xcb_intern_atom_reply(xcb_connection, tray_cookie, NULL))) { + ELOG("Could not get atom %s\n", atomname); + exit(EXIT_FAILURE); + } } xcb_set_selection_owner(xcb_connection, @@ -1031,23 +1153,48 @@ void init_tray(void) { return; } - /* Inform clients waiting for a new _NET_SYSTEM_TRAY that we are here */ - void *event = scalloc(32); - xcb_client_message_event_t *ev = event; - ev->response_type = XCB_CLIENT_MESSAGE; - ev->window = xcb_root; - ev->type = atoms[MANAGER]; - ev->format = 32; - ev->data.data32[0] = XCB_CURRENT_TIME; - ev->data.data32[1] = tray_reply->atom; - ev->data.data32[2] = selwin; - xcb_send_event(xcb_connection, - 0, - xcb_root, - 0xFFFFFF, - (char*)ev); - free(event); - free(tray_reply); + send_tray_clientmessage(); +} + +/* + * We need to set the _NET_SYSTEM_TRAY_COLORS atom on the tray selection window + * to make GTK+ 3 applets with Symbolic Icons visible. If the colors are unset, + * they assume a light background. + * See also https://bugzilla.gnome.org/show_bug.cgi?id=679591 + * + */ +void init_tray_colors(void) { + /* Convert colors.bar_fg (#rrggbb) to 16-bit RGB */ + const char *bar_fg = (config.colors.bar_fg ? config.colors.bar_fg : "#FFFFFF"); + + DLOG("Setting bar_fg = %s as _NET_SYSTEM_TRAY_COLORS\n", bar_fg); + + char strgroups[3][3] = {{bar_fg[1], bar_fg[2], '\0'}, + {bar_fg[3], bar_fg[4], '\0'}, + {bar_fg[5], bar_fg[6], '\0'}}; + const uint8_t r = strtol(strgroups[0], NULL, 16); + const uint8_t g = strtol(strgroups[1], NULL, 16); + const uint8_t b = strtol(strgroups[2], NULL, 16); + + const uint16_t r16 = ((uint16_t)r << 8) | r; + const uint16_t g16 = ((uint16_t)g << 8) | g; + const uint16_t b16 = ((uint16_t)b << 8) | b; + + const uint32_t tray_colors[12] = { + r16, g16, b16, /* foreground color */ + r16, g16, b16, /* error color */ + r16, g16, b16, /* warning color */ + r16, g16, b16, /* success color */ + }; + + xcb_change_property(xcb_connection, + XCB_PROP_MODE_REPLACE, + selwin, + atoms[_NET_SYSTEM_TRAY_COLORS], + XCB_ATOM_CARDINAL, + 32, + 12, + tray_colors); } /* @@ -1107,6 +1254,9 @@ void get_atoms(void) { * */ void kick_tray_clients(i3_output *output) { + if (TAILQ_EMPTY(output->trayclients)) + return; + trayclient *trayclient; while (!TAILQ_EMPTY(output->trayclients)) { trayclient = TAILQ_FIRST(output->trayclients); @@ -1122,6 +1272,20 @@ void kick_tray_clients(i3_output *output) { * event afterwards, but better safe than sorry. */ TAILQ_REMOVE(output->trayclients, trayclient, tailq); } + + /* Fake a DestroyNotify so that Qt re-adds tray icons. + * We cannot actually destroy the window because then Qt will not restore + * its event mask on the new window. */ + uint8_t buffer[32] = { 0 }; + xcb_destroy_notify_event_t *event = (xcb_destroy_notify_event_t*)buffer; + + event->response_type = XCB_DESTROY_NOTIFY; + event->event = selwin; + event->window = selwin; + + xcb_send_event(conn, false, selwin, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (char*)event); + + send_tray_clientmessage(); } /* @@ -1155,7 +1319,7 @@ void realloc_sl_buffer(void) { statusline_pm, xcb_root, MAX(root_screen->width_in_pixels, statusline_width), - root_screen->height_in_pixels); + bar_height); uint32_t mask = XCB_GC_FOREGROUND; uint32_t vals[2] = { colors.bar_bg, colors.bar_bg }; @@ -1189,7 +1353,7 @@ void realloc_sl_buffer(void) { * Reconfigure all bars and create new bars for recently activated outputs * */ -void reconfig_windows(void) { +void reconfig_windows(bool redraw_bars) { uint32_t mask; uint32_t values[5]; static bool tray_configured = false; @@ -1211,8 +1375,8 @@ void reconfig_windows(void) { mask = XCB_CW_BACK_PIXEL | XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK; /* Black background */ values[0] = colors.bar_bg; - /* If hide_on_modifier is set, i3 is not supposed to manage our bar-windows */ - values[1] = config.hide_on_modifier; + /* If hide_on_modifier is set to hide or invisible mode, i3 is not supposed to manage our bar-windows */ + values[1] = (config.hide_on_modifier == M_DOCK ? 0 : 1); /* We enable the following EventMask fields: * EXPOSURE, to get expose events (we have to re-draw then) * SUBSTRUCTURE_REDIRECT, to get ConfigureRequests when the tray @@ -1228,9 +1392,9 @@ void reconfig_windows(void) { root_screen->root_depth, walk->bar, xcb_root, - walk->rect.x, walk->rect.y + walk->rect.h - font.height - 6, - walk->rect.w, font.height + 6, - 1, + walk->rect.x, walk->rect.y + walk->rect.h - bar_height, + walk->rect.w, bar_height, + 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, root_screen->root_visual, mask, @@ -1242,7 +1406,7 @@ void reconfig_windows(void) { walk->buffer, walk->bar, walk->rect.w, - walk->rect.h); + bar_height); /* Set the WM_CLASS and WM_NAME (we don't need UTF-8) atoms */ xcb_void_cookie_t class_cookie; @@ -1303,12 +1467,12 @@ void reconfig_windows(void) { case POS_NONE: break; case POS_TOP: - strut_partial.top = font.height + 6; + strut_partial.top = bar_height; strut_partial.top_start_x = walk->rect.x; strut_partial.top_end_x = walk->rect.x + walk->rect.w; break; case POS_BOT: - strut_partial.bottom = font.height + 6; + strut_partial.bottom = bar_height; strut_partial.bottom_start_x = walk->rect.x; strut_partial.bottom_end_x = walk->rect.x + walk->rect.w; break; @@ -1333,7 +1497,7 @@ void reconfig_windows(void) { /* We finally map the bar (display it on screen), unless the modifier-switch is on */ xcb_void_cookie_t map_cookie; - if (!config.hide_on_modifier) { + if (config.hide_on_modifier == M_DOCK) { map_cookie = xcb_map_window_checked(xcb_connection, walk->bar); } @@ -1344,14 +1508,24 @@ void reconfig_windows(void) { xcb_request_failed(name_cookie, "Could not set WM_NAME") || xcb_request_failed(strut_cookie, "Could not set strut") || xcb_request_failed(gc_cookie, "Could not create graphical context") || - (!config.hide_on_modifier && xcb_request_failed(map_cookie, "Could not map window"))) { + ((config.hide_on_modifier == M_DOCK) && xcb_request_failed(map_cookie, "Could not map window"))) { exit(EXIT_FAILURE); } - if (!tray_configured && - (!config.tray_output || - strcasecmp("none", config.tray_output) != 0)) { - init_tray(); + const char *tray_output = (config.tray_output ? config.tray_output : SLIST_FIRST(outputs)->name); + if (!tray_configured && strcasecmp(tray_output, "none") != 0) { + /* Configuration sanity check: ensure this i3bar instance handles the output on + * which the tray should appear (e.g. don’t initialize a tray if tray_output == + * VGA-1 but output == [HDMI-1]). + */ + i3_output *output; + SLIST_FOREACH(output, outputs, slist) { + if (strcasecmp(output->name, tray_output) == 0 || + (strcasecmp(tray_output, "primary") == 0 && output->primary)) { + init_tray(); + break; + } + } tray_configured = true; } } else { @@ -1362,12 +1536,12 @@ void reconfig_windows(void) { XCB_CONFIG_WINDOW_HEIGHT | XCB_CONFIG_WINDOW_STACK_MODE; values[0] = walk->rect.x; - values[1] = walk->rect.y + walk->rect.h - font.height - 6; + values[1] = walk->rect.y + walk->rect.h - bar_height; values[2] = walk->rect.w; - values[3] = font.height + 6; + values[3] = bar_height; values[4] = XCB_STACK_MODE_ABOVE; - DLOG("Destroying buffer for output %s", walk->name); + DLOG("Destroying buffer for output %s\n", walk->name); xcb_free_pixmap(xcb_connection, walk->buffer); DLOG("Reconfiguring Window for output %s to %d,%d\n", walk->name, values[0], values[1]); @@ -1376,18 +1550,47 @@ void reconfig_windows(void) { mask, values); - DLOG("Recreating buffer for output %s", walk->name); + mask = XCB_CW_OVERRIDE_REDIRECT; + values[0] = (config.hide_on_modifier == M_DOCK ? 0 : 1); + DLOG("Changing Window attribute override_redirect for output %s to %d\n", walk->name, values[0]); + xcb_void_cookie_t chg_cookie = xcb_change_window_attributes(xcb_connection, + walk->bar, + mask, + values); + + DLOG("Recreating buffer for output %s\n", walk->name); xcb_void_cookie_t pm_cookie = xcb_create_pixmap_checked(xcb_connection, root_screen->root_depth, walk->buffer, walk->bar, walk->rect.w, - walk->rect.h); + bar_height); + + xcb_void_cookie_t map_cookie, umap_cookie; + if (redraw_bars) { + /* Unmap the window, and draw it again when in dock mode */ + umap_cookie = xcb_unmap_window_checked(xcb_connection, walk->bar); + if (config.hide_on_modifier == M_DOCK) { + cont_child(); + map_cookie = xcb_map_window_checked(xcb_connection, walk->bar); + } else { + stop_child(); + } - if (xcb_request_failed(cfg_cookie, "Could not reconfigure window")) { - exit(EXIT_FAILURE); + if (config.hide_on_modifier == M_HIDE) { + /* Switching to hide mode, register for keyevents */ + register_xkb_keyevents(); + } else { + /* Switching to dock/invisible mode, deregister from keyevents */ + deregister_xkb_keyevents(); + } } - if (xcb_request_failed(pm_cookie, "Could not create pixmap")) { + + if (xcb_request_failed(cfg_cookie, "Could not reconfigure window") || + xcb_request_failed(chg_cookie, "Could not change window") || + xcb_request_failed(pm_cookie, "Could not create pixmap") || + (redraw_bars && (xcb_request_failed(umap_cookie, "Could not unmap window") || + (config.hide_on_modifier == M_DOCK && xcb_request_failed(map_cookie, "Could not map window"))))) { exit(EXIT_FAILURE); } } @@ -1404,9 +1607,6 @@ void draw_bars(bool unhide) { refresh_statusline(); - static char *last_urgent_ws = NULL; - bool walks_away = true; - i3_output *outputs_walk; SLIST_FOREACH(outputs_walk, outputs, slist) { if (!outputs_walk->active) { @@ -1415,7 +1615,7 @@ void draw_bars(bool unhide) { } if (outputs_walk->bar == XCB_NONE) { /* Oh shit, an active output without an own bar. Create it now! */ - reconfig_windows(); + reconfig_windows(false); } /* First things first: clear the backbuffer */ uint32_t color = colors.bar_bg; @@ -1423,7 +1623,7 @@ void draw_bars(bool unhide) { outputs_walk->bargc, XCB_GC_FOREGROUND, &color); - xcb_rectangle_t rect = { 0, 0, outputs_walk->rect.w, font.height + 6 }; + xcb_rectangle_t rect = { 0, 0, outputs_walk->rect.w, bar_height }; xcb_poly_fill_rectangle(xcb_connection, outputs_walk->buffer, outputs_walk->bargc, @@ -1455,83 +1655,111 @@ void draw_bars(bool unhide) { outputs_walk->bargc, MAX(0, (int16_t)(statusline_width - outputs_walk->rect.w + 4)), 0, MAX(0, (int16_t)(outputs_walk->rect.w - statusline_width - traypx - 4)), 3, - MIN(outputs_walk->rect.w - traypx - 4, statusline_width), font.height); + MIN(outputs_walk->rect.w - traypx - 4, statusline_width), font.height + 2); } - if (config.disable_ws) { - continue; - } - - i3_ws *ws_walk; - - TAILQ_FOREACH(ws_walk, outputs_walk->workspaces, tailq) { - DLOG("Drawing Button for WS %s at x = %d, len = %d\n", i3string_as_utf8(ws_walk->name), i, ws_walk->name_width); - uint32_t fg_color = colors.inactive_ws_fg; - uint32_t bg_color = colors.inactive_ws_bg; - uint32_t border_color = colors.inactive_ws_border; - if (ws_walk->visible) { - if (!ws_walk->focused) { - fg_color = colors.active_ws_fg; - bg_color = colors.active_ws_bg; - border_color = colors.active_ws_border; - } else { - fg_color = colors.focus_ws_fg; - bg_color = colors.focus_ws_bg; - 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 (!config.disable_ws) { + i3_ws *ws_walk; + TAILQ_FOREACH(ws_walk, outputs_walk->workspaces, tailq) { + DLOG("Drawing Button for WS %s at x = %d, len = %d\n", + i3string_as_utf8(ws_walk->name), i, ws_walk->name_width); + uint32_t fg_color = colors.inactive_ws_fg; + uint32_t bg_color = colors.inactive_ws_bg; + uint32_t border_color = colors.inactive_ws_border; + if (ws_walk->visible) { + if (!ws_walk->focused) { + fg_color = colors.active_ws_fg; + bg_color = colors.active_ws_bg; + border_color = colors.active_ws_border; + } else { + fg_color = colors.focus_ws_fg; + bg_color = colors.focus_ws_bg; + border_color = colors.focus_ws_border; + } } - } - if (ws_walk->urgent) { - DLOG("WS %s is urgent!\n", i3string_as_utf8(ws_walk->name)); - fg_color = colors.urgent_ws_fg; - bg_color = colors.urgent_ws_bg; - border_color = colors.urgent_ws_border; - unhide = true; - if (!ws_walk->focused) { - FREE(last_urgent_ws); - last_urgent_ws = sstrdup(i3string_as_utf8(ws_walk->name)); + if (ws_walk->urgent) { + DLOG("WS %s is urgent!\n", i3string_as_utf8(ws_walk->name)); + fg_color = colors.urgent_ws_fg; + bg_color = colors.urgent_ws_bg; + border_color = colors.urgent_ws_border; + unhide = true; } + uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND; + uint32_t vals_border[] = { border_color, border_color }; + xcb_change_gc(xcb_connection, + outputs_walk->bargc, + mask, + vals_border); + xcb_rectangle_t rect_border = { i, 1, ws_walk->name_width + 10, font.height + 4 }; + xcb_poly_fill_rectangle(xcb_connection, + outputs_walk->buffer, + outputs_walk->bargc, + 1, + &rect_border); + uint32_t vals[] = { bg_color, bg_color }; + xcb_change_gc(xcb_connection, + outputs_walk->bargc, + mask, + vals); + xcb_rectangle_t rect = { i + 1, 2, ws_walk->name_width + 8, font.height + 2 }; + xcb_poly_fill_rectangle(xcb_connection, + outputs_walk->buffer, + outputs_walk->bargc, + 1, + &rect); + set_font_colors(outputs_walk->bargc, fg_color, bg_color); + draw_text(ws_walk->name, outputs_walk->buffer, outputs_walk->bargc, + i + 5, 3, ws_walk->name_width); + i += 10 + ws_walk->name_width + 1; + } + } + + if (binding.name && !config.disable_binding_mode_indicator) { + uint32_t fg_color = colors.urgent_ws_fg; + uint32_t bg_color = colors.urgent_ws_bg; uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND; - uint32_t vals_border[] = { border_color, border_color }; + + uint32_t vals_border[] = { colors.urgent_ws_border, colors.urgent_ws_border }; xcb_change_gc(xcb_connection, outputs_walk->bargc, mask, vals_border); - xcb_rectangle_t rect_border = { i, 0, ws_walk->name_width + 10, font.height + 4 }; + xcb_rectangle_t rect_border = { i, 1, binding.width + 10, font.height + 4 }; xcb_poly_fill_rectangle(xcb_connection, outputs_walk->buffer, outputs_walk->bargc, 1, &rect_border); + uint32_t vals[] = { bg_color, bg_color }; xcb_change_gc(xcb_connection, outputs_walk->bargc, mask, vals); - xcb_rectangle_t rect = { i + 1, 1, ws_walk->name_width + 8, font.height + 2 }; + xcb_rectangle_t rect = { i + 1, 2, binding.width + 8, font.height + 2 }; xcb_poly_fill_rectangle(xcb_connection, outputs_walk->buffer, outputs_walk->bargc, 1, &rect); + set_font_colors(outputs_walk->bargc, fg_color, bg_color); - draw_text(ws_walk->name, outputs_walk->buffer, outputs_walk->bargc, i + 5, 2, ws_walk->name_width); - i += 10 + ws_walk->name_width + 1; + draw_text(binding.name, outputs_walk->buffer, outputs_walk->bargc, i + 5, 3, binding.width); + + unhide = true; } i = 0; } - if (!mod_pressed) { - if (unhide) { - /* The urgent-hint should get noticed, so we unhide the bars shortly */ - unhide_bars(); - } else if (walks_away) { - FREE(last_urgent_ws); - hide_bars(); - } + /* Assure the bar is hidden/unhidden according to the specified hidden_state and mode */ + if (mod_pressed || + config.hidden_state == S_SHOW || + unhide) { + unhide_bars(); + } else if (config.hide_on_modifier == M_HIDE) { + hide_bars(); } redraw_bars(); @@ -1558,3 +1786,14 @@ void redraw_bars(void) { xcb_flush(xcb_connection); } } + +/* + * Set the current binding mode + * + */ +void set_current_mode(struct mode *current) { + I3STRING_FREE(binding.name); + binding = *current; + activated_mode = binding.name != NULL; + return; +}