X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3bar%2Fsrc%2Fxcb.c;h=205e277a5b97d9db37218de31f1c2e48de5ecdd8;hb=037cb317cb1eb6dc6929dad65d549b5a22e5b2b3;hp=8bda53c45ea656c289acb0b61696787ee9c39c60;hpb=0148dc6fd30a41b7005ccdf6cda921b34c1ac592;p=i3%2Fi3 diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c index 8bda53c4..205e277a 100644 --- a/i3bar/src/xcb.c +++ b/i3bar/src/xcb.c @@ -34,7 +34,7 @@ #include "common.h" #include "libi3.h" -/* We save the Atoms in an easy to access array, indexed by an enum */ +/* We save the atoms in an easy to access array, indexed by an enum */ enum { #define ATOM_DO(name) name, #include "xcb_atoms.def" @@ -63,6 +63,9 @@ static i3Font font; /* Overall height of the bar (based on font size) */ int bar_height; +/* Cached width of the custom separator if one was set */ +int separator_symbol_width; + /* These are only relevant for XKB, which we only need for grabbing modifiers */ int xkb_base; int mod_pressed = 0; @@ -74,7 +77,7 @@ xcb_gcontext_t statusline_clear; xcb_pixmap_t statusline_pm; uint32_t statusline_width; -/* 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; @@ -106,7 +109,26 @@ struct xcb_colors_t { }; struct xcb_colors_t colors; -/* We define xcb_request_failed as a macro to include the relevant line-number */ +/* Horizontal offset between a workspace label and button borders */ +const static int ws_hoff_px = 4; + +/* Vertical offset between a workspace label and button borders */ +const static int ws_voff_px = 3; + +/* Offset between two workspace buttons */ +const static 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; + +/* Additional offset between the tray and the statusline, if the tray is not empty */ +const static int tray_loff_px = 2; + +/* Vertical offset between the bar and a separator */ +const static 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; @@ -123,11 +145,51 @@ uint32_t get_sep_offset(struct status_block *block) { return 0; } +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); + } + if (tray_width > 0) + tray_width += logical_px(tray_loff_px); + return tray_width; +} + +/* + * Draws a separator for the given block if necessary. + * + */ +static void draw_separator(uint32_t x, struct status_block *block) { + uint32_t sep_offset = get_sep_offset(block); + if (TAILQ_NEXT(block, blocks) == NULL || sep_offset == 0) + return; + + uint32_t center_x = x - sep_offset; + if (config.separator_symbol == NULL) { + /* Draw a classic one pixel, vertical 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[]){{center_x, logical_px(sep_voff_px)}, + {center_x, bar_height - 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); + set_font_colors(statusline_ctx, colors.sep_fg, colors.bar_bg); + draw_text(config.separator_symbol, statusline_pm, statusline_ctx, + separator_x, logical_px(ws_voff_px), x - separator_x); + } +} + /* * Redraws the statusline to the buffer * */ -void refresh_statusline(void) { +void refresh_statusline(bool use_short_text) { struct status_block *block; uint32_t old_statusline_width = statusline_width; @@ -135,6 +197,12 @@ void refresh_statusline(void) { /* Predict the text width of all blocks (in pixels). */ TAILQ_FOREACH(block, &statusline_head, blocks) { + /* Try to use the shorter text if necessary and possible. */ + if (use_short_text && block->short_text != NULL) { + I3STRING_FREE(block->full_text); + block->full_text = i3string_copy(block->short_text); + } + if (i3string_get_num_bytes(block->full_text) == 0) continue; @@ -174,7 +242,7 @@ void refresh_statusline(void) { realloc_sl_buffer(); /* Clear the statusline pixmap. */ - xcb_rectangle_t rect = {0, 0, root_screen->width_in_pixels, bar_height}; + 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); /* Draw the text of each block. */ @@ -204,20 +272,11 @@ void refresh_statusline(void) { } set_font_colors(statusline_ctx, fg_color, colors.bar_bg); - draw_text(block->full_text, statusline_pm, statusline_ctx, x + block->x_offset, 3, block->width); + 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(4)}, - {x - sep_offset, bar_height - logical_px(4)}}); - } + /* If this is not the last block, draw a separator. */ + draw_separator(x, block); } } @@ -273,7 +332,7 @@ void unhide_bars(void) { values[2] = walk->rect.w; 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]); + 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, mask, @@ -317,14 +376,12 @@ void init_colors(const struct xcb_color_strings_t *new_colors) { } /* - * 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 occured 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) { - i3_ws *cur_ws; - /* Determine, which bar was clicked */ i3_output *walk; xcb_window_t bar = event->event; @@ -335,32 +392,35 @@ void handle_button(xcb_button_press_event_t *event) { } if (walk == NULL) { - DLOG("Unknown Bar klicked!\n"); + DLOG("Unknown bar clicked!\n"); return; } int32_t x = event->event_x >= 0 ? event->event_x : 0; int32_t original_x = x; - DLOG("Got Button %d\n", event->detail); + DLOG("Got button %d\n", event->detail); - if (child_want_click_events()) { - /* If the child asked for click events, - * check if a status block has been clicked. */ + int workspace_width = 0; + i3_ws *cur_ws = NULL, *clicked_ws = NULL, *ws_walk; - /* 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 + logical_px(2)); - } - if (tray_width > 0) - tray_width += logical_px(2); + TAILQ_FOREACH(ws_walk, walk->workspaces, tailq) { + int w = 2 * logical_px(ws_hoff_px) + 2 * logical_px(1) + ws_walk->name_width; + if (x >= workspace_width && x <= workspace_width + w) + clicked_ws = ws_walk; + if (ws_walk->visible) + cur_ws = ws_walk; + workspace_width += w; + if (TAILQ_NEXT(ws_walk, tailq) != NULL) + workspace_width += logical_px(ws_spacing_px); + } + if (x > workspace_width && child_want_click_events()) { + /* 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(4); + int offset = walk->rect.w - statusline_width - tray_width - logical_px(sb_hoff_px); x = original_x - offset; if (x >= 0) { @@ -385,15 +445,8 @@ void handle_button(xcb_button_press_event_t *event) { x = original_x; } - /* TODO: Move this to extern get_ws_for_output() */ - TAILQ_FOREACH(cur_ws, walk->workspaces, tailq) { - if (cur_ws->visible) { - break; - } - } - if (cur_ws == NULL) { - DLOG("No Workspace active?\n"); + DLOG("No workspace active?\n"); return; } @@ -435,17 +488,10 @@ void handle_button(xcb_button_press_event_t *event) { cur_ws = TAILQ_NEXT(cur_ws, tailq); break; case 1: - /* 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 + logical_px(10)) { - break; - } - x -= cur_ws->name_width + logical_px(11); - } + cur_ws = clicked_ws; - /* Otherwise, focus our currently visible workspace if it is not - * already focused */ + /* if no workspace was clicked, focus our currently visible + * workspace if it is not already focused */ if (cur_ws == NULL) { TAILQ_FOREACH(cur_ws, walk->workspaces, tailq) { if (cur_ws->visible && !cur_ws->focused) @@ -497,7 +543,7 @@ void handle_button(xcb_button_press_event_t *event) { /* * 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) { @@ -862,7 +908,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); @@ -1001,7 +1047,7 @@ void xcb_chk_cb(struct ev_loop *loop, ev_check *watcher, int revents) { redraw_bars(); break; 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: @@ -1034,7 +1080,7 @@ void xcb_chk_cb(struct ev_loop *loop, ev_check *watcher, int revents) { } /* - * 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 * */ @@ -1047,7 +1093,7 @@ void xcb_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) { * */ char *init_xcb_early() { - /* FIXME: xcb_connect leaks Memory */ + /* FIXME: xcb_connect leaks memory */ xcb_connection = xcb_connect(NULL, &screen); if (xcb_connection_has_error(xcb_connection)) { ELOG("Cannot open display\n"); @@ -1090,7 +1136,7 @@ char *init_xcb_early() { root_screen->width_in_pixels, root_screen->height_in_pixels); - /* The various Watchers to communicate with xcb */ + /* 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)); @@ -1108,9 +1154,9 @@ char *init_xcb_early() { 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")) { + 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); } @@ -1118,7 +1164,7 @@ char *init_xcb_early() { } /* - * 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. * @@ -1170,8 +1216,11 @@ void init_xcb_late(char *fontname) { /* Load the font */ font = load_font(fontname, true); set_font(&font); - DLOG("Calculated Font-height: %d\n", font.height); - bar_height = font.height + logical_px(6); + DLOG("Calculated font height: %d\n", font.height); + bar_height = font.height + 2 * logical_px(ws_voff_px); + + if (config.separator_symbol) + separator_symbol_width = predict_text_width(config.separator_symbol); xcb_flush(xcb_connection); @@ -1284,7 +1333,7 @@ void init_tray(void) { /* * 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 * @@ -1324,7 +1373,7 @@ void init_tray_colors(void) { } /* - * Cleanup the xcb-stuff. + * Cleanup the xcb stuff. * Called once, before the program terminates. * */ @@ -1369,7 +1418,7 @@ void get_atoms(void) { free(reply); #include "xcb_atoms.def" - DLOG("Got Atoms\n"); + DLOG("Got atoms\n"); } /* @@ -1434,11 +1483,11 @@ void destroy_window(i3_output *output) { } /* - * Reallocate the statusline-buffer + * Reallocate the statusline buffer * */ void realloc_sl_buffer(void) { - DLOG("Re-allocating statusline-buffer, statusline_width = %d, root_screen->width_in_pixels = %d\n", + 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); @@ -1469,9 +1518,9 @@ void realloc_sl_buffer(void) { 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")) { + 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); } } @@ -1495,14 +1544,14 @@ void reconfig_windows(bool redraw_bars) { continue; } if (walk->bar == XCB_NONE) { - DLOG("Creating Window for output %s\n", walk->name); + 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 */ + /* 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) @@ -1564,7 +1613,7 @@ 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, @@ -1619,7 +1668,7 @@ void reconfig_windows(bool redraw_bars) { 12, &strut_partial); - /* We also want a graphics-context for the bars (it defines the properties + /* 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, @@ -1669,7 +1718,10 @@ void reconfig_windows(bool redraw_bars) { XCB_CONFIG_WINDOW_HEIGHT | XCB_CONFIG_WINDOW_STACK_MODE; values[0] = walk->rect.x; - values[1] = walk->rect.y + walk->rect.h - bar_height; + if (config.position == POS_TOP) + values[1] = walk->rect.y; + else + values[1] = walk->rect.y + walk->rect.h - bar_height; values[2] = walk->rect.w; values[3] = bar_height; values[4] = XCB_STACK_MODE_ABOVE; @@ -1677,7 +1729,7 @@ void reconfig_windows(bool redraw_bars) { 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]); + 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, mask, @@ -1685,7 +1737,7 @@ void reconfig_windows(bool redraw_bars) { 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]); + 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, @@ -1735,10 +1787,10 @@ void reconfig_windows(bool redraw_bars) { * */ void draw_bars(bool unhide) { - DLOG("Drawing Bars...\n"); - int i = 0; + DLOG("Drawing bars...\n"); + int workspace_width = 0; - refresh_statusline(); + refresh_statusline(false); i3_output *outputs_walk; SLIST_FOREACH(outputs_walk, outputs, slist) { @@ -1763,39 +1815,11 @@ void draw_bars(bool unhide) { 1, &rect); - 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 */ - trayclient *trayclient; - int traypx = 0; - TAILQ_FOREACH(trayclient, outputs_walk->trayclients, tailq) { - if (!trayclient->mapped) - continue; - /* We assume the tray icons are quadratic (we use the font - * *height* as *width* of the icons) because we configured them - * like this. */ - traypx += font.height + logical_px(2); - } - /* Add 2px of padding if there are any tray icons */ - if (traypx > 0) - traypx += logical_px(2); - xcb_copy_area(xcb_connection, - statusline_pm, - outputs_walk->buffer, - outputs_walk->bargc, - MAX(0, (int16_t)(statusline_width - outputs_walk->rect.w + logical_px(4))), 0, - MAX(0, (int16_t)(outputs_walk->rect.w - statusline_width - traypx - logical_px(4))), 0, - MIN(outputs_walk->rect.w - traypx - logical_px(4), (int)statusline_width), bar_height); - } - 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); + 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; @@ -1823,10 +1847,10 @@ void draw_bars(bool unhide) { outputs_walk->bargc, mask, vals_border); - xcb_rectangle_t rect_border = {i, + xcb_rectangle_t rect_border = {workspace_width, logical_px(1), - ws_walk->name_width + logical_px(10), - font.height + logical_px(4)}; + 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, @@ -1837,10 +1861,10 @@ void draw_bars(bool unhide) { outputs_walk->bargc, mask, vals); - xcb_rectangle_t rect = {i + logical_px(1), + xcb_rectangle_t rect = {workspace_width + logical_px(1), 2 * logical_px(1), - ws_walk->name_width + logical_px(8), - font.height + logical_px(2)}; + 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, @@ -1848,12 +1872,19 @@ void draw_bars(bool unhide) { &rect); set_font_colors(outputs_walk->bargc, fg_color, bg_color); draw_text(ws_walk->name, outputs_walk->buffer, outputs_walk->bargc, - i + logical_px(5), 3 * logical_px(1), ws_walk->name_width); - i += logical_px(10) + ws_walk->name_width + logical_px(1); + 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) + workspace_width += logical_px(ws_spacing_px); } } 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; @@ -1863,7 +1894,10 @@ void draw_bars(bool unhide) { outputs_walk->bargc, mask, vals_border); - xcb_rectangle_t rect_border = {i, 1, binding.width + 10, font.height + 4}; + 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, @@ -1875,7 +1909,10 @@ void draw_bars(bool unhide) { outputs_walk->bargc, mask, vals); - xcb_rectangle_t rect = {i + 1, 2, binding.width + 8, font.height + 2}; + 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, @@ -1883,12 +1920,41 @@ void draw_bars(bool unhide) { &rect); set_font_colors(outputs_walk->bargc, fg_color, bg_color); - draw_text(binding.name, outputs_walk->buffer, outputs_walk->bargc, i + 5, 3, binding.width); + 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); unhide = true; + workspace_width += 2 * logical_px(ws_hoff_px) + 2 * logical_px(1) + binding.width; + } + + if (!TAILQ_EMPTY(&statusline_head)) { + DLOG("Printing statusline!\n"); + + int tray_width = get_tray_width(outputs_walk->trayclients); + int max_statusline_width = outputs_walk->rect.w - workspace_width - tray_width - 2 * logical_px(sb_hoff_px); + + /* If the statusline is too long, try to use short texts. */ + if (statusline_width > max_statusline_width) + refresh_statusline(true); + + /* Luckily we already prepared a seperate pixmap containing the rendered + * statusline, we just have to copy the relevant parts to the relevant + * position */ + int visible_statusline_width = MIN(statusline_width, max_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); } - i = 0; + workspace_width = 0; } /* Assure the bar is hidden/unhidden according to the specified hidden_state and mode */