Mercurial > hg > xemacs-beta
view lwlib/lwlib-fonts.c @ 4539:061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
lib-src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.c (main): Allow more than one -d argument, followed
by a directory to change to.
(put_filename): Don't strip directory information; with previous
change, allows retrieval of Lisp function and variable origin
files from #'built-in-symbol-file relative to lisp-directory.
(scan_lisp_file): Don't add an extraneous newline after the file
name, put_filename has added the newline already.
lisp/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* loadup.el (load-history):
Add the contents of current-load-list to load-history before
clearing it. Move the variable declarations earlier in the file to
a format understood by make-docfile.c.
* custom.el (custom-declare-variable): Add the variable's symbol
to the current file's load history entry correctly, don't use a
cons. Eliminate a comment that we don't need to worry about, we
don't need to check the `initialized' C variable in Lisp.
* bytecomp.el (byte-compile-output-file-form):
Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here;
treat #'custom-declare-variable correctly, generating the
docstrings in a format understood by make-docfile.c.
* loadhist.el (symbol-file): Correct behaviour for checking
autoloaded macros and functions when supplied with a TYPE
argument. Accept fully-qualified paths from
#'built-in-symbol-file; if a path is not fully-qualified, return
it relative to lisp-directory if the filename corresponds to a
Lisp file, and relative to (concat source-directory "/src/")
otherwise.
* make-docfile.el (preloaded-file-list):
Rationalise some let bindings a little. Use the "-d" argument to
make-docfile.c to supply Lisp paths relative to lisp-directory,
not absolutely. Add in loadup.el explicitly to the list of files
to be processed by make-docfile.c--it doesn't make sense to add it
to preloaded-file-list, since that is used for purposes of
byte-compilation too.
src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* doc.c (Fbuilt_in_symbol_file):
Return a subr's filename immediately if we've found it. Check for
compiled function and compiled macro docstrings in DOC too, and
return them if they exist.
The branch of the if statement focused on functions may have
executed, but we may still want to check variable bindings; an
else clause isn't appropriate.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 27 Dec 2008 14:05:50 +0000 |
| parents | 316fddbf58e2 |
| children | a6c778975d7d |
line wrap: on
line source
/* Font handling code for X and Xft. Copyright (C) 2003 Eric Knauel Copyright (C) 2004 Free Software Foundation, Inc. Author: Stephen J. Turnbull <stephen@xemacs.org> Created: 24 Jul 2004 by Stephen J. Turnbull This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in GNU Emacs. */ #include <config.h> #include <stdio.h> #include <stdlib.h> #include "lwlib-fonts.h" #if 0 /* these are all from ../src; if we need them move the code */ #include "lisp.h" #include "device.h" #include "device-impl.h" #include "console-x-impl.h" #ifdef HAVE_FONTCONFIG #include "font-mgr.h" #endif #endif /* * code for handling Xft */ #ifdef USE_XFT /* helper function to correctly open Xft/core fonts by name #### Can't we use FcParseName here? #### Is this done so often that the logic needs to be hard-coded in C? Daniel Pittman sez: Older code tried to enforce that an XLFD font was not scaled, while this version just doesn't care. I think that is a better behavior, since if someone really wants a scaled font we should oblige them. Stephen sez: This whole function was ill-conceived, and I'm not sure it succeeds at any of the things it attempts to do. First, we should be using fontconfig directly. I'm not sure what Xft (or fontconfig) will try to do if passed an XLFD. As for scaled fonts, both options are equally bad. The problem is that the X server will often scale bitmap fonts willy-nilly; it's worth trying to avoid that, but I can't say whether that's worth overriding somebody who knows what they're doing. In any case, I think we should find out what Xft (fontconfig?) is able and willing to do with XLFDs, and probably move the logic to LISP. */ XftFont * xft_open_font_by_name (Display *dpy, char *name) { XftFont *res = NULL; /* if (!NILP (Fxft_xlfd_font_name_p (make_string (name, strlen (name))))) */ /* #### this is bogus but ... */ int count = 0; char *pos = name; /* extra parens shut up gcc */ while ((pos = index (pos, '-'))) { count++; pos++; } /* #### hard-coding DefaultScreen is evil! */ if (count == 14 /* fully-qualified XLFD */ || (count < 14 /* heuristic for wildcarded XLFD */ && count >= 5 && index (name, '*'))) res = XftFontOpenXlfd (dpy, DefaultScreen (dpy), name); else res = XftFontOpenName (dpy, DefaultScreen (dpy), name); /* Try for a generic monospace font #### Why? Menus don't need to line up in columns! */ if (!res) res = XftFontOpenName (dpy, DefaultScreen (dpy), "monospace"); /* Try for anything we can get */ if (!res) res = XftFontOpenName (dpy, DefaultScreen (dpy), ""); if (!res) { /* #### This is Just So Wrong ... ! */ /* sorry folks ... */ fprintf (stderr, "Unable to find any usable XFT font, even the defaults!\n"); abort (); return 0; } return res; } #endif /* USE_XFT */ /* End of lwlib-fonts.c */