comparison 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
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
37 (color-3d-face (device-system-metric device 'color-3d-face))) 37 (color-3d-face (device-system-metric device 'color-3d-face)))
38 ; Force creation of the default face font so that if it fails we get 38 ; Force creation of the default face font so that if it fails we get
39 ; an error now instead of a crash at frame creation. 39 ; an error now instead of a crash at frame creation.
40 (unless (face-font-instance 'default device) 40 (unless (face-font-instance 'default device)
41 (error "Can't find a suitable default font")) 41 (error "Can't find a suitable default font"))
42 42
43 ;; Don't set them on the device because then the global setting won't
44 ;; override them.
45 ;; #### Use device tags if we have multiple msprinter devices. (can we?)
43 (if (car color-default) 46 (if (car color-default)
44 (set-face-foreground 'default (car color-default)) device) 47 (set-face-foreground 'default (car color-default) nil
48 (device-type device)))
45 (if (cdr color-default) 49 (if (cdr color-default)
46 (set-face-background 'default (cdr color-default)) device) 50 (set-face-background 'default (cdr color-default) nil
51 (device-type device)))
47 (if (car color-3d-face) 52 (if (car color-3d-face)
48 (set-face-foreground 'gui-element (car color-3d-face)) device) 53 (set-face-foreground 'gui-element (car color-3d-face) nil
54 (device-type device)))
49 (if (cdr color-3d-face) 55 (if (cdr color-3d-face)
50 (set-face-background 'gui-element (cdr color-3d-face)) device) 56 (set-face-background 'gui-element (cdr color-3d-face) nil
57 (device-type device)))
51 )) 58 ))
52 59
53 (defun mswindows-init-frame-faces (frame) 60 (defun mswindows-init-frame-faces (frame)
54 ) 61 )
55 62
56 ;; Other functions expect these regexps 63 ;; Other functions expect these regexps
57 (defconst mswindows-font-regexp 64 (let
58 (let 65 ((- ":")
59 ((- ":") 66 (fontname "\\([a-zA-Z ]*\\)") ; 1
60 (fontname "\\([a-zA-Z ]+\\)") 67 (style "\\(\\(?:[a-zA-Z]+\\(?: +[a-zA-Z]+\\)*\\)?\\)") ; 2
61 (weight "\\([a-zA-Z]*\\)?") 68 (pointsize "\\([0-9]*\\)") ; 3
62 (style "\\( [a-zA-Z]*\\)?") 69 (effects "\\(\\(?:[a-zA-Z]+\\(?: +[a-zA-Z]+\\)*\\)?\\)") ; 4
63 (pointsize "\\([0-9]+\\)?") 70 ;; must match "OEM/DOS"
64 (effects "\\([a-zA-Z ]*\\)?") 71 (charset "\\([a-zA-Z/ ]*\\)") ; 5
65 (charset "\\([a-zA-Z 0-9]*\\)") 72 )
66 ) 73 (defconst mswindows-font-regexp
67 (concat "^" 74 (concat "^" fontname - style - pointsize - effects - charset "$"))
68 fontname - weight style - pointsize - effects - charset "$"))) 75 (defconst mswindows-font-regexp-missing-1
76 (concat "^" fontname - style - pointsize - effects "$"))
77 (defconst mswindows-font-regexp-missing-2
78 (concat "^" fontname - style - pointsize "$"))
79 (defconst mswindows-font-regexp-missing-3
80 (concat "^" fontname - style "$"))
81 (defconst mswindows-font-regexp-missing-4
82 (concat "^" fontname "$"))
83 )
69 84
70 ;;; Fill in missing parts of a font spec. This is primarily intended as a 85 ;;; Fill in missing parts of a font spec. This is primarily intended as a
71 ;;; helper function for the functions below. 86 ;;; helper function for the functions below.
72 ;;; mswindows fonts look like: 87 ;;; mswindows fonts look like:
73 ;;; fontname[:[weight][ style][:pointsize[:effects]]][:charset] 88 ;;; fontname[:[weight][ slant][:pointsize[:effects]]][:charset]
74 ;;; A minimal mswindows font spec looks like: 89 ;;; A minimal mswindows font spec looks like:
75 ;;; Courier New 90 ;;; Courier New
76 ;;; A maximal mswindows font spec looks like: 91 ;;; A maximal mswindows font spec looks like:
77 ;;; Courier New:Bold Italic:10:underline strikeout:Western 92 ;;; Courier New:Bold Italic:10:underline strikeout:Western
78 ;;; Missing parts of the font spec should be filled in with these values: 93 (defun mswindows-canonicalize-font-name (font)
79 ;;; Courier New:Regular:10::Western 94 "Given a mswindows font or font name, return its name in canonical form.
80 (defun mswindows-font-canonicalize-name (font) 95 This adds missing colons and fills in the style field with \"Regular\".
81 "Given a mswindows font or font name, this returns its name in 96 This does *NOT* fill in the point size or charset fields, because in those
82 canonical form." 97 cases an empty field is not equivalent to any particular field value, but a
83 (if (or (font-instance-p font) 98 wildcard allowing for any possible value (charset Western and point size 10
84 (stringp font)) 99 are chosen first, if they exist)."
85 (let ((name (if (font-instance-p font) 100 (if (font-instance-p font) (setq font (font-instance-name font)))
86 (font-instance-name font) 101 ;; fill in missing colons
87 font))) 102 (setq font
88 (cond ((string-match 103 (cond ((string-match mswindows-font-regexp font) font)
89 "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+:[a-zA-Z ]*:[a-zA-Z 0-9]*$" 104 ((string-match mswindows-font-regexp-missing-1 font)
90 name) name) 105 (concat font ":"))
91 ((string-match "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+:[a-zA-Z ]*$" 106 ((string-match mswindows-font-regexp-missing-2 font)
92 name) (concat name ":Western")) 107 (concat font "::"))
93 ((string-match "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+$" name) 108 ((string-match mswindows-font-regexp-missing-3 font)
94 (concat name "::Western")) 109 (concat font ":::"))
95 ((string-match "^[a-zA-Z ]+:[a-zA-Z ]*$" name) 110 ((string-match mswindows-font-regexp-missing-4 font)
96 (concat name ":10::Western")) 111 (concat font "::::"))
97 ((string-match "^[a-zA-Z ]+$" name) 112 (t "::::")))
98 (concat name ":Regular:10::Western")) 113 (or (string-match mswindows-font-regexp font) (error "can't parse %S" font))
99 (t "Courier New:Regular:10::Western"))))) 114 (if (equal "" (match-string 2 font))
115 (concat (substring font 0 (match-beginning 2)) "Regular"
116 (substring font (match-beginning 2)))
117 font))
118
119 (defun mswindows-parse-font-style (style)
120 ;; Parse a style into a cons (WEIGHT . SLANT). WEIGHT will never be the
121 ;; empty string (it may be "Regular"), but SLANT will be empty for
122 ;; non-italic.
123 (save-match-data
124 (let ((case-fold-search t))
125 (cond ((equalp style "Italic") '("Regular" . "Italic"))
126 ((string-match "^\\([a-zA-Z ]+?\\) +Italic$" style)
127 (cons (match-string 1 style) "Italic"))
128 (t (cons style ""))))))
129
130 (defun mswindows-construct-font-style (weight slant)
131 ;; Construct the style from WEIGHT and SLANT. Opposite of
132 ;; mswindows-parse-font-style.
133 (cond ((and (equal slant "") (equal weight "")) "Regular")
134 ((equal slant "") weight)
135 ((or (equalp weight "Regular") (equal weight "")) slant)
136 (t (concat weight " " slant))))
137
138 (defun mswindows-frob-font-style (font which)
139 ;; Given a font name or font instance, return a name with the style field
140 ;; (which includes weight and/or slant) changed according to WHICH, a plist.
141 ;; If no entry found, don't change.
142 (if (null font) nil
143 (setq font (mswindows-canonicalize-font-name font))
144 (or (string-match mswindows-font-regexp font)
145 (error "can't parse %S" font))
146 (let* ((style (match-string 2 font))
147 (style-rep
148 (save-match-data
149 (or (loop for (x y) on which by #'cddr
150 if (string-match (concat "^" x "$") style)
151 return (replace-match y nil nil style))
152 style))))
153 (concat (substring font 0 (match-beginning 2))
154 style-rep
155 (substring font (match-end 2))))))
156
157 (defun mswindows-frob-font-style-and-sizify (font which &optional device)
158 (if (null font) nil
159 (let* ((oldwidth (if (font-instance-p font) (font-instance-width font)
160 (let ((fi (make-font-instance font device t)))
161 (and fi (font-instance-width fi)))))
162 (newname (mswindows-frob-font-style font which))
163 (newfont (make-font-instance newname device t)))
164 ;; Hack! On MS Windows, bold fonts (even monospaced) are often wider
165 ;; than the equivalent non-bold font. Making the bold font one point
166 ;; smaller usually makes it the same width (maybe at the expense of
167 ;; making it one pixel shorter). Do the same trick in both directions.
168 (when (font-instance-p newfont)
169 (let ((newerfont newfont))
170 (block nil
171 (while (and newerfont oldwidth)
172 (setq newfont newerfont)
173 (cond ((< (font-instance-width newfont) oldwidth)
174 (setq newerfont
175 (make-font-instance
176 (mswindows-find-larger-font newfont device)
177 device t))
178 (if (and newerfont
179 (> (font-instance-width newerfont) oldwidth))
180 (return nil)))
181 ((> (font-instance-width newfont) oldwidth)
182 (setq newerfont
183 (make-font-instance
184 (mswindows-find-smaller-font newfont device)
185 device t))
186 (if (and newerfont
187 (< (font-instance-width newerfont) oldwidth))
188 (return nil)))
189 (t (return nil))))))
190 (if (font-instance-p newfont) (font-instance-name newfont) newfont)))))
191
192 (defconst mswindows-nonbold-weight-regexp
193 ;; He looked so, so cool with the ultra light dangling from his mouth as
194 ;; his fingers spun out demisemiquavers from the keyboard ...
195 "\\(Regular\\|Thin\\|Extra Light\\|Ultra Light\\|Light\\|Normal\\|Medium\\|Semi Bold\\|Demi Bold\\)"
196 )
197 (defconst mswindows-bold-weight-regexp
198 "\\(Semi Bold\\|Demi Bold\\|Bold\\|Extra Bold\\|Ultra Bold\\|Heavy\\|Black\\)"
199 )
200
201 (defconst mswindows-make-font-bold-mapper
202 `(,mswindows-nonbold-weight-regexp "Bold"
203 "Italic" "Bold Italic"
204 ,(concat mswindows-nonbold-weight-regexp " Italic") "Bold Italic"))
205
206 (defconst mswindows-make-font-nonbold-mapper
207 `(,mswindows-bold-weight-regexp "Regular"
208 ,(concat mswindows-bold-weight-regexp " Italic") "Italic"))
209
210 (defconst mswindows-make-font-italic-mapper
211 '("\\(.*\\)Italic" "\\1Italic"
212 "\\(.*\\)" "\\1 Italic"))
213
214 (defconst mswindows-make-font-unitalic-mapper
215 '("Italic" "Regular"
216 "\\(.*\\) Italic" "\\1"))
217
218 (defconst mswindows-make-font-bold-italic-mapper
219 `(,mswindows-nonbold-weight-regexp "Bold Italic"
220 ,(concat mswindows-nonbold-weight-regexp " Italic") "Bold Italic"
221 "Italic" "Bold Italic"
222 ,mswindows-bold-weight-regexp "\\1 Italic"))
100 223
101 (defun mswindows-make-font-bold (font &optional device) 224 (defun mswindows-make-font-bold (font &optional device)
102 "Given a mswindows font specification, this attempts to make a bold font. 225 "Given a mswindows font specification, this attempts to make a bold font.
103 If it fails, it returns nil." 226 If it fails, it returns nil."
104 (if (font-instance-p font) 227 (mswindows-frob-font-style-and-sizify font mswindows-make-font-bold-mapper
105 (let ((name (mswindows-font-canonicalize-name font)) 228 device))
106 (oldwidth (font-instance-width font)))
107 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
108 (let ((newfont (make-font-instance
109 (concat (substring name 0 (match-beginning 1))
110 "Bold" (substring name (match-end 1)))
111 device t)))
112 ; Hack! on mswindows, bold fonts (even monospaced) are often wider than the
113 ; equivalent non-bold font. Making the bold font one point smaller usually
114 ; makes it the same width (maybe at the expense of making it one pixel shorter)
115 (if (font-instance-p newfont)
116 (if (> (font-instance-width newfont) oldwidth)
117 (mswindows-find-smaller-font newfont device)
118 newfont))))))
119 229
120 (defun mswindows-make-font-unbold (font &optional device) 230 (defun mswindows-make-font-unbold (font &optional device)
121 "Given a mswindows font specification, this attempts to make a non-bold font. 231 "Given a mswindows font specification, this attempts to make a non-bold font.
122 If it fails, it returns nil." 232 If it fails, it returns nil."
123 (if (font-instance-p font) 233 (mswindows-frob-font-style-and-sizify font mswindows-make-font-nonbold-mapper
124 (let ((name (mswindows-font-canonicalize-name font))) 234 device))
125 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
126 (make-font-instance (concat
127 (substring name 0 (match-beginning 1))
128 "Regular" (substring name (match-end 1)))
129 device t))))
130 235
131 (defun mswindows-make-font-italic (font &optional device) 236 (defun mswindows-make-font-italic (font &optional device)
132 "Given a mswindows font specification, this attempts to make an `italic' 237 "Given a mswindows font specification, this attempts to make an `italic'
133 font. If it fails, it returns nil." 238 font. If it fails, it returns nil."
134 (if (font-instance-p font) 239 (try-font-name (mswindows-frob-font-style
135 (let ((name (mswindows-font-canonicalize-name font))) 240 font mswindows-make-font-italic-mapper) device))
136 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
137 (make-font-instance (concat
138 (substring name 0 (match-beginning 1))
139 "Italic" (substring name (match-end 1)))
140 device t))))
141 241
142 (defun mswindows-make-font-unitalic (font &optional device) 242 (defun mswindows-make-font-unitalic (font &optional device)
143 "Given a mswindows font specification, this attempts to make a non-italic 243 "Given a mswindows font specification, this attempts to make a non-italic
144 font. If it fails, it returns nil." 244 font. If it fails, it returns nil."
145 (if (font-instance-p font) 245 (try-font-name (mswindows-frob-font-style
146 (let ((name (mswindows-font-canonicalize-name font))) 246 font mswindows-make-font-unitalic-mapper) device))
147 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name)
148 (make-font-instance (concat
149 (substring name 0 (match-beginning 1))
150 "Regular" (substring name (match-end 1)))
151 device t))))
152 247
153 (defun mswindows-make-font-bold-italic (font &optional device) 248 (defun mswindows-make-font-bold-italic (font &optional device)
154 "Given a mswindows font specification, this attempts to make a `bold-italic' 249 "Given a mswindows font specification, this attempts to make a `bold-italic'
155 font. If it fails, it returns nil." 250 font. If it fails, it returns nil."
156 (if (font-instance-p font) 251 (mswindows-frob-font-style-and-sizify font
157 (let ((name (mswindows-font-canonicalize-name font)) 252 mswindows-make-font-bold-italic-mapper
158 (oldwidth (font-instance-width font))) 253 device))
159 (string-match "^[a-zA-Z ]+:\\([a-zA-Z ]*\\):" name) 254
160 (let ((newfont (make-font-instance 255 (defun mswindows-available-font-sizes (font device)
161 (concat (substring name 0 (match-beginning 1)) 256 (if (font-instance-p font) (setq font (font-instance-name font)))
162 "Bold Italic" (substring name (match-end 1))) 257 (setq font (mswindows-canonicalize-font-name font))
163 device t))) 258 (or (string-match mswindows-font-regexp font) (error "Can't parse %S" font))
164 ; Hack! on mswindows, bold fonts (even monospaced) are often wider than the 259 ;; turn pointsize into wildcard
165 ; equivalent non-bold font. Making the bold font one point smaller usually 260 (setq font
166 ; makes it the same width (maybe at the expense of making it one pixel shorter) 261 (concat (substring font 0 (match-beginning 3))
167 (if (font-instance-p newfont) 262 (substring font (match-end 3) (match-end 0))))
168 (if (> (font-instance-width newfont) oldwidth) 263 (sort
169 (mswindows-find-smaller-font newfont device) 264 (delq nil
170 newfont)))))) 265 (mapcar #'(lambda (name)
266 (and (string-match mswindows-font-regexp name)
267 (string-to-int (substring name (match-beginning 3)
268 (match-end 3)))))
269 (list-fonts font device)))
270 #'<))
271
272 (defun mswindows-frob-font-size (font up-p device)
273 (if (stringp font) (setq font (make-font-instance font device)))
274 (let* ((name (font-instance-name font))
275 (truename (font-instance-truename font))
276 (available (and truename
277 (mswindows-available-font-sizes truename device))))
278 (if (null available) nil
279 (or (string-match mswindows-font-regexp truename)
280 (error "can't parse %S" truename))
281 (let ((old-size (string-to-int
282 (substring truename
283 (match-beginning 3) (match-end 3)))))
284 (or (> old-size 0) (error "font truename has 0 pointsize?"))
285 (or (string-match mswindows-font-regexp name)
286 (error "can't parse %S" name))
287 (let ((newsize
288 ;; scalable fonts: change size by 1 point.
289 (if (= 0 (car available))
290 (if (and (not up-p) (= 1 old-size)) nil
291 (if up-p (1+ old-size) (1- old-size)))
292 ;; non-scalable fonts: take the next available size.
293 (if up-p
294 (loop for tail on available
295 if (eql (car tail) old-size)
296 return (cadr tail))
297 (loop for tail on available
298 if (eql (cadr tail) old-size)
299 return (car tail))))))
300 (and newsize
301 (concat (substring name 0 (match-beginning 3))
302 (int-to-string newsize)
303 (substring name (match-end 3) (match-end 0)))))))))
171 304
172 (defun mswindows-find-smaller-font (font &optional device) 305 (defun mswindows-find-smaller-font (font &optional device)
173 "Loads a new version of the given font (or font name) 1 point smaller. 306 "Loads a new version of the given font (or font name) 1 point smaller.
174 Returns the font if it succeeds, nil otherwise." 307 Returns the font if it succeeds, nil otherwise."
175 (if (stringp font) (setq font (make-font-instance font device))) 308 (mswindows-frob-font-size font nil device))
176 (if (font-instance-p font) (setq font (font-instance-truename font)))
177 (if (stringp font) (setq font (make-font-instance font device)))
178 (if (font-instance-p font)
179 (let (old-size (name (mswindows-font-canonicalize-name font)))
180 (string-match "^[a-zA-Z ]+:[a-zA-Z ]*:\\([0-9]+\\):" name)
181 (setq old-size (string-to-int
182 (substring name (match-beginning 1) (match-end 1))))
183 (if (> old-size 0)
184 (make-font-instance (concat
185 (substring name 0 (match-beginning 1))
186 (int-to-string (- old-size 1))
187 (substring name (match-end 1)))
188 device t)))))
189 309
190 (defun mswindows-find-larger-font (font &optional device) 310 (defun mswindows-find-larger-font (font &optional device)
191 "Loads a new version of the given font (or font name) 1 point larger. 311 "Loads a new version of the given font (or font name) 1 point larger.
192 Returns the font if it succeeds, nil otherwise." 312 Returns the font if it succeeds, nil otherwise."
193 (if (stringp font) (setq font (make-font-instance font device))) 313 (mswindows-frob-font-size font t device))
194 (if (font-instance-p font) (setq font (font-instance-truename font)))
195 (if (stringp font) (setq font (make-font-instance font device)))
196 (if (font-instance-p font)
197 (let (old-size (name (mswindows-font-canonicalize-name font)))
198 (string-match "^[a-zA-Z ]+:[a-zA-Z ]*:\\([0-9]+\\):" name)
199 (setq old-size (string-to-int
200 (substring name (match-beginning 1) (match-end 1))))
201 (make-font-instance (concat
202 (substring name 0 (match-beginning 1))
203 (int-to-string (+ old-size 1))
204 (substring name (match-end 1)))
205 device t))))