summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-05-27 19:06:07 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-05-27 19:06:07 +0000
commit5e27ce9f7cbbb50341960dcb479e24aeb2b5fad3 (patch)
tree9835de2cdaf10c5ed7a64098e054184543efac61 /pango
parent1bd576b13291693093d9e28d5ae77a698e144b24 (diff)
downloadpango-5e27ce9f7cbbb50341960dcb479e24aeb2b5fad3.tar.gz
Get the fontnmap for the right screen (#113452, Morten Welinder)
Tue May 27 15:01:24 2003 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_font_get_metrics): Get the fontnmap for the right screen (#113452, Morten Welinder)
Diffstat (limited to 'pango')
-rw-r--r--pango/pangoxft-font.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index 262cbb05..c198a0ac 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -446,6 +446,7 @@ pango_xft_font_get_metrics (PangoFont *font,
PangoContext *context;
XftFont *xft_font;
Display *display;
+ int screen;
info = g_new0 (PangoXftMetricsInfo, 1);
xfont->metrics_by_lang = g_slist_prepend (xfont->metrics_by_lang,
@@ -456,8 +457,8 @@ pango_xft_font_get_metrics (PangoFont *font,
{
xft_font = xft_font_get_font (font);
- _pango_xft_font_map_get_info (xfont->fontmap, &display, NULL);
- context = pango_xft_get_context (display, 0);
+ _pango_xft_font_map_get_info (xfont->fontmap, &display, &screen);
+ context = pango_xft_get_context (display, screen);
info->sample_str = sample_str;
info->metrics = pango_font_metrics_new ();