/*
- * i3bar - an xcb-based status- and ws-bar for i3
- *
- * © 2010-2011 Axel Wagner and contributors
+ * vim:ts=4:sw=4:expandtab
*
- * See file LICNSE for license information
+ * i3bar - an xcb-based status- and ws-bar for i3
+ * © 2010-2011 Axel Wagner and contributors (see also: LICENSE)
*
- * src/xcb.c: Communicating with X
+ * xcb.c: Communicating with X
*
*/
#include <xcb/xcb.h>
#include <xcb/xproto.h>
#include <xcb/xcb_atom.h>
+#include <xcb/xcb_aux.h>
+
+#ifdef XCB_COMPAT
+#include "xcb_compat.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <ev.h>
#include <errno.h>
#include <limits.h>
+#include <err.h>
#include <X11/Xlib.h>
#include <X11/XKBlib.h>
#include <X11/extensions/XKB.h>
#include "common.h"
-
-#if defined(__APPLE__)
-
-/*
- * Taken from FreeBSD
- * Returns a pointer to a new string which is a duplicate of the
- * string, but only copies at most n characters.
- *
- */
-char *strndup(const char *str, size_t n) {
- size_t len;
- char *copy;
-
- for (len = 0; len < n && str[len]; len++)
- continue;
-
- if ((copy = malloc(len + 1)) == NULL)
- return (NULL);
- memcpy(copy, str, len);
- copy[len] = '\0';
- return (copy);
-}
-
-#endif
+#include "libi3.h"
/* We save the Atoms in an easy to access array, indexed by an enum */
enum {
}
}
-/*
- * Converts a colorstring to a colorpixel as expected from xcb_change_gc.
- * s is assumed to be in the format "rrggbb"
- *
- */
-uint32_t get_colorpixel(const char *s) {
- char strings[3][3] = { { s[0], s[1], '\0'} ,
- { s[2], s[3], '\0'} ,
- { s[4], s[5], '\0'} };
- uint8_t r = strtol(strings[0], NULL, 16);
- uint8_t g = strtol(strings[1], NULL, 16);
- uint8_t b = strtol(strings[2], NULL, 16);
- return (r << 16 | g << 8 | b);
-}
-
/*
* Redraws the statusline to the buffer
*
}
xcb_char2b_t *text = (xcb_char2b_t*) convert_utf8_to_ucs2(statusline, &glyph_count);
+ uint32_t old_statusline_width = statusline_width;
statusline_width = predict_text_extents(text, glyph_count);
+ /* 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 > xcb_screen->width_in_pixels &&
+ statusline_width > old_statusline_width)
+ realloc_sl_buffer();
xcb_rectangle_t rect = { 0, 0, xcb_screen->width_in_pixels, font_height };
xcb_poly_fill_rectangle(xcb_connection, statusline_pm, statusline_clear, 1, &rect);
XCB_CONFIG_WINDOW_HEIGHT |
XCB_CONFIG_WINDOW_STACK_MODE;
values[0] = walk->rect.x;
- values[1] = walk->rect.y + walk->rect.h - font_height - 6;
+ if (config.position == POS_TOP)
+ values[1] = walk->rect.y;
+ else values[1] = walk->rect.y + walk->rect.h - font_height - 6;
values[2] = walk->rect.w;
values[3] = font_height + 6;
values[4] = XCB_STACK_MODE_ABOVE;
do { \
colors.name = get_colorpixel(new_colors->name ? new_colors->name : def); \
} while (0)
- PARSE_COLOR(bar_fg, "FFFFFF");
- PARSE_COLOR(bar_bg, "000000");
- PARSE_COLOR(active_ws_fg, "FFFFFF");
- PARSE_COLOR(active_ws_bg, "480000");
- PARSE_COLOR(inactive_ws_fg, "FFFFFF");
- PARSE_COLOR(inactive_ws_bg, "240000");
- PARSE_COLOR(urgent_ws_fg, "FFFFFF");
- PARSE_COLOR(urgent_ws_bg, "002400");
- PARSE_COLOR(focus_ws_fg, "FFFFFF");
- PARSE_COLOR(focus_ws_bg, "480000");
+ PARSE_COLOR(bar_fg, "#FFFFFF");
+ PARSE_COLOR(bar_bg, "#000000");
+ PARSE_COLOR(active_ws_fg, "#FFFFFF");
+ PARSE_COLOR(active_ws_bg, "#333333");
+ PARSE_COLOR(inactive_ws_fg, "#888888");
+ PARSE_COLOR(inactive_ws_bg, "#222222");
+ PARSE_COLOR(urgent_ws_fg, "#FFFFFF");
+ PARSE_COLOR(urgent_ws_bg, "#900000");
+ PARSE_COLOR(focus_ws_fg, "#FFFFFF");
+ PARSE_COLOR(focus_ws_bg, "#285577");
#undef PARSE_COLOR
}
int clients = 0;
TAILQ_FOREACH_REVERSE(trayclient, output->trayclients, tc_head, tailq) {
+ if (!trayclient->mapped)
+ continue;
clients++;
DLOG("Configuring tray window %08x to x=%d\n",
}
DLOG("X window %08x requested docking\n", client);
- i3_output *walk, *output;
+ i3_output *walk, *output = NULL;
SLIST_FOREACH(walk, outputs, slist) {
if (!walk->active)
continue;
+ if (config.tray_output &&
+ strcasecmp(walk->name, config.tray_output) != 0)
+ continue;
DLOG("using output %s\n", walk->name);
output = walk;
}
+ if (output == NULL) {
+ ELOG("No output found\n");
+ return;
+ }
xcb_reparent_window(xcb_connection,
client,
output->bar,
values);
/* send the XEMBED_EMBEDDED_NOTIFY message */
- void *event = calloc(32, 1);
+ void *event = scalloc(32);
xcb_client_message_event_t *ev = event;
ev->response_type = XCB_CLIENT_MESSAGE;
ev->window = client;
(char*)ev);
free(event);
+ /* Put the client inside the save set. Upon termination (whether
+ * killed or normal exit does not matter) of i3bar, these clients
+ * will be correctly reparented to their most closest living
+ * ancestor. Without this, tray icons might die when i3bar
+ * exits/crashes. */
+ xcb_change_save_set(xcb_connection, XCB_SET_MODE_INSERT, client);
+
if (map_it) {
DLOG("Mapping dock client\n");
xcb_map_window(xcb_connection, client);
} else {
DLOG("Not mapping dock client yet\n");
}
- trayclient *tc = malloc(sizeof(trayclient));
+ trayclient *tc = smalloc(sizeof(trayclient));
tc->win = client;
tc->mapped = map_it;
tc->xe_version = xe_version;
xcb_get_property_reply_t *xembedr = xcb_get_property_reply(xcb_connection,
xembedc,
NULL);
- if (xembedr == NULL || xembedr->length == 0)
+ if (xembedr == NULL || xembedr->length == 0) {
+ DLOG("xembed_info unset\n");
return;
+ }
DLOG("xembed format = %d, len = %d\n", xembedr->format, xembedr->length);
uint32_t *xembed = xcb_get_property_value(xembedr);
/* need to unmap the window */
xcb_unmap_window(xcb_connection, trayclient->win);
trayclient->mapped = map_it;
+ configure_trayclients();
draw_bars();
} else if (!trayclient->mapped && map_it) {
/* need to map the window */
xcb_map_window(xcb_connection, trayclient->win);
trayclient->mapped = map_it;
+ configure_trayclients();
draw_bars();
}
free(xembedr);
}
}
+/*
+ * Handle ConfigureRequests by denying them and sending the client a
+ * ConfigureNotify with its actual size.
+ *
+ */
+static void handle_configure_request(xcb_configure_request_event_t *event) {
+ DLOG("ConfigureRequest for window = %08x\n", event->window);
+
+ trayclient *trayclient;
+ i3_output *output;
+ SLIST_FOREACH(output, outputs, slist) {
+ if (!output->active)
+ continue;
+
+ int clients = 0;
+ TAILQ_FOREACH_REVERSE(trayclient, output->trayclients, tc_head, tailq) {
+ if (!trayclient->mapped)
+ continue;
+ clients++;
+
+ if (trayclient->win != event->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;
+
+ DLOG("This is a tray window. x = %d\n", rect.x);
+ fake_configure_notify(xcb_connection, rect, event->window, 0);
+ return;
+ }
+ }
+
+ 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_chk_cb(struct ev_loop *loop, ev_check *watcher, int revents) {
xcb_generic_event_t *event;
- while ((event = xcb_poll_for_event(xcb_connection)) == NULL) {
- return;
+
+ if (xcb_connection_has_error(xcb_connection)) {
+ ELOG("X11 connection was closed unexpectedly - maybe your X server terminated / crashed?\n");
+ exit(1);
}
- switch (event->response_type & ~0x80) {
- case XCB_EXPOSE:
- /* Expose-events happen, when the window needs to be redrawn */
- redraw_bars();
- break;
- case XCB_BUTTON_PRESS:
- /* 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:
- /* Client messages are used for client-to-client communication, for
- * example system tray widgets talk to us directly via client messages. */
- handle_client_message((xcb_client_message_event_t*) event);
- break;
- case XCB_UNMAP_NOTIFY:
- /* UnmapNotifies are received when a tray window unmaps itself */
- handle_unmap_notify((xcb_unmap_notify_event_t*) event);
- break;
- case XCB_PROPERTY_NOTIFY:
- /* PropertyNotify */
- handle_property_notify((xcb_property_notify_event_t*) event);
- break;
+ while ((event = xcb_poll_for_event(xcb_connection)) != NULL) {
+ switch (event->response_type & ~0x80) {
+ case XCB_EXPOSE:
+ /* Expose-events happen, when the window needs to be redrawn */
+ redraw_bars();
+ break;
+ case XCB_BUTTON_PRESS:
+ /* 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:
+ /* Client messages are used for client-to-client communication, for
+ * example system tray widgets talk to us directly via client messages. */
+ handle_client_message((xcb_client_message_event_t*) event);
+ break;
+ case XCB_UNMAP_NOTIFY:
+ case XCB_DESTROY_NOTIFY:
+ /* UnmapNotifies are received when a tray window unmaps itself */
+ handle_unmap_notify((xcb_unmap_notify_event_t*) event);
+ break;
+ case XCB_PROPERTY_NOTIFY:
+ /* PropertyNotify */
+ handle_property_notify((xcb_property_notify_event_t*) event);
+ break;
+ case XCB_CONFIGURE_REQUEST:
+ /* ConfigureRequest, sent by a tray child */
+ handle_configure_request((xcb_configure_request_event_t*) event);
+ break;
+ }
+ free(event);
}
- FREE(event);
}
/*
}
/*
- * Initialize xcb and use the specified fontname for text-rendering
+ * Early initialization of the connection to X11: Everything which does not
+ * depend on 'config'.
*
*/
-char *init_xcb(char *fontname) {
+char *init_xcb_early() {
/* FIXME: xcb_connect leaks Memory */
xcb_connection = xcb_connect(NULL, &screen);
if (xcb_connection_has_error(xcb_connection)) {
#define ATOM_DO(name) atom_cookies[name] = xcb_intern_atom(xcb_connection, 0, strlen(#name), #name);
#include "xcb_atoms.def"
- xcb_screen = xcb_setup_roots_iterator(xcb_get_setup(xcb_connection)).data;
+ xcb_screen = xcb_aux_get_screen(xcb_connection, screen);
xcb_root = xcb_screen->root;
- /* We load and allocate the font */
- xcb_font = xcb_generate_id(xcb_connection);
- xcb_void_cookie_t open_font_cookie;
- open_font_cookie = xcb_open_font_checked(xcb_connection,
- xcb_font,
- strlen(fontname),
- fontname);
-
- /* We need to save info about the font, because we need the font's height and
- * information about the width of characters */
- xcb_query_font_cookie_t query_font_cookie;
- query_font_cookie = xcb_query_font(xcb_connection,
- xcb_font);
-
- /* To grab modifiers without blocking other applications from receiving key-events
- * involving that modifier, we sadly have to use xkb which is not yet fully supported
- * in xcb */
- if (config.hide_on_modifier) {
- int xkb_major, xkb_minor, xkb_errbase, xkb_err;
- xkb_major = XkbMajorVersion;
- xkb_minor = XkbMinorVersion;
-
- xkb_dpy = XkbOpenDisplay(NULL,
- &xkb_event_base,
- &xkb_errbase,
- &xkb_major,
- &xkb_minor,
- &xkb_err);
-
- if (xkb_dpy == NULL) {
- ELOG("No XKB!\n");
- exit(EXIT_FAILURE);
- }
-
- if (fcntl(ConnectionNumber(xkb_dpy), F_SETFD, FD_CLOEXEC) == -1) {
- ELOG("Could not set FD_CLOEXEC on xkbdpy: %s\n", strerror(errno));
- exit(EXIT_FAILURE);
- }
-
- int i1;
- if (!XkbQueryExtension(xkb_dpy, &i1, &xkb_event_base, &xkb_errbase, &xkb_major, &xkb_minor)) {
- ELOG("XKB not supported by X-server!\n");
- exit(EXIT_FAILURE);
- }
-
- if (!XkbSelectEvents(xkb_dpy, XkbUseCoreKbd, XkbStateNotifyMask, XkbStateNotifyMask)) {
- ELOG("Could not grab Key!\n");
- exit(EXIT_FAILURE);
- }
-
- xkb_io = malloc(sizeof(ev_io));
- ev_io_init(xkb_io, &xkb_io_cb, ConnectionNumber(xkb_dpy), EV_READ);
- ev_io_start(main_loop, xkb_io);
- XFlush(xkb_dpy);
- }
-
/* 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[3] = { colors.bar_bg, colors.bar_bg, xcb_font };
+ 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,
mask,
vals);
- mask |= XCB_GC_BACKGROUND | XCB_GC_FONT;
+ mask |= XCB_GC_BACKGROUND;
vals[0] = colors.bar_fg;
statusline_ctx = xcb_generate_id(xcb_connection);
xcb_void_cookie_t sl_ctx_cookie = xcb_create_gc_checked(xcb_connection,
/* The various Watchers to communicate with xcb */
- xcb_io = malloc(sizeof(ev_io));
- xcb_prep = malloc(sizeof(ev_prepare));
- xcb_chk = malloc(sizeof(ev_check));
+ 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);
}
}
+
+ 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;
+}
+
+/*
+ * Initialization which depends on 'config' being usable. Called after the
+ * configuration has arrived.
+ *
+ */
+void init_xcb_late(char *fontname) {
+ if (fontname == NULL) {
+ /* XXX: font fallback to 'misc' like i3 does it would be good. */
+ fontname = "-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1";
+ }
+
+ /* We load and allocate the font */
+ xcb_font = xcb_generate_id(xcb_connection);
+ xcb_void_cookie_t open_font_cookie;
+ open_font_cookie = xcb_open_font_checked(xcb_connection,
+ xcb_font,
+ strlen(fontname),
+ fontname);
+
+ /* We need to save info about the font, because we need the font's height and
+ * information about the width of characters */
+ xcb_query_font_cookie_t query_font_cookie;
+ query_font_cookie = xcb_query_font(xcb_connection,
+ xcb_font);
+
+ xcb_change_gc(xcb_connection,
+ statusline_ctx,
+ XCB_GC_FONT,
+ (uint32_t[]){ xcb_font });
+
+ xcb_flush(xcb_connection);
+
+ /* To grab modifiers without blocking other applications from receiving key-events
+ * involving that modifier, we sadly have to use xkb which is not yet fully supported
+ * in xcb */
+ if (config.hide_on_modifier) {
+ int xkb_major, xkb_minor, xkb_errbase, xkb_err;
+ xkb_major = XkbMajorVersion;
+ xkb_minor = XkbMinorVersion;
+
+ xkb_dpy = XkbOpenDisplay(NULL,
+ &xkb_event_base,
+ &xkb_errbase,
+ &xkb_major,
+ &xkb_minor,
+ &xkb_err);
+
+ if (xkb_dpy == NULL) {
+ ELOG("No XKB!\n");
+ exit(EXIT_FAILURE);
+ }
+
+ if (fcntl(ConnectionNumber(xkb_dpy), F_SETFD, FD_CLOEXEC) == -1) {
+ ELOG("Could not set FD_CLOEXEC on xkbdpy: %s\n", strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+
+ int i1;
+ if (!XkbQueryExtension(xkb_dpy, &i1, &xkb_event_base, &xkb_errbase, &xkb_major, &xkb_minor)) {
+ ELOG("XKB not supported by X-server!\n");
+ exit(EXIT_FAILURE);
+ }
+
+ if (!XkbSelectEvents(xkb_dpy, XkbUseCoreKbd, XkbStateNotifyMask, XkbStateNotifyMask)) {
+ ELOG("Could not grab Key!\n");
+ exit(EXIT_FAILURE);
+ }
+
+ xkb_io = smalloc(sizeof(ev_io));
+ ev_io_init(xkb_io, &xkb_io_cb, ConnectionNumber(xkb_dpy), EV_READ);
+ ev_io_start(main_loop, xkb_io);
+ XFlush(xkb_dpy);
+ }
+
/* Now we save the font-infos */
font_info = xcb_query_font_reply(xcb_connection,
query_font_cookie,
}
DLOG("Calculated Font-height: %d\n", font_height);
-
- 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;
}
/*
*
*/
void init_tray() {
+ 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];
snprintf(atomname, strlen("_NET_SYSTEM_TRAY_S") + 11, "_NET_SYSTEM_TRAY_S%d", screen);
XCB_PROP_MODE_REPLACE,
selwin,
atoms[_NET_SYSTEM_TRAY_ORIENTATION],
- atoms[CARDINAL],
+ XCB_ATOM_CARDINAL,
32,
1,
&orientation);
}
/* Inform clients waiting for a new _NET_SYSTEM_TRAY that we are here */
- void *event = calloc(32, 1);
+ void *event = scalloc(32);
xcb_client_message_event_t *ev = event;
ev->response_type = XCB_CLIENT_MESSAGE;
ev->window = xcb_root;
*/
void clean_xcb() {
i3_output *o_walk;
+ trayclient *trayclient;
free_workspaces();
SLIST_FOREACH(o_walk, outputs, slist) {
+ TAILQ_FOREACH(trayclient, o_walk->trayclients, tailq) {
+ /* Unmap, then reparent (to root) the tray client windows */
+ xcb_unmap_window(xcb_connection, trayclient->win);
+ xcb_reparent_window(xcb_connection,
+ trayclient->win,
+ xcb_root,
+ 0,
+ 0);
+ }
destroy_window(o_walk);
+ FREE(o_walk->trayclients);
FREE(o_walk->workspaces);
FREE(o_walk->name);
}
FREE_SLIST(outputs, i3_output);
FREE(outputs);
+ xcb_flush(xcb_connection);
xcb_disconnect(xcb_connection);
ev_check_stop(main_loop, xcb_chk);
*
*/
void realloc_sl_buffer() {
+ DLOG("Re-allocating statusline-buffer, statusline_width = %d, xcb_screen->width_in_pixels = %d\n",
+ statusline_width, xcb_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,
xcb_screen->root_depth,
statusline_pm,
xcb_root,
- xcb_screen->width_in_pixels,
+ MAX(xcb_screen->width_in_pixels, statusline_width),
xcb_screen->height_in_pixels);
uint32_t mask = XCB_GC_FOREGROUND;
void reconfig_windows() {
uint32_t mask;
uint32_t values[5];
+ static bool tray_configured = false;
i3_output *walk;
SLIST_FOREACH(walk, outputs, slist) {
if (walk->bar == XCB_NONE) {
DLOG("Creating Window for output %s\n", walk->name);
- /* TODO: only call init_tray() if the tray is configured for this output */
- init_tray();
-
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;
values[0] = colors.bar_bg;
/* If hide_on_modifier is set, i3 is not supposed to manage our bar-windows */
values[1] = config.hide_on_modifier;
- /* The events we want to receive */
- values[2] = XCB_EVENT_MASK_EXPOSURE;
+ /* 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 |
+ XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT;
if (!config.disable_ws) {
values[2] |= XCB_EVENT_MASK_BUTTON_PRESS;
}
walk->rect.w,
walk->rect.h);
+ /* 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,
+ XCB_ATOM_WM_CLASS,
+ XCB_ATOM_STRING,
+ 8,
+ (strlen("i3bar") + 1) * 2,
+ "i3bar\0i3bar\0");
+
+ char *name;
+ if (asprintf(&name, "i3bar for output %s", walk->name) == -1)
+ err(EXIT_FAILURE, "asprintf()");
+ xcb_void_cookie_t name_cookie;
+ name_cookie = xcb_change_property(xcb_connection,
+ XCB_PROP_MODE_REPLACE,
+ walk->bar,
+ XCB_ATOM_WM_NAME,
+ XCB_ATOM_STRING,
+ 8,
+ strlen(name),
+ name);
+ free(name);
+
/* 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,
uint32_t bottom_start_x;
uint32_t bottom_end_x;
} __attribute__((__packed__)) strut_partial = {0,};
- switch (config.dockpos) {
- case DOCKPOS_NONE:
+ switch (config.position) {
+ case POS_NONE:
break;
- case DOCKPOS_TOP:
+ case POS_TOP:
strut_partial.top = font_height + 6;
strut_partial.top_start_x = walk->rect.x;
strut_partial.top_end_x = walk->rect.x + walk->rect.w;
break;
- case DOCKPOS_BOT:
+ case POS_BOT:
strut_partial.bottom = font_height + 6;
strut_partial.bottom_start_x = walk->rect.x;
strut_partial.bottom_end_x = walk->rect.x + walk->rect.w;
if (xcb_request_failed(win_cookie, "Could not create window") ||
xcb_request_failed(pm_cookie, "Could not create 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 && xcb_request_failed(map_cookie, "Could not map window"))) {
exit(EXIT_FAILURE);
}
+
+ if (!tray_configured &&
+ (!config.tray_output ||
+ strcasecmp("none", config.tray_output) != 0)) {
+ init_tray();
+ tray_configured = true;
+ }
} else {
/* We already have a bar, so we just reconfigure it */
mask = XCB_CONFIG_WINDOW_X |
/* 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;
+ traypx += font_height + 2;
}
/* Add 2px of padding if there are any tray icons */
if (traypx > 0)
projects / i3 / i3 / blobdiff