X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libi3%2Ffont.c;h=3dca8124bbce32c7cdd97738244ec7af4e3c5fa7;hb=aa8215194cecd6e791f1b560799e9bd641b431f4;hp=b578bf8b0eb49ca7ae795e920f573f1cb0d95096;hpb=54dbbe2f06134b32c03af38db7ec0aa7d3d0b74e;p=i3%2Fi3 diff --git a/libi3/font.c b/libi3/font.c index b578bf8b..3dca8124 100644 --- a/libi3/font.c +++ b/libi3/font.c @@ -5,6 +5,8 @@ * © 2009 Michael Stapelberg and contributors (see also: LICENSE) * */ +#include "libi3.h" + #include #include #include @@ -13,41 +15,21 @@ #include #include -#if PANGO_SUPPORT #include -#endif - -#include "libi3.h" - -extern xcb_connection_t *conn; -extern xcb_screen_t *root_screen; static const i3Font *savedFont = NULL; -#if PANGO_SUPPORT static xcb_visualtype_t *root_visual_type; static double pango_font_red; static double pango_font_green; static double pango_font_blue; -/* Necessary to track whether the dpi changes and trigger a LOG() message, - * which is more easily visible to users. */ -static double logged_dpi = 0.0; - static PangoLayout *create_layout_with_dpi(cairo_t *cr) { PangoLayout *layout; PangoContext *context; context = pango_cairo_create_context(cr); - const double dpi = (double)root_screen->height_in_pixels * 25.4 / - (double)root_screen->height_in_millimeters; - if (logged_dpi != dpi) { - logged_dpi = dpi; - LOG("X11 root window dictates %f DPI\n", dpi); - } else { - DLOG("X11 root window dictates %f DPI\n", dpi); - } - pango_cairo_context_set_resolution(context, dpi); + pango_cairo_context_set_resolution(context, get_dpi_value()); layout = pango_layout_new(context); g_object_unref(context); @@ -103,7 +85,7 @@ static bool load_pango_font(i3Font *font, const char *desc) { */ static void draw_text_pango(const char *text, size_t text_len, xcb_drawable_t drawable, xcb_visualtype_t *visual, int x, int y, - int max_width, bool is_markup) { + int max_width, bool pango_markup) { /* Create the Pango layout */ /* root_visual_type is cached in load_pango_font */ cairo_surface_t *surface = cairo_xcb_surface_create(conn, drawable, @@ -117,7 +99,7 @@ static void draw_text_pango(const char *text, size_t text_len, pango_layout_set_wrap(layout, PANGO_WRAP_CHAR); pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END); - if (is_markup) + if (pango_markup) pango_layout_set_markup(layout, text, text_len); else pango_layout_set_text(layout, text, text_len); @@ -129,12 +111,10 @@ static void draw_text_pango(const char *text, size_t text_len, pango_layout_get_pixel_size(layout, NULL, &height); /* Center the piece of text vertically if its height is smaller than the * cached font height, and just let "high" symbols fall out otherwise. */ - int yoffset = (height < savedFont->height ? 0.5 : 1) * (height - savedFont->height); + int yoffset = abs(height - savedFont->height) / 2; cairo_move_to(cr, x, y - yoffset); pango_cairo_show_layout(cr, layout); - cairo_surface_flush(surface); - /* Free resources */ g_object_unref(layout); cairo_destroy(cr); @@ -145,7 +125,7 @@ static void draw_text_pango(const char *text, size_t text_len, * Calculate the text width using Pango rendering. * */ -static int predict_text_width_pango(const char *text, size_t text_len, bool is_markup) { +static int predict_text_width_pango(const char *text, size_t text_len, bool pango_markup) { /* Create a dummy Pango layout */ /* root_visual_type is cached in load_pango_font */ cairo_surface_t *surface = cairo_xcb_surface_create(conn, root_screen->root, root_visual_type, 1, 1); @@ -156,7 +136,7 @@ static int predict_text_width_pango(const char *text, size_t text_len, bool is_m gint width; pango_layout_set_font_description(layout, savedFont->specific.pango_desc); - if (is_markup) + if (pango_markup) pango_layout_set_markup(layout, text, text_len); else pango_layout_set_text(layout, text, text_len); @@ -171,7 +151,6 @@ static int predict_text_width_pango(const char *text, size_t text_len, bool is_m return width; } -#endif /* * Loads a font for usage, also getting its metrics. If fallback is true, @@ -192,7 +171,6 @@ i3Font load_font(const char *pattern, const bool fallback) { return font; } -#if PANGO_SUPPORT /* Try to load a pango font if specified */ if (strlen(pattern) > strlen("pango:") && !strncmp(pattern, "pango:", strlen("pango:"))) { const char *font_pattern = pattern + strlen("pango:"); @@ -207,7 +185,6 @@ i3Font load_font(const char *pattern, const bool fallback) { return font; } } -#endif /* Send all our requests first */ font.specific.xcb.id = xcb_generate_id(conn); @@ -229,6 +206,7 @@ i3Font load_font(const char *pattern, const bool fallback) { info_cookie = xcb_query_font(conn, font.specific.xcb.id); /* Check if we managed to open 'fixed' */ + free(error); error = xcb_request_check(conn, font_cookie); /* Fall back to '-misc-*' if opening 'fixed' fails. */ @@ -239,12 +217,16 @@ i3Font load_font(const char *pattern, const bool fallback) { strlen(pattern), pattern); info_cookie = xcb_query_font(conn, font.specific.xcb.id); + free(error); if ((error = xcb_request_check(conn, font_cookie)) != NULL) errx(EXIT_FAILURE, "Could open neither requested font nor fallbacks " "(fixed or -misc-*): X11 error %d", error->error_code); } } + if (error != NULL) { + free(error); + } font.pattern = sstrdup(pattern); LOG("Using X font %s\n", pattern); @@ -297,15 +279,10 @@ void free_font(void) { free(savedFont->specific.xcb.info); break; } -#if PANGO_SUPPORT case FONT_TYPE_PANGO: /* Free the font description */ pango_font_description_free(savedFont->specific.pango_desc); break; -#endif - default: - assert(false); - break; } savedFont = NULL; @@ -315,7 +292,7 @@ void free_font(void) { * Defines the colors to be used for the forthcoming draw_text calls. * */ -void set_font_colors(xcb_gcontext_t gc, uint32_t foreground, uint32_t background) { +void set_font_colors(xcb_gcontext_t gc, color_t foreground, color_t background) { assert(savedFont != NULL); switch (savedFont->type) { @@ -325,20 +302,15 @@ void set_font_colors(xcb_gcontext_t gc, uint32_t foreground, uint32_t background case FONT_TYPE_XCB: { /* Change the font and colors in the GC */ uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND | XCB_GC_FONT; - uint32_t values[] = {foreground, background, savedFont->specific.xcb.id}; + uint32_t values[] = {foreground.colorpixel, background.colorpixel, savedFont->specific.xcb.id}; xcb_change_gc(conn, gc, mask, values); break; } -#if PANGO_SUPPORT case FONT_TYPE_PANGO: /* Save the foreground font */ - pango_font_red = ((foreground >> 16) & 0xff) / 255.0; - pango_font_green = ((foreground >> 8) & 0xff) / 255.0; - pango_font_blue = (foreground & 0xff) / 255.0; - break; -#endif - default: - assert(false); + pango_font_red = foreground.red; + pango_font_green = foreground.green; + pango_font_blue = foreground.blue; break; } } @@ -348,11 +320,7 @@ void set_font_colors(xcb_gcontext_t gc, uint32_t foreground, uint32_t background * */ bool font_is_pango(void) { -#if PANGO_SUPPORT return savedFont->type == FONT_TYPE_PANGO; -#else - return false; -#endif } static int predict_text_width_xcb(const xcb_char2b_t *text, size_t text_len); @@ -409,15 +377,11 @@ void draw_text(i3String *text, xcb_drawable_t drawable, xcb_gcontext_t gc, draw_text_xcb(i3string_as_ucs2(text), i3string_get_num_glyphs(text), drawable, gc, x, y, max_width); break; -#if PANGO_SUPPORT case FONT_TYPE_PANGO: /* Render the text using Pango */ draw_text_pango(i3string_as_utf8(text), i3string_get_num_bytes(text), drawable, visual, x, y, max_width, i3string_is_markup(text)); return; -#endif - default: - assert(false); } } @@ -448,15 +412,11 @@ void draw_text_ascii(const char *text, xcb_drawable_t drawable, } break; } -#if PANGO_SUPPORT case FONT_TYPE_PANGO: /* Render the text using Pango */ draw_text_pango(text, strlen(text), drawable, root_visual_type, x, y, max_width, false); return; -#endif - default: - assert(false); } } @@ -545,14 +505,10 @@ int predict_text_width(i3String *text) { return 0; case FONT_TYPE_XCB: return predict_text_width_xcb(i3string_as_ucs2(text), i3string_get_num_glyphs(text)); -#if PANGO_SUPPORT case FONT_TYPE_PANGO: /* Calculate extents using Pango */ return predict_text_width_pango(i3string_as_utf8(text), i3string_get_num_bytes(text), i3string_is_markup(text)); -#endif - default: - assert(false); - return 0; } + assert(false); }