Mercurial > hg > xemacs-beta
view lisp/font-menu.el @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | 943eaba38521 |
children | 79c6ff3eef26 |
line wrap: on
line source
;; font-menu.el --- Managing menus of fonts. ;; Copyright (C) 1994 Free Software Foundation, Inc. ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp. ;; Copyright (C) 1997 Sun Microsystems ;; Adapted from x-font-menu.el by Andy Piper <andy@xemacs.org> ;; 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;; This file contains the device-nospecific font menu stuff ;;; Commentary: ;;; ;;; Creates three menus, "Font", "Size", and "Weight", and puts them on the ;;; "Options" menu. The contents of these menus are the superset of those ;;; properties available on any fonts, but only the intersection of the three ;;; sets is selectable at one time. ;;; ;;; Known Problems: ;;; =============== ;;; Items on the Font menu are selectable if and only if that font exists in ;;; the same size and weight as the current font. This means that some fonts ;;; are simply not reachable from some other fonts - if only one font comes ;;; in only one point size (like "Nil", which comes only in 2), you will never ;;; be able to select it. It would be better if the items on the Fonts menu ;;; were always selectable, and selecting them would set the size to be the ;;; closest size to the current font's size. ;;; ;;; This attempts to change all other faces in an analogous way to the change ;;; that was made to the default face; if it can't, it will skip over the face. ;;; However, this could leave incongruous font sizes around, which may cause ;;; some nonreversibility problems if further changes are made. Perhaps it ;;; should remember the initial fonts of all faces, and derive all subsequent ;;; fonts from that initial state. ;;; ;;; xfontsel(1) is a lot more flexible (but probably harder to understand). ;;; ;;; The code to construct menus from all of the x11 fonts available from the ;;; server is autoloaded and executed the very first time that one of the Font ;;; menus is selected on each device. That is, if XEmacs has frames on two ;;; different devices, then separate font menu information will be maintained ;;; for each X display. If the font path changes after emacs has already ;;; asked the X server on a particular display for its list of fonts, this ;;; won't notice. Also, the first time that a font menu is posted on each ;;; display will entail a lengthy delay, but that's better than slowing down ;;; XEmacs startup. At any time (i.e.: after a font-path change or ;;; immediately after device creation), you can call ;;; `reset-device-font-menus' to rebuild the menus from all currently ;;; available fonts. ;;; ;;; There is knowledge here about the regexp match numbers in ;;; `mswindows-font-regexp' and `mswindows-font-regexp-foundry-and-family' defined in ;;; mswindows-faces.el. ;;; ;;; There are at least three kinds of fonts under X11r5: ;;; ;;; - bitmap fonts, which can be assumed to look as good as possible; ;;; - bitmap fonts which have been (or can be) automatically scaled to ;;; a new size, and which almost always look awful; ;;; - and true outline fonts, which should look ok at any size, but in ;;; practice (on at least some systems) look awful at any size, and ;;; even in theory are unlikely ever to look as good as non-scaled ;;; bitmap fonts. ;;; ;;; It would be nice to get this code to look for non-scaled bitmap fonts ;;; first, then outline fonts, then scaled bitmap fonts as a last resort. ;;; But it's not clear to me how to tell them apart based on their truenames ;;; and/or the result of XListFonts(). I welcome any and all explanations ;;; of the subtleties involved... ;;; ;;; ;;; If You Think You'Re Seeing A Bug: ;;; ================================= ;;; When reporting problems, send the following information: ;;; ;;; - Exactly what behavior you're seeing; ;;; - The output of the `xlsfonts' program; ;;; - The value of the variable `device-fonts-cache'; ;;; - The values of the following expressions, both before and after ;;; making a selection from any of the fonts-related menus: ;;; (face-font 'default) ;;; (font-truename (face-font 'default)) ;;; (font-properties (face-font 'default)) ;;; - The values of the following variables after making a selection: ;;; font-menu-preferred-resolution ;;; font-menu-registry-encoding ;;; ;;; There is a common misconception that "*-courier-medium-r-*-11-*", also ;;; known as "-adobe-courier-medium-r-normal--11-80-100-100-m-60-iso8859-1", ;;; is an 11-point font. It is not -- it is an 11-pixel font at 100dpi, ;;; which is an 8-point font (the number after -11- is the size in tenths ;;; of points). So if you expect to be seeing an "11" entry in the "Size" ;;; menu and are not, this may be why. ;;; ;;; In the real world (aka Solaris), one has to deal with fonts that ;;; appear to be medium-i but are really light-r, and fonts that ;;; resolve to different resolutions depending on the charset: ;;; ;;; (font-instance-truename ;;; (make-font-instance "-*-mincho-medium-i-normal-*-*-*-*-*-*-*-jisx0201*-*")) ;;; ==> ;;; "-morisawa-ryumin light kl-light-r-normal--10-100-72-72-m-50-jisx0201.1976-0" ;;; ;;; (list-fonts "-dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*") ;;; ==> ;;; ("-dt-interface user-medium-r-normal-s sans-12-120-72-72-m-70-iso8859-1" ;;; "-dt-interface user-medium-r-normal-s-14-120-75-75-m-120-jisx0208.1983-0" ;;; "-dt-interface user-medium-r-normal-s-14-120-75-75-m-60-jisx0201.1976-0") ;;;###autoload (defcustom font-menu-ignore-scaled-fonts nil "*If non-nil, then the font menu will try to show only bitmap fonts." :type 'boolean :group 'font-menu) ;;;###autoload (defcustom font-menu-this-frame-only-p nil "*If non-nil, then changing the default font from the font menu will only affect one frame instead of all frames." :type 'boolean :group 'font-menu) (defvaralias 'font-menu-max-items 'menu-max-items) (defvaralias 'font-menu-submenu-name-format 'menu-submenu-name-format) (defvar font-menu-preferred-resolution (make-specifier-and-init 'generic '((global ((mswindows) . ":") ((x) . "*-*"))) t) "Preferred horizontal and vertical font menu resolution (e.g. \"75:75\").") (defvar font-menu-size-scaling (make-specifier-and-init 'integer '((global ((mswindows) . 1) ((x) . 10))) t) "Scale factor used in defining font sizes.") ;; only call XListFonts (and parse) once per device. ;; ( (device . [parsed-list-fonts family-menu size-menu weight-menu]) ...) (defvar device-fonts-cache nil) (defsubst device-fonts-cache () (or (cdr (assq (selected-device) device-fonts-cache)) (and (reset-device-font-menus (selected-device)) (cdr (assq (selected-device) device-fonts-cache))))) ;;;###autoload (fset 'install-font-menus 'reset-device-font-menus) (make-obsolete 'install-font-menus 'reset-device-font-menus) ;;;###autoload (defun reset-device-font-menus (&optional device debug) "Generates the `Font', `Size', and `Weight' submenus for the Options menu. This is run the first time that a font-menu is needed for each device. If you don't like the lazy invocation of this function, you can add it to `create-device-hook' and that will make the font menus respond more quickly when they are selected for the first time. If you add fonts to your system, or if you change your font path, you can call this to re-initialize the menus." (message "Getting list of fonts from server... ") (if (or noninteractive (not (or device (setq device (selected-device))))) nil (call-device-method 'reset-device-font-menus device device debug) (message "Getting list of fonts from server... done."))) ;;;###autoload (defun font-menu-family-constructor (ignored) (catch 'menu (unless (console-on-window-system-p) (throw 'menu '(["Cannot parse current font" ding nil]))) (let* ((dcache (device-fonts-cache)) (font-data (font-menu-font-data 'default dcache)) (entry (aref font-data 0)) (family (aref font-data 1)) (size (aref font-data 2)) (weight (aref font-data 3)) f) (unless family (throw 'menu '(["Cannot parse current font" ding nil]))) ;; Items on the Font menu are enabled iff that font exists in ;; the same size and weight as the current font (scalable fonts ;; exist in every size). Only the current font is marked as ;; selected. (menu-split-long-menu (mapcar (lambda (item) (setq f (menu-item-strip-accelerator-spec (aref item 0)) entry (vassoc f (aref dcache 0))) (if (and (or (member weight (aref entry 1)) ;; mswindows often allows any weight (member "" (aref entry 1))) (or (member size (aref entry 2)) (and (not font-menu-ignore-scaled-fonts) (member 0 (aref entry 2))))) (enable-menu-item item) (disable-menu-item item)) (if (string-equal family f) (select-toggle-menu-item item) (deselect-toggle-menu-item item)) item) (aref dcache 1)))))) (define-device-method* font-menu-font-data) ;;;###autoload (defun font-menu-size-constructor (ignored) (catch 'menu (unless (console-on-window-system-p) (throw 'menu '(["Cannot parse current font" ding nil]))) (let* ((dcache (device-fonts-cache)) (font-data (font-menu-font-data 'default dcache)) (entry (aref font-data 0)) (family (aref font-data 1)) (size (aref font-data 2)) ;;(weight (aref font-data 3)) s) (unless family (throw 'menu '(["Cannot parse current font" ding nil]))) ;; Items on the Size menu are enabled iff current font has ;; that size. Only the size of the current font is selected. ;; (If the current font comes in size 0, it is scalable, and ;; thus has every size.) (mapcar (lambda (item) (setq s (nth 3 (aref item 1))) (if (or (member s (aref entry 2)) (and (not font-menu-ignore-scaled-fonts) (member 0 (aref entry 2)))) (enable-menu-item item) (disable-menu-item item)) (if (eq size s) (select-toggle-menu-item item) (deselect-toggle-menu-item item)) item) (submenu-generate-accelerator-spec (aref dcache 2)))))) ;;;###autoload (defun font-menu-weight-constructor (ignored) (catch 'menu (unless (console-on-window-system-p) (throw 'menu '(["Cannot parse current font" ding nil]))) (let* ((dcache (device-fonts-cache)) (font-data (font-menu-font-data 'default dcache)) (entry (aref font-data 0)) (family (aref font-data 1)) ;;(size (aref font-data 2)) (weight (aref font-data 3)) w) (unless family (throw 'menu '(["Cannot parse current font" ding nil]))) ;; Items on the Weight menu are enabled iff current font ;; has that weight. Only the weight of the current font ;; is selected. (mapcar (lambda (item) (setq w (aref item 0)) (if (member w (aref entry 1)) (enable-menu-item item) (disable-menu-item item)) (if (string-equal weight w) (select-toggle-menu-item item) (deselect-toggle-menu-item item)) item) (submenu-generate-accelerator-spec (aref dcache 3)))))) ;;; Changing font sizes (defun font-menu-set-font (family weight size) ;; This is what gets run when an item is selected from any of the three ;; fonts menus. It needs to be rather clever. ;; (size is measured in 10ths of points.) (let* ((dcache (device-fonts-cache)) (font-data (font-menu-font-data 'default dcache)) (from-family (aref font-data 1)) (from-size (aref font-data 2)) (from-weight (aref font-data 3)) (from-slant (aref font-data 4)) (face-list-to-change (delq 'default (face-list))) new-default-face-font) (unless from-family (signal 'error '("couldn't parse font name for default face"))) (when weight (signal 'error '("Setting weight currently not supported"))) (setq new-default-face-font (font-menu-load-font (or family from-family) (or weight from-weight) (or size from-size) from-slant (specifier-instance font-menu-preferred-resolution (selected-device)))) ;; This is such a gross hack. The border-glyph face under ;; mswindows is in a symbol font. Thus it will not appear in the ;; cache - being a junk family. What we should do is change the ;; size but not the family, but this is more work than I care to ;; invest at the moment. (when (eq (device-type) 'mswindows) (setq face-list-to-change (delq 'border-glyph face-list-to-change))) (dolist (face face-list-to-change) (when (face-font-instance face) (message "Changing font of `%s'..." face) (condition-case c (font-menu-change-face face from-family from-weight from-size family weight size) (error (display-error c nil) (sit-for 1))))) ;; Set the default face's font after hacking the other faces, so that ;; the frame size doesn't change until we are all done. ;; If we need to be frame local we do the changes ourselves. (if font-menu-this-frame-only-p ;;; WMP - we need to honor font-menu-this-frame-only-p here! (set-face-font 'default new-default-face-font (and font-menu-this-frame-only-p (selected-frame))) ;; OK Let Customize do it. (custom-set-face-update-spec 'default (list (list 'type (device-type))) (list :family family :size (concat (int-to-string (/ (or size from-size) (specifier-instance font-menu-size-scaling (selected-device)))) "pt"))) (message "Font %s" (face-font-name 'default))))) (defun font-menu-change-face (face from-family from-weight from-size to-family to-weight to-size) (check-type face symbol) (let* ((dcache (device-fonts-cache)) (font-data (font-menu-font-data face dcache)) (face-family (aref font-data 1)) (face-size (aref font-data 2)) (face-weight (aref font-data 3)) (face-slant (aref font-data 4))) (or face-family (signal 'error (list "couldn't parse font name for face" face))) ;; If this face matches the old default face in the attribute we ;; are changing, then change it to the new attribute along that ;; dimension. Also, the face must have its own global attribute. ;; If its value is inherited, we don't touch it. If any of this ;; is not true, we leave it alone. (when (and (face-font face 'global) (cond (to-family (string-equal face-family from-family)) (to-weight (string-equal face-weight from-weight)) (to-size (= face-size from-size)))) (set-face-font face (font-menu-load-font (or to-family face-family) (or to-weight face-weight) (or to-size face-size) face-slant (specifier-instance font-menu-preferred-resolution (selected-device))) (and font-menu-this-frame-only-p (selected-frame)))))) (define-device-method font-menu-load-font) (defun flush-device-fonts-cache (device) ;; by Stig@hackvan.com (let ((elt (assq device device-fonts-cache))) (and elt (setq device-fonts-cache (delq elt device-fonts-cache))))) (add-hook 'delete-device-hook 'flush-device-fonts-cache) (provide 'font-menu) ;; font-menu ends here