* 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 <X11/Xlib.h>
#include <X11/XKBlib.h>
#include <X11/extensions/XKB.h>
+#include <cairo/cairo-xcb.h>
#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"
/* 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;
/* 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;
+surface_t statusline_surface;
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;
/* 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 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;
-/* 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__)
+/* Horizontal offset between a workspace label and button borders */
+static const int ws_hoff_px = 4;
+
+/* Vertical offset between a workspace label and button borders */
+static const int ws_voff_px = 3;
+
+/* Offset between two workspace buttons */
+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 */
+static const int sb_hoff_px = 4;
+
+/* Additional offset between the tray and the statusline, if the tray is not empty */
+static const int tray_loff_px = 2;
+
+/* Vertical offset between the bar and a separator */
+static const int sep_voff_px = 4;
+
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) {
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 += icon_size + logical_px(config.tray_padding);
+ }
+ 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. */
+ cairo_save(statusline_surface.cr);
+ cairo_set_operator(statusline_surface.cr, CAIRO_OPERATOR_SOURCE);
+ cairo_set_source_color(&statusline_surface, colors.sep_fg);
+ cairo_rectangle(statusline_surface.cr, center_x, logical_px(sep_voff_px), logical_px(1), bar_height - 2 * logical_px(sep_voff_px));
+ cairo_fill(statusline_surface.cr);
+ cairo_restore(statusline_surface.cr);
+ } 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_surface.gc, colors.sep_fg.colorpixel, colors.bar_bg.colorpixel);
+ draw_text(config.separator_symbol, statusline_surface.id, statusline_surface.gc, visual_type,
+ 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;
/* 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;
realloc_sl_buffer();
/* Clear the statusline pixmap. */
- xcb_rectangle_t rect = {0, 0, root_screen->width_in_pixels, bar_height};
- xcb_poly_fill_rectangle(xcb_connection, statusline_pm, statusline_clear, 1, &rect);
+ cairo_save(statusline_surface.cr);
+ cairo_set_source_color(&statusline_surface, colors.bar_bg);
+ cairo_set_operator(statusline_surface.cr, CAIRO_OPERATOR_SOURCE);
+ cairo_paint(statusline_surface.cr);
+ cairo_restore(statusline_surface.cr);
/* Draw the text of each block. */
uint32_t x = 0;
TAILQ_FOREACH(block, &statusline_head, blocks) {
if (i3string_get_num_bytes(block->full_text) == 0)
continue;
- uint32_t fg_color;
+ color_t fg_color;
/* If this block is urgent, draw it with the defined color and border. */
if (block->urgent) {
fg_color = colors.urgent_ws_fg;
- uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND;
-
/* 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);
-
- /* 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);
+ cairo_set_source_color(&statusline_surface, colors.urgent_ws_bg);
+ cairo_rectangle(statusline_surface.cr, x - logical_px(2), logical_px(1), block->width + logical_px(4), bar_height - logical_px(2));
+ cairo_fill(statusline_surface.cr);
} else {
- fg_color = (block->color ? get_colorpixel(block->color) : colors.bar_fg);
+ fg_color = (block->color ? cairo_hex_to_color(block->color) : colors.bar_fg);
}
- 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);
+ set_font_colors(statusline_surface.gc, fg_color.colorpixel, colors.bar_bg.colorpixel);
+ draw_text(block->full_text, statusline_surface.id, statusline_surface.gc, visual_type,
+ 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);
}
}
if (!walk->active) {
continue;
}
- xcb_unmap_window(xcb_connection, walk->bar);
+ xcb_unmap_window(xcb_connection, walk->bar.id);
}
stop_child();
}
cont_child();
SLIST_FOREACH(walk, outputs, slist) {
- if (walk->bar == XCB_NONE) {
+ if (walk->bar.id == XCB_NONE) {
continue;
}
mask = XCB_CONFIG_WINDOW_X |
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,
+ 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);
}
}
*
*/
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 = cairo_hex_to_color(new_colors->name ? new_colors->name : def); \
} while (0)
PARSE_COLOR(bar_fg, "#FFFFFF");
PARSE_COLOR(bar_bg, "#000000");
PARSE_COLOR(focus_ws_border, "#4c7899");
#undef PARSE_COLOR
+#define PARSE_COLOR_FALLBACK(name, fallback) \
+ do { \
+ colors.name = new_colors->name ? cairo_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);
+#undef PARSE_COLOR_FALLBACK
+
init_tray_colors();
xcb_flush(xcb_connection);
}
/*
- * 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;
SLIST_FOREACH(walk, outputs, slist) {
- if (walk->bar == bar) {
+ if (walk->bar.id == bar) {
break;
}
}
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) {
+ if (x >= 0 && (size_t)x < statusline_width) {
struct status_block *block;
int sep_offset_remainder = 0;
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 a custom command was specified for this mouse button, it overrides
+ * the default behavior. */
+ binding_t *binding;
+ TAILQ_FOREACH(binding, &(config.bindings), bindings) {
+ if (binding->input_code != event->detail)
+ continue;
+
+ i3_send_msg(I3_IPC_MESSAGE_TYPE_COMMAND, binding->command);
+ return;
}
if (cur_ws == NULL) {
- DLOG("No Workspace active?\n");
+ DLOG("No workspace active?\n");
return;
}
-
switch (event->detail) {
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 `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;
* 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;
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)
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(). */
}
const size_t len = namelen + strlen("workspace \"\"") + 1;
- char *buffer = scalloc(len + num_quotes);
+ char *buffer = scalloc(len + num_quotes, 1);
strncpy(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++;
}
/*
* 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) {
if (!output->active) {
continue;
}
- if (output->bar == event->window) {
+ if (output->bar.id == event->window) {
if (output->visible == visible) {
return;
}
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,
ELOG("No output found\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->bar.id,
+ output->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->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[2] = output->bar.id;
ev->data.data32[3] = xe_version;
xcb_send_event(xcb_connection,
0,
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);
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);
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:
}
/*
- * 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
*
*/
*
*/
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");
root_screen = xcb_aux_get_screen(xcb_connection, screen);
xcb_root = root_screen->root;
+ depth = root_screen->root_depth;
+ colormap = root_screen->default_colormap;
+ visual_type = xcb_aux_find_visual_by_attrs(root_screen, -1, 32);
+ if (visual_type) {
+ depth = xcb_aux_get_depth_of_visual(root_screen, visual_type->visual_id);
+ colormap = xcb_generate_id(xcb_connection);
+ xcb_void_cookie_t cm_cookie = xcb_create_colormap_checked(xcb_connection,
+ XCB_COLORMAP_ALLOC_NONE,
+ colormap,
+ xcb_root,
+ visual_type->visual_id);
+ if (xcb_request_failed(cm_cookie, "Could not allocate colormap")) {
+ exit(EXIT_FAILURE);
+ }
+ } else {
+ visual_type = get_visualtype(root_screen);
+ }
+
/* 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_pixmap_t statusline_id = xcb_generate_id(xcb_connection);
xcb_void_cookie_t sl_pm_cookie = xcb_create_pixmap_checked(xcb_connection,
- root_screen->root_depth,
- statusline_pm,
+ depth,
+ statusline_id,
xcb_root,
root_screen->width_in_pixels,
root_screen->height_in_pixels);
+ cairo_surface_init(&statusline_surface, statusline_id, 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));
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"))
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.
*
/* 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);
+ 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);
/* 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);
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();
/*
* 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
*
}
/*
- * Cleanup the xcb-stuff.
+ * Cleanup the xcb stuff.
* Called once, before the program terminates.
*
*/
free(reply);
#include "xcb_atoms.def"
- DLOG("Got Atoms\n");
+ DLOG("Got atoms\n");
}
/*
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;
}
/*
- * 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);
+ xcb_free_pixmap(xcb_connection, statusline_surface.id);
+ cairo_surface_free(&statusline_surface);
+
+ xcb_pixmap_t statusline_id = xcb_generate_id(xcb_connection);
xcb_void_cookie_t sl_pm_cookie = xcb_create_pixmap_checked(xcb_connection,
- root_screen->root_depth,
- statusline_pm,
+ depth,
+ statusline_id,
xcb_root,
MAX(root_screen->width_in_pixels, statusline_width),
bar_height);
+ cairo_surface_init(&statusline_surface, statusline_id, root_screen->width_in_pixels, root_screen->height_in_pixels);
- 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")) {
+ if (xcb_request_failed(sl_pm_cookie, "Could not allocate statusline buffer"))
exit(EXIT_FAILURE);
+}
+
+/* Strut partial tells i3 where to reserve space for i3bar. This is determined
+ * by the `position` bar config directive. */
+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);
}
/*
destroy_window(walk);
continue;
}
- if (walk->bar == 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);
+ if (walk->bar.id == XCB_NONE) {
+ DLOG("Creating window for output %s\n", walk->name);
+
+ xcb_window_t bar_id = xcb_generate_id(xcb_connection);
+ xcb_pixmap_t 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;
+
+ 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;
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;
+
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);
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,
"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,
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);
+ cairo_surface_init(&walk->bar, bar_id, walk->rect.w, bar_height);
+ cairo_surface_init(&walk->buffer, buffer_id, 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(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);
}
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;
+ 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("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,
+ walk->bar.id,
mask,
values);
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,
+ 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);
+ cairo_surface_free(&(walk->bar));
+ cairo_surface_free(&(walk->buffer));
+ cairo_surface_init(&(walk->bar), walk->bar.id, walk->rect.w, bar_height);
+ cairo_surface_init(&(walk->buffer), walk->buffer.id, 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();
}
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(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);
*
*/
void draw_bars(bool unhide) {
- DLOG("Drawing Bars...\n");
- int i = 0;
+ DLOG("Drawing bars...\n");
+ int workspace_width = 0;
+ /* Is the currently-rendered statusline using short_text items? */
+ bool rendered_statusline_is_short = false;
- refresh_statusline();
+ refresh_statusline(false);
i3_output *outputs_walk;
SLIST_FOREACH(outputs_walk, outputs, slist) {
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);
}
- /* 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);
-
- 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);
- }
+ /* First things first: clear the backbuffer */
+ cairo_save(outputs_walk->buffer.cr);
+ cairo_set_source_color(&(outputs_walk->buffer), colors.bar_bg);
+ cairo_set_operator(outputs_walk->buffer.cr, CAIRO_OPERATOR_SOURCE);
+ cairo_paint(outputs_walk->buffer.cr);
+ cairo_restore(outputs_walk->buffer.cr);
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;
+ DLOG("Drawing button for WS %s at x = %d, len = %d\n",
+ i3string_as_utf8(ws_walk->name), workspace_width, ws_walk->name_width);
+ 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;
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,
- logical_px(1),
- ws_walk->name_width + logical_px(10),
- font.height + logical_px(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 + logical_px(1),
- 2 * logical_px(1),
- ws_walk->name_width + logical_px(8),
- font.height + logical_px(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 + logical_px(5), 3 * logical_px(1), ws_walk->name_width);
- i += logical_px(10) + ws_walk->name_width + logical_px(1);
+
+ cairo_save(outputs_walk->buffer.cr);
+ cairo_set_operator(outputs_walk->buffer.cr, CAIRO_OPERATOR_SOURCE);
+
+ /* Draw the border of the button. */
+ cairo_set_source_color(&(outputs_walk->buffer), border_color);
+ cairo_rectangle(outputs_walk->buffer.cr, 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));
+ cairo_fill(outputs_walk->buffer.cr);
+
+ /* Draw the inside of the button. */
+ cairo_set_source_color(&(outputs_walk->buffer), bg_color);
+ cairo_rectangle(outputs_walk->buffer.cr, 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));
+ cairo_fill(outputs_walk->buffer.cr);
+
+ cairo_restore(outputs_walk->buffer.cr);
+
+ set_font_colors(outputs_walk->buffer.gc, fg_color.colorpixel, bg_color.colorpixel);
+ draw_text(ws_walk->name, outputs_walk->buffer.id, outputs_walk->buffer.gc, visual_type,
+ 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) {
- 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 = {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, 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(binding.name, outputs_walk->buffer, outputs_walk->bargc, i + 5, 3, binding.width);
+ workspace_width += logical_px(ws_spacing_px);
+
+ color_t fg_color = colors.binding_mode_fg;
+ color_t bg_color = colors.binding_mode_bg;
+
+ cairo_save(outputs_walk->buffer.cr);
+ cairo_set_operator(outputs_walk->buffer.cr, CAIRO_OPERATOR_SOURCE);
+
+ cairo_set_source_color(&(outputs_walk->buffer), colors.binding_mode_border);
+ cairo_rectangle(outputs_walk->buffer.cr, 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));
+ cairo_fill(outputs_walk->buffer.cr);
+
+ cairo_set_source_color(&(outputs_walk->buffer), bg_color);
+ cairo_rectangle(outputs_walk->buffer.cr, 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));
+ cairo_fill(outputs_walk->buffer.cr);
+
+ cairo_restore(outputs_walk->buffer.cr);
+
+ set_font_colors(outputs_walk->buffer.gc, fg_color.colorpixel, bg_color.colorpixel);
+ draw_text(binding.name,
+ outputs_walk->buffer.id,
+ outputs_walk->buffer.gc,
+ visual_type,
+ 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;
}
- i = 0;
+ if (!TAILQ_EMPTY(&statusline_head)) {
+ DLOG("Printing statusline!\n");
+
+ int tray_width = get_tray_width(outputs_walk->trayclients);
+ uint32_t 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) {
+ /* If the currently rendered statusline is long, render a short status line */
+ refresh_statusline(true);
+ rendered_statusline_is_short = true;
+ } else if (rendered_statusline_is_short) {
+ /* If the currently rendered statusline is short, render a long status line */
+ refresh_statusline(false);
+ rendered_statusline_is_short = false;
+ }
+
+ /* 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);
+ int x_src = (int16_t)(statusline_width - visible_statusline_width);
+ int x_dest = (int16_t)(outputs_walk->rect.w - tray_width - logical_px(sb_hoff_px) - visible_statusline_width);
+
+ cairo_save(outputs_walk->buffer.cr);
+ cairo_set_operator(outputs_walk->buffer.cr, CAIRO_OPERATOR_SOURCE);
+ cairo_set_source_surface(outputs_walk->buffer.cr, statusline_surface.surface, x_dest - x_src, 0);
+ cairo_rectangle(outputs_walk->buffer.cr, x_dest, 0, (int16_t)visible_statusline_width, (int16_t)bar_height);
+ cairo_fill(outputs_walk->buffer.cr);
+ cairo_restore(outputs_walk->buffer.cr);
+ }
+
+ workspace_width = 0;
}
/* Assure the bar is hidden/unhidden according to the specified hidden_state and mode */
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);
+
+ cairo_save(outputs_walk->bar.cr);
+ cairo_set_operator(outputs_walk->bar.cr, CAIRO_OPERATOR_SOURCE);
+ cairo_set_source_surface(outputs_walk->bar.cr, outputs_walk->buffer.surface, 0, 0);
+ cairo_rectangle(outputs_walk->bar.cr, 0, 0, outputs_walk->rect.w, outputs_walk->rect.h);
+ cairo_fill(outputs_walk->bar.cr);
+ cairo_restore(outputs_walk->bar.cr);
+
xcb_flush(xcb_connection);
}
}
projects / i3 / i3 / blobdiff