diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-05-27 19:06:07 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-05-27 19:06:07 +0000 |
| commit | 5e27ce9f7cbbb50341960dcb479e24aeb2b5fad3 (patch) | |
| tree | 9835de2cdaf10c5ed7a64098e054184543efac61 | |
| parent | 1bd576b13291693093d9e28d5ae77a698e144b24 (diff) | |
| download | pango-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)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/pangoxft-font.c | 5 |
6 files changed, 33 insertions, 2 deletions
@@ -1,3 +1,9 @@ +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) + Tue May 27 12:36:50 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Fix typo for FreeType dependencies diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d8f0b334..c90b0bb8 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +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) + Tue May 27 12:36:50 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Fix typo for FreeType dependencies diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index d8f0b334..c90b0bb8 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +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) + Tue May 27 12:36:50 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Fix typo for FreeType dependencies diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index d8f0b334..c90b0bb8 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +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) + Tue May 27 12:36:50 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Fix typo for FreeType dependencies diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index d8f0b334..c90b0bb8 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +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) + Tue May 27 12:36:50 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Fix typo for FreeType dependencies 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 (); |