#include <err.h>
#include <cairo/cairo-xcb.h>
-#if PANGO_SUPPORT
#include <pango/pangocairo.h>
-#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;
-static double pango_font_alpha;
/* Necessary to track whether the dpi changes and trigger a LOG() message,
* which is more easily visible to users. */
*/
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,
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);
/* Do the drawing */
- cairo_set_source_rgba(cr, pango_font_red, pango_font_green, pango_font_blue, pango_font_alpha);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+ cairo_set_source_rgb(cr, pango_font_red, pango_font_green, pango_font_blue);
pango_cairo_update_layout(cr, layout);
pango_layout_get_pixel_size(layout, NULL, &height);
/* Center the piece of text vertically if its height is smaller than the
* 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);
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);
return width;
}
-#endif
/*
* Loads a font for usage, also getting its metrics. If fallback is true,
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:");
return font;
}
}
-#endif
/* Send all our requests first */
font.specific.xcb.id = xcb_generate_id(conn);
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. */
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);
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;
* 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) {
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;
- pango_font_alpha = ((foreground >> 24) & 0xff) / 255.0;
+ pango_font_red = foreground.red;
+ pango_font_green = foreground.green;
+ pango_font_blue = foreground.blue;
break;
-#endif
default:
assert(false);
break;
*
*/
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);
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);
}
}
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);
}
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;
projects / i3 / i3 / blobdiff