comparison lisp/x-faces.el @ 872:79c6ff3eef26

[xemacs-hg @ 2002-06-20 21:18:01 by ben] font changes etc.; some 21.4 changes mule/mule-msw-init-late.el: Specify charset->windows-registry conversion. mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c. cl-macs.el: Document better. font-lock.el: Move Lisp function regexp to lisp-mode.el. lisp-mode.el: Various indentation fixes: Handle flet functions better. Handle argument lists in defuns and flets. Handle quoted lists, e.g. property lists -- don't indent like function calls. Distinguish between lambdas and other lists. lisp-mode.el: Handle this form. faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code: -- Fix lots of bogus code in msw-faces.el, msw-font-menu.el, font-menu.el that was "truenaming" font specs -- i.e. in the process of frobbing a particular field in a general user-specified font spec with wildcarded fields, sticking in particular values for all the remaining wildcarded fields. This bug was rampant everywhere except in x-faces.el (the oldest and only correctly written code). This also means that we need to work with font names at all times and not font instances, because a font instance is essentially a truenamed font. -- Total rewrite of extremely junky code in msw-faces.el. Work with names as well as font instances, and return names; stop truenaming when canonicalizing and frobbing; fix handling of the combined style field, i.e. weight/slant (also fixed in font.el). -- Totally rewrite the frobbing functions in faces.el. This time, we frob all the instantiators rather than just computing a single instance value and working backwards. That way, e.g., `bold' will work for all charsets that have bold available, rather than only for whatever charset was part of the computed font instance (another example of the truename virus). Also fix up code to look at the fallbacks (all of them) when no global value present, so we don't need to put something in the global value. Intelligently handle a request to frob a buffer locale, rather than signalling an error. When frobbing instantiators, try hard to figure out what device type is associated with them, and frob each according to its own proper device type. Correctly handle inheritance vectors given as instantiators. Preserve existing tags when putting back frobbed instantiators. Extract out general specifier-frobbing code into specifier.el. Document everything cleanly. Do lots of other things better, etc. -- Don't duplicatively set a global specification for the default font -- it's already in the fallback and we no longer need a default global specification present. Delete various code in x-faces.el and msw-faces.el that duplicated the lists of fonts in faces.c. -- init-global-faces was not being called at all under MS Windows! Major bogosity. That caused device-specific values to get stuck into all the fonts, making it very hard to change them -- setting global specs caused nothing to happen. -- Correct weight names in font.el. -- Lots more font fixups in objects*.c. Printer.el: Warning fix. specifier.el: Add more args to map-specifier. Add various "heuristic" specifier functions to aid in creation of specifier-munging code such as in faces.el. subr.el: New functions. lwlib.c: Fix warning. config.inc.samp: Clean up, add args to control fastcall (not yet supported! the changes needed are in another ws of mine), profile support, vc6 support, union-type. xemacs.dsp, xemacs.mak: Semi-major overhaul. Fix bug where dump-id was always getting recomputed, forcing a redump even when nothing changed. Add support for fastcall. Support edit-and-continue (on by default) with vc6. Use incremental linking when doing a debug compilation. Add support for profiling. Consolidate the various debug flags. Partial support for "batch-compiling" -- compiling many files on a single invocation of the compiler. Doesn't seem to help that much for me, so it's not finished or enabled by default. Remove HAVE_MSW_C_DIRED, we always do. Correct some sloppy use of directories. s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine HAVE_MMAP). s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32 variants (Cygwin, native, MinGW). Both of these are properly used in another ws. alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made: (1) Separation of various header files into an external and an internal version, similar to the existing separation of process.h and procimpl.h. Eventually this should be done for all Lisp objects. The external version has the same name as currently; the internal adds -impl. The external file has XFOO() macros for objects, but the structure is opaque and defined only in the internal file. It's now reasonable to move all prototypes in lisp.h into the appropriate external file, and this should be done. Currently, separation has been done on extents.h, objects*.h, console.h, device.h, frame.h, and window.h. For c/d/f/w, the most basic properties are available in the external header file, with the macros resolving to functions. In the internal header file, the macros are redefined to directly access the structure. Also, the global MARK_FOO_CHANGED macros have been made into functions so that they can be accessed without needing to include lots of -impl headers -- they are used in almost exclusively in non-time-critical functions, and take up enough time that the function overhead will be negligible. Similarly, the function overhead from making the basic properties mentioned above into functions is negligible, and code that does heavy accessing of c/d/f/w structures inevitably ends up needing the internal header files, anyway. (2) More face changes. -- Major rewrite of objects-msw.c. Now handles wildcard specs properly, rather than "truenaming" (or even worse, signalling an error, which previously happened with some of the fallbacks if you tried to use them in make-font-instance!). -- Split charset matching of fonts into two stages -- one to find a font specifically designed for a particular charset (by examining its registry), the second to find a Unicode font that can support the charset. This needs to proceed as two complete, separate instantiations in order to work properly (otherwise many of the fonts in the HELLO page look wrong). This should also make it easy to support iso10646 (Unicode) fonts under X. -- All default values for fonts are now completely specified in the fallbacks. Stuff from mule-x-init.el has all been moved here, merged with the existing specs, and totally rethought so you get sensible results. (HELLO now looks much better!). -- Generalize the "default X/GTK device" stuff into a per-device-type "default device". -- Add mswindows-{set-}charset-registry. In time, charset<->code-page conversion functions will be removed. -- Wrap protective code around calls to compute device specifier tags, and do this computation before calling the face initialization code because the latter may need these tags to be correctly updated. (3) Other changes. EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes. config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of #ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside! eval.c: Let detailed backtraces be detailed. specifier.c: Don't override user's print-string-length/print-length settings. glyphs.c: New function image-instance-instantiator. config.h.in, sysdep.c: Changes for fastcall. sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP NEEDS TO GO IN, TOO. search.c: Fix *evil* crash due to incorrect synching of syntax-cache code with 21.1. THIS SHOULD GO INTO 21.4.
author ben
date Thu, 20 Jun 2002 21:19:10 +0000
parents 2b676dc88c66
children 491f8cf78a9c
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
1 ;;; x-faces.el --- X-specific face frobnication, aka black magic. 1 ;;; x-faces.el --- X-specific face frobnication, aka black magic.
2 2
3 ;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc. 3 ;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc.
4 ;; Copyright (C) 1995, 1996 Ben Wing. 4 ;; Copyright (C) 1995, 1996, 2002 Ben Wing.
5 5
6 ;; Author: Jamie Zawinski <jwz@jwz.org> 6 ;; Author: Jamie Zawinski <jwz@jwz.org>
7 ;; Maintainer: XEmacs Development Team 7 ;; Maintainer: XEmacs Development Team
8 ;; Keywords: extensions, internal, dumped 8 ;; Keywords: extensions, internal, dumped
9 9
615 ;;; x-init-global-faces is responsible for ensuring that the 615 ;;; x-init-global-faces is responsible for ensuring that the
616 ;;; default face has some reasonable fallbacks if nothing else is 616 ;;; default face has some reasonable fallbacks if nothing else is
617 ;;; specified. 617 ;;; specified.
618 ;;; 618 ;;;
619 (defun x-init-global-faces () 619 (defun x-init-global-faces ()
620 (or (face-font 'default 'global)
621 (set-face-font 'default
622 "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*"
623 'global '(x default)))
624 (or (face-foreground 'default 'global) 620 (or (face-foreground 'default 'global)
625 (set-face-foreground 'default "black" 'global '(x default))) 621 (set-face-foreground 'default "black" 'global '(x default)))
626 (or (face-background 'default 'global) 622 (or (face-background 'default 'global)
627 (set-face-background 'default "gray80" 'global '(x default)))) 623 (set-face-background 'default "gray80" 'global '(x default))))
628 624
631 ;;; 627 ;;;
632 (defun x-init-device-faces (device) 628 (defun x-init-device-faces (device)
633 ;; 629 ;;
634 ;; If the "default" face didn't have a font specified, try to pick one. 630 ;; If the "default" face didn't have a font specified, try to pick one.
635 ;; 631 ;;
636 (or 632 ;; (or
637 (face-font-instance 'default device) 633 ;; (face-font-instance 'default device)
638 ;; 634 ;;
639 ;; No font specified in the resource database; try to cope. 635 ;; [[ No font specified in the resource database; try to cope. ]]
640 ;; 636 ;;
641 ;; At first I wanted to do this by just putting a font-spec in the 637 ;; NOTE: In reality, this will never happen. The fallbacks will always
642 ;; fallback resources passed to XtAppInitialize(), but that fails 638 ;; be tried, and the last fallback is "*", which should get any font. No
643 ;; if there is an Emacs app-defaults file which doesn't specify a 639 ;; need to put the same checks here as in the fallbacks. These comments
644 ;; font: apparently the fallback resources are not consulted when 640 ;; appear to be pre-19.12. --ben
645 ;; there is an app-defaults file, which seems pretty bogus to me. 641
646 ;; 642 ;; [[ At first I wanted to do this by just putting a font-spec in the
647 ;; We should also probably try "*xtDefaultFont", but I think that it 643 ;; fallback resources passed to XtAppInitialize(), but that fails
648 ;; might be legal to specify that as "xtDefaultFont:", that is, at 644 ;; if there is an Emacs app-defaults file which doesn't specify a
649 ;; top level, instead of "*xtDefaultFont:", that is, applicable to 645 ;; font: apparently the fallback resources are not consulted when
650 ;; every application. `x-get-resource' can't handle that right now. 646 ;; there is an app-defaults file, which seems pretty bogus to me.
651 ;; Anyway, xtDefaultFont is probably variable-width. 647 ;;
652 ;; 648 ;; We should also probably try "*xtDefaultFont", but I think that it
653 ;; Some who have LucidaTypewriter think it's a better font than Courier, 649 ;; might be legal to specify that as "xtDefaultFont:", that is, at
654 ;; but it has the bug that there are no italic and bold italic versions. 650 ;; top level, instead of "*xtDefaultFont:", that is, applicable to
655 ;; We could hair this code up to try and mix-and-match fonts to get a 651 ;; every application. `x-get-resource' can't handle that right now.
656 ;; full complement, but really, why bother. It's just a default. 652 ;; Anyway, xtDefaultFont is probably variable-width.
657 ;; 653 ;;
658 (let (new-x-font) 654 ;; Some who have LucidaTypewriter think it's a better font than Courier,
659 (setq new-x-font (or 655 ;; but it has the bug that there are no italic and bold italic versions.
660 ;; 656 ;; We could hair this code up to try and mix-and-match fonts to get a
661 ;; We default to looking for iso8859 fonts. Using a wildcard for the 657 ;; full complement, but really, why bother. It's just a default. ]]
662 ;; encoding would be bad, because that can cause English speakers to get 658 ;;
663 ;; Kanji fonts by default. It is safe to assume that people using a 659 ;; [[ We default to looking for iso8859 fonts. Using a wildcard for the
664 ;; language other than English have both set $LANG, and have specified 660 ;; encoding would be bad, because that can cause English speakers to get
665 ;; their `font' and `fontList' resources. In any event, it's better to 661 ;; Kanji fonts by default. It is safe to assume that people using a
666 ;; err on the side of the English speaker in this case because they are 662 ;; language other than English have both set $LANG, and have specified
667 ;; much less likely to have encountered this problem, and are thus less 663 ;; their `font' and `fontList' resources. In any event, it's better to
668 ;; likely to know what to do about it. 664 ;; err on the side of the English speaker in this case because they are
669 665 ;; much less likely to have encountered this problem, and are thus less
670 ;; Try for Courier. Almost everyone has that. (Does anyone not?) 666 ;; likely to know what to do about it. ]]
671 (make-font-instance 667
672 "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*" device t) 668
673 (make-font-instance
674 "-*-courier-*-r-*-*-*-120-*-*-*-*-iso8859-*" device t)
675 ;; Next try for any "medium" charcell or monospaced iso8859 font.
676 (make-font-instance "-*-*-medium-r-*-*-*-120-*-*-m-*-iso8859-*" device t)
677 (make-font-instance "-*-*-medium-r-*-*-*-120-*-*-c-*-iso8859-*" device t)
678 ;; Next try for any charcell or monospaced iso8859 font.
679 (make-font-instance "-*-*-*-r-*-*-*-120-*-*-m-*-iso8859-*" device t)
680 (make-font-instance "-*-*-*-r-*-*-*-120-*-*-c-*-iso8859-*" device t)
681 ;; Ok, let's at least try to stay in 8859...
682 (make-font-instance "-*-*-*-r-*-*-*-120-*-*-*-*-iso8859-*" device t)
683 ;; Boy, we sure are losing now. Try the above, but in any encoding.
684 (make-font-instance "-*-*-medium-r-*-*-*-120-*-*-m-*-*-*" device t)
685 (make-font-instance "-*-*-medium-r-*-*-*-120-*-*-c-*-*-*" device t)
686 (make-font-instance "-*-*-*-r-*-*-*-120-*-*-m-*-*-*" device t)
687 (make-font-instance "-*-*-*-r-*-*-*-120-*-*-c-*-*-*" device t)
688 (make-font-instance "-*-*-*-r-*-*-*-120-*-*-*-*-*-*" device t)
689 ;; Hello? Please?
690 (make-font-instance "-*-*-*-*-*-*-*-120-*-*-*-*-*-*" device t)
691 (make-font-instance "*" device t)
692 ;; if we get to here we're screwed, and faces.c will fatal()...
693 ))
694 (if (not (face-font 'default 'global))
695 (set-face-font 'default new-x-font)
696 (set-face-font 'default new-x-font device))))
697 ;; 669 ;;
698 ;; If the "default" face didn't have both colors specified, then pick 670 ;; If the "default" face didn't have both colors specified, then pick
699 ;; some, taking into account whether one of the colors was specified. 671 ;; some, taking into account whether one of the colors was specified.
700 ;; 672 ;;
701 (let ((fg (face-foreground-instance 'default device)) 673 (let ((fg (face-foreground-instance 'default device))