#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"
uint32_t bar_bg;
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;
};
struct xcb_colors_t colors;
*
*/
void refresh_statusline() {
- size_t glyph_count;
+ struct status_block *block;
- if (statusline == NULL) {
- return;
+ uint32_t old_statusline_width = statusline_width;
+ statusline_width = 0;
+
+ /* Predict the text width of all blocks (in pixels). */
+ TAILQ_FOREACH(block, &statusline_head, blocks) {
+ if (i3string_get_num_bytes(block->full_text) == 0)
+ continue;
+
+ block->width = predict_text_width((char *)i3string_as_ucs2(block->full_text), i3string_get_num_glyphs(block->full_text), true);
+ /* If this is not the last block, add some pixels for a separator. */
+ if (TAILQ_NEXT(block, blocks) != NULL)
+ block->width += 9;
+ statusline_width += block->width;
}
- 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_width((char*)text, glyph_count, true);
/* 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();
+ /* Clear the statusline pixmap. */
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);
- set_font_colors(statusline_ctx, colors.bar_fg, colors.bar_bg);
- draw_text((char*)text, glyph_count, true, statusline_pm, statusline_ctx,
- 0, 0, xcb_screen->width_in_pixels);
- FREE(text);
+ /* 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 colorpixel = (block->color ? get_colorpixel(block->color) : colors.bar_fg);
+ set_font_colors(statusline_ctx, colorpixel, colors.bar_bg);
+ draw_text((char *)i3string_as_ucs2(block->full_text), i3string_get_num_glyphs(block->full_text),
+ true, statusline_pm, statusline_ctx, x, 0, block->width);
+ x += block->width;
+
+ if (TAILQ_NEXT(block, blocks) != NULL) {
+ /* This is not the last block, draw a separator. */
+ set_font_colors(statusline_ctx, get_colorpixel("#666666"), colors.bar_bg);
+ xcb_poly_line(xcb_connection, XCB_COORD_MODE_ORIGIN, statusline_pm,
+ statusline_ctx, 2,
+ (xcb_point_t[]){ { x - 5, 2 }, { x - 5, font.height - 2 } });
+ }
+ }
}
/*
PARSE_COLOR(bar_bg, "#000000");
PARSE_COLOR(active_ws_fg, "#FFFFFF");
PARSE_COLOR(active_ws_bg, "#333333");
+ PARSE_COLOR(active_ws_border, "#333333");
PARSE_COLOR(inactive_ws_fg, "#888888");
PARSE_COLOR(inactive_ws_bg, "#222222");
+ PARSE_COLOR(inactive_ws_border, "#333333");
PARSE_COLOR(urgent_ws_fg, "#FFFFFF");
PARSE_COLOR(urgent_ws_bg, "#900000");
+ PARSE_COLOR(urgent_ws_border, "#2f343a");
PARSE_COLOR(focus_ws_fg, "#FFFFFF");
PARSE_COLOR(focus_ws_bg, "#285577");
+ PARSE_COLOR(focus_ws_border, "#4c7899");
#undef PARSE_COLOR
}
return;
}
- int32_t x = event->event_x;
+ int32_t x = event->event_x >= 0 ? event->event_x : 0;
DLOG("Got Button %d\n", event->detail);
* and set cur_ws accordingly */
TAILQ_FOREACH(cur_ws, walk->workspaces, tailq) {
DLOG("x = %d\n", x);
- if (x < cur_ws->name_width + 10) {
+ if (x >= 0 && x < cur_ws->name_width + 10) {
break;
}
- x -= cur_ws->name_width + 10;
+ x -= cur_ws->name_width + 11;
}
if (cur_ws == NULL) {
return;
break;
case 4:
/* Mouse wheel down. We select the next ws */
- if (cur_ws == TAILQ_FIRST(walk->workspaces)) {
- cur_ws = TAILQ_LAST(walk->workspaces, ws_head);
- } else {
+ if (cur_ws != TAILQ_FIRST(walk->workspaces)) {
cur_ws = TAILQ_PREV(cur_ws, ws_head, tailq);
}
break;
case 5:
/* Mouse wheel up. We select the previos ws */
- if (cur_ws == TAILQ_LAST(walk->workspaces, ws_head)) {
- cur_ws = TAILQ_FIRST(walk->workspaces);
- } else {
+ if (cur_ws != TAILQ_LAST(walk->workspaces, ws_head)) {
cur_ws = TAILQ_NEXT(cur_ws, tailq);
}
break;
}
- const size_t len = strlen(cur_ws->name) + strlen("workspace \"\"") + 1;
- char buffer[len];
- snprintf(buffer, len, "workspace \"%s\"", cur_ws->name);
+ /* To properly handle workspace names with double quotes in them, we need
+ * to escape the double quotes. Unfortunately, that’s rather ugly in C: We
+ * first count the number of double quotes, then we allocate a large enough
+ * buffer, then we copy character by character. */
+ int num_quotes = 0;
+ size_t namelen = 0;
+ const char *utf8_name = i3string_as_utf8(cur_ws->name);
+ for (const char *walk = utf8_name; *walk != '\0'; walk++) {
+ if (*walk == '"')
+ num_quotes++;
+ /* While we’re looping through the name anyway, we can save one
+ * strlen(). */
+ namelen++;
+ }
+
+ const size_t len = namelen + strlen("workspace \"\"") + 1;
+ char *buffer = scalloc(len+num_quotes);
+ strncpy(buffer, "workspace \"", strlen("workspace \""));
+ int inpos, outpos;
+ for (inpos = 0, outpos = strlen("workspace \"");
+ inpos < namelen;
+ inpos++, outpos++) {
+ if (utf8_name[inpos] == '"') {
+ buffer[outpos] = '\\';
+ outpos++;
+ }
+ buffer[outpos] = utf8_name[inpos];
+ }
+ buffer[outpos] = '"';
i3_send_msg(I3_IPC_MESSAGE_TYPE_COMMAND, buffer);
+ free(buffer);
}
/*
bool map_it = true;
int xe_version = 1;
xcb_get_property_cookie_t xembedc;
- xembedc = xcb_get_property_unchecked(xcb_connection,
- 0,
- client,
- atoms[_XEMBED_INFO],
- XCB_GET_PROPERTY_TYPE_ANY,
- 0,
- 2 * 32);
+ xcb_generic_error_t *error;
+ xembedc = xcb_get_property(xcb_connection,
+ 0,
+ client,
+ atoms[_XEMBED_INFO],
+ XCB_GET_PROPERTY_TYPE_ANY,
+ 0,
+ 2 * 32);
xcb_get_property_reply_t *xembedr = xcb_get_property_reply(xcb_connection,
xembedc,
- NULL);
+ &error);
+ if (error != NULL) {
+ ELOG("Error getting _XEMBED_INFO property: error_code %d\n",
+ error->error_code);
+ free(error);
+ return;
+ }
if (xembedr != NULL && xembedr->length != 0) {
DLOG("xembed format = %d, len = %d\n", xembedr->format, xembedr->length);
uint32_t *xembed = xcb_get_property_value(xembedr);
SLIST_FOREACH(walk, outputs, slist) {
if (!walk->active)
continue;
- if (config.tray_output &&
- strcasecmp(walk->name, config.tray_output) != 0)
- 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 && 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");
}
unsigned int mods = ev.state.mods;
- modstate = mods & Mod4Mask;
+ modstate = mods & config.modifier;
}
+#define DLOGMOD(modmask, status, barfunc) \
+ 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; \
+ } \
+ barfunc(); \
+ } while (0)
+
if (modstate != mod_pressed) {
if (modstate == 0) {
- DLOG("Mod4 got released!\n");
- hide_bars();
+ DLOGMOD(config.modifier, released, hide_bars);
} else {
- DLOG("Mod4 got pressed!\n");
- unhide_bars();
+ DLOGMOD(config.modifier, pressed, unhide_bars);
}
mod_pressed = modstate;
}
+
+#undef DLOGMOD
}
/*
#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 draw the statusline to a seperate pixmap, because it looks the same on all bars and
xcb_send_event(xcb_connection,
0,
xcb_root,
- XCB_EVENT_MASK_STRUCTURE_NOTIFY,
+ 0xFFFFFF,
(char*)ev);
free(event);
free(tray_reply);
*/
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);
DLOG("Got Atoms\n");
}
+/*
+ * Reparents all tray clients of the specified output to the root window. This
+ * is either used when shutting down, when an output appears (xrandr --output
+ * VGA1 --off) or when the primary output changes.
+ *
+ * Applications using the tray will start the protocol from the beginning again
+ * afterwards.
+ *
+ */
+void kick_tray_clients(i3_output *output) {
+ trayclient *trayclient;
+ while (!TAILQ_EMPTY(output->trayclients)) {
+ trayclient = TAILQ_FIRST(output->trayclients);
+ /* 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);
+
+ /* We remove the trayclient right here. We might receive an UnmapNotify
+ * event afterwards, but better safe than sorry. */
+ TAILQ_REMOVE(output->trayclients, trayclient, tailq);
+ }
+}
+
/*
* Destroy the bar of the specified output
*
if (output->bar == XCB_NONE) {
return;
}
+
+ kick_tray_clients(output);
xcb_destroy_window(xcb_connection, output->bar);
output->bar = XCB_NONE;
}
1,
&rect);
- if (statusline != NULL) {
+ if (!TAILQ_EMPTY(&statusline_head)) {
DLOG("Printing statusline!\n");
/* Luckily we already prepared a seperate pixmap containing the rendered
}
i3_ws *ws_walk;
+ static char *last_urgent_ws = NULL;
+ bool has_urgent = false, walks_away = true;
+
TAILQ_FOREACH(ws_walk, outputs_walk->workspaces, tailq) {
- DLOG("Drawing Button for WS %s at x = %d\n", ws_walk->name, i);
+ DLOG("Drawing Button for WS %s at x = %d, len = %d\n", i3string_as_utf8(ws_walk->name), i, ws_walk->name_width);
uint32_t fg_color = colors.inactive_ws_fg;
uint32_t bg_color = colors.inactive_ws_bg;
+ uint32_t border_color = colors.inactive_ws_border;
if (ws_walk->visible) {
if (!ws_walk->focused) {
fg_color = colors.active_ws_fg;
bg_color = colors.active_ws_bg;
+ border_color = colors.active_ws_border;
} else {
fg_color = colors.focus_ws_fg;
bg_color = colors.focus_ws_bg;
+ border_color = colors.focus_ws_border;
+ if (last_urgent_ws && strcmp(i3string_as_utf8(ws_walk->name), last_urgent_ws) == 0)
+ walks_away = false;
}
}
if (ws_walk->urgent) {
- DLOG("WS %s is urgent!\n", ws_walk->name);
+ DLOG("WS %s is urgent!\n", i3string_as_utf8(ws_walk->name));
fg_color = colors.urgent_ws_fg;
bg_color = colors.urgent_ws_bg;
+ border_color = colors.urgent_ws_border;
+ has_urgent = true;
+ if (!ws_walk->focused) {
+ FREE(last_urgent_ws);
+ last_urgent_ws = sstrdup(i3string_as_utf8(ws_walk->name));
+ }
/* The urgent-hint should get noticed, so we unhide the bars shortly */
unhide_bars();
}
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, 0, ws_walk->name_width + 10, font.height + 4 };
+ xcb_poly_fill_rectangle(xcb_connection,
+ outputs_walk->buffer,
+ outputs_walk->bargc,
+ 1,
+ &rect_border);
uint32_t vals[] = { bg_color, bg_color };
xcb_change_gc(xcb_connection,
outputs_walk->bargc,
mask,
vals);
- xcb_rectangle_t rect = { i + 1, 1, ws_walk->name_width + 8, font.height + 4 };
+ xcb_rectangle_t rect = { i + 1, 1, ws_walk->name_width + 8, font.height + 2 };
xcb_poly_fill_rectangle(xcb_connection,
outputs_walk->buffer,
outputs_walk->bargc,
1,
&rect);
set_font_colors(outputs_walk->bargc, fg_color, bg_color);
- draw_text((char*)ws_walk->ucs2_name, ws_walk->name_glyphs, true,
+ draw_text((char*)i3string_as_ucs2(ws_walk->name), i3string_get_num_glyphs(ws_walk->name), true,
outputs_walk->buffer, outputs_walk->bargc, i + 5, 2, ws_walk->name_width);
- i += 10 + ws_walk->name_width;
+ i += 10 + ws_walk->name_width + 1;
+ }
+
+ if (!has_urgent && !mod_pressed && walks_away) {
+ FREE(last_urgent_ws);
+ hide_bars();
}
i = 0;
projects / i3 / i3 / blobdiff