diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-0 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-1-2 | 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/pangowin32-fontcache.c | 2 | ||||
-rw-r--r-- | pango/pangowin32-fontmap.c | 14 | ||||
-rw-r--r-- | pango/pangowin32.c | 4 |
10 files changed, 59 insertions, 3 deletions
@@ -1,5 +1,8 @@ 2002-01-02 Tor Lillqvist <tml@iki.fi> + * pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc + -Wall, initialise a couple of variables. + * pango/pangowin32-fontcache.c (pango_win32_font_cache_load): Set lfCharSet to DEFAULT_CHARSET always. Conditional debugging output with the PING() macro. @@ -12,6 +15,9 @@ (logfont_nosize_hash): Lowercase face name before calculating hash. (logfont_nosize_equal): Compare face names ignoring case. + (pango_win32_insert_font): Store "courier new" also under the name + "courier", as that is what gtk-demo (and presumably often other + applications, too?) looks for. Thu Dec 27 14:19:46 2001 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 84a8cdfb..e57a6530 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,5 +1,8 @@ 2002-01-02 Tor Lillqvist <tml@iki.fi> + * pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc + -Wall, initialise a couple of variables. + * pango/pangowin32-fontcache.c (pango_win32_font_cache_load): Set lfCharSet to DEFAULT_CHARSET always. Conditional debugging output with the PING() macro. @@ -12,6 +15,9 @@ (logfont_nosize_hash): Lowercase face name before calculating hash. (logfont_nosize_equal): Compare face names ignoring case. + (pango_win32_insert_font): Store "courier new" also under the name + "courier", as that is what gtk-demo (and presumably often other + applications, too?) looks for. Thu Dec 27 14:19:46 2001 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 84a8cdfb..e57a6530 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,8 @@ 2002-01-02 Tor Lillqvist <tml@iki.fi> + * pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc + -Wall, initialise a couple of variables. + * pango/pangowin32-fontcache.c (pango_win32_font_cache_load): Set lfCharSet to DEFAULT_CHARSET always. Conditional debugging output with the PING() macro. @@ -12,6 +15,9 @@ (logfont_nosize_hash): Lowercase face name before calculating hash. (logfont_nosize_equal): Compare face names ignoring case. + (pango_win32_insert_font): Store "courier new" also under the name + "courier", as that is what gtk-demo (and presumably often other + applications, too?) looks for. Thu Dec 27 14:19:46 2001 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 84a8cdfb..e57a6530 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,5 +1,8 @@ 2002-01-02 Tor Lillqvist <tml@iki.fi> + * pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc + -Wall, initialise a couple of variables. + * pango/pangowin32-fontcache.c (pango_win32_font_cache_load): Set lfCharSet to DEFAULT_CHARSET always. Conditional debugging output with the PING() macro. @@ -12,6 +15,9 @@ (logfont_nosize_hash): Lowercase face name before calculating hash. (logfont_nosize_equal): Compare face names ignoring case. + (pango_win32_insert_font): Store "courier new" also under the name + "courier", as that is what gtk-demo (and presumably often other + applications, too?) looks for. Thu Dec 27 14:19:46 2001 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 84a8cdfb..e57a6530 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,5 +1,8 @@ 2002-01-02 Tor Lillqvist <tml@iki.fi> + * pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc + -Wall, initialise a couple of variables. + * pango/pangowin32-fontcache.c (pango_win32_font_cache_load): Set lfCharSet to DEFAULT_CHARSET always. Conditional debugging output with the PING() macro. @@ -12,6 +15,9 @@ (logfont_nosize_hash): Lowercase face name before calculating hash. (logfont_nosize_equal): Compare face names ignoring case. + (pango_win32_insert_font): Store "courier new" also under the name + "courier", as that is what gtk-demo (and presumably often other + applications, too?) looks for. Thu Dec 27 14:19:46 2001 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 84a8cdfb..e57a6530 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,5 +1,8 @@ 2002-01-02 Tor Lillqvist <tml@iki.fi> + * pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc + -Wall, initialise a couple of variables. + * pango/pangowin32-fontcache.c (pango_win32_font_cache_load): Set lfCharSet to DEFAULT_CHARSET always. Conditional debugging output with the PING() macro. @@ -12,6 +15,9 @@ (logfont_nosize_hash): Lowercase face name before calculating hash. (logfont_nosize_equal): Compare face names ignoring case. + (pango_win32_insert_font): Store "courier new" also under the name + "courier", as that is what gtk-demo (and presumably often other + applications, too?) looks for. Thu Dec 27 14:19:46 2001 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 84a8cdfb..e57a6530 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,5 +1,8 @@ 2002-01-02 Tor Lillqvist <tml@iki.fi> + * pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc + -Wall, initialise a couple of variables. + * pango/pangowin32-fontcache.c (pango_win32_font_cache_load): Set lfCharSet to DEFAULT_CHARSET always. Conditional debugging output with the PING() macro. @@ -12,6 +15,9 @@ (logfont_nosize_hash): Lowercase face name before calculating hash. (logfont_nosize_equal): Compare face names ignoring case. + (pango_win32_insert_font): Store "courier new" also under the name + "courier", as that is what gtk-demo (and presumably often other + applications, too?) looks for. Thu Dec 27 14:19:46 2001 Owen Taylor <otaylor@redhat.com> diff --git a/pango/pangowin32-fontcache.c b/pango/pangowin32-fontcache.c index 2986a33b..9d71d738 100644 --- a/pango/pangowin32-fontcache.c +++ b/pango/pangowin32-fontcache.c @@ -206,7 +206,7 @@ pango_win32_font_cache_load (PangoWin32FontCache *cache, if (hfont != NULL) { - PING (("Success!\n")); + PING (("Success!")); break; } diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index 4488f87f..31a945d6 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -444,6 +444,8 @@ pango_win32_font_map_load_font (PangoFontMap *fontmap, name = g_ascii_strdown (pango_font_description_get_family (description), -1); + PING(("name=%s", name)); + win32family = g_hash_table_lookup (win32fontmap->families, name); if (win32family) { @@ -467,6 +469,8 @@ pango_win32_font_map_load_font (PangoFontMap *fontmap, GSList *tmp_list = best_match->cached_fonts; gint size = pango_font_description_get_size (description); + PING(("got best match:%s",best_match->logfont.lfFaceName)); + while (tmp_list) { PangoWin32Font *win32font = tmp_list->data; @@ -487,6 +491,7 @@ pango_win32_font_map_load_font (PangoFontMap *fontmap, { PangoWin32Font *win32font; + PING(("")); win32font = pango_win32_font_new (fontmap, &best_match->logfont, size); win32font->fontmap = fontmap; win32font->entry = best_match; @@ -842,6 +847,15 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap, break; } + /* Some other magic names */ + + /* Recognize just "courier" for "courier new" */ + if (g_ascii_strcasecmp (win32face->logfont.lfFaceName, "courier new") == 0) + { + font_family = pango_win32_get_font_family (win32fontmap, "courier"); + font_family->font_entries = g_slist_append (font_family->font_entries, win32face); + win32fontmap->n_fonts++; + } } /* Given a LOGFONT and size, make a matching LOGFONT corresponding to diff --git a/pango/pangowin32.c b/pango/pangowin32.c index e444e179..2ed7d555 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -543,8 +543,8 @@ pango_win32_render_layout_line (HDC hdc, while (tmp_list) { - HBRUSH oldfg; - HBRUSH brush; + HBRUSH oldfg = NULL; + HBRUSH brush = NULL; POINT points[2]; PangoUnderline uline = PANGO_UNDERLINE_NONE; PangoLayoutRun *run = tmp_list->data; |