X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=fbfa32499e8021d3f0105d4fff90bd5c60ad8df8;hb=e892406f68cb0088ba634d34f6cd94d2de26c529;hp=fc0bcd25b56b118a013f4e506069fe7988070ff1;hpb=a5f8037d4690ecd411d0385e1acc296dbc11839b;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index fc0bcd2..fbfa324 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -89,7 +89,7 @@ #include #include #include -#include +#include #include #include #include @@ -260,6 +260,8 @@ int ss_enabled = 0; int xrandr_support; int xrandr_eventbase; unsigned int numlockmask = 0; + +Display *display; xcb_connection_t *conn; xcb_key_symbols_t *syms; @@ -806,7 +808,7 @@ setup_ewmh(void) num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); for (i = 0; i < num_screens; i++) { /* Support check window will be created by workaround(). */ - + /* Report supported atoms */ xcb_delete_property(conn, screens[i].root, sup_list); for (j = 0; j < LENGTH(ewmh); j++) @@ -1353,10 +1355,10 @@ bar_print(struct swm_region *r, const char *s) return; } width = ter->overall_width; - - free(c2b); + free(ter); - + free(c2b); + switch (bar_justify) { case SWM_BAR_JUSTIFY_LEFT: x = SWM_BAR_OFFSET; @@ -1371,7 +1373,7 @@ bar_print(struct swm_region *r, const char *s) if (x < SWM_BAR_OFFSET) x = SWM_BAR_OFFSET; - + rect.x = 0; rect.y = 0; rect.width = WIDTH(r->bar); @@ -1390,7 +1392,7 @@ bar_print(struct swm_region *r, const char *s) xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv); gcv[0] = bar_fs; xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FONT, gcv); - + xcb_image_text_8(conn, len, r->bar->buffer, r->s->bar_gc, x, bar_fs_height, s); @@ -1870,7 +1872,6 @@ bar_setup(struct swm_region *r) err(1, "bar_setup: calloc: failed to allocate memory."); bar_fs = xcb_generate_id(conn); - while ((bar_font = strsep(&bar_fonts, " ,")) != NULL) { if (*bar_font == '\0') continue; @@ -1893,21 +1894,21 @@ bar_setup(struct swm_region *r) } } - bar_fs_info = xcb_query_font_reply(conn, - xcb_query_font(conn, bar_fs), + bar_fs_info = xcb_query_font_reply(conn, xcb_query_font(conn, bar_fs), NULL); - if (!bar_fs_info) - errx(1, "unable to get font information for font %s\n", + if (!bar_fs_info) { + warnx(1, "unable to get font information for font %s\n", bar_font); + return; + } bar_fs_height = bar_fs_info->font_ascent + bar_fs_info->font_descent; - free(bar_fs_info); + free(bar_fs_info); - bar_height = bar_fs_info->font_ascent + bar_fs_info->font_descent + - 4 * bar_border_width; + bar_height = bar_fs_height + 4 * bar_border_width; if (bar_height < 1) bar_height = 1; - + X(r->bar) = X(r); Y(r->bar) = bar_at_bottom ? (Y(r) + HEIGHT(r) - bar_height) : Y(r); WIDTH(r->bar) = WIDTH(r) - 2 * bar_border_width; @@ -3842,12 +3843,13 @@ search_win(struct swm_region *r, union arg *args) struct ws_win *win = NULL; struct search_window *sw = NULL; xcb_window_t w; - uint32_t gcv[3], wa[2]; - int i; + uint32_t gcv[4], wa[2]; + int i, width; char s[8]; FILE *lfile; size_t len; - XRectangle ibox, lbox; + xcb_char2b_t *c2b; + xcb_query_text_extents_reply_t *ter; DNPRINTF(SWM_D_MISC, "search_win\n"); @@ -3879,26 +3881,37 @@ search_win(struct swm_region *r, union arg *args) snprintf(s, sizeof s, "%d", i); len = strlen(s); - /* FIXME fix calculations */ -#if 0 - XmbTextExtents(bar_fs, s, len, &ibox, &lbox); -#endif + c2b = char2b(s); + if (!c2b) { + warn("search_win: char2b malloc"); + free(sw); + fclose(lfile); + search_win_cleanup(); + return; + } + ter = xcb_query_text_extents_reply(conn, + xcb_query_text_extents(conn, bar_fs, + len, c2b), + NULL); + if (!ter) { + warn("search_win: query text failed"); + free(c2b); + free(sw); + fclose(lfile); + search_win_cleanup(); + return; + } + width = ter->overall_width; + free(ter); + free(c2b); w = xcb_generate_id(conn); wa[0] = r->s->c[SWM_S_COLOR_FOCUS].color; wa[1] = r->s->c[SWM_S_COLOR_UNFOCUS].color; -#if 0 xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0, - lbox.width + 4, bar_fs_extents->max_logical_extent.height, + width + 4, bar_fs_height + 4, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa); -#else - /* workaround */ - xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0, - 22, 20, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, - XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | - XCB_CW_BORDER_PIXEL, wa); -#endif sw->indicator = w; TAILQ_INSERT_TAIL(&search_wl, sw, entry); @@ -3906,19 +3919,14 @@ search_win(struct swm_region *r, union arg *args) sw->gc = xcb_generate_id(conn); gcv[0] = r->s->c[SWM_S_COLOR_BAR].color; gcv[1] = r->s->c[SWM_S_COLOR_FOCUS].color; - gcv[2] = 0; + gcv[2] = bar_fs; + gcv[3] = 0; xcb_create_gc(conn, sw->gc, w, XCB_GC_FOREGROUND | - XCB_GC_BACKGROUND | XCB_GC_GRAPHICS_EXPOSURES, gcv); + XCB_GC_BACKGROUND | XCB_GC_FONT | XCB_GC_GRAPHICS_EXPOSURES, + gcv); map_window_raised(w); -#if 0 - xcb_image_text_8(conn, len, w, sw->gc, 2, - (bar_fs_extents->max_logical_extent.height - - lbox.height) / 2 - lbox.y, s); -#else - /* workaround */ - xcb_image_text_8(conn, len, w, sw->gc, 6, 14, s); -#endif + xcb_image_text_8(conn, len, w, sw->gc, 2, bar_fs_height, s); DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w); @@ -7707,7 +7715,10 @@ main(int argc, char *argv[]) sact.sa_flags = SA_NOCLDSTOP; sigaction(SIGCHLD, &sact, NULL); - conn = xcb_connect(NULL, NULL); + if (!(display = XOpenDisplay(0))) + errx(1, "can not open display"); + + conn = XGetXCBConnection(display); if (xcb_connection_has_error(conn)) errx(1, "can not get XCB connection");