Commit Graph

122 Commits

Author SHA1 Message Date
Keith Packard bf0c80fc49 Change $(pkgcachedir) to $(fc_cachedir) in fc-cat and fc-cache Makefile.am
make distcheck caught this bug; the effect of 'make uninstall'
would have been to execute 'rm -rf /', somewhat less that desirable.
2006-08-31 18:14:45 -07:00
Keith Packard f57783d2e9 Revert ABI changes from version 2.3
Accidental ABI changes and additions were discovered by looking at the
differences in fontconfig.h. All of those have been reverted.
2006-08-31 14:38:18 -07:00
Keith Packard d8ab9e6c42 Automatically remove invalid cache files.
Cache files for missing or more recently modified directories are
automatically removed at the end of every fc-cache run.
2006-08-31 09:42:49 -07:00
Keith Packard 2d3387fd72 Skip broken caches. Cache files are auto-written, don't rewrite in fc-cache.
Validate cache contents and skip broken caches, looking down cache path for
valid ones.

Every time a directory is scanned, it will be written to a cache file if
possible, so fc-cache doesn't need to re-write the cache file. This makes
detecting when the cache was generated a bit tricky, so we guess that if the
cache wasn't valid before running and is valid afterwards, the cache file
was written.

Also, allow empty charsets to be serialized with null leaves/numbers.

Eliminate a leak in FcEdit by switching to FcObject sooner.

Call FcFini from fc-match to make valgrind happy.
2006-08-30 21:59:53 -07:00
Keith Packard af180c4037 Fix up fc-cache and fc-cat for no global cache changes.
fc-cache and fc-cat use internal (fcint.h) APIs that have
changed with the elimination of the global cache.
2006-08-27 22:24:39 -07:00
Keith Packard 00f059e930 Eliminate global cache. Eliminate multi-arch cache code.
With the removal of the in-directory cache files, and the addition of
per-user cache directories, there is no longer any reason to preserve the
giant global cache file. Eliminating of this unifies the cache structure
and simplifies the overall caching strategies greatly.
2006-08-27 21:53:48 -07:00
Keith Packard db50cbdaf5 Eliminate NormalizeDir. Eliminate gratuitous stat/access calls per dir.
Normalized directory names offer protection against looped directory trees
but cost enormous numbers of system calls (stat per file in the hierarchy).
Also, cache file directory name contents are validated each time the
directory is modified, don't re-validate every time the cache file is loaded
with an access and stat call.
2006-08-27 18:19:39 -07:00
Patrick Lam 7410e40bd9 2006-08-04 Keith Packard (keithp@keithp.com) reviewed by: plam
Make cache directories configurable. Simplify and correct some code which
    deals with per-directory caches.
2006-08-04 16:13:00 +00:00
Patrick Lam f045376c08 Include $(top_srcdir), $(top_srcdir)/src before anything else.
Shuffle order of includes for building out of srcdir on win32.
reviewed by: plam
2006-04-25 05:57:41 +00:00
Patrick Lam 86abd75965 LD_ADD missing dependencies for binaries. Reported by Edson Alves Pereira.
reviewed by: plam
2006-04-07 18:07:51 +00:00
Patrick Lam d6217cc6bc Patrick Lam <plam@mit.edu>
Make fontconfig compile under MinGW:
1) remove unneeded #includes;
2) make use of mmap and sysconf conditional;
3) replace rand_r by srand/rand if needed;
4) use chsize instead of ftruncate; and
5) update libtool exports file
2006-04-07 04:42:32 +00:00
Patrick Lam 392fa276dc Reduce amount of dirty rss by const'ing some data structures.
Don't fail if we can't create or remove $(pkgcachedir) i.e.
    /var/cache/fontconfig. (reported by Quanah Gibson-Mount).
reviewed by: plam
2006-04-06 04:52:21 +00:00
Patrick Lam 530e66b008 Fix the underlying cause of the below segfault (must usually call
FcDirCacheHasCurrentArch after FcDirCacheValid).
2006-02-18 18:18:07 +00:00
Patrick Lam d2c0102944 Add -r --really-force option which blows away cache files and then
regenerates them.
2006-02-16 15:36:43 +00:00
Patrick Lam 719f4b841f Don't bail if fontconfig can't remove a dir cache file. Skip the ID of a
cache file when copying. Eliminate 'source file too small' bug in
    FcDirCacheWrite.
2006-02-16 07:12:04 +00:00
Patrick Lam 660acf8f22 Don't loop infinitely on recursive symlinks.
reviewed by: plam
2006-02-06 23:11:41 +00:00
Patrick Lam 788c4af232 Make 'make distcheck' work with automake 1.6.3.
reviewed by: plam
2006-02-05 04:11:08 +00:00
Patrick Lam 80ba0571f3 Stephan Kulow <coolo@suse.de> reviewed by: plam
Replace 'stamp' target with mkinstalldirs.
2006-01-31 07:30:23 +00:00
Patrick Lam 275cf6cd83 Don't stop scanning if a directory in fonts.conf doesn't exist, because
subsequent directories might exist.
reviewed by: plam
2006-01-31 04:07:45 +00:00
Patrick Lam 97293e07dd Move FcConfigNormalizeFontDir call so that it doesn't result in infinite
recursion (reported by Ronny V. Vindenes).
2006-01-27 05:47:59 +00:00
Patrick Lam 8a0b0ed6d0 Compare device numbers as well as inodes. Always normalize directory names
before comparing them.
Allocate extra space for appended '/' in directory name.
reviewed by: plam
2006-01-14 21:23:03 +00:00
Patrick Lam df3efc11a9 Explicitly add font dirs to config.fontDirs even if they're empty. Set
current config in fc-cache.c. Fix treatment of cache directory as read
    from cache file; don't use string equality to determine if we have the
    right file, use inode equality.
2006-01-10 13:15:05 +00:00
Patrick Lam cd9bca6970 Normalize font dirs by using the form, as given in fonts.conf, and recorded
in FcConfig's fontDirs string set, as canonical.
Actually update config.fontDirs as font directories are scanned.
2006-01-09 13:58:04 +00:00
Patrick Lam 3bfae75d44 Bump version to 2.3.93.
Use open instead of fopen (requested by Phil Race for Sun).
src/fccache.c (FcDirCacheWrite);
Fix GCC4 warning and Makefile brokenness for /var/cache/fontconfig dir.
2005-12-21 03:31:19 +00:00
Patrick Lam 83b6739035 Improve error message when fc-cache can't write the cache. Add missing
slash. Reported by Behdad. Incorporate Behdad's patch to create
    /var/cache/fontconfig when appropriate.
2005-12-12 13:46:45 +00:00
Patrick Lam ea44e21841 Migrate cache files from fonts directories to /var/cache/fontconfig. This
helps make fontconfig FHS-compliant, but requires that all caches get
    rebuilt.
Also, autogen.sh now needs the additional parameter
--localstatedir=/var.
2005-12-09 16:36:45 +00:00
Patrick Lam 303bcf9b9d Revert the previous patch and commit the correct patch: I forgot a
canonicalization in FcValueListSerialize, so that it would choke on
    already-serialized input files. Duh!
2005-11-02 07:37:00 +00:00
Patrick Lam c6b75577f3 Forcibly rescan a directory before writing a fresh local cache file for
that directory, fixing the losing-fonts problem reported by Mike Fabian
    and also apparently the font cache file corruption.
2005-11-02 07:01:25 +00:00
Patrick Lam 55c8fa4f08 Add new API which unlinks directory caches and checks dir caches for
existence of appropriate sections. Fix fc-cache to unlink stale cache
    files and save directory caches that lack relevant sections.
2005-10-05 00:34:52 +00:00
Patrick Lam f28f090d25 Add new command-line utility, fc-cat, to convert fonts.cache-2 files into
fonts.cache-1 files (e.g. for grepping and validation of the mmap
    codepath), as per James Cloos' request.
Remove done 'TODO' comment.
Updates for development release 2.3.90.
2005-09-23 05:59:19 +00:00
Patrick Lam a9698bed65 Update documentation -- fc-cache's man page now says that you need to run
fc-cache once per cached architecture; add some documentation to the
    FcCache structure.
Make fc-cache write out fonts.cache-2 files for directories with no fonts
    (i.e. only subdirectories).
2005-09-23 04:09:37 +00:00
Patrick Lam 2304e38f9b :
Save subdirectory names in cache files to save time. This completely
    restores the original fontconfig API, BTW. Note that directories
    without fonts don't get a cache file; but then how many files would it
    have in that directory...
2005-09-01 06:14:46 +00:00
Patrick Lam 5e678e9459 Only load requested fonts for fc-cache, and cleanup memory handling:
*Serialize no longer mutates original FcPatterns, it creates a new copy
    in the supplied buffer. Fix thinkos in global cache freeing and in
    FcCacheSkipToArch.
2005-08-31 15:12:41 +00:00
Patrick Lam eb0cf67144 src/fcint.c
The global cache now uses the same mmap-based cache infrastructure as the
    per-directory caches. Furthermore, the global cache is automatically
    updated (if possible) whenever fontconfig is used. Rip out remnants of
    the old cache infrastructure.
2005-08-30 05:55:13 +00:00
Patrick Lam 4262e0b385 Overhaul the serialization system to create one mmapable file per directory
and distribute bytes for each directory from a single malloc for that
    directory. Store pointers as differences between the data pointed to
    and the pointer's address (s_off = s - v). Don't serialize data
    structures that never actually get serialized. Separate strings used
    for keys from strings used for values (in FcPatternElt and FcValue,
    respectively). Bump FC_CACHE_VERSION to 2.
2005-08-24 06:21:30 +00:00
Patrick Lam 212c9f437e #ifdef out old cache stuff, replace with first version of new mmapping
cache. Add *Read and *Write procedures which mmap in and write out the
    fontconfig data structures to disk. Currently, create cache in /tmp,
    with different sections for each architecture (as returned by uname's
    .machine field. Run the fc-cache binary to create a new cache file;
    fontconfig then uses this cache file on subsequent runs, saving lots of
    memory. Also fixes a few bugs and leaks.
2005-07-25 04:10:09 +00:00
Keith Packard 5c1853cd4c Bump so revision for 2.3.2
Fix a few minor leaks in error cases.
2005-04-27 16:22:46 +00:00
Keith Packard 716ac8b803 Don't force bitmap font enable in default configuration; allows users to
override this in ~/.fonts.conf
Updated translations
Destroy font configuration on exit to help valgrind
Use own transcoding routines in preference to iconv which appears to have
    leaks in some translators. Call iconv_close after using iconv (oops).
Prefer unicode encoding of Euro char as some fonts mis-encode Euro in other
    ones.
Must fetch bitmap glyphs to get width values to check for
    monospace/dual-width fonts.
2005-04-21 19:03:53 +00:00
Keith Packard 46b51147d1 Change files from ISO-Latin-1 to UTF-8 2004-12-07 01:14:46 +00:00
Keith Packard 54560b013f Sleep for two seconds before exiting to make sure timestamps for future
changes have distinct mod times in the file system. Bug #1982.
Add Punjabi orthography. Bug #1671.
reviewed by: Keith Packard <keithp@keithp.com>
2004-12-05 06:19:46 +00:00
Carl Worth f6d784313f Remove excessive whitespace (missed on previous commit) 2003-12-12 17:07:55 +00:00
Carl Worth d098e4ebe7 Move man_MANS into the 'if USEDOCBOOK' block.
Move man_MANS into the 'if USEDOCBOOK' block. (all-local): Remove excessive
    whitespace.
Add 'set -e' to abort when any program fails, (avoids printing of 'now type
    make' after configure aborts).
2003-12-11 19:30:07 +00:00
Keith Packard 4cbc3ee8fe Yet more cleanups to finish getting 'make distcheck' working This has been
tested to ensure that it even works from a _build directory.
2003-10-27 10:44:13 +00:00
Keith Packard 394b2bf046 Attempts to fix 'make distcheck' work. Things are progressing pretty well,
but there are still failures long into the process dealing with docs
    (as always).
The big changes here are mostly to make $(srcdir) != "." work correctly,
    fixing the docbook related sections and fc-lang were particularily
    tricky. Docbook refuses to load system entities from anywhere other
    than where the original .sgml file was located, so no luck looking in
    "." for the configure-generated version.sgml and confdir.sgml files.
fc-lang needed help finding .orth files; added a -d option to set the
    directory as the least evil of many options.
Now to go use a faster machine and try and wring out the last issues.
2003-10-27 06:30:29 +00:00
Josselin Mouette 75839218d1 Replace fc-cache and fc-list manpages with more detailed, SGML versions. 2003-10-09 18:21:49 +00:00
Keith Packard 86b1243193 (Bug 87) Automake 1.4 doesn't do man_MAN1 correctly (Bug 88) Fix usage info
on non-long option systems (Tim Mooney)
2003-05-31 14:58:41 +00:00
Keith Packard 8cfb37394c distribute man page 2003-03-07 20:04:13 +00:00
Keith Packard 4bd4418ab5 Change RCS tag 2003-03-05 05:51:27 +00:00
Owen Taylor 22dc6fc6db Sun Mar 2 14:16:17 2003 Owen Taylor <otaylor@redhat.com>
fontconfig.spec.in: Improvements from Red Hat spec file.
{fc-lang,fc-cache,fc-list}/Makefile.am: Add man pages.
docs/*.sgml: SGML fixes.
2003-03-03 01:13:11 +00:00
Keith Packard ff3f1f98ed Switch back to -version-info for fontconfig as its at minor 0. Add
--system-only to fc-cache. Fix FC_VERSION to match product version
    rather than .so version
2003-03-02 19:12:23 +00:00
Keith Packard f2aacf1ed9 Add remaining .cvsignore files 2003-02-24 17:52:44 +00:00
Keith Packard 20fa60c9ae Switch to automake 2003-02-24 17:18:50 +00:00
Keith Packard 565a919e80 Have fc-cache skip directories without write access 2003-02-12 20:35:32 +00:00
Keith Packard c647f6f1e4 Build fclang.h before building library This required compiling the charset
funcs into fc-lang, which was done by refactoring code in fccharset.c
    and fcfreetype.c a bit
Updated ethiopic orthographies
Remove imake support
Install empty local.conf file if none is present
2003-02-06 17:46:06 +00:00
Marc Aurele La France d1bec8c66d Pacify gcc 3.2 2002-09-18 17:11:46 +00:00
Keith Packard fa244f3d88 Various config changes plus a couple of optimizations from Owen 2002-08-19 19:32:05 +00:00
Keith Packard 5d43e79919 Make missing font directory messages only displayed when verbose 2002-08-13 02:06:22 +00:00
Keith Packard 80a7d66439 Help message said -v was for --force 2002-08-11 15:09:33 +00:00
Keith Packard aefb2c41c8 Fix autoconf build BSD install and sysconfdir problems 2002-08-01 15:57:26 +00:00
Marc Aurele La France 8ea04b7956 Ident line 2002-07-01 12:38:27 +00:00
Keith Packard ad07dcf486 Make fc-cache avoid reading the whole world full of fonts 2002-07-01 05:11:20 +00:00
Keith Packard 0c35c0facb Make fc-cache more tolerant of missing font directories 2002-06-19 20:55:19 +00:00
Keith Packard ed2547b858 Clean up autoconf install to obey DESTDIR 2002-05-24 06:25:52 +00:00
Keith Packard 446bb9c9e0 More autoconf cleanup for fontconfig 2002-05-21 17:48:15 +00:00
Keith Packard 179c39959c Fix autoconf build process for fontconfig 2002-05-21 17:06:22 +00:00
Matthieu Herrb 1ce2a1bbad Don't run fc-cache on make install if DESTDIR is set. Instead; run it from
Xinstall.sh after XFree86 is installed.
2002-05-05 17:53:41 +00:00
Marc Aurele La France c4bd0638c5 Warning fixes 2002-02-26 05:10:30 +00:00
Keith Packard 2eb26602ff fontconfig fc-cache program needs to be executed with correct environment
on install
2002-02-15 23:45:33 +00:00
Keith Packard 65018b4a46 Update to Xft version 2 2002-02-15 07:36:14 +00:00
Keith Packard ccb3e93b27 fontconfig library: build fixes and compiler warning fixes 2002-02-15 06:01:28 +00:00
Keith Packard 3be03bed39 Update fontconfig and libxml2 to get them working with in-tree build
process
2002-02-15 00:49:44 +00:00
Keith Packard 24330d27f8 Initial revision 2002-02-14 23:34:13 +00:00