diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-10-03 06:18:15 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-10-03 06:18:15 +0000 |
| commit | 5c3dee45a584a81d800ffc8291b9169af6d790c0 (patch) | |
| tree | f5b5614634e91472fc15219ea301da7f4cc247c8 /pango/pangowin32.c | |
| parent | 3346b3802575f161ac9880a3ca08a3f772eb7e0d (diff) | |
| download | pango-5c3dee45a584a81d800ffc8291b9169af6d790c0.tar.gz | |
Add the Win32 GDI Pango backend to autoconfiguration:
2001-10-03 Tor Lillqvist <tml@iki.fi>
Add the Win32 GDI Pango backend to autoconfiguration:
* configure.in: Call AC_LIBTOOL_WIN32_DLL. Check for native Win32
or Cygwin, set automake conditional PLATFORM_WIN32. Check for
native Win32, set OS_WIN32. Refactor the
Xrender+Xft+Xft+FreeType.h checks not to use AC_CHECK_LIBs inside
eachother, autoconf 2.52e on Cygwin generated bad shell code for
that. Check for gdi32 library, set automake conditional
HAVE_WIN32. Add the basic-win32 module, add INCLUDED_WIN32_MODULES
and INCLUDE_BASIC_WIN32. Write pango/module-defs-win32.c. Generate
pangowin32*.pc.
* pangowin32.pc.in
* pangowin32-uninstalled.pc.in: New files.
* Makefile.am: Add pangowin32*.pc.in.
* .cvsignore: Add pangowin32*.pc.
* modules/basic/Makefile.am: Add the basic-win32 backend. Use
-no-undefined on PLATFORM_WIN32.
* pango/Makefile.am: Add the Win32 backend. Use -no-undefined on
PLATFORM_WIN32. Use the .def files on OS_WIN32. Link libpangoft2
with GLIB_LIBS.
* pango/pango-utils.c: (DllMain): New function, on
G_OS_WIN32. Used to get the actual DLL name, which is tucked away.
(pango_get_sysconf_subdirectory, pango_get_lib_subdirectory):
(Win32): Append VERSION to the registry key passed to
g_win32_get_package_installation_subdirectory(). Use the real DLL
name from above instead of assuming the DLL has a certain name.
Other Win32 backend fixes:
* pango/pangowin32-fontmap.c: (free_coverages_foreach): Remove, unused.
* pango/pangowin32.c: Remove unused variables.
* pango/pangowin32.def: Add pango_win32_font_get_glyph_index.
* pango/pangowin32.h: Remove pango_win32_font_get_coverage, which
is static.
Diffstat (limited to 'pango/pangowin32.c')
| -rw-r--r-- | pango/pangowin32.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pango/pangowin32.c b/pango/pangowin32.c index 18f128f0..c670fc6e 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -82,7 +82,6 @@ pango_win32_get_hfont (PangoFont *font) { PangoWin32Font *win32font = (PangoWin32Font *)font; PangoWin32FontCache *cache; - HGDIOBJ oldfont; TEXTMETRIC tm; if (!win32font->hfont) @@ -233,9 +232,7 @@ pango_win32_render (HDC hdc, { HFONT old_hfont = NULL; HFONT hfont; - UINT orig_align = -1; int i; - int x_off = 0; guint16 *glyph_indexes; INT *dX; @@ -275,7 +272,6 @@ pango_win32_font_get_glyph_extents (PangoFont *font, { PangoWin32Font *win32font = (PangoWin32Font *)font; guint16 glyph_index = glyph; - SIZE size; GLYPHMETRICS gm; guint32 res; HFONT hfont; @@ -434,7 +430,6 @@ pango_win32_font_finalize (GObject *object) { PangoWin32Font *win32font = (PangoWin32Font *)object; PangoWin32FontCache *cache = pango_win32_font_map_get_font_cache (win32font->fontmap); - int i; if (win32font->hfont != NULL) pango_win32_font_cache_unload (cache, win32font->hfont); @@ -1049,14 +1044,11 @@ pango_win32_font_calc_coverage (PangoFont *font, { struct type_4_table *table; guint16 *id_range_offset; - guint16 *id_delta; guint16 *start_count; guint16 *end_count; guint16 seg_count; - guint segment; guint16 id; guint32 ch; - guint16 glyph; int i; /* Do GetFontData magic on font->hfont here. */ |