X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3bar%2Fsrc%2Fxcb.c;h=4d4dd3848c114807e0e78d0b7dd96f737bb782c0;hb=e7761a342bcbb6668e9cc710570f55be623c7373;hp=4a5ff69a9d4a291638fa6682a34c8d21ed289102;hpb=6f8b2845863e9071d7d630b270729d46423c1eb5;p=i3%2Fi3 diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c index 4a5ff69a..4d4dd384 100644 --- a/i3bar/src/xcb.c +++ b/i3bar/src/xcb.c @@ -10,6 +10,7 @@ #include #include #include +#include #ifdef XCB_COMPAT #include "xcb_compat.h" @@ -79,12 +80,16 @@ struct xcb_colors_t { 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; @@ -104,28 +109,51 @@ int _xcb_request_failed(xcb_void_cookie_t cookie, char *err_msg, int line) { * */ 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; + + /* Convert all blocks from UTF-8 to UCS-2 and predict the text width (in + * pixels). */ + TAILQ_FOREACH(block, &statusline_head, blocks) { + block->ucs2_full_text = (xcb_char2b_t*)convert_utf8_to_ucs2(block->full_text, &(block->glyph_count_full_text)); + block->width = predict_text_width((char*)block->ucs2_full_text, block->glyph_count_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) { + uint32_t colorpixel = (block->color ? get_colorpixel(block->color) : colors.bar_fg); + set_font_colors(statusline_ctx, colorpixel, colors.bar_bg); + draw_text((char*)block->ucs2_full_text, block->glyph_count_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 } }); + } + + FREE(block->ucs2_full_text); + } } /* @@ -205,12 +233,16 @@ void init_colors(const struct xcb_color_strings_t *new_colors) { 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 } @@ -259,10 +291,10 @@ void handle_button(xcb_button_press_event_t *event) { * 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; @@ -286,10 +318,36 @@ void handle_button(xcb_button_press_event_t *event) { 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; + for (char *walk = cur_ws->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 (cur_ws->name[inpos] == '"') { + buffer[outpos] = '\\'; + outpos++; + } + buffer[outpos] = cur_ws->name[inpos]; + } + buffer[outpos] = '"'; i3_send_msg(I3_IPC_MESSAGE_TYPE_COMMAND, buffer); + free(buffer); } /* @@ -355,17 +413,24 @@ static void handle_client_message(xcb_client_message_event_t* event) { 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); @@ -684,19 +749,47 @@ void xkb_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) { } 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 } /* @@ -718,7 +811,7 @@ char *init_xcb_early() { #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 @@ -1302,7 +1395,7 @@ void draw_bars() { 1, &rect); - if (statusline != NULL) { + if (!TAILQ_EMPTY(&statusline_head)) { DLOG("Printing statusline!\n"); /* Luckily we already prepared a seperate pixmap containing the rendered @@ -1336,32 +1429,47 @@ void draw_bars() { i3_ws *ws_walk; 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", 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 (ws_walk->urgent) { DLOG("WS %s is urgent!\n", ws_walk->name); fg_color = colors.urgent_ws_fg; bg_color = colors.urgent_ws_bg; + border_color = colors.urgent_ws_border; /* 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, @@ -1370,7 +1478,7 @@ void draw_bars() { set_font_colors(outputs_walk->bargc, fg_color, bg_color); draw_text((char*)ws_walk->ucs2_name, ws_walk->name_glyphs, 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; } i = 0;