mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hold on to the scaled fonts we use

Browse source
This commit is contained in:
Kristian Høgsberg 2010-12-25 16:58:31 -05:00
parent 4f50670769
commit 7ae6b1a27d
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
clients/terminal.c
View file

@ -368,7 +368,7 @@ struct terminal {
struct color_scheme *color_scheme; struct color_scheme *color_scheme;
struct terminal_color color_table[256]; struct terminal_color color_table[256];
cairo_font_extents_t extents; cairo_font_extents_t extents;
cairo_font_face_t *font_normal, *font_bold; cairo_scaled_font_t *font_normal, *font_bold;
}; };
/* Create default tab stops, every 8 characters */ /* Create default tab stops, every 8 characters */
@ -769,8 +769,7 @@ terminal_draw_contents(struct terminal *terminal)
terminal_set_color(terminal, cr, terminal->color_scheme->border); terminal_set_color(terminal, cr, terminal->color_scheme->border);
cairo_paint(cr); cairo_paint(cr);
cairo_set_font_face(cr, terminal->font_normal); cairo_set_scaled_font(cr, terminal->font_normal);
cairo_set_font_size(cr, 14);
cairo_font_extents(cr, &extents); cairo_font_extents(cr, &extents);
side_margin = (allocation.width - terminal->width * extents.max_x_advance) / 2; side_margin = (allocation.width - terminal->width * extents.max_x_advance) / 2;
@ -809,9 +808,10 @@ terminal_draw_contents(struct terminal *terminal)
terminal_decode_attr(terminal, row, col, &attr); terminal_decode_attr(terminal, row, col, &attr);
if (attr.bold) if (attr.bold)
cairo_set_font_face(cr, terminal->font_bold); font = terminal->font_bold;
else else
cairo_set_font_face(cr, terminal->font_normal); font = terminal->font_normal;
cairo_set_scaled_font(cr, font);
terminal_set_color(terminal, cr, attr.foreground); terminal_set_color(terminal, cr, attr.foreground);
text_x = side_margin + col * extents.max_x_advance; text_x = side_margin + col * extents.max_x_advance;
text_y = top_margin + extents.ascent + row * extents.height; text_y = top_margin + extents.ascent + row * extents.height;
@ -824,7 +824,6 @@ terminal_draw_contents(struct terminal *terminal)
g = glyphs; g = glyphs;
num_glyphs = ARRAY_LENGTH(glyphs); num_glyphs = ARRAY_LENGTH(glyphs);
font = cairo_get_scaled_font (cr);
cairo_scaled_font_text_to_glyphs (font, text_x, text_y, cairo_scaled_font_text_to_glyphs (font, text_x, text_y,
(char *) p_row[col].byte, 4, (char *) p_row[col].byte, 4,
&g, &num_glyphs, &g, &num_glyphs,
@ -1874,16 +1873,19 @@ terminal_create(struct display *display, int fullscreen)
surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0); surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0);
cr = cairo_create(surface); cr = cairo_create(surface);
terminal->font_bold = cairo_toy_font_face_create ("mono", cairo_set_font_size(cr, 14);
cairo_select_font_face (cr, "mono",
CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_BOLD); CAIRO_FONT_WEIGHT_BOLD);
cairo_font_face_reference(terminal->font_bold); terminal->font_bold = cairo_get_scaled_font (cr);
terminal->font_normal = cairo_toy_font_face_create ("mono", cairo_scaled_font_reference(terminal->font_bold);
cairo_select_font_face (cr, "mono",
CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_SLANT_NORMAL,
CAIRO_FONT_WEIGHT_NORMAL); CAIRO_FONT_WEIGHT_NORMAL);
cairo_font_face_reference(terminal->font_normal); terminal->font_normal = cairo_get_scaled_font (cr);
cairo_set_font_face(cr, terminal->font_normal); cairo_scaled_font_reference(terminal->font_normal);
cairo_set_font_size(cr, 14);
cairo_font_extents(cr, &terminal->extents); cairo_font_extents(cr, &terminal->extents);
cairo_destroy(cr); cairo_destroy(cr);
cairo_surface_destroy(surface); cairo_surface_destroy(surface);