comparison lisp/font.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 2923009caf47
children 01c57eb70ae9
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
1 ;;; font.el --- New font model 1 ;;; font.el --- New font model
2 2
3 ;; Copyright (c) 1995, 1996 by William M. Perry (wmperry@cs.indiana.edu) 3 ;; Copyright (c) 1995, 1996 by William M. Perry (wmperry@cs.indiana.edu)
4 ;; Copyright (c) 1996, 1997 Free Software Foundation, Inc. 4 ;; Copyright (c) 1996, 1997 Free Software Foundation, Inc.
5 ;; Copyright (C) 2002 Ben Wing.
5 6
6 ;; Author: wmperry 7 ;; Author: wmperry
7 ;; Maintainer: XEmacs Development Team 8 ;; Maintainer: XEmacs Development Team
8 ;; Created: 1997/09/05 15:44:37 9 ;; Created: 1997/09/05 15:44:37
9 ;; Keywords: faces 10 ;; Keywords: faces
10 ;; Version: 1.52 11 ;; Version: 1.52
11 12
12 ;; XEmacs is free software; you can redistribute it and/or modify it 13 ;; XEmacs is free software; you can redistribute it and/or modify it
13 ;; under the terms of the GNU General Public License as published by 14 ;; under the terms of the GNU General Public License as published by
14 ;; the Free Software Foundation; either version 1, or (at your option) 15 ;; the Free Software Foundation; either version 2, or (at your option)
15 ;; any later version. 16 ;; any later version.
16 17
17 ;; XEmacs is distributed in the hope that it will be useful, but 18 ;; XEmacs is distributed in the hope that it will be useful, but
18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of 19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
32 33
33 (globally-declare-fboundp 34 (globally-declare-fboundp
34 '(x-list-fonts 35 '(x-list-fonts
35 mswindows-list-fonts ns-list-fonts internal-facep fontsetp get-font-info 36 mswindows-list-fonts ns-list-fonts internal-facep fontsetp get-font-info
36 get-fontset-info mswindows-define-rgb-color cancel-function-timers 37 get-fontset-info mswindows-define-rgb-color cancel-function-timers
38 mswindows-font-regexp mswindows-canonicalize-font-name
39 mswindows-parse-font-style mswindows-construct-font-style
37 ;; #### perhaps we should rewrite font-warn to avoid the warning 40 ;; #### perhaps we should rewrite font-warn to avoid the warning
38 font-warn)) 41 font-warn))
39 42
40 (globally-declare-boundp 43 (globally-declare-boundp
41 '(global-face-data 44 '(global-face-data
778 781
779 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 782 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
780 ;;; The window-system dependent code (mswindows-style) 783 ;;; The window-system dependent code (mswindows-style)
781 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 784 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
782 785
783 ;;; mswindows fonts look like:
784 ;;; fontname[:[weight][ style][:pointsize[:effects]]][:charset]
785 ;;; A minimal mswindows font spec looks like:
786 ;;; Courier New
787 ;;; A maximal mswindows font spec looks like:
788 ;;; Courier New:Bold Italic:10:underline strikeout:western
789 ;;; Missing parts of the font spec should be filled in with these values:
790 ;;; Courier New:Regular:10::western
791 ;; "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+:[a-zA-Z ]*:[a-zA-Z 0-9]*$"
792 (defvar font-mswindows-font-regexp
793 (let
794 ((- ":")
795 (fontname "\\([a-zA-Z ]+\\)")
796 (weight "\\([a-zA-Z]*\\)")
797 (style "\\( [a-zA-Z]*\\)?")
798 (pointsize "\\([0-9]+\\)")
799 (effects "\\([a-zA-Z ]*\\)")
800 (charset "\\([a-zA-Z 0-9]*\\)")
801 )
802 (concat "^"
803 fontname - weight style - pointsize - effects - charset "$")))
804
805 (defconst mswindows-font-weight-mappings 786 (defconst mswindows-font-weight-mappings
806 '((:extra-light . "Extralight") 787 '((:thin . "Thin")
788 (:extra-light . "Extra Light")
807 (:light . "Light") 789 (:light . "Light")
808 (:demi-light . "Demilight") 790 (:demi-light . "Light")
809 (:demi . "Demi") 791 (:demi . "Light")
810 (:book . "Book") 792 (:book . "Medium")
811 (:medium . "Medium") 793 (:medium . "Medium")
812 (:normal . "Normal") 794 (:normal . "Normal")
813 (:demi-bold . "Demibold") 795 (:demi-bold . "Demi Bold")
814 (:bold . "Bold") 796 (:bold . "Bold")
815 (:regular . "Regular") 797 (:regular . "Regular")
816 (:extra-bold . "Extrabold")) 798 (:extra-bold . "Extra Bold")
799 (:heavy . "Heavy"))
817 "An assoc list mapping keywords to actual mswindows specific strings 800 "An assoc list mapping keywords to actual mswindows specific strings
818 for use in the 'weight' field of an mswindows font string.") 801 for use in the 'weight' field of an mswindows font string.")
819 802
820 (defvar font-mswindows-family-mappings 803 (defvar font-mswindows-family-mappings
821 '( 804 '(
836 "A list of font family mappings on mswindows devices.") 819 "A list of font family mappings on mswindows devices.")
837 820
838 (defun mswindows-font-create-object (fontname &optional device) 821 (defun mswindows-font-create-object (fontname &optional device)
839 "Return a font descriptor object for FONTNAME, appropriate for MS Windows devices." 822 "Return a font descriptor object for FONTNAME, appropriate for MS Windows devices."
840 (let ((case-fold-search t) 823 (let ((case-fold-search t)
841 (font (declare-fboundp (mswindows-font-canonicalize-name fontname)))) 824 (font (declare-fboundp (mswindows-canonicalize-font-name fontname))))
842 (if (or (not (stringp font)) 825 (if (or (not (stringp font))
843 (not (string-match font-mswindows-font-regexp font))) 826 (not (string-match mswindows-font-regexp font)))
844 (make-font) 827 (make-font)
845 (let ((family (match-string 1 font)) 828 (let ((family (match-string 1 font))
846 (weight (match-string 2 font)) 829 (style (match-string 2 font))
847 (style (match-string 3 font)) 830 (pointsize (match-string 3 font))
848 (pointsize (match-string 4 font)) 831 (effects (match-string 4 font))
849 (effects (match-string 5 font)) 832 (charset (match-string 5 font))
850 (charset (match-string 6 font))
851 (retval nil) 833 (retval nil)
852 (size nil) 834 (size nil)
853 (case-fold-search t) 835 (case-fold-search t)
854 ) 836 )
855 (if pointsize (setq size (concat pointsize "pt"))) 837 (destructuring-bind (weight . slant)
856 (if weight (setq weight (intern-soft (concat ":" (downcase weight))))) 838 (mswindows-parse-font-style style)
857 (setq retval (make-font :family family 839 (if (equal pointsize "") (setq pointsize nil))
858 :weight weight 840 (if pointsize (setq size (concat pointsize "pt")))
859 :size size 841 (if weight (setq weight
860 :encoding charset)) 842 (intern-soft
861 (set-font-bold-p retval (eq :bold weight)) 843 (concat ":" (downcase (replace-in-string
862 (cond 844 weight " " "-"))))))
863 ((null style) nil) 845 (setq retval (make-font :family family
864 ((string-match "^ *[iI]talic" style) 846 :weight weight
865 (set-font-italic-p retval t))) 847 :size size
866 (cond 848 :encoding charset))
867 ((null effects) nil) 849 (set-font-bold-p retval (eq :bold weight))
868 ((string-match "^[uU]nderline [sS]trikeout" effects) 850 (cond
869 (set-font-underline-p retval t) 851 ((null slant) nil)
870 (set-font-strikethru-p retval t)) 852 ((string-match "[iI]talic" slant)
871 ((string-match "[uU]nderline" effects) 853 (set-font-italic-p retval t)))
872 (set-font-underline-p retval t)) 854 (cond
873 ((string-match "[sS]trikeout" effects) 855 ((null effects) nil)
874 (set-font-strikethru-p retval t))) 856 ((string-match "^[uU]nderline [sS]trikeout" effects)
875 retval)))) 857 (set-font-underline-p retval t)
858 (set-font-strikethru-p retval t))
859 ((string-match "[uU]nderline" effects)
860 (set-font-underline-p retval t))
861 ((string-match "[sS]trikeout" effects)
862 (set-font-strikethru-p retval t)))
863 retval)))))
876 864
877 (defun mswindows-font-create-name (fontobj &optional device) 865 (defun mswindows-font-create-name (fontobj &optional device)
878 "Return a font name constructed from FONTOBJ, appropriate for MS Windows devices." 866 "Return a font name constructed from FONTOBJ, appropriate for MS Windows devices."
879 (if (and (not (or (font-family fontobj) 867 (if (and (not (or (font-family fontobj)
880 (font-weight fontobj) 868 (font-weight fontobj)
891 (size (or (if font-running-xemacs 879 (size (or (if font-running-xemacs
892 (font-size fontobj)) 880 (font-size fontobj))
893 (font-size default))) 881 (font-size default)))
894 (underline-p (font-underline-p fontobj)) 882 (underline-p (font-underline-p fontobj))
895 (strikeout-p (font-strikethru-p fontobj)) 883 (strikeout-p (font-strikethru-p fontobj))
896 (encoding (or (font-encoding fontobj) 884 (encoding (font-encoding fontobj)))
897 (font-encoding default))))
898 (if (stringp family) 885 (if (stringp family)
899 (setq family (list family))) 886 (setq family (list family)))
900 (setq weight (font-higher-weight weight 887 (setq weight (font-higher-weight weight
901 (and (font-bold-p fontobj) :bold))) 888 (and (font-bold-p fontobj) :bold)))
902 (if (stringp size) 889 (if (stringp size)
918 (cdr-safe (assoc cur-family 905 (cdr-safe (assoc cur-family
919 font-mswindows-family-mappings)) 906 font-mswindows-family-mappings))
920 family)) 907 family))
921 ;; We treat oblique and italic as equivalent. Don't ask. 908 ;; We treat oblique and italic as equivalent. Don't ask.
922 ;; Courier New:Bold Italic:10:underline strikeout:western 909 ;; Courier New:Bold Italic:10:underline strikeout:western
923 (setq font-name (format "%s:%s%s:%s:%s:%s" 910 (setq font-name (format "%s:%s:%s:%s:%s"
924 cur-family weight 911 cur-family
925 (if (font-italic-p fontobj) 912 (mswindows-construct-font-style
926 " Italic" "") 913 weight
914 (if (font-italic-p fontobj)
915 "Italic" ""))
927 (if size 916 (if size
928 (int-to-string size) "10") 917 (int-to-string size) "10")
929 (if underline-p 918 (if underline-p
930 (if strikeout-p 919 (if strikeout-p
931 "underline strikeout" 920 "underline strikeout"