comparison lisp/msw-font-menu.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 e38acbeb1cae
children 491f8cf78a9c
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
1 ;; msw-font-menu.el --- Managing menus of mswindows fonts. 1 ;; msw-font-menu.el --- Managing menus of mswindows fonts.
2 2
3 ;; Copyright (C) 1999 Free Software Foundation, Inc. 3 ;; Copyright (C) 1999 Free Software Foundation, Inc.
4 ;; Copyright (C) 2002 Ben Wing.
4 5
5 ;; Adapted from x-font-menu.el by Andy Piper <andy@xemacs.org> 6 ;; Adapted from x-font-menu.el by Andy Piper <andy@xemacs.org>
6 7
7 ;; This file is part of XEmacs. 8 ;; This file is part of XEmacs.
8 9
18 19
19 ;; You should have received a copy of the GNU General Public License 20 ;; You should have received a copy of the GNU General Public License
20 ;; along with XEmacs; see the file COPYING. If not, write to the 21 ;; along with XEmacs; see the file COPYING. If not, write to the
21 ;; Free Software Foundation, 59 Temple Place - Suite 330, 22 ;; Free Software Foundation, 59 Temple Place - Suite 330,
22 ;; Boston, MA 02111-1307, USA. 23 ;; Boston, MA 02111-1307, USA.
24
25 ;;; Known Problems:
26 ;;; ===============
27 ;;; There is knowledge here about the regexp match numbers in
28 ;;; `mswindows-font-regexp' and `mswindows-font-regexp-foundry-and-family' defined in
29 ;;; mswindows-faces.el.
30 ;;;
23 31
24 ;;; mswindows fonts look like: 32 ;;; mswindows fonts look like:
25 ;;; fontname[:[weight][ style][:pointsize[:effects]]][:charset] 33 ;;; fontname[:[weight][ style][:pointsize[:effects]]][:charset]
26 ;;; ie: 34 ;;; ie:
27 ;;; Lucida Console:Regular:10 35 ;;; Lucida Console:Regular:10
37 ;;; (defvar font-menu-ignore-proportional-fonts nil 45 ;;; (defvar font-menu-ignore-proportional-fonts nil
38 ;;; "*If non-nil, then the font menu will only show fixed-width fonts.") 46 ;;; "*If non-nil, then the font menu will only show fixed-width fonts.")
39 47
40 (require 'font-menu) 48 (require 'font-menu)
41 (globally-declare-boundp 'mswindows-font-regexp) 49 (globally-declare-boundp 'mswindows-font-regexp)
42
43 (defvar mswindows-font-menu-registry-encoding nil
44 "Registry and encoding to use with font menu fonts.")
45 50
46 (defvar mswindows-font-menu-junk-families 51 (defvar mswindows-font-menu-junk-families
47 (mapconcat 52 (mapconcat
48 #'identity 53 #'identity
49 '("Symbol" 54 '("Symbol"
63 `create-device-hook' and that will make the font menus respond more quickly 68 `create-device-hook' and that will make the font menus respond more quickly
64 when they are selected for the first time. If you add fonts to your system, 69 when they are selected for the first time. If you add fonts to your system,
65 or if you change your font path, you can call this to re-initialize the menus." 70 or if you change your font path, you can call this to re-initialize the menus."
66 (unless mswindows-font-regexp-ascii 71 (unless mswindows-font-regexp-ascii
67 (setq mswindows-font-regexp-ascii "Western")) 72 (setq mswindows-font-regexp-ascii "Western"))
68 (setq mswindows-font-menu-registry-encoding "Western")
69 (let ((case-fold-search t) 73 (let ((case-fold-search t)
70 family size weight entry 74 family size weight entry
71 dev-cache cache families sizes weights) 75 dev-cache cache families sizes weights)
72 (dolist (name (cond ((null debug) ; debugging kludge 76 (dolist (name (cond ((null debug) ; debugging kludge
73 (list-fonts "::::" device)) 77 (list-fonts "::::" device))
74 ((stringp debug) (split-string debug "\n")) 78 ((stringp debug) (split-string debug "\n"))
75 (t debug))) 79 (t debug)))
76 (when (and (string-match mswindows-font-regexp-ascii name) 80 (when (and (string-match mswindows-font-regexp-ascii name)
77 (string-match mswindows-font-regexp name)) 81 (string-match mswindows-font-regexp name))
78 (setq weight (capitalize (match-string 2 name)) 82 (setq weight (capitalize (car (mswindows-parse-font-style
79 size (string-to-int (or (match-string 4 name) "0")) 83 (match-string 2 name))))
84 size (string-to-int (match-string 3 name))
80 family (match-string 1 name)) 85 family (match-string 1 name))
81 (unless (string-match mswindows-font-menu-junk-families family) 86 (unless (string-match mswindows-font-menu-junk-families family)
82 (setq entry (or (vassoc name cache) 87 (setq entry (or (vassoc name cache)
83 (car (setq cache 88 (car (setq cache
84 (cons (vector family nil nil t) 89 (cons (vector family nil nil t)
172 (setq entry (vassoc family (aref dcache 0)))) 177 (setq entry (vassoc family (aref dcache 0))))
173 (when (null entry) 178 (when (null entry)
174 (return-from mswindows-font-menu-font-data (make-vector 5 nil))) 179 (return-from mswindows-font-menu-font-data (make-vector 5 nil)))
175 180
176 (when (string-match mswindows-font-regexp name) 181 (when (string-match mswindows-font-regexp name)
177 (setq weight (match-string 2 name)) 182 (setq weight (car (mswindows-parse-font-style (match-string 2 name))))
178 (setq size (string-to-int (or (match-string 4 name) "0")))) 183 (setq size (string-to-int (match-string 3 name))))
179 184
180 (when (string-match mswindows-font-regexp truename) 185 (when (string-match mswindows-font-regexp truename)
181 (when (not (member weight (aref entry 1))) 186 (destructuring-bind (newweight . slant)
182 (setq weight (match-string 2 truename))) 187 (mswindows-parse-font-style (match-string 2 truename))
183 (when (not (member size (aref entry 2))) 188 (when (not (member weight (aref entry 1)))
184 (setq size (string-to-int (or (match-string 4 truename) "0")))) 189 (setq weight newweight))
185 (setq slant (match-string 5 truename))) 190 (when (not (member size (aref entry 2)))
191 (setq size (string-to-int (match-string 3 truename))))))
186 192
187 (vector entry family size weight slant))) 193 (vector entry family size weight slant)))
188 194
189 (defun mswindows-font-menu-load-font (family weight size slant resolution) 195 (defun mswindows-font-menu-load-font (family weight size slant resolution)
190 "Try to load a font with the requested properties. 196 "Try to load a font with the requested properties.
193 (let (font) 199 (let (font)
194 (catch 'got-font 200 (catch 'got-font
195 (dolist (weight (list weight "")) 201 (dolist (weight (list weight ""))
196 (dolist (slant 202 (dolist (slant
197 ;; oblique is not currently implemented 203 ;; oblique is not currently implemented
198 (cond ((string-equal slant "Oblique") '(" Italic" "")) 204 (cond ((string-equal slant "Oblique") '("Italic" ""))
199 ((string-equal slant "Italic") '(" Italic" "")) 205 ((string-equal slant "Italic") '("Italic" ""))
200 (t (list slant "")))) 206 (t (list slant ""))))
201 (when (setq font 207 (when (setq font
202 (make-font-instance 208 (make-font-instance
203 (concat family ":" weight slant ":" 209 (concat
204 size "::" 210 family ":"
205 mswindows-font-menu-registry-encoding) 211 (mswindows-construct-font-style weight slant) ":"
212 size "::")
206 nil t)) 213 nil t))
207 (throw 'got-font font))))))) 214 (throw 'got-font font)))))))
208 215
209 (provide 'mswindows-font-menu) 216 (provide 'mswindows-font-menu)
210 217