annotate lisp/gtk-faces.el @ 4885:6772ce4d982b

Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums lisp/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Correct the semantics of #'member*, #'eql, #'assoc* in the presence of bignums; change the integerp byte code to fixnump semantics. * bytecomp.el (fixnump, integerp, byte-compile-integerp): Change the integerp byte code to fixnump; add a byte-compile method to integerp using fixnump and numberp and avoiding a funcall most of the time, since in the non-core contexts where integerp is used, it's mostly distinguishing between fixnums and things that are not numbers at all. * byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops) (byte-compile-side-effect-and-error-free-ops): Replace the integerp bytecode with fixnump; add fixnump to the side-effect-free-fns. Add the other extended number type predicates to the list in passing. * obsolete.el (floatp-safe): Mark this as obsolete. * cl.el (eql): Go into more detail in the docstring here. Don't bother checking whether both arguments are numbers; one is enough, #'equal will fail correctly if they have distinct types. (subst): Replace a call to #'integerp (deciding whether to use #'memq or not) with one to #'fixnump. Delete most-positive-fixnum, most-negative-fixnum from this file; they're now always in C, so they can't be modified from Lisp. * cl-seq.el (member*, assoc*, rassoc*): Correct these functions in the presence of bignums. * cl-macs.el (cl-make-type-test): The type test for a fixnum is now fixnump. Ditch floatp-safe, use floatp instead. (eql): Correct this compiler macro in the presence of bignums. (assoc*): Correct this compiler macro in the presence of bignums. * simple.el (undo): Change #'integerp to #'fixnump here, since we use #'delq with the same value as ELT a few lines down. src/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Fix problems with #'eql, extended number types, and the hash table implementation; change the Bintegerp bytecode to fixnump semantics even on bignum builds, since #'integerp can have a fast implementation in terms of #'fixnump for most of its extant uses, but not vice-versa. * lisp.h: Always #include number.h; we want the macros provided in it, even if the various number types are not available. * number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its argument is of non-immediate number type. Equivalent to FLOATP if WITH_NUMBER_TYPES is not defined. * elhash.c (lisp_object_eql_equal, lisp_object_eql_hash): Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP, giving more correct behaviour in the presence of the extended number types. * bytecode.c (Bfixnump, execute_optimized_program): Rename Bintegerp to Bfixnump; change its semantics to reflect the new name on builds with bignum support. * data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data): Always make #'fixnump available, even on non-BIGNUM builds; always implement #'integerp in this file, even on BIGNUM builds. Move most-positive-fixnum, most-negative-fixnum here from number.c, so they are Lisp constants even on builds without number types, and attempts to change or bind them error. Use the NUMBERP and INTEGERP macros even on builds without extended number types. * data.c (fixnum_char_or_marker_to_int): Rename this function from integer_char_or_marker_to_int, to better reflect the arguments it accepts. * number.c (Fevenp, Foddp, syms_of_number): Never provide #'integerp in this file. Remove #'oddp, #'evenp; their implementations are overridden by those in cl.el. * number.c (vars_of_number): most-positive-fixnum, most-negative-fixnum are no longer here. man/ChangeLog addition: 2010-01-23 Aidan Kehoe <kehoea@parhasard.net> Generally: be careful to say fixnum, not integer, when talking about fixed-precision integral types. I'm sure I've missed instances, both here and in the docstrings, but this is a decent start. * lispref/text.texi (Columns): Document where only fixnums, not integers generally, are accepted. (Registers): Remove some ancient char-int confoundance here. * lispref/strings.texi (Creating Strings, Creating Strings): Be more exact in describing where fixnums but not integers in general are accepted. (Creating Strings): Use a more contemporary example to illustrate how concat deals with lists including integers about #xFF. Delete some obsolete documentation on same. (Char Table Types): Document that only fixnums are accepted as values in syntax tables. * lispref/searching.texi (String Search, Search and Replace): Be exact in describing where fixnums but not integers in general are accepted. * lispref/range-tables.texi (Range Tables): Be exact in describing them; only fixnums are accepted to describe ranges. * lispref/os.texi (Killing XEmacs, User Identification) (Time of Day, Time Conversion): Be more exact about using fixnum where only fixed-precision integers are accepted. * lispref/objects.texi (Integer Type): Be more exact (and up-to-date) about the possible values for integers. Cross-reference to documentation of the bignum extension. (Equality Predicates): (Range Table Type): (Array Type): Use fixnum, not integer, to describe a fixed-precision integer. (Syntax Table Type): Correct some English syntax here. * lispref/numbers.texi (Numbers): Change the phrasing here to use fixnum to mean the fixed-precision integers normal in emacs. Document that our terminology deviates from that of Common Lisp, and that we're working on it. (Compatibility Issues): Reiterate the Common Lisp versus Emacs Lisp compatibility issues. (Comparison of Numbers, Arithmetic Operations): * lispref/commands.texi (Command Loop Info, Working With Events): * lispref/buffers.texi (Modification Time): Be more exact in describing where fixnums but not integers in general are accepted.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 24 Jan 2010 15:21:27 +0000
parents 79c6ff3eef26
children 7d06a8bf47d2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
1 ;;; gtk-faces.el --- GTK-specific face frobnication, aka black magic.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
2
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
3 ;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
4 ;; Copyright (C) 1995, 1996 Ben Wing.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
5 ;; Copyright (c) 2000 William Perry
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
6
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
7 ;; Author: William M. Perry <wmperry@gnu.org>
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
8 ;; Maintainer: XEmacs Development Team
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
9 ;; Keywords: extensions, internal, dumped
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
10
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
11 ;; This file is part of XEmacs.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
12
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
13 ;; XEmacs is free software; you can redistribute it and/or modify it
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
14 ;; under the terms of the GNU General Public License as published by
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
15 ;; the Free Software Foundation; either version 2, or (at your option)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
16 ;; any later version.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
17
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
18 ;; XEmacs is distributed in the hope that it will be useful, but
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
21 ;; General Public License for more details.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
22
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
23 ;; You should have received a copy of the GNU General Public License
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
24 ;; along with XEmacs; see the file COPYING. If not, write to the
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
26 ;; Boston, MA 02111-1307, USA.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
27
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
28 ;;; Synched up with: Not synched.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
29
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
30 ;;; Commentary:
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
31
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
32 ;; This file is dumped with XEmacs (when GTK support is compiled in).
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
33
502
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
34 (globally-declare-fboundp
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
35 '(gtk-init-pointers
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
36 gtk-font-selection-dialog-new
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
37 gtk-widget-set-sensitive gtk-font-selection-dialog-apply-button
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
38 gtk-signal-connect gtk-main-quit
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
39 gtk-font-selection-dialog-ok-button
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
40 gtk-font-selection-dialog-get-font-name gtk-widget-destroy
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
41 font-menu-set-font font-family font-size
7039e6323819 [xemacs-hg @ 2001-05-04 22:41:46 by ben]
ben
parents: 462
diff changeset
42 gtk-font-selection-dialog-cancel-button gtk-widget-show-all
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 711
diff changeset
43 gtk-main gtk-style-info))
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
44
711
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
45 (eval-when-compile
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
46 (defmacro gtk-style-munge-face (face attribute value)
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
47 (let ((func (intern (format "face-%s" (eval attribute)))))
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
48 `(add-spec-to-specifier (,func ,face) ,value nil '(gtk default) 'prepend))))
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
49
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
50 ;;; gtk-init-device-faces is responsible for initializing default
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
51 ;;; values for faces on a newly created device.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
52 ;;;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
53 (defun gtk-init-device-faces (device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
54 ;;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
55 ;; If the "default" face didn't have a font specified, try to pick one.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
56 ;;
711
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
57 (when (eq (device-type device) 'gtk)
707
a307f9a2021d [xemacs-hg @ 2001-12-20 05:49:28 by andyp]
andyp
parents: 706
diff changeset
58 (let* ((style (gtk-style-info device))
711
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
59 (normal 0) ; GTK_STATE_NORMAL
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
60 ;;(active 1) ; GTK_STATE_ACTIVE
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
61 (prelight 2) ; GTK_STATE_PRELIGHT
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
62 (selected 3) ; GTK_STATE_SELECTED
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
63 ;;(insensitive 4) ; GTK_STATE_INSENSITIVE
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
64 )
711
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
65 (gtk-style-munge-face 'highlight 'foreground
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
66 (nth prelight (plist-get style 'text)))
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
67 (gtk-style-munge-face 'highlight 'background
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
68 (nth prelight (plist-get style 'background)))
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
69 (gtk-style-munge-face 'zmacs-region 'foreground
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
70 (nth selected (plist-get style 'text)))
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
71 (gtk-style-munge-face 'zmacs-region 'background
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
72 (nth selected (plist-get style 'background)))
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
73 (gtk-style-munge-face 'toolbar 'background
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
74 (nth normal (plist-get style 'base)))
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
75 (gtk-style-munge-face 'toolbar 'foreground
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
76 (nth normal (plist-get style 'text)))
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
77 (set-face-background 'modeline [toolbar background] '(gtk default))
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
78 (set-face-foreground 'modeline [toolbar foreground] '(gtk default))
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
79 )
5be46355cc42 [xemacs-hg @ 2001-12-23 01:01:45 by wmperry]
wmperry
parents: 707
diff changeset
80 (gtk-init-pointers)))
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
81
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
82 ;;; This is called from `init-frame-faces', which is called from
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
83 ;;; init_frame_faces() which is called from Fmake_frame(), to perform
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
84 ;;; any device-specific initialization.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
85 ;;;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
86 (defun gtk-init-frame-faces (frame)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
87 )
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
88
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
89 (defun gtk-init-global-faces ()
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 776
diff changeset
90 )
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
91
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
92
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
93 ;;; Lots of this stolen from x-faces.el - I'm not sure if this will
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
94 ;;; require a rewrite for win32 or not?
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
95 (defconst gtk-font-regexp nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
96 (defconst gtk-font-regexp-head nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
97 (defconst gtk-font-regexp-head-2 nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
98 (defconst gtk-font-regexp-weight nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
99 (defconst gtk-font-regexp-slant nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
100 (defconst gtk-font-regexp-pixel nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
101 (defconst gtk-font-regexp-point nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
102 (defconst gtk-font-regexp-foundry-and-family nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
103 (defconst gtk-font-regexp-registry-and-encoding nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
104 (defconst gtk-font-regexp-spacing nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
105
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
106 ;;; Regexps matching font names in "Host Portable Character Representation."
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
107 ;;;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
108 (let ((- "[-?]")
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
109 (foundry "[^-]*")
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
110 (family "[^-]*")
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
111 (weight "\\(bold\\|demibold\\|medium\\|black\\)") ; 1
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
112 ; (weight\? "\\(\\*\\|bold\\|demibold\\|medium\\|\\)") ; 1
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
113 (weight\? "\\([^-]*\\)") ; 1
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
114 (slant "\\([ior]\\)") ; 2
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
115 ; (slant\? "\\([ior?*]?\\)") ; 2
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
116 (slant\? "\\([^-]?\\)") ; 2
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
117 ; (swidth "\\(\\*\\|normal\\|semicondensed\\|\\)") ; 3
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
118 (swidth "\\([^-]*\\)") ; 3
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
119 ; (adstyle "\\(\\*\\|sans\\|\\)") ; 4
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
120 (adstyle "\\([^-]*\\)") ; 4
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
121 (pixelsize "\\(\\*\\|[0-9]+\\)") ; 5
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
122 (pointsize "\\(\\*\\|0\\|[0-9][0-9]+\\)") ; 6
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
123 ; (resx "\\(\\*\\|[0-9][0-9]+\\)") ; 7
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
124 ; (resy "\\(\\*\\|[0-9][0-9]+\\)") ; 8
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
125 (resx "\\([*0]\\|[0-9][0-9]+\\)") ; 7
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
126 (resy "\\([*0]\\|[0-9][0-9]+\\)") ; 8
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
127 (spacing "[cmp?*]")
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
128 (avgwidth "\\(\\*\\|[0-9]+\\)") ; 9
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
129 (registry "[^-]*") ; some fonts have omitted registries
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
130 ; (encoding ".+") ; note that encoding may contain "-"...
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
131 (encoding "[^-]+") ; false!
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
132 )
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
133 (setq gtk-font-regexp
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
134 (purecopy
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
135 (concat "\\`\\*?[-?*]"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
136 foundry - family - weight\? - slant\? - swidth - adstyle -
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
137 pixelsize - pointsize - resx - resy - spacing - avgwidth -
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
138 registry - encoding "\\'"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
139 )))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
140 (setq gtk-font-regexp-head
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
141 (purecopy
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
142 (concat "\\`[-?*]" foundry - family - weight\? - slant\?
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
143 "\\([-*?]\\|\\'\\)")))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
144 (setq gtk-font-regexp-head-2
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
145 (purecopy
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
146 (concat "\\`[-?*]" foundry - family - weight\? - slant\?
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
147 - swidth - adstyle - pixelsize - pointsize
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
148 "\\([-*?]\\|\\'\\)")))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
149 (setq gtk-font-regexp-slant (purecopy (concat - slant -)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
150 (setq gtk-font-regexp-weight (purecopy (concat - weight -)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
151 ;; if we can't match any of the more specific regexps (unfortunate) then
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
152 ;; look for digits; assume 2+ digits is 10ths of points, and 1-2 digits
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
153 ;; is pixels. Bogus as hell.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
154 (setq gtk-font-regexp-pixel (purecopy "[-?*]\\([0-9][0-9]?\\)[-?*]"))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
155 (setq gtk-font-regexp-point (purecopy "[-?*]\\([0-9][0-9]+\\)[-?*]"))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
156 ;; the following two are used by x-font-menu.el.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
157 (setq gtk-font-regexp-foundry-and-family
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
158 (purecopy (concat "\\`[-?*]" foundry - "\\(" family "\\)" -)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
159 (setq gtk-font-regexp-registry-and-encoding
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
160 (purecopy (concat - "\\(" registry "\\)" - "\\(" encoding "\\)\\'")))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
161 (setq gtk-font-regexp-spacing
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
162 (purecopy (concat - "\\(" spacing "\\)" - avgwidth
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
163 - registry - encoding "\\'")))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
164 )
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
165
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
166 (defvaralias 'x-font-regexp 'gtk-font-regexp)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
167 (defvaralias 'x-font-regexp-head 'gtk-font-regexp-head)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
168 (defvaralias 'x-font-regexp-head-2 'gtk-font-regexp-head-2)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
169 (defvaralias 'x-font-regexp-weight 'gtk-font-regexp-weight)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
170 (defvaralias 'x-font-regexp-slant 'gtk-font-regexp-slant)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
171 (defvaralias 'x-font-regexp-pixel 'gtk-font-regexp-pixel)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
172 (defvaralias 'x-font-regexp-point 'gtk-font-regexp-point)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
173 (defvaralias 'x-font-regexp-foundry-and-family 'gtk-font-regexp-foundry-and-family)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
174 (defvaralias 'x-font-regexp-registry-and-encoding 'gtk-font-regexp-registry-and-encoding)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
175 (defvaralias 'x-font-regexp-spacing 'gtk-font-regexp-spacing)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
176
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
177 (defun gtk-frob-font-weight (font which)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
178 (if (font-instance-p font) (setq font (font-instance-name font)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
179 (cond ((null font) nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
180 ((or (string-match gtk-font-regexp font)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
181 (string-match gtk-font-regexp-head font)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
182 (string-match gtk-font-regexp-weight font))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
183 (concat (substring font 0 (match-beginning 1)) which
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
184 (substring font (match-end 1))))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
185 (t nil)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
186
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
187 (defun gtk-frob-font-slant (font which)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
188 (if (font-instance-p font) (setq font (font-instance-name font)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
189 (cond ((null font) nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
190 ((or (string-match gtk-font-regexp font)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
191 (string-match gtk-font-regexp-head font))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
192 (concat (substring font 0 (match-beginning 2)) which
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
193 (substring font (match-end 2))))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
194 ((string-match gtk-font-regexp-slant font)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
195 (concat (substring font 0 (match-beginning 1)) which
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
196 (substring font (match-end 1))))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
197 (t nil)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
198
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
199 (defun gtk-make-font-bold (font &optional device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
200 (or (try-font-name (gtk-frob-font-weight font "bold") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
201 (try-font-name (gtk-frob-font-weight font "black") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
202 (try-font-name (gtk-frob-font-weight font "demibold") device)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
203
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
204 (defun gtk-make-font-unbold (font &optional device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
205 (try-font-name (gtk-frob-font-weight font "medium") device))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
206
776
79940b592197 [xemacs-hg @ 2002-03-15 07:43:14 by ben]
ben
parents: 771
diff changeset
207 (defcustom try-oblique-before-italic-fonts t
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
208 "*If nil, italic fonts are searched before oblique fonts.
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
209 If non-nil, oblique fonts are tried before italic fonts. This is mostly
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
210 applicable to adobe-courier fonts"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
211 :type 'boolean
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
212 :tag "Try Oblique Before Italic Fonts"
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
213 :group 'x)
776
79940b592197 [xemacs-hg @ 2002-03-15 07:43:14 by ben]
ben
parents: 771
diff changeset
214 (define-obsolete-variable-alias '*try-oblique-before-italic-fonts*
79940b592197 [xemacs-hg @ 2002-03-15 07:43:14 by ben]
ben
parents: 771
diff changeset
215 'try-oblique-before-italic-fonts)
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
216
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
217 (defun gtk-make-font-italic (font &optional device)
776
79940b592197 [xemacs-hg @ 2002-03-15 07:43:14 by ben]
ben
parents: 771
diff changeset
218 (if try-oblique-before-italic-fonts
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
219 (or (try-font-name (gtk-frob-font-slant font "o") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
220 (try-font-name (gtk-frob-font-slant font "i") device))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
221 (or (try-font-name (gtk-frob-font-slant font "i") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
222 (try-font-name (gtk-frob-font-slant font "o") device))))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
223
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
224 (defun gtk-make-font-unitalic (font &optional device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
225 (try-font-name (gtk-frob-font-slant font "r") device))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
226
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
227 (defun gtk-make-font-bold-italic (font &optional device)
776
79940b592197 [xemacs-hg @ 2002-03-15 07:43:14 by ben]
ben
parents: 771
diff changeset
228 (if try-oblique-before-italic-fonts
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
229 (or (try-font-name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
230 (gtk-frob-font-slant (gtk-frob-font-weight font "bold") "o") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
231 (try-font-name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
232 (gtk-frob-font-slant (gtk-frob-font-weight font "bold") "i") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
233 (try-font-name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
234 (gtk-frob-font-slant (gtk-frob-font-weight font "black") "o") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
235 (try-font-name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
236 (gtk-frob-font-slant (gtk-frob-font-weight font "black") "i") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
237 (try-font-name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
238 (gtk-frob-font-slant (gtk-frob-font-weight font "demibold") "o") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
239 (try-font-name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
240 (gtk-frob-font-slant (gtk-frob-font-weight font "demibold") "i") device))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
241 (or (try-font-name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
242 (gtk-frob-font-slant (gtk-frob-font-weight font "bold") "i") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
243 (try-font-name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
244 (gtk-frob-font-slant (gtk-frob-font-weight font "bold") "o") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
245 (try-font-name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
246 (gtk-frob-font-slant (gtk-frob-font-weight font "black") "i") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
247 (try-font-name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
248 (gtk-frob-font-slant (gtk-frob-font-weight font "black") "o") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
249 (try-font-name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
250 (gtk-frob-font-slant (gtk-frob-font-weight font "demibold") "i") device)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
251 (try-font-name
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
252 (gtk-frob-font-slant (gtk-frob-font-weight font "demibold") "o") device))))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
253
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
254 (defun gtk-choose-font ()
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
255 (interactive)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
256 (require 'x-font-menu)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
257 (require 'font)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
258 (let ((locale (if font-menu-this-frame-only-p
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
259 (selected-frame)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
260 nil))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
261 (dialog nil))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
262 (setq dialog (gtk-font-selection-dialog-new "Choose default font..."))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
263 (put dialog 'modal t)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
264 (put dialog 'type 'dialog)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
265
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
266 (gtk-widget-set-sensitive (gtk-font-selection-dialog-apply-button dialog) nil)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
267 (gtk-signal-connect dialog 'destroy (lambda (&rest ignored) (gtk-main-quit)))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
268 (gtk-signal-connect (gtk-font-selection-dialog-ok-button dialog)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
269 'clicked
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
270 (lambda (button data)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
271 (let* ((dialog (car data))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
272 (font (font-create-object
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
273 (gtk-font-selection-dialog-get-font-name dialog))))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
274 (gtk-widget-destroy dialog)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
275 (font-menu-set-font (car (font-family font)) nil (* 10 (font-size font)))))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
276 (cons dialog locale))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
277 (gtk-signal-connect (gtk-font-selection-dialog-cancel-button dialog)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
278 'clicked
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
279 (lambda (button dialog)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
280 (gtk-widget-destroy dialog)) dialog)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
281
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
282 (gtk-widget-show-all dialog)
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents:
diff changeset
283 (gtk-main)))