diff options
| author | Tor Lillqvist <tml@iki.fi> | 2002-10-21 23:48:24 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2002-10-21 23:48:24 +0000 |
| commit | efe38161780103a7f01e1f241eca4d02e2039326 (patch) | |
| tree | 07f9cd08c2af02229fe0cfb32dfee53189f4b889 /pango/pangowin32-fontmap.c | |
| parent | f1da959cfb199c97e45b2bde9a093205e2405247 (diff) | |
| download | pango-efe38161780103a7f01e1f241eca4d02e2039326.tar.gz | |
Add --with-usp10 flag to indicate where to find the usp10.h header, for
2002-10-22 Tor Lillqvist <tml@iki.fi>
* configure.in: Add --with-usp10 flag to indicate where to find
the usp10.h header, for using Uniscribe on Win32. Set USP10_H
autoconf variable, HAVE_USP10_H config.h macro and HAVE_USP10_H
automake conditional.
* acconfig.h: Add HAVE_USP10_H.
* pango/pangowin32-private.h (PANGO_WIN32_DEBUGGING): Change
semantics of this flag. If defined, also need to set env var
PANGO_WIN32_DEBUG to get the copious debugging output.
Change PING() macro accordingly. Add variable pango_win32_debug.
* pango/pangowin32.c (pango_win32_get_dc): New function. Code
factored out from pango_win32_font_class_init() and
pango_win32_font_map_class_init().
(pango_win32_get_debug_flag): New function.
(pango_win32_render): Handle y offsets, too. Potentially need to
call ExtTextOutW several times, one for each run of sequential
glyphs with the same y offset.
* pango/pangowin32.h: Declare above new functions, in the part
only for shaper engine use.
* pango/pangowin32.def: Export above new functions.
* pango/pangowin32-fontmap.c (pango_win32_font_map_class_init):
Call pango_win32_get_dc() as mentioned above.
* modules/basic/Makefile.am: If HAVE_USP10_H, let basic-win32.lo
depend on usp10.h.
* modules/basic/basic-win32.c: If HAVE_USP10_H, and the Uniscribe
DLL usp10.dll is present, use Uniscribe.
(uniscribe_shape, itemize_shape_and_place,
set_up_pango_log_clusters, convert_log_clusters_to_byte_offsets,
make_langid, init_uniscribe): New functions.
(dump_glyphs_and_log_clusters, lang_name, charset_name): Debugging
functions.
Diffstat (limited to 'pango/pangowin32-fontmap.c')
| -rw-r--r-- | pango/pangowin32-fontmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index e4b7604d..2ec80599 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -188,8 +188,7 @@ pango_win32_font_map_class_init (PangoFontMapClass *class) class->load_font = pango_win32_font_map_load_font; class->list_families = pango_win32_font_map_list_families; - if (pango_win32_hdc == NULL) - pango_win32_hdc = CreateDC ("DISPLAY", NULL, NULL, NULL); + pango_win32_get_dc (); } static PangoWin32FontMap *fontmap = NULL; @@ -782,7 +781,7 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap, * same entry at the moment and it isn't crashing on g_free () ??? * Maybe a memory leak ... */ - switch (lfp->lfPitchAndFamily & (0x0F << 4)) /* bit 4...7 */ + switch (lfp->lfPitchAndFamily & 0xF0) { case FF_MODERN : /* monospace */ PING(("monospace")); |