Mercurial > hg > xemacs-beta
view lisp/msw-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 | 2b6fa2618f76 |
children | 01c57eb70ae9 |
line wrap: on
line source
;;; msw-faces.el --- mswindows-specific face stuff. ;;; Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. ;;; Copyright (C) 1995, 1996, 2002 Ben Wing. ;; Author: Jamie Zawinski ;; Modified by: Chuck Thompson ;; Modified by: Ben Wing ;; Modified by: Martin Buchholz ;; Rewritten for mswindows by: Jonathan Harris ;; 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. ;; This file does the magic to parse mswindows font names, and make sure that ;; the default and modeline attributes of new frames are specified enough. (defun mswindows-init-global-faces () (set-face-font 'gui-element "MS Sans Serif:Regular:8" nil 'mswindows)) (defun mswindows-init-device-faces (device) (let ((color-default (device-system-metric device 'color-default)) (color-3d-face (device-system-metric device 'color-3d-face))) ; Force creation of the default face font so that if it fails we get ; an error now instead of a crash at frame creation. (unless (face-font-instance 'default device) (error "Can't find a suitable default font")) ;; Don't set them on the device because then the global setting won't ;; override them. ;; #### Use device tags if we have multiple msprinter devices. (can we?) (if (car color-default) (set-face-foreground 'default (car color-default) nil (device-type device))) (if (cdr color-default) (set-face-background 'default (cdr color-default) nil (device-type device))) (if (car color-3d-face) (set-face-foreground 'gui-element (car color-3d-face) nil (device-type device))) (if (cdr color-3d-face) (set-face-background 'gui-element (cdr color-3d-face) nil (device-type device))) )) (defun mswindows-init-frame-faces (frame) ) ;; Other functions expect these regexps (let ((- ":") (fontname "\\([a-zA-Z ]*\\)") ; 1 (style "\\(\\(?:[a-zA-Z]+\\(?: +[a-zA-Z]+\\)*\\)?\\)") ; 2 (pointsize "\\([0-9]*\\)") ; 3 (effects "\\(\\(?:[a-zA-Z]+\\(?: +[a-zA-Z]+\\)*\\)?\\)") ; 4 ;; must match "OEM/DOS" (charset "\\([a-zA-Z/ ]*\\)") ; 5 ) (defconst mswindows-font-regexp (concat "^" fontname - style - pointsize - effects - charset "$")) (defconst mswindows-font-regexp-missing-1 (concat "^" fontname - style - pointsize - effects "$")) (defconst mswindows-font-regexp-missing-2 (concat "^" fontname - style - pointsize "$")) (defconst mswindows-font-regexp-missing-3 (concat "^" fontname - style "$")) (defconst mswindows-font-regexp-missing-4 (concat "^" fontname "$")) ) ;;; Fill in missing parts of a font spec. This is primarily intended as a ;;; helper function for the functions below. ;;; mswindows fonts look like: ;;; fontname[:[weight][ slant][:pointsize[:effects]]][:charset] ;;; A minimal mswindows font spec looks like: ;;; Courier New ;;; A maximal mswindows font spec looks like: ;;; Courier New:Bold Italic:10:underline strikeout:Western (defun mswindows-canonicalize-font-name (font) "Given a mswindows font or font name, return its name in canonical form. This adds missing colons and fills in the style field with \"Regular\". This does *NOT* fill in the point size or charset fields, because in those cases an empty field is not equivalent to any particular field value, but a wildcard allowing for any possible value (charset Western and point size 10 are chosen first, if they exist)." (if (font-instance-p font) (setq font (font-instance-name font))) ;; fill in missing colons (setq font (cond ((string-match mswindows-font-regexp font) font) ((string-match mswindows-font-regexp-missing-1 font) (concat font ":")) ((string-match mswindows-font-regexp-missing-2 font) (concat font "::")) ((string-match mswindows-font-regexp-missing-3 font) (concat font ":::")) ((string-match mswindows-font-regexp-missing-4 font) (concat font "::::")) (t "::::"))) (or (string-match mswindows-font-regexp font) (error "can't parse %S" font)) (if (equal "" (match-string 2 font)) (concat (substring font 0 (match-beginning 2)) "Regular" (substring font (match-beginning 2))) font)) (defun mswindows-parse-font-style (style) ;; Parse a style into a cons (WEIGHT . SLANT). WEIGHT will never be the ;; empty string (it may be "Regular"), but SLANT will be empty for ;; non-italic. (save-match-data (let ((case-fold-search t)) (cond ((equalp style "Italic") '("Regular" . "Italic")) ((string-match "^\\([a-zA-Z ]+?\\) +Italic$" style) (cons (match-string 1 style) "Italic")) (t (cons style "")))))) (defun mswindows-construct-font-style (weight slant) ;; Construct the style from WEIGHT and SLANT. Opposite of ;; mswindows-parse-font-style. (cond ((and (equal slant "") (equal weight "")) "Regular") ((equal slant "") weight) ((or (equalp weight "Regular") (equal weight "")) slant) (t (concat weight " " slant)))) (defun mswindows-frob-font-style (font which) ;; Given a font name or font instance, return a name with the style field ;; (which includes weight and/or slant) changed according to WHICH, a plist. ;; If no entry found, don't change. (if (null font) nil (setq font (mswindows-canonicalize-font-name font)) (or (string-match mswindows-font-regexp font) (error "can't parse %S" font)) (let* ((style (match-string 2 font)) (style-rep (save-match-data (or (loop for (x y) on which by #'cddr if (string-match (concat "^" x "$") style) return (replace-match y nil nil style)) style)))) (concat (substring font 0 (match-beginning 2)) style-rep (substring font (match-end 2)))))) (defun mswindows-frob-font-style-and-sizify (font which &optional device) (if (null font) nil (let* ((oldwidth (if (font-instance-p font) (font-instance-width font) (let ((fi (make-font-instance font device t))) (and fi (font-instance-width fi))))) (newname (mswindows-frob-font-style font which)) (newfont (make-font-instance newname device t))) ;; Hack! On MS Windows, bold fonts (even monospaced) are often wider ;; than the equivalent non-bold font. Making the bold font one point ;; smaller usually makes it the same width (maybe at the expense of ;; making it one pixel shorter). Do the same trick in both directions. (when (font-instance-p newfont) (let ((newerfont newfont)) (block nil (while (and newerfont oldwidth) (setq newfont newerfont) (cond ((< (font-instance-width newfont) oldwidth) (setq newerfont (make-font-instance (mswindows-find-larger-font newfont device) device t)) (if (and newerfont (> (font-instance-width newerfont) oldwidth)) (return nil))) ((> (font-instance-width newfont) oldwidth) (setq newerfont (make-font-instance (mswindows-find-smaller-font newfont device) device t)) (if (and newerfont (< (font-instance-width newerfont) oldwidth)) (return nil))) (t (return nil)))))) (if (font-instance-p newfont) (font-instance-name newfont) newfont))))) (defconst mswindows-nonbold-weight-regexp ;; He looked so, so cool with the ultra light dangling from his mouth as ;; his fingers spun out demisemiquavers from the keyboard ... "\\(Regular\\|Thin\\|Extra Light\\|Ultra Light\\|Light\\|Normal\\|Medium\\|Semi Bold\\|Demi Bold\\)" ) (defconst mswindows-bold-weight-regexp "\\(Semi Bold\\|Demi Bold\\|Bold\\|Extra Bold\\|Ultra Bold\\|Heavy\\|Black\\)" ) (defconst mswindows-make-font-bold-mapper `(,mswindows-nonbold-weight-regexp "Bold" "Italic" "Bold Italic" ,(concat mswindows-nonbold-weight-regexp " Italic") "Bold Italic")) (defconst mswindows-make-font-nonbold-mapper `(,mswindows-bold-weight-regexp "Regular" ,(concat mswindows-bold-weight-regexp " Italic") "Italic")) (defconst mswindows-make-font-italic-mapper '("\\(.*\\)Italic" "\\1Italic" "\\(.*\\)" "\\1 Italic")) (defconst mswindows-make-font-unitalic-mapper '("Italic" "Regular" "\\(.*\\) Italic" "\\1")) (defconst mswindows-make-font-bold-italic-mapper `(,mswindows-nonbold-weight-regexp "Bold Italic" ,(concat mswindows-nonbold-weight-regexp " Italic") "Bold Italic" "Italic" "Bold Italic" ,mswindows-bold-weight-regexp "\\1 Italic")) (defun mswindows-make-font-bold (font &optional device) "Given a mswindows font specification, this attempts to make a bold font. If it fails, it returns nil." (mswindows-frob-font-style-and-sizify font mswindows-make-font-bold-mapper device)) (defun mswindows-make-font-unbold (font &optional device) "Given a mswindows font specification, this attempts to make a non-bold font. If it fails, it returns nil." (mswindows-frob-font-style-and-sizify font mswindows-make-font-nonbold-mapper device)) (defun mswindows-make-font-italic (font &optional device) "Given a mswindows font specification, this attempts to make an `italic' font. If it fails, it returns nil." (try-font-name (mswindows-frob-font-style font mswindows-make-font-italic-mapper) device)) (defun mswindows-make-font-unitalic (font &optional device) "Given a mswindows font specification, this attempts to make a non-italic font. If it fails, it returns nil." (try-font-name (mswindows-frob-font-style font mswindows-make-font-unitalic-mapper) device)) (defun mswindows-make-font-bold-italic (font &optional device) "Given a mswindows font specification, this attempts to make a `bold-italic' font. If it fails, it returns nil." (mswindows-frob-font-style-and-sizify font mswindows-make-font-bold-italic-mapper device)) (defun mswindows-available-font-sizes (font device) (if (font-instance-p font) (setq font (font-instance-name font))) (setq font (mswindows-canonicalize-font-name font)) (or (string-match mswindows-font-regexp font) (error "Can't parse %S" font)) ;; turn pointsize into wildcard (setq font (concat (substring font 0 (match-beginning 3)) (substring font (match-end 3) (match-end 0)))) (sort (delq nil (mapcar #'(lambda (name) (and (string-match mswindows-font-regexp name) (string-to-int (substring name (match-beginning 3) (match-end 3))))) (list-fonts font device))) #'<)) (defun mswindows-frob-font-size (font up-p device) (if (stringp font) (setq font (make-font-instance font device))) (let* ((name (font-instance-name font)) (truename (font-instance-truename font)) (available (and truename (mswindows-available-font-sizes truename device)))) (if (null available) nil (or (string-match mswindows-font-regexp truename) (error "can't parse %S" truename)) (let ((old-size (string-to-int (substring truename (match-beginning 3) (match-end 3))))) (or (> old-size 0) (error "font truename has 0 pointsize?")) (or (string-match mswindows-font-regexp name) (error "can't parse %S" name)) (let ((newsize ;; scalable fonts: change size by 1 point. (if (= 0 (car available)) (if (and (not up-p) (= 1 old-size)) nil (if up-p (1+ old-size) (1- old-size))) ;; non-scalable fonts: take the next available size. (if up-p (loop for tail on available if (eql (car tail) old-size) return (cadr tail)) (loop for tail on available if (eql (cadr tail) old-size) return (car tail)))))) (and newsize (concat (substring name 0 (match-beginning 3)) (int-to-string newsize) (substring name (match-end 3) (match-end 0))))))))) (defun mswindows-find-smaller-font (font &optional device) "Loads a new version of the given font (or font name) 1 point smaller. Returns the font if it succeeds, nil otherwise." (mswindows-frob-font-size font nil device)) (defun mswindows-find-larger-font (font &optional device) "Loads a new version of the given font (or font name) 1 point larger. Returns the font if it succeeds, nil otherwise." (mswindows-frob-font-size font t device))