X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3bar%2Fsrc%2Fxcb.c;h=f90bbceede5e51356204f85d1e9ceb38874606a7;hb=e240c118c742b73506c9ea840b7144ce6d6c42a7;hp=96fcb3fa39157bb75e8935a9cca288d77a024760;hpb=8d0fb482d98ff8932b40b30eb8dd78acf51f4aef;p=i3%2Fi3 diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c index 96fcb3fa..d43a4bdd 100644 --- a/i3bar/src/xcb.c +++ b/i3bar/src/xcb.c @@ -2,19 +2,18 @@ * vim:ts=4:sw=4:expandtab * * i3bar - an xcb-based status- and ws-bar for i3 - * © 2010-2012 Axel Wagner and contributors (see also: LICENSE) + * © 2010 Axel Wagner and contributors (see also: LICENSE) * * xcb.c: Communicating with X * */ +#include "common.h" + #include #include #include #include - -#ifdef XCB_COMPAT -#include "xcb_compat.h" -#endif +#include #include #include @@ -31,10 +30,17 @@ #include #include -#include "common.h" +#ifdef I3_ASAN_ENABLED +#include +#endif + #include "libi3.h" -/* We save the Atoms in an easy to access array, indexed by an enum */ +/** This is the equivalent of XC_left_ptr. I’m not sure why xcb doesn’t have a + * constant for that. */ +#define XCB_CURSOR_LEFT_PTR 68 + +/* We save the atoms in an easy to access array, indexed by an enum */ enum { #define ATOM_DO(name) name, #include "xcb_atoms.def" @@ -49,6 +55,7 @@ xcb_connection_t *xcb_connection; int screen; xcb_screen_t *root_screen; xcb_window_t xcb_root; +static xcb_cursor_t cursor; /* selection window for tray support */ static xcb_window_t selwin = XCB_NONE; @@ -60,23 +67,22 @@ xcb_connection_t *conn; /* The font we'll use */ static i3Font font; +/* Icon size (based on font size) */ +int icon_size; + +xcb_visualtype_t *visual_type; +uint8_t depth; +xcb_colormap_t colormap; + /* 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 */ int xkb_base; -int mod_pressed = 0; - -/* Because the statusline is the same on all outputs, we have - * global buffer to render it on */ -xcb_gcontext_t statusline_ctx; -xcb_gcontext_t statusline_clear; -xcb_pixmap_t statusline_pm; -uint32_t statusline_width; +bool mod_pressed = 0; -/* Event-Watchers, to interact with the user */ +/* Event watchers, to interact with the user */ ev_prepare *xcb_prep; -ev_check *xcb_chk; ev_io *xcb_io; ev_io *xkb_io; @@ -86,47 +92,54 @@ static mode binding; /* Indicates whether a new binding mode was recently activated */ bool activated_mode = false; +/* The output in which the tray should be displayed. */ +static i3_output *output_for_tray; + /* 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; - uint32_t inactive_ws_fg; - uint32_t inactive_ws_bg; - uint32_t inactive_ws_border; - uint32_t urgent_ws_bg; - uint32_t urgent_ws_fg; - uint32_t urgent_ws_border; - uint32_t focus_ws_bg; - uint32_t focus_ws_fg; - uint32_t focus_ws_border; + color_t bar_fg; + color_t bar_bg; + color_t sep_fg; + color_t focus_bar_fg; + color_t focus_bar_bg; + color_t focus_sep_fg; + color_t active_ws_fg; + color_t active_ws_bg; + color_t active_ws_border; + color_t inactive_ws_fg; + color_t inactive_ws_bg; + color_t inactive_ws_border; + color_t urgent_ws_bg; + color_t urgent_ws_fg; + color_t urgent_ws_border; + color_t focus_ws_bg; + color_t focus_ws_fg; + color_t focus_ws_border; + color_t binding_mode_bg; + color_t binding_mode_fg; + color_t binding_mode_border; }; struct xcb_colors_t colors; /* Horizontal offset between a workspace label and button borders */ -const static int ws_hoff_px = 4; +static const int ws_hoff_px = 4; /* Vertical offset between a workspace label and button borders */ -const static int ws_voff_px = 3; +static const int ws_voff_px = 3; /* Offset between two workspace buttons */ -const static int ws_spacing_px = 1; +static const int ws_spacing_px = 1; /* Offset between the statusline and 1) workspace buttons on the left * 2) the tray or screen edge on the right */ -const static int sb_hoff_px = 4; +static const int sb_hoff_px = 4; /* Additional offset between the tray and the statusline, if the tray is not empty */ -const static int tray_loff_px = 2; +static const int tray_loff_px = 2; /* Vertical offset between the bar and a separator */ -const static int sep_voff_px = 4; +static const int sep_voff_px = 4; -/* We define xcb_request_failed as a macro to include the relevant line-number */ -#define xcb_request_failed(cookie, err_msg) _xcb_request_failed(cookie, err_msg, __LINE__) int _xcb_request_failed(xcb_void_cookie_t cookie, char *err_msg, int line) { xcb_generic_error_t *err; if ((err = xcb_request_check(xcb_connection, cookie)) != NULL) { @@ -136,19 +149,19 @@ int _xcb_request_failed(xcb_void_cookie_t cookie, char *err_msg, int line) { return 0; } -uint32_t get_sep_offset(struct status_block *block) { +static uint32_t get_sep_offset(struct status_block *block) { if (!block->no_separator && block->sep_block_width > 0) return block->sep_block_width / 2 + block->sep_block_width % 2; return 0; } -int get_tray_width(struct tc_head *trayclients) { +static int get_tray_width(struct tc_head *trayclients) { trayclient *trayclient; int tray_width = 0; TAILQ_FOREACH_REVERSE(trayclient, trayclients, tc_head, tailq) { if (!trayclient->mapped) continue; - tray_width += font.height + logical_px(2); + tray_width += icon_size + logical_px(config.tray_padding); } if (tray_width > 0) tray_width += logical_px(tray_loff_px); @@ -156,99 +169,162 @@ int get_tray_width(struct tc_head *trayclients) { } /* - * Redraws the statusline to the buffer + * Draws a separator for the given block if necessary. * */ -void refresh_statusline(void) { - struct status_block *block; +static void draw_separator(i3_output *output, uint32_t x, struct status_block *block, bool use_focus_colors) { + color_t sep_fg = (use_focus_colors ? colors.focus_sep_fg : colors.sep_fg); + color_t bar_bg = (use_focus_colors ? colors.focus_bar_bg : colors.bar_bg); + + uint32_t sep_offset = get_sep_offset(block); + if (TAILQ_NEXT(block, blocks) == NULL || sep_offset == 0) + return; - uint32_t old_statusline_width = statusline_width; - statusline_width = 0; + uint32_t center_x = x - sep_offset; + if (config.separator_symbol == NULL) { + /* Draw a classic one pixel, vertical separator. */ + draw_util_rectangle(&output->statusline_buffer, sep_fg, + center_x, + logical_px(sep_voff_px), + logical_px(1), + bar_height - 2 * logical_px(sep_voff_px)); + } else { + /* Draw a custom separator. */ + uint32_t separator_x = MAX(x - block->sep_block_width, center_x - separator_symbol_width / 2); + draw_util_text(config.separator_symbol, &output->statusline_buffer, sep_fg, bar_bg, + separator_x, logical_px(ws_voff_px), x - separator_x); + } +} + +static uint32_t predict_statusline_length(bool use_short_text) { + uint32_t width = 0; + struct status_block *block; - /* Predict the text width of all blocks (in pixels). */ TAILQ_FOREACH(block, &statusline_head, blocks) { - if (i3string_get_num_bytes(block->full_text) == 0) + i3String *text = block->full_text; + struct status_block_render_desc *render = &block->full_render; + if (use_short_text && block->short_text != NULL) { + text = block->short_text; + render = &block->short_render; + } + + if (i3string_get_num_bytes(text) == 0) continue; - block->width = predict_text_width(block->full_text); + render->width = predict_text_width(text); + if (block->border) + render->width += logical_px(2); /* Compute offset and append for text aligment in min_width. */ - if (block->min_width <= block->width) { - block->x_offset = 0; - block->x_append = 0; + if (block->min_width <= render->width) { + render->x_offset = 0; + render->x_append = 0; } else { - uint32_t padding_width = block->min_width - block->width; + uint32_t padding_width = block->min_width - render->width; switch (block->align) { case ALIGN_LEFT: - block->x_append = padding_width; + render->x_append = padding_width; break; case ALIGN_RIGHT: - block->x_offset = padding_width; + render->x_offset = padding_width; break; case ALIGN_CENTER: - block->x_offset = padding_width / 2; - block->x_append = padding_width / 2 + padding_width % 2; + render->x_offset = padding_width / 2; + render->x_append = padding_width / 2 + padding_width % 2; break; } } + width += render->width + render->x_offset + render->x_append; + /* If this is not the last block, add some pixels for a separator. */ if (TAILQ_NEXT(block, blocks) != NULL) - statusline_width += block->sep_block_width; - - statusline_width += block->width + block->x_offset + block->x_append; + width += block->sep_block_width; } - /* If the statusline is bigger than our screen we need to make sure that - * the pixmap provides enough space, so re-allocate if the width grew */ - if (statusline_width > root_screen->width_in_pixels && - statusline_width > old_statusline_width) - realloc_sl_buffer(); + return width; +} + +/* + * Redraws the statusline to the output's statusline_buffer + */ +static void draw_statusline(i3_output *output, uint32_t clip_left, bool use_focus_colors, bool use_short_text) { + struct status_block *block; - /* Clear the statusline pixmap. */ - xcb_rectangle_t rect = {0, 0, MAX(root_screen->width_in_pixels, statusline_width), bar_height}; - xcb_poly_fill_rectangle(xcb_connection, statusline_pm, statusline_clear, 1, &rect); + color_t bar_color = (use_focus_colors ? colors.focus_bar_bg : colors.bar_bg); + draw_util_clear_surface(&output->statusline_buffer, bar_color); - /* Draw the text of each block. */ - uint32_t x = 0; + /* Use unsigned integer wraparound to clip off the left side. + * For example, if clip_left is 75, then x will start at the very large + * number INT_MAX-75, which is way outside the surface dimensions. Drawing + * to that x position is a no-op which XCB and Cairo safely ignore. Once x moves + * up by 75 and goes past INT_MAX, it will wrap around again to 0, and we start + * actually rendering content to the surface. */ + uint32_t x = 0 - clip_left; + + /* Draw the text of each block */ TAILQ_FOREACH(block, &statusline_head, blocks) { - if (i3string_get_num_bytes(block->full_text) == 0) + i3String *text = block->full_text; + struct status_block_render_desc *render = &block->full_render; + if (use_short_text && block->short_text != NULL) { + text = block->short_text; + render = &block->short_render; + } + + if (i3string_get_num_bytes(text) == 0) continue; - uint32_t fg_color; - /* If this block is urgent, draw it with the defined color and border. */ + color_t fg_color; if (block->urgent) { fg_color = colors.urgent_ws_fg; + } else if (block->color) { + fg_color = draw_util_hex_to_color(block->color); + } else if (use_focus_colors) { + fg_color = colors.focus_bar_fg; + } else { + fg_color = colors.bar_fg; + } - uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND; + color_t bg_color = bar_color; - /* Draw the background */ - uint32_t bg_color = colors.urgent_ws_bg; - uint32_t bg_values[] = {bg_color, bg_color}; - xcb_change_gc(xcb_connection, statusline_ctx, mask, bg_values); + int border_width = (block->border) ? logical_px(1) : 0; + int full_render_width = render->width + render->x_offset + render->x_append; + if (block->border || block->background || block->urgent) { + /* Let's determine the colors first. */ + color_t border_color = bar_color; + if (block->urgent) { + border_color = colors.urgent_ws_border; + bg_color = colors.urgent_ws_bg; + } else { + if (block->border) + border_color = draw_util_hex_to_color(block->border); + if (block->background) + bg_color = draw_util_hex_to_color(block->background); + } - /* The urgent background “overshoots” by 2 px so that the text that - * is printed onto it will not be look so cut off. */ - xcb_rectangle_t bg_rect = {x - logical_px(2), logical_px(1), block->width + logical_px(4), bar_height - logical_px(2)}; - xcb_poly_fill_rectangle(xcb_connection, statusline_pm, statusline_ctx, 1, &bg_rect); - } else { - fg_color = (block->color ? get_colorpixel(block->color) : colors.bar_fg); + /* Draw the border. */ + draw_util_rectangle(&output->statusline_buffer, border_color, + x, logical_px(1), + full_render_width, + bar_height - logical_px(2)); + + /* Draw the background. */ + draw_util_rectangle(&output->statusline_buffer, bg_color, + x + border_width, + logical_px(1) + border_width, + full_render_width - 2 * border_width, + bar_height - 2 * border_width - logical_px(2)); } - set_font_colors(statusline_ctx, fg_color, colors.bar_bg); - draw_text(block->full_text, statusline_pm, statusline_ctx, x + block->x_offset, logical_px(ws_voff_px), block->width); - x += block->width + block->sep_block_width + block->x_offset + block->x_append; - - uint32_t sep_offset = get_sep_offset(block); - if (TAILQ_NEXT(block, blocks) != NULL && sep_offset > 0) { - /* This is not the last block, draw a separator. */ - uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND | XCB_GC_LINE_WIDTH; - uint32_t values[] = {colors.sep_fg, colors.bar_bg, logical_px(1)}; - 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 - sep_offset, logical_px(sep_voff_px)}, - {x - sep_offset, bar_height - logical_px(sep_voff_px)}}); + draw_util_text(text, &output->statusline_buffer, fg_color, bg_color, + x + render->x_offset + border_width, logical_px(ws_voff_px), + render->width - 2 * border_width); + x += full_render_width; + + /* If this is not the last block, draw a separator. */ + if (TAILQ_NEXT(block, blocks) != NULL) { + x += block->sep_block_width; + draw_separator(output, x, block, use_focus_colors); } } } @@ -257,7 +333,7 @@ void refresh_statusline(void) { * Hides all bars (unmaps them) * */ -void hide_bars(void) { +static void hide_bars(void) { if ((config.hide_on_modifier == M_DOCK) || (config.hidden_state == S_SHOW && config.hide_on_modifier == M_HIDE)) { return; } @@ -267,7 +343,7 @@ void hide_bars(void) { if (!walk->active) { continue; } - xcb_unmap_window(xcb_connection, walk->bar); + xcb_unmap_window(xcb_connection, walk->bar.id); } stop_child(); } @@ -276,7 +352,7 @@ void hide_bars(void) { * Unhides all bars (maps them) * */ -void unhide_bars(void) { +static void unhide_bars(void) { if (config.hide_on_modifier != M_HIDE) { return; } @@ -289,7 +365,7 @@ void unhide_bars(void) { cont_child(); SLIST_FOREACH(walk, outputs, slist) { - if (walk->bar == XCB_NONE) { + if (walk->bar.id == XCB_NONE) { continue; } mask = XCB_CONFIG_WINDOW_X | @@ -307,14 +383,14 @@ void unhide_bars(void) { 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, - walk->bar, + walk->bar.id, mask, values); if (xcb_request_failed(cookie, "Could not reconfigure window")) { exit(EXIT_FAILURE); } - xcb_map_window(xcb_connection, walk->bar); + xcb_map_window(xcb_connection, walk->bar.id); } } @@ -323,9 +399,9 @@ void unhide_bars(void) { * */ void init_colors(const struct xcb_color_strings_t *new_colors) { -#define PARSE_COLOR(name, def) \ - do { \ - colors.name = get_colorpixel(new_colors->name ? new_colors->name : def); \ +#define PARSE_COLOR(name, def) \ + do { \ + colors.name = draw_util_hex_to_color(new_colors->name ? new_colors->name : def); \ } while (0) PARSE_COLOR(bar_fg, "#FFFFFF"); PARSE_COLOR(bar_bg, "#000000"); @@ -344,22 +420,52 @@ void init_colors(const struct xcb_color_strings_t *new_colors) { PARSE_COLOR(focus_ws_border, "#4c7899"); #undef PARSE_COLOR +#define PARSE_COLOR_FALLBACK(name, fallback) \ + do { \ + colors.name = new_colors->name ? draw_util_hex_to_color(new_colors->name) : colors.fallback; \ + } while (0) + + /* For the binding mode indicator colors, we don't hardcode a default. + * Instead, we fall back to urgent_ws_* colors. */ + PARSE_COLOR_FALLBACK(binding_mode_fg, urgent_ws_fg); + PARSE_COLOR_FALLBACK(binding_mode_bg, urgent_ws_bg); + PARSE_COLOR_FALLBACK(binding_mode_border, urgent_ws_border); + + /* Similarly, for unspecified focused bar colors, we fall back to the + * regular bar colors. */ + PARSE_COLOR_FALLBACK(focus_bar_fg, bar_fg); + PARSE_COLOR_FALLBACK(focus_bar_bg, bar_bg); + PARSE_COLOR_FALLBACK(focus_sep_fg, sep_fg); +#undef PARSE_COLOR_FALLBACK + init_tray_colors(); xcb_flush(xcb_connection); } +static bool execute_custom_command(xcb_keycode_t input_code, bool event_is_release) { + binding_t *binding; + TAILQ_FOREACH(binding, &(config.bindings), bindings) { + if ((binding->input_code != input_code) || (binding->release != event_is_release)) + continue; + + i3_send_msg(I3_IPC_MESSAGE_TYPE_RUN_COMMAND, binding->command); + return true; + } + return false; +} + /* - * Handle a button-press-event (i.e. a mouse click on one of our bars). - * We determine, whether the click occured on a ws-button or if the scroll- + * Handle a button press event (i.e. a mouse click on one of our bars). + * We determine, whether the click occurred on a workspace button or if the scroll- * wheel was used and change the workspace appropriately * */ -void handle_button(xcb_button_press_event_t *event) { +static void handle_button(xcb_button_press_event_t *event) { /* Determine, which bar was clicked */ i3_output *walk; xcb_window_t bar = event->event; SLIST_FOREACH(walk, outputs, slist) { - if (walk->bar == bar) { + if (walk->bar.id == bar) { break; } } @@ -369,11 +475,16 @@ void handle_button(xcb_button_press_event_t *event) { return; } - int32_t x = event->event_x >= 0 ? event->event_x : 0; - int32_t original_x = x; - DLOG("Got button %d\n", event->detail); + /* During button release events, only check for custom commands. */ + const bool event_is_release = (event->response_type & ~0x80) == XCB_BUTTON_RELEASE; + if (event_is_release) { + execute_custom_command(event->detail, event_is_release); + return; + } + + int32_t x = event->event_x >= 0 ? event->event_x : 0; int workspace_width = 0; i3_ws *cur_ws = NULL, *clicked_ws = NULL, *ws_walk; @@ -392,69 +503,64 @@ void handle_button(xcb_button_press_event_t *event) { /* If the child asked for click events, * check if a status block has been clicked. */ int tray_width = get_tray_width(walk->trayclients); - int block_x = 0, last_block_x; - int offset = walk->rect.w - statusline_width - tray_width - logical_px(sb_hoff_px); + int last_block_x = 0; + int offset = walk->rect.w - walk->statusline_width - tray_width - logical_px((tray_width > 0) * sb_hoff_px); + int32_t statusline_x = x - offset; - x = original_x - offset; - if (x >= 0) { + if (statusline_x >= 0 && statusline_x < walk->statusline_width) { struct status_block *block; - int sep_offset_remainder = 0; TAILQ_FOREACH(block, &statusline_head, blocks) { - if (i3string_get_num_bytes(block->full_text) == 0) - continue; + i3String *text = block->full_text; + struct status_block_render_desc *render = &block->full_render; + if (walk->statusline_short_text && block->short_text != NULL) { + text = block->short_text; + render = &block->short_render; + } - last_block_x = block_x; - block_x += block->width + block->x_offset + block->x_append + get_sep_offset(block) + sep_offset_remainder; + if (i3string_get_num_bytes(text) == 0) + continue; - if (x <= block_x && x >= last_block_x) { - send_block_clicked(event->detail, block->name, block->instance, event->root_x, event->root_y); + const int relative_x = statusline_x - last_block_x; + if (relative_x >= 0 && (uint32_t)relative_x <= render->width) { + send_block_clicked(event->detail, block->name, block->instance, + event->root_x, event->root_y, relative_x, event->event_y, render->width, bar_height); return; } - sep_offset_remainder = block->sep_block_width - get_sep_offset(block); + last_block_x += render->width + render->x_append + render->x_offset + block->sep_block_width; } } - x = original_x; + } + + /* If a custom command was specified for this mouse button, it overrides + * the default behavior. */ + if (execute_custom_command(event->detail, event_is_release)) { + return; } if (cur_ws == NULL) { DLOG("No workspace active?\n"); return; } - switch (event->detail) { - case 4: + case XCB_BUTTON_SCROLL_UP: + case XCB_BUTTON_SCROLL_LEFT: /* 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 `wheel_up_cmd [COMMAND]` was specified, it should override - * the default behavior */ - if (config.wheel_up_cmd) { - i3_send_msg(I3_IPC_MESSAGE_TYPE_COMMAND, config.wheel_up_cmd); - return; - } - if (cur_ws == TAILQ_FIRST(walk->workspaces)) return; cur_ws = TAILQ_PREV(cur_ws, ws_head, tailq); break; - case 5: + case XCB_BUTTON_SCROLL_DOWN: + case XCB_BUTTON_SCROLL_RIGHT: /* 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 `wheel_down_cmd [COMMAND]` was specified, it should override - * the default behavior */ - if (config.wheel_down_cmd) { - i3_send_msg(I3_IPC_MESSAGE_TYPE_COMMAND, config.wheel_down_cmd); - return; - } - if (cur_ws == TAILQ_LAST(walk->workspaces, ws_head)) return; @@ -489,7 +595,7 @@ void handle_button(xcb_button_press_event_t *event) { size_t namelen = 0; const char *utf8_name = cur_ws->canonical_name; for (const char *walk = utf8_name; *walk != '\0'; walk++) { - if (*walk == '"') + if (*walk == '"' || *walk == '\\') num_quotes++; /* While we’re looping through the name anyway, we can save one * strlen(). */ @@ -497,26 +603,26 @@ void handle_button(xcb_button_press_event_t *event) { } const size_t len = namelen + strlen("workspace \"\"") + 1; - char *buffer = scalloc(len + num_quotes); - strncpy(buffer, "workspace \"", strlen("workspace \"")); + char *buffer = scalloc(len + num_quotes, 1); + memcpy(buffer, "workspace \"", strlen("workspace \"")); size_t inpos, outpos; for (inpos = 0, outpos = strlen("workspace \""); inpos < namelen; inpos++, outpos++) { - if (utf8_name[inpos] == '"') { + if (utf8_name[inpos] == '"' || utf8_name[inpos] == '\\') { buffer[outpos] = '\\'; outpos++; } buffer[outpos] = utf8_name[inpos]; } buffer[outpos] = '"'; - i3_send_msg(I3_IPC_MESSAGE_TYPE_COMMAND, buffer); + i3_send_msg(I3_IPC_MESSAGE_TYPE_RUN_COMMAND, buffer); free(buffer); } /* * Handle visibility notifications: when none of the bars are visible, e.g. - * if windows are in full-screen on each output, suspend the child process. + * if windows are in fullscreen on each output, suspend the child process. * */ static void handle_visibility_notify(xcb_visibility_notify_event_t *event) { @@ -528,7 +634,7 @@ static void handle_visibility_notify(xcb_visibility_notify_event_t *event) { if (!output->active) { continue; } - if (output->bar == event->window) { + if (output->bar.id == event->window) { if (output->visible == visible) { return; } @@ -567,8 +673,8 @@ static void configure_trayclients(void) { clients++; DLOG("Configuring tray window %08x to x=%d\n", - trayclient->win, output->rect.w - (clients * (font.height + logical_px(2)))); - uint32_t x = output->rect.w - (clients * (font.height + logical_px(2))); + trayclient->win, output->rect.w - (clients * (icon_size + logical_px(config.tray_padding)))); + uint32_t x = output->rect.w - (clients * (icon_size + logical_px(config.tray_padding))); xcb_configure_window(xcb_connection, trayclient->win, XCB_CONFIG_WINDOW_X, @@ -585,8 +691,17 @@ static void configure_trayclients(void) { * */ static void handle_client_message(xcb_client_message_event_t *event) { - if (event->type == atoms[_NET_SYSTEM_TRAY_OPCODE] && - event->format == 32) { + if (event->type == atoms[I3_SYNC]) { + xcb_window_t window = event->data.data32[0]; + uint32_t rnd = event->data.data32[1]; + /* Forward the request to i3 via the IPC interface so that all pending + * IPC messages are guaranteed to be handled. */ + char *payload = NULL; + sasprintf(&payload, "{\"rnd\":%d, \"window\":%d}", rnd, window); + i3_send_msg(I3_IPC_MESSAGE_TYPE_SYNC, payload); + free(payload); + } else if (event->type == atoms[_NET_SYSTEM_TRAY_OPCODE] && + event->format == 32) { DLOG("_NET_SYSTEM_TRAY_OPCODE received\n"); /* event->data.data32[0] is the timestamp */ uint32_t op = event->data.data32[1]; @@ -595,15 +710,17 @@ static void handle_client_message(xcb_client_message_event_t *event) { if (op == SYSTEM_TRAY_REQUEST_DOCK) { xcb_window_t client = event->data.data32[2]; - /* Listen for PropertyNotify events to get the most recent value of - * the XEMBED_MAPPED atom, also listen for UnmapNotify events */ mask = XCB_CW_EVENT_MASK; - values[0] = XCB_EVENT_MASK_PROPERTY_CHANGE | - XCB_EVENT_MASK_STRUCTURE_NOTIFY; - xcb_change_window_attributes(xcb_connection, - client, - mask, - values); + + /* Needed to get the most recent value of XEMBED_MAPPED. */ + values[0] = XCB_EVENT_MASK_PROPERTY_CHANGE; + /* Needed for UnmapNotify events. */ + values[0] |= XCB_EVENT_MASK_STRUCTURE_NOTIFY; + /* Needed because some tray applications (e.g., VLC) use + * override_redirect which causes no ConfigureRequest to be sent. */ + values[0] |= XCB_EVENT_MASK_RESIZE_REDIRECT; + + xcb_change_window_attributes(xcb_connection, client, mask, values); /* Request the _XEMBED_INFO property. The XEMBED specification * (which is referred by the tray specification) says this *has* to @@ -644,65 +761,43 @@ static void handle_client_message(xcb_client_message_event_t *event) { } DLOG("X window %08x requested docking\n", client); - i3_output *walk, *output = NULL; - SLIST_FOREACH(walk, outputs, slist) { - if (!walk->active) - continue; - if (config.tray_output) { - if ((strcasecmp(walk->name, config.tray_output) != 0) && - (!walk->primary || strcasecmp("primary", config.tray_output) != 0)) - continue; - } - DLOG("using output %s\n", walk->name); - output = walk; - break; - } - /* In case of tray_output == primary and there is no primary output - * configured, we fall back to the first available output. */ - if (output == NULL && - config.tray_output && - strcasecmp("primary", config.tray_output) == 0) { - SLIST_FOREACH(walk, outputs, slist) { - if (!walk->active) - continue; - DLOG("Falling back to output %s because no primary output is configured\n", walk->name); - output = walk; - break; - } - } - if (output == NULL) { - ELOG("No output found\n"); + if (output_for_tray == NULL) { + ELOG("No output found for tray\n"); return; } - xcb_reparent_window(xcb_connection, - client, - output->bar, - output->rect.w - font.height - 2, - 2); + + xcb_void_cookie_t rcookie = xcb_reparent_window(xcb_connection, + client, + output_for_tray->bar.id, + output_for_tray->rect.w - icon_size - logical_px(config.tray_padding), + logical_px(config.tray_padding)); + if (xcb_request_failed(rcookie, "Could not reparent window. Maybe it is using an incorrect depth/visual?")) + return; + /* We reconfigure the window to use a reasonable size. The systray * specification explicitly says: * Tray icons may be assigned any size by the system tray, and * should do their best to cope with any size effectively */ mask = XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT; - values[0] = font.height; - values[1] = font.height; + values[0] = icon_size; + values[1] = icon_size; xcb_configure_window(xcb_connection, client, mask, values); /* send the XEMBED_EMBEDDED_NOTIFY message */ - void *event = scalloc(32); + void *event = scalloc(32, 1); xcb_client_message_event_t *ev = event; ev->response_type = XCB_CLIENT_MESSAGE; ev->window = client; ev->type = atoms[_XEMBED]; ev->format = 32; ev->data.data32[0] = XCB_CURRENT_TIME; - ev->data.data32[1] = atoms[XEMBED_EMBEDDED_NOTIFY]; - ev->data.data32[2] = output->bar; + ev->data.data32[1] = XEMBED_EMBEDDED_NOTIFY; + ev->data.data32[2] = output_for_tray->bar.id; ev->data.data32[3] = xe_version; xcb_send_event(xcb_connection, 0, @@ -722,7 +817,7 @@ static void handle_client_message(xcb_client_message_event_t *event) { tc->win = client; tc->xe_version = xe_version; tc->mapped = false; - TAILQ_INSERT_TAIL(output->trayclients, tc, tailq); + TAILQ_INSERT_TAIL(output_for_tray->trayclients, tc, tailq); if (map_it) { DLOG("Mapping dock client\n"); @@ -744,7 +839,7 @@ static void handle_client_message(xcb_client_message_event_t *event) { * client to finish the protocol. After this event is received, there is no * further interaction with the tray client. * - * See: http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html + * See: https://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html * */ static void handle_destroy_notify(xcb_destroy_notify_event_t *event) { @@ -757,11 +852,13 @@ static void handle_destroy_notify(xcb_destroy_notify_event_t *event) { DLOG("checking output %s\n", walk->name); trayclient *trayclient; TAILQ_FOREACH(trayclient, walk->trayclients, tailq) { - if (trayclient->win != event->window) + if (trayclient->win != event->window) { continue; + } DLOG("Removing tray client with window ID %08x\n", event->window); TAILQ_REMOVE(walk->trayclients, trayclient, tailq); + FREE(trayclient); /* Trigger an update, we now have more space for the statusline */ configure_trayclients(); @@ -881,7 +978,7 @@ static void handle_property_notify(xcb_property_notify_event_t *event) { DLOG("xembed version = %d\n", xembed[0]); DLOG("xembed flags = %d\n", xembed[1]); bool map_it = ((xembed[1] & XEMBED_MAPPED) == XEMBED_MAPPED); - DLOG("map-state now %d\n", map_it); + DLOG("map state now %d\n", map_it); if (trayclient->mapped && !map_it) { /* need to unmap the window */ xcb_unmap_window(xcb_connection, trayclient->win); @@ -894,13 +991,11 @@ static void handle_property_notify(xcb_property_notify_event_t *event) { } /* - * Handle ConfigureRequests by denying them and sending the client a - * ConfigureNotify with its actual size. + * If a tray client attempts to change its size we deny the request and respond + * by telling it its actual size. * */ -static void handle_configure_request(xcb_configure_request_event_t *event) { - DLOG("ConfigureRequest for window = %08x\n", event->window); - +static void handle_configuration_change(xcb_window_t window) { trayclient *trayclient; i3_output *output; SLIST_FOREACH(output, outputs, slist) { @@ -913,17 +1008,17 @@ static void handle_configure_request(xcb_configure_request_event_t *event) { continue; clients++; - if (trayclient->win != event->window) + if (trayclient->win != window) continue; xcb_rectangle_t rect; - rect.x = output->rect.w - (clients * (font.height + 2)); - rect.y = 2; - rect.width = font.height; - rect.height = font.height; + rect.x = output->rect.w - (clients * (icon_size + logical_px(config.tray_padding))); + rect.y = logical_px(config.tray_padding); + rect.width = icon_size; + rect.height = icon_size; DLOG("This is a tray window. x = %d\n", rect.x); - fake_configure_notify(xcb_connection, rect, event->window, 0); + fake_configure_notify(xcb_connection, rect, window, 0); return; } } @@ -931,79 +1026,55 @@ static void handle_configure_request(xcb_configure_request_event_t *event) { DLOG("WARNING: Could not find corresponding tray window.\n"); } -/* - * This function is called immediately before the main loop locks. We flush xcb - * then (and only then) - * - */ -void xcb_prep_cb(struct ev_loop *loop, ev_prepare *watcher, int revents) { - xcb_flush(xcb_connection); +static void handle_configure_request(xcb_configure_request_event_t *event) { + DLOG("ConfigureRequest for window = %08x\n", event->window); + handle_configuration_change(event->window); +} + +static void handle_resize_request(xcb_resize_request_event_t *event) { + DLOG("ResizeRequest for window = %08x\n", event->window); + handle_configuration_change(event->window); } /* - * This function is called immediately after the main loop locks, so when one - * of the watchers registered an event. - * We check whether an X-Event arrived and handle it. + * This function is called immediately before the main loop locks. We check for + * events from X11, handle them, then flush our outgoing queue. * */ -void xcb_chk_cb(struct ev_loop *loop, ev_check *watcher, int revents) { +static void xcb_prep_cb(struct ev_loop *loop, ev_prepare *watcher, int revents) { xcb_generic_event_t *event; if (xcb_connection_has_error(xcb_connection)) { ELOG("X11 connection was closed unexpectedly - maybe your X server terminated / crashed?\n"); +#ifdef I3_ASAN_ENABLED + __lsan_do_leak_check(); +#endif exit(1); } while ((event = xcb_poll_for_event(xcb_connection)) != NULL) { + if (event->response_type == 0) { + xcb_generic_error_t *error = (xcb_generic_error_t *)event; + DLOG("Received X11 error, sequence 0x%x, error_code = %d\n", error->sequence, error->error_code); + free(event); + continue; + } + int type = (event->response_type & ~0x80); if (type == xkb_base && xkb_base > -1) { DLOG("received an xkb event\n"); xcb_xkb_state_notify_event_t *state = (xcb_xkb_state_notify_event_t *)event; - if (state->xkbType == XCB_XKB_STATE_NOTIFY) { - int modstate = state->mods & config.modifier; - -#define DLOGMOD(modmask, status) \ - do { \ - switch (modmask) { \ - case ShiftMask: \ - DLOG("ShiftMask got " #status "!\n"); \ - break; \ - case ControlMask: \ - DLOG("ControlMask got " #status "!\n"); \ - break; \ - case Mod1Mask: \ - DLOG("Mod1Mask got " #status "!\n"); \ - break; \ - case Mod2Mask: \ - DLOG("Mod2Mask got " #status "!\n"); \ - break; \ - case Mod3Mask: \ - DLOG("Mod3Mask got " #status "!\n"); \ - break; \ - case Mod4Mask: \ - DLOG("Mod4Mask got " #status "!\n"); \ - break; \ - case Mod5Mask: \ - DLOG("Mod5Mask got " #status "!\n"); \ - break; \ - } \ - } while (0) - - if (modstate != mod_pressed) { - if (modstate == 0) { - DLOGMOD(config.modifier, released); - if (!activated_mode) - hide_bars(); - } else { - DLOGMOD(config.modifier, pressed); - activated_mode = false; - unhide_bars(); - } - mod_pressed = modstate; + const uint32_t mod = (config.modifier & 0xFFFF); + mod_pressed = (mod != 0 && (state->mods & mod) == mod); + if (state->xkbType == XCB_XKB_STATE_NOTIFY && config.modifier != XCB_NONE) { + if (mod_pressed) { + activated_mode = false; + unhide_bars(); + } else if (!activated_mode) { + hide_bars(); } -#undef DLOGMOD } free(event); @@ -1016,11 +1087,15 @@ void xcb_chk_cb(struct ev_loop *loop, ev_check *watcher, int revents) { handle_visibility_notify((xcb_visibility_notify_event_t *)event); break; case XCB_EXPOSE: - /* Expose-events happen, when the window needs to be redrawn */ - redraw_bars(); + if (((xcb_expose_event_t *)event)->count == 0) { + /* Expose-events happen, when the window needs to be redrawn */ + redraw_bars(); + } + break; + case XCB_BUTTON_RELEASE: case XCB_BUTTON_PRESS: - /* Button-press-events are mouse-buttons clicked on one of our bars */ + /* Button press events are mouse buttons clicked on one of our bars */ handle_button((xcb_button_press_event_t *)event); break; case XCB_CLIENT_MESSAGE: @@ -1047,17 +1122,23 @@ void xcb_chk_cb(struct ev_loop *loop, ev_check *watcher, int revents) { /* ConfigureRequest, sent by a tray child */ handle_configure_request((xcb_configure_request_event_t *)event); break; + case XCB_RESIZE_REQUEST: + /* ResizeRequest sent by a tray child using override_redirect. */ + handle_resize_request((xcb_resize_request_event_t *)event); + break; } free(event); } + + xcb_flush(xcb_connection); } /* - * Dummy Callback. We only need this, so that the Prepare- and Check-Watchers + * Dummy callback. We only need this, so that the prepare and check watchers * are triggered * */ -void xcb_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) { +static void xcb_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) { } /* @@ -1065,8 +1146,8 @@ void xcb_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) { * depend on 'config'. * */ -char *init_xcb_early() { - /* FIXME: xcb_connect leaks Memory */ +char *init_xcb_early(void) { + /* FIXME: xcb_connect leaks memory */ xcb_connection = xcb_connect(NULL, &screen); if (xcb_connection_has_error(xcb_connection)) { ELOG("Cannot open display\n"); @@ -1082,67 +1163,53 @@ char *init_xcb_early() { root_screen = xcb_aux_get_screen(xcb_connection, screen); xcb_root = root_screen->root; - /* We draw the statusline to a seperate pixmap, because it looks the same on all bars and - * this way, we can choose to crop it */ - uint32_t mask = XCB_GC_FOREGROUND; - uint32_t vals[] = {colors.bar_bg, colors.bar_bg}; - - statusline_clear = xcb_generate_id(xcb_connection); - xcb_void_cookie_t clear_ctx_cookie = xcb_create_gc_checked(xcb_connection, - statusline_clear, - xcb_root, - mask, - vals); - - statusline_ctx = xcb_generate_id(xcb_connection); - xcb_void_cookie_t sl_ctx_cookie = xcb_create_gc_checked(xcb_connection, - statusline_ctx, - xcb_root, - 0, - NULL); - - statusline_pm = xcb_generate_id(xcb_connection); - xcb_void_cookie_t sl_pm_cookie = xcb_create_pixmap_checked(xcb_connection, - root_screen->root_depth, - statusline_pm, - xcb_root, - root_screen->width_in_pixels, - root_screen->height_in_pixels); - - /* The various Watchers to communicate with xcb */ + depth = root_screen->root_depth; + colormap = root_screen->default_colormap; + visual_type = get_visualtype(root_screen); + + xcb_cursor_context_t *cursor_ctx; + if (xcb_cursor_context_new(conn, root_screen, &cursor_ctx) == 0) { + cursor = xcb_cursor_load_cursor(cursor_ctx, "left_ptr"); + xcb_cursor_context_free(cursor_ctx); + } else { + cursor = xcb_generate_id(xcb_connection); + i3Font cursor_font = load_font("cursor", false); + xcb_create_glyph_cursor( + xcb_connection, + cursor, + cursor_font.specific.xcb.id, + cursor_font.specific.xcb.id, + XCB_CURSOR_LEFT_PTR, + XCB_CURSOR_LEFT_PTR + 1, + 0, 0, 0, + 65535, 65535, 65535); + } + + /* The various watchers to communicate with xcb */ xcb_io = smalloc(sizeof(ev_io)); xcb_prep = smalloc(sizeof(ev_prepare)); - xcb_chk = smalloc(sizeof(ev_check)); ev_io_init(xcb_io, &xcb_io_cb, xcb_get_file_descriptor(xcb_connection), EV_READ); ev_prepare_init(xcb_prep, &xcb_prep_cb); - ev_check_init(xcb_chk, &xcb_chk_cb); ev_io_start(main_loop, xcb_io); ev_prepare_start(main_loop, xcb_prep); - ev_check_start(main_loop, xcb_chk); /* Now we get the atoms and save them in a nice data structure */ get_atoms(); 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") || - xcb_request_failed(sl_ctx_cookie, "Could not allocate statusline-buffer-context")) { - exit(EXIT_FAILURE); - } - return path; } /* - * Register for xkb keyevents. To grab modifiers without blocking other applications from receiving key-events + * 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 register_xkb_keyevents() { +static void register_xkb_keyevents(void) { const xcb_query_extension_reply_t *extreply; extreply = xcb_get_extension_data(conn, &xcb_xkb_id); if (!extreply->present) { @@ -1166,7 +1233,7 @@ void register_xkb_keyevents() { * Deregister from xkb keyevents. * */ -void deregister_xkb_keyevents() { +static void deregister_xkb_keyevents(void) { xcb_xkb_select_events(conn, XCB_XKB_ID_USE_CORE_KBD, 0, @@ -1191,6 +1258,10 @@ void init_xcb_late(char *fontname) { set_font(&font); DLOG("Calculated font height: %d\n", font.height); bar_height = font.height + 2 * logical_px(ws_voff_px); + icon_size = bar_height - 2 * logical_px(config.tray_padding); + + if (config.separator_symbol) + separator_symbol_width = predict_text_width(config.separator_symbol); xcb_flush(xcb_connection); @@ -1228,7 +1299,7 @@ static void send_tray_clientmessage(void) { * atom. Afterwards, tray clients will send ClientMessages to our window. * */ -void init_tray(void) { +static void init_tray(void) { DLOG("Initializing system tray functionality\n"); /* request the tray manager atom for the X11 display we are running on */ char atomname[strlen("_NET_SYSTEM_TRAY_S") + 11]; @@ -1239,17 +1310,17 @@ void init_tray(void) { /* tray support: we need a window to own the selection */ selwin = xcb_generate_id(xcb_connection); - uint32_t selmask = XCB_CW_OVERRIDE_REDIRECT; - uint32_t selval[] = {1}; + uint32_t selmask = XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL | XCB_CW_OVERRIDE_REDIRECT | XCB_CW_COLORMAP; + uint32_t selval[] = {root_screen->black_pixel, root_screen->black_pixel, 1, colormap}; xcb_create_window(xcb_connection, - root_screen->root_depth, + depth, selwin, xcb_root, -1, -1, 1, 1, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, - root_screen->root_visual, + visual_type->visual_id, selmask, selval); @@ -1263,6 +1334,14 @@ void init_tray(void) { 32, 1, &orientation); + xcb_change_property(xcb_connection, + XCB_PROP_MODE_REPLACE, + selwin, + atoms[_NET_SYSTEM_TRAY_VISUAL], + XCB_ATOM_VISUALID, + 32, + 1, + &visual_type->visual_id); init_tray_colors(); @@ -1298,12 +1377,14 @@ void init_tray(void) { return; } + free(selreply); + 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, + * 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 * @@ -1343,31 +1424,23 @@ void init_tray_colors(void) { } /* - * Cleanup the xcb-stuff. + * Cleanup the xcb stuff. * Called once, before the program terminates. * */ void clean_xcb(void) { - i3_output *o_walk; - free_workspaces(); - SLIST_FOREACH(o_walk, outputs, slist) { - destroy_window(o_walk); - FREE(o_walk->trayclients); - FREE(o_walk->workspaces); - FREE(o_walk->name); - } - FREE_SLIST(outputs, i3_output); - FREE(outputs); + free_outputs(); + free_font(); + + xcb_free_cursor(xcb_connection, cursor); xcb_flush(xcb_connection); xcb_aux_sync(xcb_connection); xcb_disconnect(xcb_connection); - ev_check_stop(main_loop, xcb_chk); ev_prepare_stop(main_loop, xcb_prep); ev_io_stop(main_loop, xcb_io); - FREE(xcb_chk); FREE(xcb_prep); FREE(xcb_io); } @@ -1418,6 +1491,7 @@ void kick_tray_clients(i3_output *output) { /* We remove the trayclient right here. We might receive an UnmapNotify * event afterwards, but better safe than sorry. */ TAILQ_REMOVE(output->trayclients, trayclient, tailq); + FREE(trayclient); } /* Fake a DestroyNotify so that Qt re-adds tray icons. @@ -1443,56 +1517,107 @@ void destroy_window(i3_output *output) { if (output == NULL) { return; } - if (output->bar == XCB_NONE) { + if (output->bar.id == XCB_NONE) { return; } kick_tray_clients(output); - xcb_destroy_window(xcb_connection, output->bar); - output->bar = XCB_NONE; + xcb_destroy_window(xcb_connection, output->bar.id); + output->bar.id = XCB_NONE; +} + +/* Strut partial tells i3 where to reserve space for i3bar. This is determined + * by the `position` bar config directive. */ +static xcb_void_cookie_t config_strut_partial(i3_output *output) { + /* A local struct to save the strut_partial property */ + struct { + uint32_t left; + uint32_t right; + uint32_t top; + uint32_t bottom; + uint32_t left_start_y; + uint32_t left_end_y; + uint32_t right_start_y; + uint32_t right_end_y; + uint32_t top_start_x; + uint32_t top_end_x; + uint32_t bottom_start_x; + uint32_t bottom_end_x; + } __attribute__((__packed__)) strut_partial; + memset(&strut_partial, 0, sizeof(strut_partial)); + + switch (config.position) { + case POS_NONE: + break; + case POS_TOP: + strut_partial.top = bar_height; + strut_partial.top_start_x = output->rect.x; + strut_partial.top_end_x = output->rect.x + output->rect.w; + break; + case POS_BOT: + strut_partial.bottom = bar_height; + strut_partial.bottom_start_x = output->rect.x; + strut_partial.bottom_end_x = output->rect.x + output->rect.w; + break; + } + return xcb_change_property(xcb_connection, + XCB_PROP_MODE_REPLACE, + output->bar.id, + atoms[_NET_WM_STRUT_PARTIAL], + XCB_ATOM_CARDINAL, + 32, + 12, + &strut_partial); } /* - * Reallocate the statusline-buffer + * Returns the output which should hold the tray, if one exists. + * + * An output is returned in these scenarios: + * 1. A specific output was listed in tray_outputs which is also in the list + * of outputs managed by this bar. + * 2. No tray_output directive was specified. In this case, we use the first + * available output. + * 3. 'tray_output primary' was specified. In this case we use the primary + * output. * + * Three scenarios in which we specifically don't want to use a tray: + * 1. 'tray_output none' was specified. + * 2. A specific output was listed as a tray_output, but is not one of the + * outputs managed by this bar. For example, consider tray_outputs == [VGA-1], + * but outputs == [HDMI-1]. + * 3. 'tray_output primary' was specified and no output in the list is + * primary. */ -void realloc_sl_buffer(void) { - DLOG("Re-allocating statusline-buffer, statusline_width = %d, root_screen->width_in_pixels = %d\n", - statusline_width, root_screen->width_in_pixels); - xcb_free_pixmap(xcb_connection, statusline_pm); - statusline_pm = xcb_generate_id(xcb_connection); - xcb_void_cookie_t sl_pm_cookie = xcb_create_pixmap_checked(xcb_connection, - root_screen->root_depth, - statusline_pm, - xcb_root, - MAX(root_screen->width_in_pixels, statusline_width), - bar_height); - - uint32_t mask = XCB_GC_FOREGROUND; - uint32_t vals[2] = {colors.bar_bg, colors.bar_bg}; - xcb_free_gc(xcb_connection, statusline_clear); - statusline_clear = xcb_generate_id(xcb_connection); - xcb_void_cookie_t clear_ctx_cookie = xcb_create_gc_checked(xcb_connection, - statusline_clear, - xcb_root, - mask, - vals); - - mask |= XCB_GC_BACKGROUND; - vals[0] = colors.bar_fg; - xcb_free_gc(xcb_connection, statusline_ctx); - statusline_ctx = xcb_generate_id(xcb_connection); - xcb_void_cookie_t sl_ctx_cookie = xcb_create_gc_checked(xcb_connection, - statusline_ctx, - xcb_root, - mask, - vals); - - if (xcb_request_failed(sl_pm_cookie, "Could not allocate statusline-buffer") || - xcb_request_failed(clear_ctx_cookie, "Could not allocate statusline-buffer-clearcontext") || - xcb_request_failed(sl_ctx_cookie, "Could not allocate statusline-buffer-context")) { - exit(EXIT_FAILURE); +static i3_output *get_tray_output(void) { + i3_output *output = NULL; + if (TAILQ_EMPTY(&(config.tray_outputs))) { + /* No tray_output specified, use first active output. */ + SLIST_FOREACH(output, outputs, slist) { + if (output->active) { + return output; + } + } + return NULL; + } else if (strcasecmp(TAILQ_FIRST(&(config.tray_outputs))->output, "none") == 0) { + /* Check for "tray_output none" */ + return NULL; } + + /* If one or more tray_output assignments were specified, we ensure that at + * least one of them is actually an output managed by this instance. */ + tray_output_t *tray_output; + TAILQ_FOREACH(tray_output, &(config.tray_outputs), tray_outputs) { + SLIST_FOREACH(output, outputs, slist) { + if (output->active && + (strcasecmp(output->name, tray_output->output) == 0 || + (strcasecmp(tray_output->output, "primary") == 0 && output->primary))) { + return output; + } + } + } + + return NULL; } /* @@ -1501,8 +1626,7 @@ void realloc_sl_buffer(void) { */ void reconfig_windows(bool redraw_bars) { uint32_t mask; - uint32_t values[5]; - static bool tray_configured = false; + uint32_t values[6]; i3_output *walk; SLIST_FOREACH(walk, outputs, slist) { @@ -1513,56 +1637,70 @@ void reconfig_windows(bool redraw_bars) { destroy_window(walk); continue; } - if (walk->bar == XCB_NONE) { + if (walk->bar.id == XCB_NONE) { DLOG("Creating window for output %s\n", walk->name); - walk->bar = xcb_generate_id(xcb_connection); - walk->buffer = xcb_generate_id(xcb_connection); - 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 to hide or invisible mode, i3 is not supposed to manage our bar-windows */ - values[1] = (config.hide_on_modifier == M_DOCK ? 0 : 1); + xcb_window_t bar_id = xcb_generate_id(xcb_connection); + xcb_pixmap_t buffer_id = xcb_generate_id(xcb_connection); + xcb_pixmap_t statusline_buffer_id = xcb_generate_id(xcb_connection); + mask = XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL | XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK | XCB_CW_COLORMAP | XCB_CW_CURSOR; + + values[0] = colors.bar_bg.colorpixel; + values[1] = root_screen->black_pixel; + /* If hide_on_modifier is set to hide or invisible mode, i3 is not supposed to manage our bar windows */ + values[2] = (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 * child windows use ConfigureWindow * BUTTON_PRESS, to handle clicks on the workspace buttons * */ - values[2] = XCB_EVENT_MASK_EXPOSURE | + values[3] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | - XCB_EVENT_MASK_BUTTON_PRESS; + XCB_EVENT_MASK_BUTTON_PRESS | + XCB_EVENT_MASK_BUTTON_RELEASE; if (config.hide_on_modifier == M_DOCK) { /* If the bar is normally visible, catch visibility change events to suspend * the status process when the bar is obscured by full-screened windows. */ - values[2] |= XCB_EVENT_MASK_VISIBILITY_CHANGE; + values[3] |= XCB_EVENT_MASK_VISIBILITY_CHANGE; walk->visible = true; } + values[4] = colormap; + values[5] = cursor; + xcb_void_cookie_t win_cookie = xcb_create_window_checked(xcb_connection, - root_screen->root_depth, - walk->bar, + depth, + bar_id, xcb_root, 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, + visual_type->visual_id, mask, values); /* The double-buffer we use to render stuff off-screen */ xcb_void_cookie_t pm_cookie = xcb_create_pixmap_checked(xcb_connection, - root_screen->root_depth, - walk->buffer, - walk->bar, + depth, + buffer_id, + bar_id, walk->rect.w, bar_height); + /* The double-buffer we use to render the statusline before copying to buffer */ + xcb_void_cookie_t slpm_cookie = xcb_create_pixmap_checked(xcb_connection, + depth, + statusline_buffer_id, + bar_id, + walk->rect.w, + bar_height); + /* Set the WM_CLASS and WM_NAME (we don't need UTF-8) atoms */ xcb_void_cookie_t class_cookie; class_cookie = xcb_change_property(xcb_connection, XCB_PROP_MODE_REPLACE, - walk->bar, + bar_id, XCB_ATOM_WM_CLASS, XCB_ATOM_STRING, 8, @@ -1570,12 +1708,11 @@ void reconfig_windows(bool redraw_bars) { "i3bar\0i3bar\0"); char *name; - if (asprintf(&name, "i3bar for output %s", walk->name) == -1) - err(EXIT_FAILURE, "asprintf()"); + sasprintf(&name, "i3bar for output %s", walk->name); xcb_void_cookie_t name_cookie; name_cookie = xcb_change_property(xcb_connection, XCB_PROP_MODE_REPLACE, - walk->bar, + bar_id, XCB_ATOM_WM_NAME, XCB_ATOM_STRING, 8, @@ -1583,103 +1720,40 @@ void reconfig_windows(bool redraw_bars) { name); free(name); - /* We want dock-windows (for now). When override_redirect is set, i3 is ignoring + /* We want dock windows (for now). When override_redirect is set, i3 is ignoring * this one */ xcb_void_cookie_t dock_cookie = xcb_change_property(xcb_connection, XCB_PROP_MODE_REPLACE, - walk->bar, + bar_id, atoms[_NET_WM_WINDOW_TYPE], XCB_ATOM_ATOM, 32, 1, (unsigned char *)&atoms[_NET_WM_WINDOW_TYPE_DOCK]); - /* We need to tell i3, where to reserve space for i3bar */ - /* left, right, top, bottom, left_start_y, left_end_y, - * right_start_y, right_end_y, top_start_x, top_end_x, bottom_start_x, - * bottom_end_x */ - /* A local struct to save the strut_partial property */ - struct { - uint32_t left; - uint32_t right; - uint32_t top; - uint32_t bottom; - uint32_t left_start_y; - uint32_t left_end_y; - uint32_t right_start_y; - uint32_t right_end_y; - uint32_t top_start_x; - uint32_t top_end_x; - uint32_t bottom_start_x; - uint32_t bottom_end_x; - } __attribute__((__packed__)) strut_partial; - memset(&strut_partial, 0, sizeof(strut_partial)); - - switch (config.position) { - case POS_NONE: - break; - case POS_TOP: - 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 = bar_height; - strut_partial.bottom_start_x = walk->rect.x; - strut_partial.bottom_end_x = walk->rect.x + walk->rect.w; - break; - } - xcb_void_cookie_t strut_cookie = xcb_change_property(xcb_connection, - XCB_PROP_MODE_REPLACE, - walk->bar, - atoms[_NET_WM_STRUT_PARTIAL], - XCB_ATOM_CARDINAL, - 32, - 12, - &strut_partial); - - /* We also want a graphics-context for the bars (it defines the properties - * with which we draw to them) */ - walk->bargc = xcb_generate_id(xcb_connection); - xcb_void_cookie_t gc_cookie = xcb_create_gc_checked(xcb_connection, - walk->bargc, - walk->bar, - 0, - NULL); + draw_util_surface_init(xcb_connection, &walk->bar, bar_id, NULL, walk->rect.w, bar_height); + draw_util_surface_init(xcb_connection, &walk->buffer, buffer_id, NULL, walk->rect.w, bar_height); + draw_util_surface_init(xcb_connection, &walk->statusline_buffer, statusline_buffer_id, NULL, walk->rect.w, bar_height); + + xcb_void_cookie_t strut_cookie = config_strut_partial(walk); /* 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 == M_DOCK) { - map_cookie = xcb_map_window_checked(xcb_connection, walk->bar); + map_cookie = xcb_map_window_checked(xcb_connection, bar_id); } if (xcb_request_failed(win_cookie, "Could not create window") || xcb_request_failed(pm_cookie, "Could not create pixmap") || + xcb_request_failed(slpm_cookie, "Could not create statusline pixmap") || xcb_request_failed(dock_cookie, "Could not set dock mode") || xcb_request_failed(class_cookie, "Could not set WM_CLASS") || 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 == M_DOCK) && xcb_request_failed(map_cookie, "Could not map window"))) { exit(EXIT_FAILURE); } - 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 { /* We already have a bar, so we just reconfigure it */ mask = XCB_CONFIG_WINDOW_X | @@ -1696,12 +1770,18 @@ void reconfig_windows(bool redraw_bars) { values[3] = bar_height; values[4] = XCB_STACK_MODE_ABOVE; + DLOG("Reconfiguring strut partial property for output %s\n", walk->name); + xcb_void_cookie_t strut_cookie = config_strut_partial(walk); + DLOG("Destroying buffer for output %s\n", walk->name); - xcb_free_pixmap(xcb_connection, walk->buffer); + xcb_free_pixmap(xcb_connection, walk->buffer.id); + + DLOG("Destroying statusline buffer for output %s\n", walk->name); + xcb_free_pixmap(xcb_connection, walk->statusline_buffer.id); DLOG("Reconfiguring window for output %s to %d,%d\n", walk->name, values[0], values[1]); xcb_void_cookie_t cfg_cookie = xcb_configure_window_checked(xcb_connection, - walk->bar, + walk->bar.id, mask, values); @@ -1709,25 +1789,40 @@ void reconfig_windows(bool redraw_bars) { 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, + walk->bar.id, 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, + depth, + walk->buffer.id, + walk->bar.id, walk->rect.w, bar_height); + DLOG("Recreating statusline buffer for output %s\n", walk->name); + xcb_void_cookie_t slpm_cookie = xcb_create_pixmap_checked(xcb_connection, + depth, + walk->statusline_buffer.id, + walk->bar.id, + walk->rect.w, + bar_height); + + draw_util_surface_free(xcb_connection, &(walk->bar)); + draw_util_surface_free(xcb_connection, &(walk->buffer)); + draw_util_surface_free(xcb_connection, &(walk->statusline_buffer)); + draw_util_surface_init(xcb_connection, &(walk->bar), walk->bar.id, NULL, walk->rect.w, bar_height); + draw_util_surface_init(xcb_connection, &(walk->buffer), walk->buffer.id, NULL, walk->rect.w, bar_height); + draw_util_surface_init(xcb_connection, &(walk->statusline_buffer), walk->statusline_buffer.id, NULL, walk->rect.w, 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); + umap_cookie = xcb_unmap_window_checked(xcb_connection, walk->bar.id); if (config.hide_on_modifier == M_DOCK) { cont_child(); - map_cookie = xcb_map_window_checked(xcb_connection, walk->bar); + map_cookie = xcb_map_window_checked(xcb_connection, walk->bar.id); } else { stop_child(); } @@ -1744,12 +1839,27 @@ void reconfig_windows(bool redraw_bars) { 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") || + xcb_request_failed(slpm_cookie, "Could not create statusline pixmap") || + xcb_request_failed(strut_cookie, "Could not set strut") || (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); } } } + + /* Finally, check if we want to initialize the tray or destroy the selection + * window. The result of get_tray_output() is cached. */ + output_for_tray = get_tray_output(); + if (output_for_tray) { + if (selwin == XCB_NONE) { + init_tray(); + } + } else if (selwin != XCB_NONE) { + DLOG("Destroying tray selection window\n"); + xcb_destroy_window(xcb_connection, selwin); + selwin = XCB_NONE; + } } /* @@ -1758,41 +1868,36 @@ void reconfig_windows(bool redraw_bars) { */ void draw_bars(bool unhide) { DLOG("Drawing bars...\n"); - int workspace_width = 0; - refresh_statusline(); + uint32_t full_statusline_width = predict_statusline_length(false); + uint32_t short_statusline_width = predict_statusline_length(true); i3_output *outputs_walk; SLIST_FOREACH(outputs_walk, outputs, slist) { + int workspace_width = 0; + if (!outputs_walk->active) { DLOG("Output %s inactive, skipping...\n", outputs_walk->name); continue; } - if (outputs_walk->bar == XCB_NONE) { + if (outputs_walk->bar.id == XCB_NONE) { /* Oh shit, an active output without an own bar. Create it now! */ reconfig_windows(false); } + + bool use_focus_colors = output_has_focus(outputs_walk); + /* First things first: clear the backbuffer */ - uint32_t color = colors.bar_bg; - xcb_change_gc(xcb_connection, - outputs_walk->bargc, - XCB_GC_FOREGROUND, - &color); - xcb_rectangle_t rect = {0, 0, outputs_walk->rect.w, bar_height}; - xcb_poly_fill_rectangle(xcb_connection, - outputs_walk->buffer, - outputs_walk->bargc, - 1, - &rect); + draw_util_clear_surface(&(outputs_walk->buffer), (use_focus_colors ? colors.focus_bar_bg : colors.bar_bg)); 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), workspace_width, 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; + color_t fg_color = colors.inactive_ws_fg; + color_t bg_color = colors.inactive_ws_bg; + color_t border_color = colors.inactive_ws_border; if (ws_walk->visible) { if (!ws_walk->focused) { fg_color = colors.active_ws_fg; @@ -1811,40 +1916,25 @@ void draw_bars(bool unhide) { 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 = {workspace_width, - logical_px(1), - ws_walk->name_width + 2 * logical_px(ws_hoff_px) + 2 * logical_px(1), - font.height + 2 * logical_px(ws_voff_px) - 2 * logical_px(1)}; - 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 = {workspace_width + logical_px(1), - 2 * logical_px(1), - ws_walk->name_width + 2 * logical_px(ws_hoff_px), - font.height + 2 * logical_px(ws_voff_px) - 4 * logical_px(1)}; - 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, - workspace_width + logical_px(ws_hoff_px) + logical_px(1), - logical_px(ws_voff_px), - ws_walk->name_width); + + /* Draw the border of the button. */ + draw_util_rectangle(&(outputs_walk->buffer), border_color, + workspace_width, + logical_px(1), + ws_walk->name_width + 2 * logical_px(ws_hoff_px) + 2 * logical_px(1), + font.height + 2 * logical_px(ws_voff_px) - 2 * logical_px(1)); + + /* Draw the inside of the button. */ + draw_util_rectangle(&(outputs_walk->buffer), bg_color, + workspace_width + logical_px(1), + 2 * logical_px(1), + ws_walk->name_width + 2 * logical_px(ws_hoff_px), + font.height + 2 * logical_px(ws_voff_px) - 4 * logical_px(1)); + + draw_util_text(ws_walk->name, &(outputs_walk->buffer), fg_color, bg_color, + workspace_width + logical_px(ws_hoff_px) + logical_px(1), + logical_px(ws_voff_px), + ws_walk->name_width); workspace_width += 2 * logical_px(ws_hoff_px) + 2 * logical_px(1) + ws_walk->name_width; if (TAILQ_NEXT(ws_walk, tailq) != NULL) @@ -1855,47 +1945,25 @@ void draw_bars(bool unhide) { if (binding.name && !config.disable_binding_mode_indicator) { workspace_width += logical_px(ws_spacing_px); - 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[] = {colors.urgent_ws_border, colors.urgent_ws_border}; - xcb_change_gc(xcb_connection, - outputs_walk->bargc, - mask, - vals_border); - xcb_rectangle_t rect_border = {workspace_width, - logical_px(1), - binding.width + 2 * logical_px(ws_hoff_px) + 2 * logical_px(1), - font.height + 2 * logical_px(ws_voff_px) - 2 * logical_px(1)}; - 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 = {workspace_width + logical_px(1), - 2 * logical_px(1), - binding.width + 2 * logical_px(ws_hoff_px), - font.height + 2 * logical_px(ws_voff_px) - 4 * logical_px(1)}; - 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(binding.name, - outputs_walk->buffer, - outputs_walk->bargc, - workspace_width + logical_px(ws_hoff_px) + logical_px(1), - logical_px(ws_voff_px), - binding.width); + color_t fg_color = colors.binding_mode_fg; + color_t bg_color = colors.binding_mode_bg; + + draw_util_rectangle(&(outputs_walk->buffer), colors.binding_mode_border, + workspace_width, + logical_px(1), + binding.width + 2 * logical_px(ws_hoff_px) + 2 * logical_px(1), + font.height + 2 * logical_px(ws_voff_px) - 2 * logical_px(1)); + + draw_util_rectangle(&(outputs_walk->buffer), bg_color, + workspace_width + logical_px(1), + 2 * logical_px(1), + binding.width + 2 * logical_px(ws_hoff_px), + font.height + 2 * logical_px(ws_voff_px) - 4 * logical_px(1)); + + draw_util_text(binding.name, &(outputs_walk->buffer), fg_color, bg_color, + workspace_width + logical_px(ws_hoff_px) + logical_px(1), + logical_px(ws_voff_px), + binding.width); unhide = true; workspace_width += 2 * logical_px(ws_hoff_px) + 2 * logical_px(1) + binding.width; @@ -1904,24 +1972,31 @@ void draw_bars(bool unhide) { if (!TAILQ_EMPTY(&statusline_head)) { DLOG("Printing statusline!\n"); - /* Luckily we already prepared a seperate pixmap containing the rendered - * statusline, we just have to copy the relevant parts to the relevant - * position */ int tray_width = get_tray_width(outputs_walk->trayclients); + uint32_t hoff = logical_px(((workspace_width > 0) + (tray_width > 0)) * sb_hoff_px); + uint32_t max_statusline_width = outputs_walk->rect.w - workspace_width - tray_width - hoff; + uint32_t clip_left = 0; + uint32_t statusline_width = full_statusline_width; + bool use_short_text = false; + + if (statusline_width > max_statusline_width) { + statusline_width = short_statusline_width; + use_short_text = true; + if (statusline_width > max_statusline_width) { + clip_left = statusline_width - max_statusline_width; + } + } - int visible_statusline_width = MIN(statusline_width, - outputs_walk->rect.w - workspace_width - tray_width - 2 * logical_px(sb_hoff_px)); + int16_t visible_statusline_width = MIN(statusline_width, max_statusline_width); + int x_dest = outputs_walk->rect.w - tray_width - logical_px((tray_width > 0) * sb_hoff_px) - visible_statusline_width; - xcb_copy_area(xcb_connection, - statusline_pm, - outputs_walk->buffer, - outputs_walk->bargc, - (int16_t)(statusline_width - visible_statusline_width), 0, - (int16_t)(outputs_walk->rect.w - tray_width - logical_px(sb_hoff_px) - visible_statusline_width), 0, - (int16_t)visible_statusline_width, (int16_t)bar_height); - } + draw_statusline(outputs_walk, clip_left, use_focus_colors, use_short_text); + draw_util_copy_surface(&outputs_walk->statusline_buffer, &outputs_walk->buffer, 0, 0, + x_dest, 0, visible_statusline_width, (int16_t)bar_height); - workspace_width = 0; + outputs_walk->statusline_width = statusline_width; + outputs_walk->statusline_short_text = use_short_text; + } } /* Assure the bar is hidden/unhidden according to the specified hidden_state and mode */ @@ -1946,14 +2021,9 @@ void redraw_bars(void) { if (!outputs_walk->active) { continue; } - xcb_copy_area(xcb_connection, - outputs_walk->buffer, - outputs_walk->bar, - outputs_walk->bargc, - 0, 0, - 0, 0, - outputs_walk->rect.w, - outputs_walk->rect.h); + + draw_util_copy_surface(&(outputs_walk->buffer), &(outputs_walk->bar), 0, 0, + 0, 0, outputs_walk->rect.w, outputs_walk->rect.h); xcb_flush(xcb_connection); } } @@ -1966,5 +2036,4 @@ void set_current_mode(struct mode *current) { I3STRING_FREE(binding.name); binding = *current; activated_mode = binding.name != NULL; - return; }