X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=cd629162ddc6f3ba210d05e9829b9ae4b7577594;hb=78294264814075f867420d88e406593dab73dc75;hp=dee3300cd07756d8f87210bfafec0b179a0a94b5;hpb=d691aa1d13c2b0f2e064341fc299ad27d8215750;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index dee3300..cd62916 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -89,6 +89,7 @@ #include #include #include +#include #include #include #include @@ -350,8 +351,7 @@ int border_width = 1; int verbose_layout = 0; time_t time_started; pid_t bar_pid; -xcb_font_t bar_fs; -int32_t bar_fs_height; +XftFont *bar_font; char *bar_fonts; struct passwd *pwd; @@ -669,7 +669,7 @@ char2b(const char *str) s = malloc(len * sizeof(xcb_char2b_t)); if (!s) return (NULL); - + for (i = 0; i < len; i++) { s[i].byte1 = '\0'; s[i].byte2 = str[i]; @@ -808,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++) @@ -1339,41 +1339,28 @@ bar_print(struct swm_region *r, const char *s) size_t len; xcb_rectangle_t rect; uint32_t gcv[1]; - xcb_char2b_t *c2b; - xcb_query_text_extents_reply_t *ter; - int32_t x, width; + int32_t x; + XGlyphInfo info; len = strlen(s); - c2b = char2b(s); - if (!c2b) - return; - ter = xcb_query_text_extents_reply(conn, - xcb_query_text_extents(conn, bar_fs, len, c2b), - NULL); - if (!ter) { - free(c2b); - return; - } - width = ter->overall_width; - - free(ter); - free(c2b); - + + XftTextExtentsUtf8(display, bar_font, (FcChar8 *)s, len, &info); + switch (bar_justify) { case SWM_BAR_JUSTIFY_LEFT: x = SWM_BAR_OFFSET; break; case SWM_BAR_JUSTIFY_CENTER: - x = (WIDTH(r) - width) / 2; + x = (WIDTH(r) - info.width) / 2; break; case SWM_BAR_JUSTIFY_RIGHT: - x = WIDTH(r) - width - SWM_BAR_OFFSET; + x = WIDTH(r) - info.width - SWM_BAR_OFFSET; break; } if (x < SWM_BAR_OFFSET) x = SWM_BAR_OFFSET; - + rect.x = 0; rect.y = 0; rect.width = WIDTH(r->bar); @@ -1390,11 +1377,9 @@ bar_print(struct swm_region *r, const char *s) xcb_change_gc(conn, r->s->bar_gc, XCB_GC_BACKGROUND, gcv); gcv[0] = r->s->c[SWM_S_COLOR_BAR_FONT].color; 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); + bar_font->height, s); /* blt */ xcb_copy_area(conn, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0, @@ -1856,54 +1841,36 @@ bar_refresh(void) void bar_setup(struct swm_region *r) { - char *bar_font; + char *font; xcb_screen_t *screen = get_screen(r->s->idx); uint32_t wa[3]; - xcb_generic_error_t *error; - xcb_void_cookie_t voc; - xcb_query_font_reply_t *bar_fs_info; - if (bar_fs) { - xcb_close_font(conn, bar_fs); - bar_fs = 0; + if (bar_font) { + XftFontClose(display, bar_font); + bar_font = NULL; } if ((r->bar = calloc(1, sizeof(struct swm_bar))) == NULL) 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') + while ((font = strsep(&bar_fonts, " ,")) != NULL) { + if (*font == '\0') continue; - DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", bar_font); - voc = xcb_open_font_checked(conn, bar_fs, strlen(bar_font), - bar_font); - - if ((error = xcb_request_check(conn, voc))) { - DNPRINTF(SWM_D_INIT, - "bar_setup: unable to open font: %s\n", - bar_font); - free(error); - warnx("unable to load font %s", bar_font); + DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", font); + bar_font = XftFontOpenName(display, DefaultScreen(display), + font); + if (!bar_font) { + warnx("unable to load font %s", font); + continue; } else { - DNPRINTF(SWM_D_INIT, - "bar_setup: successfully opened font: %s\n", - bar_font); + DNPRINTF(SWM_D_INIT, "successfully opened font %s\n", + font); break; } } - 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", - bar_font); - bar_fs_height = bar_fs_info->font_ascent + bar_fs_info->font_descent; - free(bar_fs_info); - - bar_height = bar_fs_height + 4 * bar_border_width; + bar_height = bar_font->height + 4 * bar_border_width; if (bar_height < 1) bar_height = 1; @@ -3842,13 +3809,12 @@ 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[4], wa[2]; - int i, width; + uint32_t gcv[3], wa[2]; + int i; char s[8]; FILE *lfile; size_t len; - xcb_char2b_t *c2b; - xcb_query_text_extents_reply_t *ter; + XGlyphInfo info; DNPRINTF(SWM_D_MISC, "search_win\n"); @@ -3880,35 +3846,13 @@ search_win(struct swm_region *r, union arg *args) snprintf(s, sizeof s, "%d", i); len = strlen(s); - 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); + XftTextExtentsUtf8(display, bar_font, (FcChar8 *)s, len, &info); 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; xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0, - width + 4, bar_fs_height + 4, + info.width + 4, bar_font->height + 4, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa); @@ -3918,14 +3862,12 @@ 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] = bar_fs; - gcv[3] = 0; + gcv[2] = 0; xcb_create_gc(conn, sw->gc, w, XCB_GC_FOREGROUND | - XCB_GC_BACKGROUND | XCB_GC_FONT | XCB_GC_GRAPHICS_EXPOSURES, - gcv); + XCB_GC_BACKGROUND | XCB_GC_GRAPHICS_EXPOSURES, gcv); map_window_raised(w); - xcb_image_text_8(conn, len, w, sw->gc, 2, bar_fs_height, s); + xcb_image_text_8(conn, len, w, sw->gc, 2, bar_font->height, s); DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w); @@ -7198,7 +7140,7 @@ int enable_wm(void) { int num_screens, i; - const uint32_t val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT; + const uint32_t val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT; xcb_screen_t *sc; xcb_void_cookie_t wac; xcb_generic_error_t *error; @@ -7697,7 +7639,7 @@ main(int argc, char *argv[]) start_argv = argv; warnx("Welcome to spectrwm V%s Build: %s", SPECTRWM_VERSION, buildstr); - if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "")) + if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "")) warnx("no locale support"); /* handle some signals */ @@ -7717,10 +7659,12 @@ main(int argc, char *argv[]) if (!(display = XOpenDisplay(0))) errx(1, "can not open display"); - conn = XGetXCBConnection(display); + conn = XGetXCBConnection(display); if (xcb_connection_has_error(conn)) errx(1, "can not get XCB connection"); + XSetEventQueueOwner(display, XCBOwnsEventQueue); + xcb_prefetch_extension_data(conn, &xcb_randr_id); xfd = xcb_get_file_descriptor(conn); @@ -7870,7 +7814,7 @@ done: if (screens[i].bar_gc != 0) xcb_free_gc(conn, screens[i].bar_gc); #if 0 - XFreeFontSet(display, bar_fs); + XFreeFontSet(display, bar_font); #endif xcb_key_symbols_free(syms); xcb_flush(conn);