summaryrefslogtreecommitdiff
path: root/pango/pangoxft-fontmap.c
Commit message (Collapse)AuthorAgeFilesLines
* Rewrite to reduce the number of strcmps.Owen Taylor2002-02-241-49/+115
| | | | | | | | | | | | Sun Feb 24 13:40:55 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-fontmap.c (pango_xft_pattern_equal): Rewrite to reduce the number of strcmps. * pango/pangoxft-fontmap.c (pango_xft_font_map_load_font): Compute the patterns as for load_fontset(), then just return the first. This takes advantage of our caching strategy.
* Rewrite to reduce the number of strcmps.Owen Taylor2002-02-241-44/+41
| | | | | | | | | | | | Sun Feb 24 13:40:55 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-fontmap.c (pango_xft_pattern_equal): Rewrite to reduce the number of strcmps. * pango/pangoxft-fontmap.c (pango_xft_font_map_load_font): Compute the patterns as for load_fontset(), then just return the first. This takes advantage of our caching strategy.
* Fix problem where we unref'ed before we ref'ed resulting in entries in theOwen Taylor2002-02-241-3/+5
| | | | | | | | | | | Sun Feb 24 12:12:09 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-fontmap.c (pango_xft_font_map_new_font): Fix problem where we unref'ed before we ref'ed resulting in entries in the cache that shouldn't have been there. * pango/pangoft2-fontmap.c (pango_ft2_font_map_new_font): Same.
* move to next element in list.Anders Carlsson2002-02-011-0/+2
| | | | | | | 2002-02-01 Anders Carlsson <andersca@gnu.org> * pango/pangoxft-fontmap.c (pango_xft_get_font_map): move to next element in list.
* Split comma separated family names and add them in pieces, so they are allOwen Taylor2002-01-111-8/+16
| | | | | | | | | | | | Fri Jan 11 15:01:13 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_make_pattern) pango/pangoxft-fontmap.c (pango_xft_make_pattern): Split comma separated family names and add them in pieces, so they are all visible to Xft. * pango/pangoxft-fontmap.c: Remove duplicate XFT_FAMILY in call to XftListFonts.
* Add g_error if font match fails, referencing bug #68030, which is theAlex Larsson2002-01-101-0/+4
| | | | | | | | 2002-01-09 Alex Larsson <alexl@redhat.com> * pango/pangoxft-fontmap.c (pango_xft_font_map_load_fontset): Add g_error if font match fails, referencing bug #68030, which is the "libXrender is broken" bug.
* pango/pangoft2-private.h Take extra parameter include_size that determinesAlex Larsson2001-11-271-2/+6
| | | | | | | | | | | | | | | | | | 2001-11-27 Alex Larsson <alexl@redhat.com> * pango/pangoft2-private.h * pango/pangoft2-fontmap.c (_pango_ft2_font_desc_from_pattern): Take extra parameter include_size that determines if the descriptor includes the size. * pango/pangoft2.c (_pango_ft2_font_new): Include size in ft2font->description. * pango/pangoxft-private.h * pango/pangoxft-fontmap.c (_pango_xft_font_desc_from_pattern): Take extra parameter include_size that determines if the descriptor includes the size. * pango/pangoxft-font.c: Include size in xfont->description.
* Don't leak filename copy. Don't leak matched patternAlex Larsson2001-11-271-3/+8
| | | | | | | | 2001-11-26 Alex Larsson <alexl@redhat.com> * pango/pangoxft-font.c (pango_xft_font_get_coverage): Don't leak filename copy. * pango/pangoxft-fontmap.c (pango_xft_font_map_load_font): Don't leak matched pattern
* acconfig.h support for --with-xftconfig-dir= path to system XftConfig fileManish Singh2001-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | 2001-11-24 Manish Singh <yosh@gimp.org> * acconfig.h * configure.in: support for --with-xftconfig-dir= path to system XftConfig file * pango/pango-utils.c * pango/pangox.c: include "config.h", not <config.h> * pango/pangoxft-fontmap.c: this file is pangoxft-fontmap.c, not pangoxft-fontmap.h :) * pango/mini-xft/minixftint.h * pango/mini-xft/minixftinit.c: add code for searching common locations for the XftConfig file. We search MINI_XFTCONFIG_DIR if configure defines it for us (as above), then $sysconfdir, then (only on !_WIN32) /etc/X11 and /usr/X11R6/lib/X11.
* Add new function pango_context_load_fontset() to wrapAlex Larsson2001-11-181-0/+4
| | | | | | | | | | | | | | | | | 2001-11-18 Alex Larsson <alexl@redhat.com> * pango/pango-context.[ch]: Add new function pango_context_load_fontset() to wrap pango_font_map_load_fontset(). Add PangoContext arguments to load_font and load_fontset. * pango/pango-fontmap.[ch]: * pango/pangoft2-fontmap.c: * pango/pangowin32-fontmap.c: * pango/pangox-fontmap.c: * pango/pangoxft-font.c: * pango/pangoxft-fontmap.c Add PangoContext arguments to load_font and load_fontset.
* Add XFT_MATRIX and XFT_MINSPACE macro definitions if missing.Alexander Larsson2001-11-181-0/+8
| | | | | | | 2001-11-18 Alexander Larsson <alla@lysator.liu.se> * pango/pangoxft-fontmap.c: Add XFT_MATRIX and XFT_MINSPACE macro definitions if missing.
* Check for LEX and YACC. This will be made optional later, with the buildAlexander Larsson2001-11-181-98/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-11-17 Alexander Larsson <alla@lysator.liu.se> * configure.in: Check for LEX and YACC. This will be made optional later, with the build sources checked in to cvs. Generate pango/mini-xft/Makefile * modules/basic/basic-ft2.c: Use the new pangoft2 API. * pango/Makefile.am: Build mini-xft. Add new files. * pango/pango-context.[ch]: Support only one fontmap per context. Use pango_font_map_load_fontset() and PangoFontset instead of internal fontset. * pango/pango-fontmap.[ch]: New virtual function pango_font_map_load_fontset() and default implementation that uses pango_font_map_load_font(). * pango/pango-utils.[ch] (pango_lookup_aliases): Utility function for looking up aliases. This can be used by backend that has no backend specific aliases. * pango/pangoft2-fontcache.c: Removed file. * pango/pangoft2-fontmap.c: * pango/pangoft2-private.h: * pango/pangoft2.c: * pango/pangoft2.h: Major rewrite. Doesn't handle fontsets. Uses mini-xft so that it will always match the PangoXft backend. Simplified the public API. * pango/pangowin32.c: * pango/pangox.c: pango_context_add_font_map -> pango_context_set_font_map * pango/pangoxft-font.c: * pango/pangoxft-fontmap.c: * pango/pangoxft-private.h: New code to handle fontsets. * pango/mini-xft/*: Mini version of libXft from XFree86 in order to have the pangoFT2 and pangXft backends have same config files and generate the same fonts.
* Documentation updates.Matthias Clasen2001-10-261-1/+1
| | | | | | | | | | | | * pango/fonts.c, pango/pangoft2.c, pango/pangowin32.c, pango/pangoxft-font.c, pango/pangox-fontmap.c, pango/pangoft2-fontmap.c, pango/pangoxft-fontmap.c, pango/pangowin32-fontmap.c, docs/pango-sections.txt, docs/tmpl/coverage-maps.sgml, docs/tmpl/fonts.sgml, docs/tmpl/freetype-fonts.sgml, docs/tmpl/glyphs.sgml, docs/tmpl/layout.sgml, docs/tmpl/main.sgml, docs/tmpl/modules.sgml, docs/tmpl/tab-stops.sgml, docs/tmpl/text-attributes.sgml, docs/tmpl/win32-fonts.sgml: Documentation updates.
* Documentation updates.Matthias Clasen2001-10-141-0/+10
| | | | | * pango/pangox.c, pango/pangoxft-font.c, pango/pangoxft-fontmap.c, docs/pango-sections.txt, docs/tmpl/fonts.sgml: Documentation updates.
* Up to 0.19.Owen Taylor2001-09-181-164/+317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tue Sep 18 15:47:08 2001 Owen Taylor <otaylor@redhat.com> * configure.in (PANGO_MINOR_VERSION): Up to 0.19. * pango/pango-font.h pango/pango-fontmap.[ch] pango/fonts.c pango/pangoxft-fontmap.c pango/pangoft-fontmap.c pango/pango-context.[ch] pango/pangox-fontmap.c: Add new PangoFontFace and PangoFontFamily object types, and change the font listing API to list faces and families, instead of face names and font descriptions. * pango/pango-font.h pango/fonts.c: Make PangoFontDescription an opaque heap-allocated structure, add accessors and convenience functions. * pango/pango-font.h pango/pango-private.h: Make PangoFontMetrics heap allocated, protect the structure definition with #ifdef PANGO_ENABLE_BACKEND, and add getters for the fields. * pango/pango-attributes.[ch] ( pango_attr_iterator_get_font): instead of providing a base font description and one to fill in, provide a single font description to modify based on the attributes. * pango/pango-attributes.[ch]: Fix PangoAttrFontDesc to have a PangoFontDescription by reference, not by value. * pango/pango-utils.[ch]: make pango_parse_style() and friends take pointers to individual enumerations instead of to a PangoFontDescription structure. * pango/*.c: Fix for the PangoFontDescription and PangoFontMetrics changes. * pango/pango-{break,engine,indic,ot,xft}.h pango/Makefile.am pango/opentype/Makefile.am: Protect portions with PANGO_ENABLE_ENGINE to shrink the public API. * modules/*/Makefile.am: -DPANGO_ENABLE_ENGINE. * pango/{pangox.h,pangox-private.h} modules/basic/basic-x.c: Move pango_x_font_get_unknown_glyph() into public header since it is used from modules. * pango/pango-{context,font,fontmap,modules.utils}.h pango/Makefile.am: Protect portions with PANGO_ENABLE_BACKEND to shrink the public API. * pango/*.h: Use G_BEGIN/END_DECLS * examples/viewer-qt.[cc,h]: Fix for changes to font listing API, PangoFontDescription. * pango/pango-indic.h modules/indic/*: Since we install this header fix it up to Pango conventions, namespece ZERO_WIDTH_JOINER, ZERO_WIDTH_NON_JOINER. * docs/pango-sections.txt: Updated.
* Require GLib-1.3.7Owen Taylor2001-06-291-1/+1
| | | | | | | | | | Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com> * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7 * pango/pangoft2-fontmap.c pango/pangowin32-fontmap.c pango/pangox-fontmap.c pango/pangoxft-fontmap.c: Fix args to g_type_init().
* pass 0 as first argument to g_type_init().Tim Janik2001-02-041-1/+1
| | | | | | | | | | | | | | | | Sun Feb 4 07:48:47 2001 Tim Janik <timj@gtk.org> * pango/pango-attributes.c (pango_color_get_type): pass 0 as first argument to g_type_init(). * pango/pangoxft-fontmap.c (pango_xft_get_font_map): * pango/pangowin32-fontmap.c (pango_win32_font_map_for_display): * pango/pangoft2-fontmap.c (pango_ft2_font_map_for_display): * pango/pangox-fontmap.c (pango_x_font_map_for_display): * pango/pango-context.c (pango_context_new): likewise. * i dare saying that i doubt the usefullness of all these g_type_init() calls though.
* Update the default list of included modules forAlexander Larsson2001-01-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-01-03 Alexander Larsson <alexl@redhat.com> * configure.in: Update the default list of included modules for --with-included-modules=yes to include all new modules. Split INCLUDED_MODULES and module-defs.c into per shaper engine type lists. * modules/arabic/Makefile.am: Build libpango-arabic-xft.la if INCLUDE_ARABIC_XFT. * modules/arabic/arabic-xft.c: Change module prefix to _pango_arabic_xft_ * modules/basic/Makefile.am: Build static libs for all included modules. * modules/basic/basic-ft2.c: Change module prefix to _pango_basic_ft2_ * modules/basic/basic-xft.c: Change module prefix to _pango_basic_xft_ * pango/Makefile.am: Include correct module-defs-XXX in libs. * pango/modules.h: Split _pango_included_modules[] into separate lists. * pango/pangox.c: * pango/pangoft2.c: * pango/pangoxft-fontmap.c: Register built in modules.
* Since Xft may only be available statically without shlib deps, check forOwen Taylor2000-12-201-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | Tue Dec 19 22:47:16 2000 Owen Taylor <otaylor@redhat.com> * configure.in pango-config.in pangoxft.pc.in modules/basic/Makefile.am: Since Xft may only be available statically without shlib deps, check for FreeType libs explicitly and include them when linking, otherwise things won't work. Also, define FREETYPE_CFLAGS from freetype-config --cflags. * modules/basic/basic-xft.c pango/pangoxft-font{,map}.c: Fool Xft into not converting glyph indices by loading the face unencoded then calling FT_Set_Charmap ourselves. * pango/Makefile.am pango/pango-ot.h pango/opentype/* :Add start of opentype handling - most of the actually meat of the code here is the OpenType layout code from FreeType 1 ported to freetype2 and adapted slighlty for our purposes. Also, includes a incomplete OpenType-table-dumping code useful for figuring out what is going on. * pango/pangoxft.h pango/pangoxft-font.h: Add calls for getting FT_Face and PangoOTInfo from PangoXftFont. * modules/arabic/{Makefile.am,arabic-ot.[ch],arabic-xft.c}: Initial support for rendering Arabic with OpenType fonts.
* Fix macro breakage.Owen Taylor2000-12-151-0/+499
Thu Dec 14 19:00:46 2000 Owen Taylor <otaylor@redhat.com> * modules/indic/pango-indic-script.h: Fix macro breakage. * modules/basic/tables-big.i: Remove extra copy of basic_ranges. * modules/thai/thai.c: Fix various warnings. * configure.in Makefile.am pangoxft.pc.in pango-config.in modules/basic/Makefile.am modules/basic/basic-xft.c pango/Makefile.am pango/pangoxft-font.[ch] pango/pangoxft-fontmap.c pango/pangoxft.h pango/pangoxft-private.h: Initial support for rendering via Xft and the Xrender extension.