Mercurial > emacs
annotate lisp/faces.el @ 36708:0e09b49d21b8
(hi-lock-line-face-buffer): Wrap the regexp in a group
so ^, $, *, ? and + are interpreted correctly.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 09 Mar 2001 21:16:18 +0000 |
parents | d9b4d1370073 |
children | 6ae575a7a695 |
rev | line source |
---|---|
25012 | 1 ;;; faces.el --- Lisp faces |
2456 | 2 |
36060
d9b4d1370073
(set-face-background, set-face-foreground)
Miles Bader <miles@gnu.org>
parents:
36035
diff
changeset
|
3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 |
25012 | 4 ;; Free Software Foundation, Inc. |
2456 | 5 |
6 ;; This file is part of GNU Emacs. | |
7 | |
8 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
9 ;; it under the terms of the GNU General Public License as published by | |
10 ;; the Free Software Foundation; either version 2, or (at your option) | |
11 ;; any later version. | |
12 | |
13 ;; GNU Emacs is distributed in the hope that it will be useful, | |
14 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 ;; GNU General Public License for more details. | |
17 | |
18 ;; You should have received a copy of the GNU General Public License | |
14169 | 19 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
20 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
21 ;; Boston, MA 02111-1307, USA. | |
2456 | 22 |
23 ;;; Commentary: | |
24 | |
25 ;;; Code: | |
26 | |
10107
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
27 (eval-when-compile |
31528
a461cad7a942
(face-x-resources): Make custom type more specific.
Dave Love <fx@gnu.org>
parents:
31500
diff
changeset
|
28 (require 'cl) |
a461cad7a942
(face-x-resources): Make custom type more specific.
Dave Love <fx@gnu.org>
parents:
31500
diff
changeset
|
29 ;; Warning suppression -- can't require x-win in batch: |
a461cad7a942
(face-x-resources): Make custom type more specific.
Dave Love <fx@gnu.org>
parents:
31500
diff
changeset
|
30 (autoload 'xw-defined-colors "x-win")) |
2456 | 31 |
25012 | 32 (require 'cus-face) |
2456 | 33 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
34 |
25012 | 35 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
36 ;;; Font selection. | |
37 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2456 | 38 |
25012 | 39 (defgroup font-selection nil |
40 "Influencing face font selection." | |
41 :group 'faces) | |
2456 | 42 |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
43 |
25012 | 44 (defcustom face-font-selection-order |
45 '(:width :height :weight :slant) | |
46 "*A list specifying how face font selection chooses fonts. | |
47 Each of the four symbols `:width', `:height', `:weight', and `:slant' | |
48 must appear once in the list, and the list must not contain any other | |
49 elements. Font selection tries to find a best matching font for | |
50 those face attributes first that appear first in the list. For | |
51 example, if `:slant' appears before `:height', font selection first | |
52 tries to find a font with a suitable slant, even if this results in | |
53 a font height that isn't optimal." | |
54 :tag "Font selection order." | |
30306
7a694e8efd12
(face-font-selection-order)
Gerd Moellmann <gerd@gnu.org>
parents:
30188
diff
changeset
|
55 :type '(list symbol symbol symbol symbol) |
25012 | 56 :group 'font-selection |
57 :set #'(lambda (symbol value) | |
58 (set-default symbol value) | |
59 (internal-set-font-selection-order value))) | |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
60 |
33371
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
61 |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
62 ;; This is defined originally in xfaces.c. |
25012 | 63 (defcustom face-font-family-alternatives |
64 '(("courier" "fixed") | |
27888
3e1c17057b79
(face-font-family-alternatives): Add arial to helv.
Jason Rumney <jasonr@gnu.org>
parents:
27831
diff
changeset
|
65 ("helv" "helvetica" "arial" "fixed")) |
25012 | 66 "*Alist of alternative font family names. |
67 Each element has the the form (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...). | |
68 If fonts of family FAMILY can't be loaded, try ALTERNATIVE1, then | |
69 ALTERNATIVE2 etc." | |
70 :tag "Alternative font families to try." | |
30306
7a694e8efd12
(face-font-selection-order)
Gerd Moellmann <gerd@gnu.org>
parents:
30188
diff
changeset
|
71 :type '(repeat (repeat string)) |
25012 | 72 :group 'font-selection |
73 :set #'(lambda (symbol value) | |
74 (set-default symbol value) | |
75 (internal-set-alternative-font-family-alist value))) | |
13725 | 76 |
25012 | 77 |
33371
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
78 ;; This is defined originally in xfaces.c. |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
79 (defcustom face-font-registry-alternatives |
34162
08b928780fd1
(face-font-registry-alternatives): Add entries for CJK
Kenichi Handa <handa@m17n.org>
parents:
34018
diff
changeset
|
80 '(("gb2312.1980" "gb2312.80&gb8565.88" "gbk*") |
08b928780fd1
(face-font-registry-alternatives): Add entries for CJK
Kenichi Handa <handa@m17n.org>
parents:
34018
diff
changeset
|
81 ("jisx0208.1990" "jisx0208.1983" "jisx0208.1978") |
08b928780fd1
(face-font-registry-alternatives): Add entries for CJK
Kenichi Handa <handa@m17n.org>
parents:
34018
diff
changeset
|
82 ("ksc5601.1989" "ksx1001.1992" "ksc5601.1987") |
08b928780fd1
(face-font-registry-alternatives): Add entries for CJK
Kenichi Handa <handa@m17n.org>
parents:
34018
diff
changeset
|
83 ("muletibetan-2" "muletibetan-0")) |
33371
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
84 "*Alist of alternative font registry names. |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
85 Each element has the the form (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...). |
34162
08b928780fd1
(face-font-registry-alternatives): Add entries for CJK
Kenichi Handa <handa@m17n.org>
parents:
34018
diff
changeset
|
86 If fonts of registry REGISTRY can be loaded, font selection |
08b928780fd1
(face-font-registry-alternatives): Add entries for CJK
Kenichi Handa <handa@m17n.org>
parents:
34018
diff
changeset
|
87 tries to find a best matching font among all fonts of registry |
08b928780fd1
(face-font-registry-alternatives): Add entries for CJK
Kenichi Handa <handa@m17n.org>
parents:
34018
diff
changeset
|
88 REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc." |
33371
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
89 :tag "Alternative font registries to try." |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
90 :type '(repeat (repeat string)) |
33419
21ac2c51ac59
(face-font-registry-alternatives): Add :version.
Dave Love <fx@gnu.org>
parents:
33371
diff
changeset
|
91 :version "21.1" |
33371
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
92 :group 'font-selection |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
93 :set #'(lambda (symbol value) |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
94 (set-default symbol value) |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
95 (internal-set-alternative-font-registry-alist value))) |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
96 |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
97 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
98 |
25012 | 99 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
100 ;;; Creation, copying. | |
101 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
102 |
3925
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
103 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
104 (defun face-list () |
25012 | 105 "Return a list of all defined face names." |
106 (mapcar #'car face-new-frame-defaults)) | |
107 | |
108 | |
109 ;;; ### If not frame-local initialize by what X resources? | |
110 | |
111 (defun make-face (face &optional no-init-from-resources) | |
112 "Define a new face with name FACE, a symbol. | |
113 NO-INIT-FROM-RESOURCES non-nil means don't initialize frame-local | |
114 variants of FACE from X resources. (X resources recognized are found | |
115 in the global variable `face-x-resources'.) If FACE is already known | |
116 as a face, leave it unmodified. Value is FACE." | |
117 (interactive "SMake face: ") | |
118 (unless (facep face) | |
119 ;; Make frame-local faces (this also makes the global one). | |
120 (dolist (frame (frame-list)) | |
121 (internal-make-lisp-face face frame)) | |
122 ;; Add the face to the face menu. | |
123 (when (fboundp 'facemenu-add-new-face) | |
124 (facemenu-add-new-face face)) | |
125 ;; Define frame-local faces for all frames from X resources. | |
126 (unless no-init-from-resources | |
127 (make-face-x-resource-internal face))) | |
128 face) | |
129 | |
130 | |
131 (defun make-empty-face (face) | |
132 "Define a new, empty face with name FACE. | |
133 If the face already exists, it is left unmodified. Value is FACE." | |
134 (interactive "SMake empty face: ") | |
135 (make-face face 'no-init-from-resources)) | |
136 | |
137 | |
138 (defun copy-face (old-face new-face &optional frame new-frame) | |
139 "Define a face just like OLD-FACE, with name NEW-FACE. | |
140 | |
141 If NEW-FACE already exists as a face, it is modified to be like | |
142 OLD-FACE. If it doesn't already exist, it is created. | |
143 | |
144 If the optional argument FRAME is given as a frame, NEW-FACE is | |
145 changed on FRAME only. | |
146 If FRAME is t, the frame-independent default specification for OLD-FACE | |
147 is copied to NEW-FACE. | |
148 If FRAME is nil, copying is done for the frame-independent defaults | |
149 and for each existing frame. | |
150 | |
151 If the optional fourth argument NEW-FRAME is given, | |
152 copy the information from face OLD-FACE on frame FRAME | |
153 to NEW-FACE on frame NEW-FRAME." | |
154 (let ((inhibit-quit t)) | |
155 (if (null frame) | |
156 (progn | |
157 (dolist (frame (frame-list)) | |
158 (copy-face old-face new-face frame)) | |
159 (copy-face old-face new-face t)) | |
160 (internal-copy-lisp-face old-face new-face frame new-frame)) | |
161 new-face)) | |
162 | |
163 | |
164 | |
165 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
166 ;;; Obsolete functions | |
167 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
168 | |
169 ;; The functions in this section are defined because Lisp packages use | |
170 ;; them, despite the prefix `internal-' suggesting that they are | |
28840 | 171 ;; private to the face implementation. |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
172 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
173 (defun internal-find-face (name &optional frame) |
25012 | 174 "Retrieve the face named NAME. |
175 Return nil if there is no such face. | |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
176 If the optional argument FRAME is given, this gets the face NAME for |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
177 that frame; otherwise, it uses the selected frame. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
178 If FRAME is the symbol t, then the global, non-frame face is returned. |
25012 | 179 If NAME is already a face, it is simply returned. |
180 | |
181 This function is defined for compatibility with Emacs 20.2. It | |
182 should not be used anymore." | |
183 (facep name)) | |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
184 (make-obsolete 'internal-find-face 'facep "21.1") |
25012 | 185 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
186 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
187 (defun internal-get-face (name &optional frame) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
188 "Retrieve the face named NAME; error if there is none. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
189 If the optional argument FRAME is given, this gets the face NAME for |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
190 that frame; otherwise, it uses the selected frame. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
191 If FRAME is the symbol t, then the global, non-frame face is returned. |
25012 | 192 If NAME is already a face, it is simply returned. |
193 | |
194 This function is defined for compatibility with Emacs 20.2. It | |
195 should not be used anymore." | |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
196 (or (internal-find-face name frame) |
25012 | 197 (check-face name))) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
198 (make-obsolete 'internal-get-face "See `facep' and `check-face'." "21.1") |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
199 |
25012 | 200 |
201 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
202 ;;; Predicates, type checks. | |
203 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
204 | |
205 (defun facep (face) | |
206 "Return non-nil if FACE is a face name." | |
207 (internal-lisp-face-p face)) | |
208 | |
209 | |
210 (defun check-face (face) | |
211 "Signal an error if FACE doesn't name a face. | |
212 Value is FACE." | |
213 (unless (facep face) | |
214 (error "Not a face: %s" face)) | |
215 face) | |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
216 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
217 |
25012 | 218 ;; The ID returned is not to be confused with the internally used IDs |
219 ;; of realized faces. The ID assigned to Lisp faces is used to | |
220 ;; support faces in display table entries. | |
17386
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
221 |
25012 | 222 (defun face-id (face &optional frame) |
223 "Return the interNal ID of face with name FACE. | |
224 If optional argument FRAME is nil or omitted, use the selected frame." | |
225 (check-face face) | |
226 (get face 'face)) | |
2456 | 227 |
228 | |
229 (defun face-equal (face1 face2 &optional frame) | |
25012 | 230 "Non-nil if faces FACE1 and FACE2 are equal. |
231 Faces are considered equal if all their attributes are equal. | |
232 If the optional argument FRAME is given, report on face FACE in that frame. | |
233 If FRAME is t, report on the defaults for face FACE (for new frames). | |
234 If FRAME is omitted or nil, use the selected frame." | |
235 (internal-lisp-face-equal-p face1 face2 frame)) | |
236 | |
2456 | 237 |
238 (defun face-differs-from-default-p (face &optional frame) | |
25012 | 239 "Non-nil if FACE displays differently from the default face. |
240 If the optional argument FRAME is given, report on face FACE in that frame. | |
241 If FRAME is t, report on the defaults for face FACE (for new frames). | |
242 If FRAME is omitted or nil, use the selected frame. | |
243 A face is considered to be ``the same'' as the default face if it is | |
244 actually specified in the same way (equal attributes) or if it is | |
245 fully-unspecified, and thus inherits the attributes of any face it | |
246 is displayed on top of." | |
25814
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
247 (cond ((eq frame t) (setq frame nil)) |
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
248 ((null frame) (setq frame (selected-frame)))) |
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
249 (let* ((v1 (internal-lisp-face-p face frame)) |
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
250 (n (if v1 (length v1) 0)) |
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
251 (v2 (internal-lisp-face-p 'default frame)) |
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
252 (i 1)) |
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
253 (unless v1 |
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
254 (error "Not a face: %S" face)) |
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
255 (while (and (< i n) |
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
256 (or (eq 'unspecified (aref v1 i)) |
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
257 (equal (aref v1 i) (aref v2 i)))) |
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
258 (setq i (1+ i))) |
34c27e95b254
(face-differs-from-default-p): Compare face
Gerd Moellmann <gerd@gnu.org>
parents:
25688
diff
changeset
|
259 (< i n))) |
10379
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
260 |
2456 | 261 |
10379
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
262 (defun face-nontrivial-p (face &optional frame) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
263 "True if face FACE has some non-nil attribute. |
25012 | 264 If the optional argument FRAME is given, report on face FACE in that frame. |
265 If FRAME is t, report on the defaults for face FACE (for new frames). | |
266 If FRAME is omitted or nil, use the selected frame." | |
267 (not (internal-lisp-face-empty-p face frame))) | |
268 | |
269 | |
270 | |
271 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
272 ;;; Setting face attributes from X resources. | |
273 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
274 | |
275 (defcustom face-x-resources | |
276 '((:family (".attributeFamily" . "Face.AttributeFamily")) | |
277 (:width (".attributeWidth" . "Face.AttributeWidth")) | |
278 (:height (".attributeHeight" . "Face.AttributeHeight")) | |
279 (:weight (".attributeWeight" . "Face.AttributeWeight")) | |
280 (:slant (".attributeSlant" . "Face.AttributeSlant")) | |
281 (:foreground (".attributeForeground" . "Face.AttributeForeground")) | |
282 (:background (".attributeBackground" . "Face.AttributeBackground")) | |
283 (:overline (".attributeOverline" . "Face.AttributeOverline")) | |
284 (:strike-through (".attributeStrikeThrough" . "Face.AttributeStrikeThrough")) | |
285 (:box (".attributeBox" . "Face.AttributeBox")) | |
286 (:underline (".attributeUnderline" . "Face.AttributeUnderline")) | |
287 (:inverse-video (".attributeInverse" . "Face.AttributeInverse")) | |
288 (:stipple | |
289 (".attributeStipple" . "Face.AttributeStipple") | |
290 (".attributeBackgroundPixmap" . "Face.AttributeBackgroundPixmap")) | |
291 (:bold (".attributeBold" . "Face.AttributeBold")) | |
292 (:italic (".attributeItalic" . "Face.AttributeItalic")) | |
31193
a15c5cb8ec71
(face-x-resources): Add entry for :inherit.
Miles Bader <miles@gnu.org>
parents:
31190
diff
changeset
|
293 (:font (".attributeFont" . "Face.AttributeFont")) |
a15c5cb8ec71
(face-x-resources): Add entry for :inherit.
Miles Bader <miles@gnu.org>
parents:
31190
diff
changeset
|
294 (:inherit (".attributeInherit" . "Face.AttributeInherit"))) |
25012 | 295 "*List of X resources and classes for face attributes. |
296 Each element has the form (ATTRIBUTE ENTRY1 ENTRY2...) where ATTRIBUTE is | |
297 the name of a face attribute, and each ENTRY is a cons of the form | |
298 (RESOURCE . CLASS) with RESOURCE being the resource and CLASS being the | |
299 X resource class for the attribute." | |
31528
a461cad7a942
(face-x-resources): Make custom type more specific.
Dave Love <fx@gnu.org>
parents:
31500
diff
changeset
|
300 :type '(repeat (cons symbol (repeat (cons string string)))) |
25012 | 301 :group 'faces) |
302 | |
303 | |
304 (defun set-face-attribute-from-resource (face attribute resource class frame) | |
305 "Set FACE's ATTRIBUTE from X resource RESOURCE, class CLASS on FRAME. | |
306 Value is the attribute value specified by the resource, or nil | |
307 if not present. This function displays a message if the resource | |
308 specifies an invalid attribute." | |
309 (let* ((face-name (face-name face)) | |
310 (value (internal-face-x-get-resource (concat face-name resource) | |
311 class frame))) | |
312 (when value | |
313 (condition-case () | |
314 (internal-set-lisp-face-attribute-from-resource | |
315 face attribute (downcase value) frame) | |
316 (error | |
317 (message "Face %s, frame %s: invalid attribute %s %s from X resource" | |
318 face-name frame attribute value)))) | |
319 value)) | |
320 | |
321 | |
322 (defun set-face-attributes-from-resources (face frame) | |
323 "Set attributes of FACE from X resources for FRAME." | |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32734
diff
changeset
|
324 (when (memq (framep frame) '(x w32 mac)) |
25012 | 325 (dolist (definition face-x-resources) |
326 (let ((attribute (car definition))) | |
327 (dolist (entry (cdr definition)) | |
328 (set-face-attribute-from-resource face attribute (car entry) | |
329 (cdr entry) frame)))))) | |
330 | |
331 | |
332 (defun make-face-x-resource-internal (face &optional frame) | |
333 "Fill frame-local FACE on FRAME from X resources. | |
334 FRAME nil or not specified means do it for all frames." | |
335 (if (null frame) | |
336 (dolist (frame (frame-list)) | |
337 (set-face-attributes-from-resources face frame)) | |
338 (set-face-attributes-from-resources face frame))) | |
339 | |
340 | |
341 | |
342 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
343 ;;; Retrieving face attributes. | |
344 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
345 | |
346 (defun face-name (face) | |
347 "Return the name of face FACE." | |
348 (symbol-name (check-face face))) | |
349 | |
350 | |
351 (defun face-attribute (face attribute &optional frame) | |
352 "Return the value of FACE's ATTRIBUTE on FRAME. | |
353 If the optional argument FRAME is given, report on face FACE in that frame. | |
354 If FRAME is t, report on the defaults for face FACE (for new frames). | |
355 If FRAME is omitted or nil, use the selected frame." | |
356 (internal-get-lisp-face-attribute face attribute frame)) | |
357 | |
358 | |
359 (defun face-foreground (face &optional frame) | |
360 "Return the foreground color name of FACE, or nil if unspecified. | |
361 If the optional argument FRAME is given, report on face FACE in that frame. | |
362 If FRAME is t, report on the defaults for face FACE (for new frames). | |
363 If FRAME is omitted or nil, use the selected frame." | |
34018
a442998dd573
(face-foreground, face-background, face-stipple):
Gerd Moellmann <gerd@gnu.org>
parents:
33852
diff
changeset
|
364 (let ((value (internal-get-lisp-face-attribute face :foreground frame))) |
a442998dd573
(face-foreground, face-background, face-stipple):
Gerd Moellmann <gerd@gnu.org>
parents:
33852
diff
changeset
|
365 (if (eq value 'unspecified) |
a442998dd573
(face-foreground, face-background, face-stipple):
Gerd Moellmann <gerd@gnu.org>
parents:
33852
diff
changeset
|
366 nil |
a442998dd573
(face-foreground, face-background, face-stipple):
Gerd Moellmann <gerd@gnu.org>
parents:
33852
diff
changeset
|
367 value))) |
25012 | 368 |
369 | |
370 (defun face-background (face &optional frame) | |
371 "Return the background color name of FACE, or nil if unspecified. | |
372 If the optional argument FRAME is given, report on face FACE in that frame. | |
373 If FRAME is t, report on the defaults for face FACE (for new frames). | |
374 If FRAME is omitted or nil, use the selected frame." | |
34018
a442998dd573
(face-foreground, face-background, face-stipple):
Gerd Moellmann <gerd@gnu.org>
parents:
33852
diff
changeset
|
375 (let ((value (internal-get-lisp-face-attribute face :background frame))) |
a442998dd573
(face-foreground, face-background, face-stipple):
Gerd Moellmann <gerd@gnu.org>
parents:
33852
diff
changeset
|
376 (if (eq value 'unspecified) |
a442998dd573
(face-foreground, face-background, face-stipple):
Gerd Moellmann <gerd@gnu.org>
parents:
33852
diff
changeset
|
377 nil |
a442998dd573
(face-foreground, face-background, face-stipple):
Gerd Moellmann <gerd@gnu.org>
parents:
33852
diff
changeset
|
378 value))) |
25012 | 379 |
380 | |
381 (defun face-stipple (face &optional frame) | |
382 "Return the stipple pixmap name of FACE, or nil if unspecified. | |
383 If the optional argument FRAME is given, report on face FACE in that frame. | |
384 If FRAME is t, report on the defaults for face FACE (for new frames). | |
385 If FRAME is omitted or nil, use the selected frame." | |
34018
a442998dd573
(face-foreground, face-background, face-stipple):
Gerd Moellmann <gerd@gnu.org>
parents:
33852
diff
changeset
|
386 (let ((value (internal-get-lisp-face-attribute face :stipple frame))) |
a442998dd573
(face-foreground, face-background, face-stipple):
Gerd Moellmann <gerd@gnu.org>
parents:
33852
diff
changeset
|
387 (if (eq value 'unspecified) |
a442998dd573
(face-foreground, face-background, face-stipple):
Gerd Moellmann <gerd@gnu.org>
parents:
33852
diff
changeset
|
388 nil |
a442998dd573
(face-foreground, face-background, face-stipple):
Gerd Moellmann <gerd@gnu.org>
parents:
33852
diff
changeset
|
389 value))) |
25012 | 390 |
391 | |
392 (defalias 'face-background-pixmap 'face-stipple) | |
393 | |
394 | |
395 (defun face-underline-p (face &optional frame) | |
396 "Return non-nil if FACE is underlined. | |
397 If the optional argument FRAME is given, report on face FACE in that frame. | |
398 If FRAME is t, report on the defaults for face FACE (for new frames). | |
399 If FRAME is omitted or nil, use the selected frame." | |
400 (eq (face-attribute face :underline frame) t)) | |
401 | |
402 | |
403 (defun face-inverse-video-p (face &optional frame) | |
404 "Return non-nil if FACE is in inverse video on FRAME. | |
405 If the optional argument FRAME is given, report on face FACE in that frame. | |
406 If FRAME is t, report on the defaults for face FACE (for new frames). | |
407 If FRAME is omitted or nil, use the selected frame." | |
408 (eq (face-attribute face :inverse-video frame) t)) | |
409 | |
410 | |
411 (defun face-bold-p (face &optional frame) | |
412 "Return non-nil if the font of FACE is bold on FRAME. | |
413 If the optional argument FRAME is given, report on face FACE in that frame. | |
414 If FRAME is t, report on the defaults for face FACE (for new frames). | |
415 If FRAME is omitted or nil, use the selected frame. | |
416 Use `face-attribute' for finer control." | |
417 (let ((bold (face-attribute face :weight frame))) | |
25561
67c224f5cc1a
(face-bold-p): Don't return t if face has lighter
Gerd Moellmann <gerd@gnu.org>
parents:
25545
diff
changeset
|
418 (memq bold '(semi-bold bold extra-bold ultra-bold)))) |
25012 | 419 |
420 | |
421 (defun face-italic-p (face &optional frame) | |
422 "Return non-nil if the font of FACE is italic on FRAME. | |
423 If the optional argument FRAME is given, report on face FACE in that frame. | |
424 If FRAME is t, report on the defaults for face FACE (for new frames). | |
425 If FRAME is omitted or nil, use the selected frame. | |
426 Use `face-attribute' for finer control." | |
427 (let ((italic (face-attribute face :slant frame))) | |
25616
4dbea85f5af0
(face-italic-p): Return t only for values `italic'
Gerd Moellmann <gerd@gnu.org>
parents:
25588
diff
changeset
|
428 (memq italic '(italic oblique)))) |
25012 | 429 |
430 | |
431 | |
432 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
433 ;;; Face documentation. | |
434 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
435 | |
436 (defun face-documentation (face) | |
437 "Get the documentation string for FACE." | |
438 (get face 'face-documentation)) | |
439 | |
440 | |
441 (defun set-face-documentation (face string) | |
442 "Set the documentation string for FACE to STRING." | |
26927
27d6c0e07ea8
(set-face-attribute): Purecopy the attributes set.
Dave Love <fx@gnu.org>
parents:
26902
diff
changeset
|
443 ;; Perhaps the text should go in DOC. |
26657
b5c0d55411ad
(set-face-documentation): Purecopy STRING.
Dave Love <fx@gnu.org>
parents:
26353
diff
changeset
|
444 (put face 'face-documentation (purecopy string))) |
25012 | 445 |
446 | |
447 (defalias 'face-doc-string 'face-documentation) | |
448 (defalias 'set-face-doc-string 'set-face-documentation) | |
449 | |
450 | |
451 | |
452 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
453 ;; Setting face attributes. | |
454 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
455 | |
456 | |
457 (defun set-face-attribute (face frame &rest args) | |
458 "Set attributes of FACE on FRAME from ARGS. | |
459 | |
460 FRAME nil means change attributes on all frames. FRAME t means change | |
461 the default for new frames (this is done automatically each time an | |
462 attribute is changed on all frames). | |
463 | |
464 ARGS must come in pairs ATTRIBUTE VALUE. ATTRIBUTE must be a valid | |
465 face attribute name. All attributes can be set to `unspecified'; | |
466 this fact is not further mentioned below. | |
467 | |
468 The following attributes are recognized: | |
469 | |
470 `:family' | |
471 | |
472 VALUE must be a string specifying the font family, e.g. ``courier'', | |
473 or a fontset alias name. If a font family is specified, wild-cards `*' | |
474 and `?' are allowed. | |
475 | |
476 `:width' | |
477 | |
478 VALUE specifies the relative proportionate width of the font to use. | |
479 It must be one of the symbols `ultra-condensed', `extra-condensed', | |
480 `condensed', `semi-condensed', `normal', `semi-expanded', `expanded', | |
481 `extra-expanded', or `ultra-expanded'. | |
482 | |
483 `:height' | |
484 | |
31190 | 485 VALUE must be either an integer specifying the height of the font to use |
486 in 1/10 pt, a floating point number specifying the amount by which to | |
487 scale any underlying face, or a function, which is called with the old | |
488 height (from the underlying face), and should return the new height. | |
25012 | 489 |
490 `:weight' | |
491 | |
492 VALUE specifies the weight of the font to use. It must be one of the | |
493 symbols `ultra-bold', `extra-bold', `bold', `semi-bold', `normal', | |
494 `semi-light', `light', `extra-light', `ultra-light'. | |
495 | |
496 `:slant' | |
497 | |
498 VALUE specifies the slant of the font to use. It must be one of the | |
499 symbols `italic', `oblique', `normal', `reverse-italic', or | |
500 `reverse-oblique'. | |
501 | |
502 `:foreground', `:background' | |
503 | |
504 VALUE must be a color name, a string. | |
505 | |
506 `:underline' | |
507 | |
508 VALUE specifies whether characters in FACE should be underlined. If | |
509 VALUE is t, underline with foreground color of the face. If VALUE is | |
510 a string, underline with that color. If VALUE is nil, explicitly | |
511 don't underline. | |
512 | |
513 `:overline' | |
514 | |
515 VALUE specifies whether characters in FACE should be overlined. If | |
516 VALUE is t, overline with foreground color of the face. If VALUE is a | |
517 string, overline with that color. If VALUE is nil, explicitly don't | |
518 overline. | |
519 | |
520 `:strike-through' | |
521 | |
522 VALUE specifies whether characters in FACE should be drawn with a line | |
523 striking through them. If VALUE is t, use the foreground color of the | |
524 face. If VALUE is a string, strike-through with that color. If VALUE | |
525 is nil, explicitly don't strike through. | |
526 | |
527 `:box' | |
528 | |
529 VALUE specifies whether characters in FACE should have a box drawn | |
530 around them. If VALUE is nil, explicitly don't draw boxes. If | |
531 VALUE is t, draw a box with lines of width 1 in the foreground color | |
532 of the face. If VALUE is a string, the string must be a color name, | |
533 and the box is drawn in that color with a line width of 1. Otherwise, | |
534 VALUE must be a property list of the form `(:line-width WIDTH | |
535 :color COLOR :style STYLE)'. If a keyword/value pair is missing from | |
536 the property list, a default value will be used for the value, as | |
537 specified below. WIDTH specifies the width of the lines to draw; it | |
36009
3f009240cc7d
(set-face-attribute): Describe the case of a negative
Kenichi Handa <handa@m17n.org>
parents:
34682
diff
changeset
|
538 defaults to 1. If WIDTH is negative, the absolute value is the width |
3f009240cc7d
(set-face-attribute): Describe the case of a negative
Kenichi Handa <handa@m17n.org>
parents:
34682
diff
changeset
|
539 of the lines, and draw top/bottom lines inside the characters area, |
3f009240cc7d
(set-face-attribute): Describe the case of a negative
Kenichi Handa <handa@m17n.org>
parents:
34682
diff
changeset
|
540 not around it. COLOR is the name of the color to draw in, default is |
25012 | 541 the foreground color of the face for simple boxes, and the background |
542 color of the face for 3D boxes. STYLE specifies whether a 3D box | |
543 should be draw. If STYLE is `released-button', draw a box looking | |
544 like a released 3D button. If STYLE is `pressed-button' draw a box | |
545 that appears like a pressed button. If STYLE is nil, the default if | |
546 the property list doesn't contain a style specification, draw a 2D | |
547 box. | |
548 | |
549 `:inverse-video' | |
550 | |
551 VALUE specifies whether characters in FACE should be displayed in | |
28840 | 552 inverse video. VALUE must be one of t or nil. |
25012 | 553 |
554 `:stipple' | |
555 | |
556 If VALUE is a string, it must be the name of a file of pixmap data. | |
557 The directories listed in the `x-bitmap-file-path' variable are | |
558 searched. Alternatively, VALUE may be a list of the form (WIDTH | |
559 HEIGHT DATA) where WIDTH and HEIGHT are the size in pixels, and DATA | |
560 is a string containing the raw bits of the bitmap. VALUE nil means | |
561 explicitly don't use a stipple pattern. | |
562 | |
563 For convenience, attributes `:family', `:width', `:height', `:weight', | |
564 and `:slant' may also be set in one step from an X font name: | |
565 | |
566 `:font' | |
567 | |
568 Set font-related face attributes from VALUE. VALUE must be a valid | |
569 XLFD font name. If it is a font name pattern, the first matching font | |
570 will be used. | |
571 | |
572 For compatibility with Emacs 20, keywords `:bold' and `:italic' can | |
573 be used to specify that a bold or italic font should be used. VALUE | |
31190 | 574 must be t or nil in that case. A value of `unspecified' is not allowed. |
575 | |
576 `:inherit' | |
577 | |
578 VALUE is the name of a face from which to inherit attributes, or a list | |
579 of face names. Attributes from inherited faces are merged into the face | |
580 like an underlying face would be, with higher priority than underlying faces." | |
31439
d7a98f35b441
(set-face-attribute): Simplify by calling
Gerd Moellmann <gerd@gnu.org>
parents:
31401
diff
changeset
|
581 (let ((where (if (null frame) 0 frame))) |
d7a98f35b441
(set-face-attribute): Simplify by calling
Gerd Moellmann <gerd@gnu.org>
parents:
31401
diff
changeset
|
582 (setq args (purecopy args)) |
d7a98f35b441
(set-face-attribute): Simplify by calling
Gerd Moellmann <gerd@gnu.org>
parents:
31401
diff
changeset
|
583 (while args |
d7a98f35b441
(set-face-attribute): Simplify by calling
Gerd Moellmann <gerd@gnu.org>
parents:
31401
diff
changeset
|
584 (internal-set-lisp-face-attribute face (car args) |
d7a98f35b441
(set-face-attribute): Simplify by calling
Gerd Moellmann <gerd@gnu.org>
parents:
31401
diff
changeset
|
585 (purecopy (cadr args)) |
d7a98f35b441
(set-face-attribute): Simplify by calling
Gerd Moellmann <gerd@gnu.org>
parents:
31401
diff
changeset
|
586 where) |
d7a98f35b441
(set-face-attribute): Simplify by calling
Gerd Moellmann <gerd@gnu.org>
parents:
31401
diff
changeset
|
587 (setq args (cdr (cdr args)))))) |
25012 | 588 |
589 | |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
590 (defun make-face-bold (face &optional frame noerror) |
25012 | 591 "Make the font of FACE be bold, if possible. |
592 FRAME nil or not specified means change face on all frames. | |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
593 Argument NOERROR is ignored and retained for compatibility. |
25012 | 594 Use `set-face-attribute' for finer control of the font weight." |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
595 (interactive (list (read-face-name "Make which face bold "))) |
25012 | 596 (set-face-attribute face frame :weight 'bold)) |
597 | |
598 | |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
599 (defun make-face-unbold (face &optional frame noerror) |
25012 | 600 "Make the font of FACE be non-bold, if possible. |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
601 FRAME nil or not specified means change face on all frames. |
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
602 Argument NOERROR is ignored and retained for compatibility." |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
603 (interactive (list (read-face-name "Make which face non-bold "))) |
25012 | 604 (set-face-attribute face frame :weight 'normal)) |
605 | |
606 | |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
607 (defun make-face-italic (face &optional frame noerror) |
25012 | 608 "Make the font of FACE be italic, if possible. |
609 FRAME nil or not specified means change face on all frames. | |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
610 Argument NOERROR is ignored and retained for compatibility. |
25012 | 611 Use `set-face-attribute' for finer control of the font slant." |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
612 (interactive (list (read-face-name "Make which face italic "))) |
25012 | 613 (set-face-attribute face frame :slant 'italic)) |
614 | |
615 | |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
616 (defun make-face-unitalic (face &optional frame noerror) |
25012 | 617 "Make the font of FACE be non-italic, if possible. |
28840 | 618 FRAME nil or not specified means change face on all frames. |
619 Argument NOERROR is ignored and retained for compatibility." | |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
620 (interactive (list (read-face-name "Make which face non-italic "))) |
25012 | 621 (set-face-attribute face frame :slant 'normal)) |
622 | |
623 | |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
624 (defun make-face-bold-italic (face &optional frame noerror) |
25012 | 625 "Make the font of FACE be bold and italic, if possible. |
626 FRAME nil or not specified means change face on all frames. | |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
627 Argument NOERROR is ignored and retained for compatibility. |
25012 | 628 Use `set-face-attribute' for finer control of font weight and slant." |
629 (interactive (list (read-face-name "Make which face bold-italic: "))) | |
630 (set-face-attribute face frame :weight 'bold :slant 'italic)) | |
631 | |
632 | |
633 (defun set-face-font (face font &optional frame) | |
634 "Change font-related attributes of FACE to those of FONT (a string). | |
635 FRAME nil or not specified means change face on all frames. | |
636 This sets the attributes `:family', `:width', `:height', `:weight', | |
637 and `:slant'. When called interactively, prompt for the face and font." | |
638 (interactive (read-face-and-attribute :font)) | |
639 (set-face-attribute face frame :font font)) | |
640 | |
641 | |
642 ;; Implementation note: Emulating gray background colors with a | |
643 ;; stipple pattern is now part of the face realization process, and is | |
644 ;; done in C depending on the frame on which the face is realized. | |
645 | |
646 (defun set-face-background (face color &optional frame) | |
647 "Change the background color of face FACE to COLOR (a string). | |
648 FRAME nil or not specified means change face on all frames. | |
649 When called interactively, prompt for the face and color." | |
650 (interactive (read-face-and-attribute :background)) | |
36060
d9b4d1370073
(set-face-background, set-face-foreground)
Miles Bader <miles@gnu.org>
parents:
36035
diff
changeset
|
651 (set-face-attribute face frame :background (or color 'unspecified))) |
25012 | 652 |
653 | |
654 (defun set-face-foreground (face color &optional frame) | |
655 "Change the foreground color of face FACE to COLOR (a string). | |
656 FRAME nil or not specified means change face on all frames. | |
657 When called interactively, prompt for the face and color." | |
658 (interactive (read-face-and-attribute :foreground)) | |
36060
d9b4d1370073
(set-face-background, set-face-foreground)
Miles Bader <miles@gnu.org>
parents:
36035
diff
changeset
|
659 (set-face-attribute face frame :foreground (or color 'unspecified))) |
25012 | 660 |
661 | |
662 (defun set-face-stipple (face stipple &optional frame) | |
663 "Change the stipple pixmap of face FACE to STIPPLE. | |
664 FRAME nil or not specified means change face on all frames. | |
28840 | 665 STIPPLE should be a string, the name of a file of pixmap data. |
25012 | 666 The directories listed in the `x-bitmap-file-path' variable are searched. |
667 | |
668 Alternatively, STIPPLE may be a list of the form (WIDTH HEIGHT DATA) | |
669 where WIDTH and HEIGHT are the size in pixels, | |
670 and DATA is a string, containing the raw bits of the bitmap." | |
671 (interactive (read-face-and-attribute :stipple)) | |
36060
d9b4d1370073
(set-face-background, set-face-foreground)
Miles Bader <miles@gnu.org>
parents:
36035
diff
changeset
|
672 (set-face-attribute face frame :stipple (or stipple 'unspecified))) |
25012 | 673 |
674 | |
675 (defun set-face-underline (face underline &optional frame) | |
676 "Specify whether face FACE is underlined. | |
677 UNDERLINE nil means FACE explicitly doesn't underline. | |
678 UNDERLINE non-nil means FACE explicitly does underlining | |
679 with the same of the foreground color. | |
680 If UNDERLINE is a string, underline with the color named UNDERLINE. | |
681 FRAME nil or not specified means change face on all frames. | |
682 Use `set-face-attribute' to ``unspecify'' underlining." | |
683 (interactive | |
684 (let ((list (read-face-and-attribute :underline))) | |
685 (list (car list) (eq (car (cdr list)) t)))) | |
686 (set-face-attribute face frame :underline underline)) | |
687 | |
688 | |
689 (defun set-face-underline-p (face underline-p &optional frame) | |
690 "Specify whether face FACE is underlined. | |
691 UNDERLINE-P nil means FACE explicitly doesn't underline. | |
692 UNDERLINE-P non-nil means FACE explicitly does underlining. | |
693 FRAME nil or not specified means change face on all frames. | |
694 Use `set-face-attribute' to ``unspecify'' underlining." | |
695 (interactive | |
696 (let ((list (read-face-and-attribute :underline))) | |
697 (list (car list) (eq (car (cdr list)) t)))) | |
698 (set-face-attribute face frame :underline underline-p)) | |
699 | |
700 | |
701 (defun set-face-inverse-video-p (face inverse-video-p &optional frame) | |
702 "Specify whether face FACE is in inverse video. | |
703 INVERSE-VIDEO-P non-nil means FACE displays explicitly in inverse video. | |
704 INVERSE-VIDEO-P nil means FACE explicitly is not in inverse video. | |
705 FRAME nil or not specified means change face on all frames. | |
706 Use `set-face-attribute' to ``unspecify'' the inverse video attribute." | |
707 (interactive | |
708 (let ((list (read-face-and-attribute :inverse-video))) | |
709 (list (car list) (eq (car (cdr list)) t)))) | |
710 (set-face-attribute face frame :inverse-video inverse-video-p)) | |
711 | |
712 | |
713 (defun set-face-bold-p (face bold-p &optional frame) | |
714 "Specify whether face FACE is bold. | |
715 BOLD-P non-nil means FACE should explicitly display bold. | |
716 BOLD-P nil means FACE should explicitly display non-bold. | |
717 FRAME nil or not specified means change face on all frames. | |
718 Use `set-face-attribute' or `modify-face' for finer control." | |
719 (if (null bold-p) | |
720 (make-face-unbold face frame) | |
721 (make-face-bold face frame))) | |
722 | |
723 | |
724 (defun set-face-italic-p (face italic-p &optional frame) | |
725 "Specify whether face FACE is italic. | |
726 ITALIC-P non-nil means FACE should explicitly display italic. | |
727 ITALIC-P nil means FACE should explicitly display non-italic. | |
728 FRAME nil or not specified means change face on all frames. | |
729 Use `set-face-attribute' or `modify-face' for finer control." | |
730 (if (null italic-p) | |
731 (make-face-unitalic face frame) | |
732 (make-face-italic face frame))) | |
733 | |
734 | |
735 (defalias 'set-face-background-pixmap 'set-face-stipple) | |
10379
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
736 |
2456 | 737 |
738 (defun invert-face (face &optional frame) | |
25012 | 739 "Swap the foreground and background colors of FACE. |
740 FRAME nil or not specified means change face on all frames. | |
741 If FACE specifies neither foreground nor background color, | |
742 set its foreground and background to the background and foreground | |
743 of the default face. Value is FACE." | |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
744 (interactive (list (read-face-name "Invert face "))) |
25012 | 745 (let ((fg (face-attribute face :foreground frame)) |
746 (bg (face-attribute face :background frame))) | |
2456 | 747 (if (or fg bg) |
25012 | 748 (set-face-attribute face frame :foreground bg :background fg) |
749 (set-face-attribute face frame | |
750 :foreground | |
751 (face-attribute 'default :background frame) | |
752 :background | |
753 (face-attribute 'default :foreground frame)))) | |
2456 | 754 face) |
755 | |
25012 | 756 |
757 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
758 ;;; Interactively modifying faces. | |
759 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2456 | 760 |
25012 | 761 (defun read-face-name (prompt) |
762 "Read and return a face symbol, prompting with PROMPT. | |
763 Value is a symbol naming a known face." | |
764 (let ((face-list (mapcar #'(lambda (x) (cons (symbol-name x) x)) | |
765 (face-list))) | |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
766 (def (thing-at-point 'symbol)) |
25012 | 767 face) |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
768 (cond ((assoc def face-list) |
31190 | 769 (setq prompt (concat prompt " (default " def "): "))) |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
770 (t (setq def nil) |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
771 (setq prompt (concat prompt ": ")))) |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
772 (while (equal "" (setq face (completing-read |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
773 prompt face-list nil t nil nil def)))) |
25012 | 774 (intern face))) |
775 | |
776 | |
777 (defun face-valid-attribute-values (attribute &optional frame) | |
778 "Return valid values for face attribute ATTRIBUTE. | |
779 The optional argument FRAME is used to determine available fonts | |
780 and colors. If it is nil or not specified, the selected frame is | |
781 used. Value is an alist of (NAME . VALUE) if ATTRIBUTE expects a value | |
782 out of a set of discrete values. Value is `integerp' if ATTRIBUTE expects | |
783 an integer value." | |
25245
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
784 (let (valid) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
785 (setq valid |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
786 (case attribute |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
787 (:family |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
788 (if window-system |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
789 (mapcar #'(lambda (x) (cons (car x) (car x))) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
790 (x-font-family-list)) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
791 ;; Only one font on TTYs. |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
792 (list (cons "default" "default")))) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
793 ((:width :weight :slant :inverse-video) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
794 (mapcar #'(lambda (x) (cons (symbol-name x) x)) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
795 (internal-lisp-face-attribute-values attribute))) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
796 ((:underline :overline :strike-through :box) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
797 (if window-system |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
798 (nconc (mapcar #'(lambda (x) (cons (symbol-name x) x)) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
799 (internal-lisp-face-attribute-values attribute)) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
800 (mapcar #'(lambda (c) (cons c c)) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
801 (x-defined-colors frame))) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
802 (mapcar #'(lambda (x) (cons (symbol-name x) x)) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
803 (internal-lisp-face-attribute-values attribute)))) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
804 ((:foreground :background) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
805 (mapcar #'(lambda (c) (cons c c)) |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
806 (defined-colors frame))) |
25245
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
807 ((:height) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
808 'integerp) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
809 (:stipple |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32734
diff
changeset
|
810 (and (memq window-system '(x w32 mac)) |
25245
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
811 (mapcar #'list |
31753
7d6ee5c362b2
(face-valid-attribute-values): Make sure directories we search for
Miles Bader <miles@gnu.org>
parents:
31681
diff
changeset
|
812 (apply #'nconc |
7d6ee5c362b2
(face-valid-attribute-values): Make sure directories we search for
Miles Bader <miles@gnu.org>
parents:
31681
diff
changeset
|
813 (mapcar (lambda (dir) |
7d6ee5c362b2
(face-valid-attribute-values): Make sure directories we search for
Miles Bader <miles@gnu.org>
parents:
31681
diff
changeset
|
814 (and (file-readable-p dir) |
7d6ee5c362b2
(face-valid-attribute-values): Make sure directories we search for
Miles Bader <miles@gnu.org>
parents:
31681
diff
changeset
|
815 (file-directory-p dir) |
7d6ee5c362b2
(face-valid-attribute-values): Make sure directories we search for
Miles Bader <miles@gnu.org>
parents:
31681
diff
changeset
|
816 (directory-files dir))) |
7d6ee5c362b2
(face-valid-attribute-values): Make sure directories we search for
Miles Bader <miles@gnu.org>
parents:
31681
diff
changeset
|
817 x-bitmap-file-path))))) |
31190 | 818 (:inherit |
819 (cons '("none" . nil) | |
820 (mapcar #'(lambda (c) (cons (symbol-name c) c)) | |
821 (face-list)))) | |
25245
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
822 (t |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
823 (error "Internal error")))) |
31190 | 824 (if (and (listp valid) (not (memq attribute '(:inherit)))) |
25245
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
825 (nconc (list (cons "unspecified" 'unspecified)) valid) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
826 valid))) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
827 |
25012 | 828 |
829 | |
830 (defvar face-attribute-name-alist | |
831 '((:family . "font family") | |
832 (:width . "character set width") | |
833 (:height . "height in 1/10 pt") | |
834 (:weight . "weight") | |
835 (:slant . "slant") | |
836 (:underline . "underline") | |
837 (:overline . "overline") | |
838 (:strike-through . "strike-through") | |
839 (:box . "box") | |
840 (:inverse-video . "inverse-video display") | |
841 (:foreground . "foreground color") | |
842 (:background . "background color") | |
31190 | 843 (:stipple . "background stipple") |
844 (:inherit . "inheritance")) | |
25012 | 845 "An alist of descriptive names for face attributes. |
846 Each element has the form (ATTRIBUTE-NAME . DESCRIPTION) where | |
847 ATTRIBUTE-NAME is a face attribute name (a keyword symbol), and | |
848 DESCRIPTION is a descriptive name for ATTRIBUTE-NAME.") | |
849 | |
850 | |
851 (defun face-descriptive-attribute-name (attribute) | |
852 "Return a descriptive name for ATTRIBUTE." | |
853 (cdr (assq attribute face-attribute-name-alist))) | |
854 | |
855 | |
856 (defun face-read-string (face default name &optional completion-alist) | |
857 "Interactively read a face attribute string value. | |
31190 | 858 FACE is the face whose attribute is read. If non-nil, DEFAULT is the |
859 default string to return if no new value is entered. NAME is a | |
860 descriptive name of the attribute for prompting. COMPLETION-ALIST is an | |
861 alist of valid values, if non-nil. | |
25012 | 862 |
31190 | 863 Entering nothing accepts the default string DEFAULT. |
25012 | 864 Value is the new attribute value." |
31190 | 865 ;; Capitalize NAME (we don't use `capitalize' because that capitalizes |
866 ;; each word in a string separately). | |
867 (setq name (concat (upcase (substring name 0 1)) (substring name 1))) | |
25012 | 868 (let* ((completion-ignore-case t) |
869 (value (completing-read | |
870 (if default | |
31190 | 871 (format "%s for face `%s' (default %s): " |
872 name face default) | |
873 (format "%s for face `%s': " name face)) | |
25012 | 874 completion-alist))) |
25245
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
875 (if (equal value "") default value))) |
25012 | 876 |
877 | |
878 (defun face-read-integer (face default name) | |
879 "Interactively read an integer face attribute value. | |
880 FACE is the face whose attribute is read. DEFAULT is the default | |
881 value to return if no new value is entered. NAME is a descriptive | |
882 name of the attribute for prompting. Value is the new attribute value." | |
25245
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
883 (let ((new-value |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
884 (face-read-string face |
31190 | 885 (format "%s" default) |
25245
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
886 name |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
887 (list (cons "unspecified" 'unspecified))))) |
31190 | 888 (cond ((equal new-value "unspecified") |
889 'unspecified) | |
890 ((member new-value '("unspecified-fg" "unspecified-bg")) | |
891 new-value) | |
892 (t | |
893 (string-to-int new-value))))) | |
25012 | 894 |
895 | |
896 (defun read-face-attribute (face attribute &optional frame) | |
897 "Interactively read a new value for FACE's ATTRIBUTE. | |
898 Optional argument FRAME nil or unspecified means read an attribute value | |
899 of a global face. Value is the new attribute value." | |
900 (let* ((old-value (face-attribute face attribute frame)) | |
901 (attribute-name (face-descriptive-attribute-name attribute)) | |
902 (valid (face-valid-attribute-values attribute frame)) | |
903 new-value) | |
904 ;; Represent complex attribute values as strings by printing them | |
905 ;; out. Stipple can be a vector; (WIDTH HEIGHT DATA). Box can be | |
906 ;; a list `(:width WIDTH :color COLOR)' or `(:width WIDTH :shadow | |
907 ;; SHADOW)'. | |
908 (when (and (or (eq attribute :stipple) | |
909 (eq attribute :box)) | |
910 (or (consp old-value) | |
911 (vectorp old-value))) | |
912 (setq old-value (prin1-to-string old-value))) | |
913 (cond ((listp valid) | |
31190 | 914 (let ((default |
915 (or (car (rassoc old-value valid)) | |
916 (format "%s" old-value)))) | |
917 (setq new-value | |
918 (face-read-string face default attribute-name valid)) | |
919 (if (equal new-value default) | |
920 ;; Nothing changed, so don't bother with all the stuff | |
921 ;; below. In particular, this avoids a non-tty color | |
922 ;; from being canonicalized for a tty when the user | |
923 ;; just uses the default. | |
924 (setq new-value old-value) | |
925 ;; Terminal frames can support colors that don't appear | |
926 ;; explicitly in VALID, using color approximation code | |
927 ;; in tty-colors.el. | |
34585
1e66e14d9695
(read-face-attribute): If there's no entry for the user's input in
Miles Bader <miles@gnu.org>
parents:
34246
diff
changeset
|
928 (when (and (memq attribute '(:foreground :background)) |
1e66e14d9695
(read-face-attribute): If there's no entry for the user's input in
Miles Bader <miles@gnu.org>
parents:
34246
diff
changeset
|
929 (not (memq window-system '(x w32 mac))) |
1e66e14d9695
(read-face-attribute): If there's no entry for the user's input in
Miles Bader <miles@gnu.org>
parents:
34246
diff
changeset
|
930 (not (member new-value |
1e66e14d9695
(read-face-attribute): If there's no entry for the user's input in
Miles Bader <miles@gnu.org>
parents:
34246
diff
changeset
|
931 '("unspecified" |
1e66e14d9695
(read-face-attribute): If there's no entry for the user's input in
Miles Bader <miles@gnu.org>
parents:
34246
diff
changeset
|
932 "unspecified-fg" "unspecified-bg")))) |
34587 | 933 (setq new-value (car (tty-color-desc new-value frame)))) |
34585
1e66e14d9695
(read-face-attribute): If there's no entry for the user's input in
Miles Bader <miles@gnu.org>
parents:
34246
diff
changeset
|
934 (when (assoc new-value valid) |
1e66e14d9695
(read-face-attribute): If there's no entry for the user's input in
Miles Bader <miles@gnu.org>
parents:
34246
diff
changeset
|
935 (setq new-value (cdr (assoc new-value valid))))))) |
25012 | 936 ((eq valid 'integerp) |
937 (setq new-value (face-read-integer face old-value attribute-name))) | |
938 (t (error "Internal error"))) | |
939 ;; Convert stipple and box value text we read back to a list or | |
940 ;; vector if it looks like one. This makes the assumption that a | |
941 ;; pixmap file name won't start with an open-paren. | |
942 (when (and (or (eq attribute :stipple) | |
943 (eq attribute :box)) | |
944 (stringp new-value) | |
945 (string-match "^[[(]" new-value)) | |
946 (setq new-value (read new-value))) | |
947 new-value)) | |
948 | |
949 | |
950 (defun read-face-font (face &optional frame) | |
951 "Read the name of a font for FACE on FRAME. | |
952 If optional argument FRAME Is nil or omitted, use the selected frame." | |
953 (let ((completion-ignore-case t)) | |
31197
39d437913f44
(read-face-font, read-face-and-attribute): Tweak prompts.
Miles Bader <miles@gnu.org>
parents:
31193
diff
changeset
|
954 (completing-read (format "Set font attributes of face `%s' from font: " face) |
28214
73c16c6e401e
(read-face-font): Fix TABLE arg to completing-read.
Kenichi Handa <handa@m17n.org>
parents:
27928
diff
changeset
|
955 (mapcar 'list (x-list-fonts "*" nil frame))))) |
25012 | 956 |
957 | |
958 (defun read-all-face-attributes (face &optional frame) | |
959 "Interactively read all attributes for FACE. | |
960 If optional argument FRAME Is nil or omitted, use the selected frame. | |
961 Value is a property list of attribute names and new values." | |
962 (let (result) | |
963 (dolist (attribute face-attribute-name-alist result) | |
964 (setq result (cons (car attribute) | |
965 (cons (read-face-attribute face (car attribute) frame) | |
966 result)))))) | |
967 | |
968 | |
969 (defun modify-face (&optional frame) | |
970 "Modify attributes of faces interactively. | |
971 If optional argument FRAME is nil or omitted, modify the face used | |
972 for newly created frame, i.e. the global face." | |
973 (interactive) | |
31190 | 974 (let ((face (read-face-name "Modify face"))) |
25012 | 975 (apply #'set-face-attribute face frame |
976 (read-all-face-attributes face frame)))) | |
977 | |
978 | |
979 (defun read-face-and-attribute (attribute &optional frame) | |
980 "Read face name and face attribute value. | |
981 ATTRIBUTE is the attribute whose new value is read. | |
982 FRAME nil or unspecified means read attribute value of global face. | |
983 Value is a list (FACE NEW-VALUE) where FACE is the face read | |
984 (a symbol), and NEW-VALUE is value read." | |
985 (cond ((eq attribute :font) | |
31197
39d437913f44
(read-face-font, read-face-and-attribute): Tweak prompts.
Miles Bader <miles@gnu.org>
parents:
31193
diff
changeset
|
986 (let* ((prompt "Set font-related attributes of face") |
25012 | 987 (face (read-face-name prompt)) |
988 (font (read-face-font face frame))) | |
989 (list face font))) | |
990 (t | |
991 (let* ((attribute-name (face-descriptive-attribute-name attribute)) | |
31190 | 992 (prompt (format "Set %s of face" attribute-name)) |
25012 | 993 (face (read-face-name prompt)) |
994 (new-value (read-face-attribute face attribute frame))) | |
995 (list face new-value))))) | |
996 | |
997 | |
998 | |
999 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1000 ;;; Listing faces. | |
1001 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1002 | |
1003 (defvar list-faces-sample-text | |
1004 "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ" | |
1005 "*Text string to display as the sample text for `list-faces-display'.") | |
1006 | |
1007 | |
1008 ;; The name list-faces would be more consistent, but let's avoid a | |
1009 ;; conflict with Lucid, which uses that name differently. | |
1010 | |
1011 (defun list-faces-display () | |
1012 "List all faces, using the same sample text in each. | |
1013 The sample text is a string that comes from the variable | |
1014 `list-faces-sample-text'." | |
1015 (interactive) | |
1016 (let ((faces (sort (face-list) #'string-lessp)) | |
1017 (face nil) | |
1018 (frame (selected-frame)) | |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1019 disp-frame window face-name) |
25012 | 1020 (with-output-to-temp-buffer "*Faces*" |
1021 (save-excursion | |
1022 (set-buffer standard-output) | |
1023 (setq truncate-lines t) | |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1024 (insert |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1025 (substitute-command-keys |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1026 (concat |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1027 "Use " |
27736
b4d0a1247b35
(list-faces-display): Use display-mouse-p, not window-system.
Eli Zaretskii <eliz@gnu.org>
parents:
27716
diff
changeset
|
1028 (if (display-mouse-p) "\\[help-follow-mouse] or ") |
27831
05cce359cbf0
(list-faces-display): Fix header typo.
Dave Love <fx@gnu.org>
parents:
27736
diff
changeset
|
1029 "\\[help-follow] on a face name to customize it\n" |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1030 "or on its sample text for a decription of the face.\n\n"))) |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1031 (setq help-xref-stack nil) |
25012 | 1032 (while faces |
1033 (setq face (car faces)) | |
1034 (setq faces (cdr faces)) | |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1035 (setq face-name (symbol-name face)) |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1036 (insert (format "%25s " face-name)) |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1037 ;; Hyperlink to a customization buffer for the face. Using |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1038 ;; the help xref mechanism may not be the best way. |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1039 (save-excursion |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1040 (save-match-data |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1041 (search-backward face-name) |
28840 | 1042 (help-xref-button 0 (lambda (f) |
1043 (if help-xref-stack | |
1044 (pop help-xref-stack)) | |
1045 (customize-face f)) | |
1046 face-name | |
27928
0ffb33d1514a
(list-faces-display): Supply help-echo with
Dave Love <fx@gnu.org>
parents:
27888
diff
changeset
|
1047 "mouse-2: customize this face"))) |
25012 | 1048 (let ((beg (point))) |
1049 (insert list-faces-sample-text) | |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1050 ;; Hyperlink to a help buffer for the face. |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1051 (save-excursion |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1052 (save-match-data |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1053 (search-backward list-faces-sample-text) |
27928
0ffb33d1514a
(list-faces-display): Supply help-echo with
Dave Love <fx@gnu.org>
parents:
27888
diff
changeset
|
1054 (help-xref-button 0 #'describe-face face |
0ffb33d1514a
(list-faces-display): Supply help-echo with
Dave Love <fx@gnu.org>
parents:
27888
diff
changeset
|
1055 "mouse-2: describe this face"))) |
25012 | 1056 (insert "\n") |
1057 (put-text-property beg (1- (point)) 'face face) | |
1058 ;; If the sample text has multiple lines, line up all of them. | |
1059 (goto-char beg) | |
1060 (forward-line 1) | |
1061 (while (not (eobp)) | |
1062 (insert " ") | |
1063 (forward-line 1)))) | |
1064 (goto-char (point-min))) | |
1065 (print-help-return-message)) | |
1066 ;; If the *Faces* buffer appears in a different frame, | |
1067 ;; copy all the face definitions from FRAME, | |
1068 ;; so that the display will reflect the frame that was selected. | |
1069 (setq window (get-buffer-window (get-buffer "*Faces*") t)) | |
1070 (setq disp-frame (if window (window-frame window) | |
1071 (car (frame-list)))) | |
1072 (or (eq frame disp-frame) | |
1073 (let ((faces (face-list))) | |
1074 (while faces | |
1075 (copy-face (car faces) (car faces) frame disp-frame) | |
1076 (setq faces (cdr faces))))))) | |
1077 | |
1078 | |
1079 (defun describe-face (face &optional frame) | |
1080 "Display the properties of face FACE on FRAME. | |
1081 If the optional argument FRAME is given, report on face FACE in that frame. | |
1082 If FRAME is t, report on the defaults for face FACE (for new frames). | |
1083 If FRAME is omitted or nil, use the selected frame." | |
28840 | 1084 (interactive (list (read-face-name "Describe face"))) |
25012 | 1085 (let* ((attrs '((:family . "Family") |
1086 (:width . "Width") | |
1087 (:height . "Height") | |
1088 (:weight . "Weight") | |
1089 (:slant . "Slant") | |
1090 (:foreground . "Foreground") | |
1091 (:background . "Background") | |
1092 (:underline . "Underline") | |
1093 (:overline . "Overline") | |
1094 (:strike-through . "Strike-through") | |
1095 (:box . "Box") | |
1096 (:inverse-video . "Inverse") | |
28214
73c16c6e401e
(read-face-font): Fix TABLE arg to completing-read.
Kenichi Handa <handa@m17n.org>
parents:
27928
diff
changeset
|
1097 (:stipple . "Stipple") |
31179
354c781f2864
(describe-face): Add support for :inherit attribute.
Miles Bader <miles@gnu.org>
parents:
30971
diff
changeset
|
1098 (:font . "Font or fontset") |
354c781f2864
(describe-face): Add support for :inherit attribute.
Miles Bader <miles@gnu.org>
parents:
30971
diff
changeset
|
1099 (:inherit . "Inherit"))) |
25012 | 1100 (max-width (apply #'max (mapcar #'(lambda (x) (length (cdr x))) |
1101 attrs)))) | |
1102 (with-output-to-temp-buffer "*Help*" | |
1103 (save-excursion | |
1104 (set-buffer standard-output) | |
1105 (dolist (a attrs) | |
1106 (let ((attr (face-attribute face (car a) frame))) | |
1107 (insert (make-string (- max-width (length (cdr a))) ?\ ) | |
1108 (cdr a) ": " (format "%s" attr) "\n"))) | |
1109 (insert "\nDocumentation:\n\n" | |
1110 (or (face-documentation face) | |
28840 | 1111 "not documented as a face.")) |
1112 (let ((customize-label "customize")) | |
1113 (terpri) | |
1114 (terpri) | |
1115 (princ (concat "You can " customize-label " this face.")) | |
1116 (with-current-buffer "*Help*" | |
1117 (save-excursion | |
1118 (re-search-backward | |
1119 (concat "\\(" customize-label "\\)") nil t) | |
1120 (help-xref-button 1 #'customize-face face | |
1121 "mouse-2, RET: customize face"))))) | |
1122 (print-help-return-message) | |
1123 (with-current-buffer "*Help*" | |
1124 (help-setup-xref (list #'describe-face face) (interactive-p)) | |
1125 (buffer-string))))) | |
2456 | 1126 |
25012 | 1127 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
1128 ;;; Face specifications (defface). | |
1129 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1130 | |
1131 ;; Parameter FRAME Is kept for call compatibility to with previous | |
1132 ;; face implementation. | |
1133 | |
1134 (defun face-attr-construct (face &optional frame) | |
1135 "Return a defface-style attribute list for FACE on FRAME. | |
1136 Value is a property list of pairs ATTRIBUTE VALUE for all specified | |
1137 face attributes of FACE where ATTRIBUTE is the attribute name and | |
1138 VALUE is the specified value of that attribute." | |
1139 (let (result) | |
1140 (dolist (entry face-attribute-name-alist result) | |
1141 (let* ((attribute (car entry)) | |
1142 (value (face-attribute face attribute))) | |
1143 (unless (eq value 'unspecified) | |
1144 (setq result (nconc (list attribute value) result))))))) | |
1145 | |
1146 | |
1147 (defun face-spec-set-match-display (display frame) | |
1148 "Non-nil if DISPLAY matches FRAME. | |
1149 DISPLAY is part of a spec such as can be used in `defface'. | |
1150 If FRAME is nil, the current FRAME is used." | |
1151 (let* ((conjuncts display) | |
1152 conjunct req options | |
1153 ;; t means we have succeeded against all the conjuncts in | |
1154 ;; DISPLAY that have been tested so far. | |
1155 (match t)) | |
1156 (if (eq conjuncts t) | |
1157 (setq conjuncts nil)) | |
1158 (while (and conjuncts match) | |
1159 (setq conjunct (car conjuncts) | |
1160 conjuncts (cdr conjuncts) | |
1161 req (car conjunct) | |
1162 options (cdr conjunct) | |
1163 match (cond ((eq req 'type) | |
1164 (or (memq window-system options) | |
33447
45961172564e
(face-spec-set-match-display): Revert the change from
Eli Zaretskii <eliz@gnu.org>
parents:
33419
diff
changeset
|
1165 ;; FIXME: This should be revisited to use |
45961172564e
(face-spec-set-match-display): Revert the change from
Eli Zaretskii <eliz@gnu.org>
parents:
33419
diff
changeset
|
1166 ;; display-graphic-p, provided that the |
45961172564e
(face-spec-set-match-display): Revert the change from
Eli Zaretskii <eliz@gnu.org>
parents:
33419
diff
changeset
|
1167 ;; color selection depends on the number |
45961172564e
(face-spec-set-match-display): Revert the change from
Eli Zaretskii <eliz@gnu.org>
parents:
33419
diff
changeset
|
1168 ;; of supported colors, and all defface's |
45961172564e
(face-spec-set-match-display): Revert the change from
Eli Zaretskii <eliz@gnu.org>
parents:
33419
diff
changeset
|
1169 ;; are changed to look at number of colors |
45961172564e
(face-spec-set-match-display): Revert the change from
Eli Zaretskii <eliz@gnu.org>
parents:
33419
diff
changeset
|
1170 ;; instead of (type graphic) etc. |
45961172564e
(face-spec-set-match-display): Revert the change from
Eli Zaretskii <eliz@gnu.org>
parents:
33419
diff
changeset
|
1171 (and (null window-system) |
45961172564e
(face-spec-set-match-display): Revert the change from
Eli Zaretskii <eliz@gnu.org>
parents:
33419
diff
changeset
|
1172 (memq 'tty options)) |
25887
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1173 (and (memq 'motif options) |
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1174 (featurep 'motif)) |
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1175 (and (memq 'lucid options) |
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1176 (featurep 'x-toolkit) |
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1177 (not (featurep 'motif))) |
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1178 (and (memq 'x-toolkit options) |
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1179 (featurep 'x-toolkit)))) |
25012 | 1180 ((eq req 'class) |
1181 (memq (frame-parameter frame 'display-type) options)) | |
1182 ((eq req 'background) | |
1183 (memq (frame-parameter frame 'background-mode) | |
1184 options)) | |
28840 | 1185 (t (error "Unknown req `%S' with options `%S'" |
25012 | 1186 req options))))) |
1187 match)) | |
1188 | |
1189 | |
1190 (defun face-spec-choose (spec &optional frame) | |
32758
a0ca98ed466a
(face-user-default-spec, face-default-spec): New functions.
Miles Bader <miles@gnu.org>
parents:
32756
diff
changeset
|
1191 "Choose the proper attributes for FRAME, out of SPEC. |
a0ca98ed466a
(face-user-default-spec, face-default-spec): New functions.
Miles Bader <miles@gnu.org>
parents:
32756
diff
changeset
|
1192 If SPEC is nil, return nil." |
25012 | 1193 (unless frame |
1194 (setq frame (selected-frame))) | |
1195 (let ((tail spec) | |
1196 result) | |
1197 (while tail | |
32940
80681aca0859
(face-spec-choose): Change syntax so that the list of attribute-value
Miles Bader <miles@gnu.org>
parents:
32801
diff
changeset
|
1198 (let* ((entry (pop tail)) |
80681aca0859
(face-spec-choose): Change syntax so that the list of attribute-value
Miles Bader <miles@gnu.org>
parents:
32801
diff
changeset
|
1199 (display (car entry)) |
80681aca0859
(face-spec-choose): Change syntax so that the list of attribute-value
Miles Bader <miles@gnu.org>
parents:
32801
diff
changeset
|
1200 (attrs (cdr entry))) |
25012 | 1201 (when (face-spec-set-match-display display frame) |
32940
80681aca0859
(face-spec-choose): Change syntax so that the list of attribute-value
Miles Bader <miles@gnu.org>
parents:
32801
diff
changeset
|
1202 (setq result (if (listp (car attrs)) |
80681aca0859
(face-spec-choose): Change syntax so that the list of attribute-value
Miles Bader <miles@gnu.org>
parents:
32801
diff
changeset
|
1203 ;; Old-style entry, the attribute list is the |
80681aca0859
(face-spec-choose): Change syntax so that the list of attribute-value
Miles Bader <miles@gnu.org>
parents:
32801
diff
changeset
|
1204 ;; first element. |
80681aca0859
(face-spec-choose): Change syntax so that the list of attribute-value
Miles Bader <miles@gnu.org>
parents:
32801
diff
changeset
|
1205 (car attrs) |
80681aca0859
(face-spec-choose): Change syntax so that the list of attribute-value
Miles Bader <miles@gnu.org>
parents:
32801
diff
changeset
|
1206 attrs) |
80681aca0859
(face-spec-choose): Change syntax so that the list of attribute-value
Miles Bader <miles@gnu.org>
parents:
32801
diff
changeset
|
1207 tail nil)))) |
25012 | 1208 result)) |
1209 | |
1210 | |
1211 (defun face-spec-reset-face (face &optional frame) | |
1212 "Reset all attributes of FACE on FRAME to unspecified." | |
31401
0b8165a82e34
(set-face-attribute, face-spec-reset-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31197
diff
changeset
|
1213 (let ((attrs face-attribute-name-alist)) |
25012 | 1214 (while attrs |
1215 (let ((attr-and-name (car attrs))) | |
31401
0b8165a82e34
(set-face-attribute, face-spec-reset-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31197
diff
changeset
|
1216 (set-face-attribute face frame (car attr-and-name) 'unspecified)) |
0b8165a82e34
(set-face-attribute, face-spec-reset-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31197
diff
changeset
|
1217 (setq attrs (cdr attrs))))) |
25012 | 1218 |
1219 | |
1220 (defun face-spec-set (face spec &optional frame) | |
1221 "Set FACE's attributes according to the first matching entry in SPEC. | |
1222 FRAME is the frame whose frame-local face is set. FRAME nil means | |
32758
a0ca98ed466a
(face-user-default-spec, face-default-spec): New functions.
Miles Bader <miles@gnu.org>
parents:
32756
diff
changeset
|
1223 do it on all frames. See `defface' for information about SPEC. |
a0ca98ed466a
(face-user-default-spec, face-default-spec): New functions.
Miles Bader <miles@gnu.org>
parents:
32756
diff
changeset
|
1224 If SPEC is nil, do nothing." |
31401
0b8165a82e34
(set-face-attribute, face-spec-reset-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31197
diff
changeset
|
1225 (let ((attrs (face-spec-choose spec frame))) |
31500
33b9a5b2a3bc
(face-spec-set): Only face-spec-reset-face when
Gerd Moellmann <gerd@gnu.org>
parents:
31466
diff
changeset
|
1226 (when attrs |
33b9a5b2a3bc
(face-spec-set): Only face-spec-reset-face when
Gerd Moellmann <gerd@gnu.org>
parents:
31466
diff
changeset
|
1227 (face-spec-reset-face face frame)) |
25012 | 1228 (while attrs |
1229 (let ((attribute (car attrs)) | |
1230 (value (car (cdr attrs)))) | |
1231 ;; Support some old-style attribute names and values. | |
1232 (case attribute | |
1233 (:bold (setq attribute :weight value (if value 'bold 'normal))) | |
30010
281fa98f5c87
(face-spec-set): Ignore invalid attributes like 20.x.
Gerd Moellmann <gerd@gnu.org>
parents:
29976
diff
changeset
|
1234 (:italic (setq attribute :slant value (if value 'italic 'normal))) |
34682
4130c0ad0a5e
(face-spec-set): Interpret a nil in specs for
Gerd Moellmann <gerd@gnu.org>
parents:
34587
diff
changeset
|
1235 ((:foreground :background) |
4130c0ad0a5e
(face-spec-set): Interpret a nil in specs for
Gerd Moellmann <gerd@gnu.org>
parents:
34587
diff
changeset
|
1236 ;; Compatibility with 20.x. Some bogus face specs seem to |
4130c0ad0a5e
(face-spec-set): Interpret a nil in specs for
Gerd Moellmann <gerd@gnu.org>
parents:
34587
diff
changeset
|
1237 ;; exist containing things like `:foreground nil'. |
4130c0ad0a5e
(face-spec-set): Interpret a nil in specs for
Gerd Moellmann <gerd@gnu.org>
parents:
34587
diff
changeset
|
1238 (if (null value) (setq value 'unspecified))) |
30010
281fa98f5c87
(face-spec-set): Ignore invalid attributes like 20.x.
Gerd Moellmann <gerd@gnu.org>
parents:
29976
diff
changeset
|
1239 (t (unless (assq attribute face-x-resources) |
281fa98f5c87
(face-spec-set): Ignore invalid attributes like 20.x.
Gerd Moellmann <gerd@gnu.org>
parents:
29976
diff
changeset
|
1240 (setq attribute nil)))) |
281fa98f5c87
(face-spec-set): Ignore invalid attributes like 20.x.
Gerd Moellmann <gerd@gnu.org>
parents:
29976
diff
changeset
|
1241 (when attribute |
31401
0b8165a82e34
(set-face-attribute, face-spec-reset-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31197
diff
changeset
|
1242 (set-face-attribute face frame attribute value))) |
0b8165a82e34
(set-face-attribute, face-spec-reset-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31197
diff
changeset
|
1243 (setq attrs (cdr (cdr attrs)))))) |
25012 | 1244 |
1245 | |
1246 (defun face-attr-match-p (face attrs &optional frame) | |
30971 | 1247 "Return t if attributes of FACE match values in plist ATTRS. |
25012 | 1248 Optional parameter FRAME is the frame whose definition of FACE |
1249 is used. If nil or omitted, use the selected frame." | |
1250 (unless frame | |
1251 (setq frame (selected-frame))) | |
1252 (let ((list face-attribute-name-alist) | |
1253 (match t)) | |
1254 (while (and match (not (null list))) | |
1255 (let* ((attr (car (car list))) | |
30971 | 1256 (specified-value |
1257 (if (plist-member attrs attr) | |
1258 (plist-get attrs attr) | |
1259 'unspecified)) | |
25012 | 1260 (value-now (face-attribute face attr frame))) |
30971 | 1261 (setq match (equal specified-value value-now)) |
25012 | 1262 (setq list (cdr list)))) |
1263 match)) | |
1264 | |
1265 (defun face-spec-match-p (face spec &optional frame) | |
1266 "Return t if FACE, on FRAME, matches what SPEC says it should look like." | |
1267 (face-attr-match-p face (face-spec-choose spec frame) frame)) | |
1268 | |
32795
975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
Miles Bader <miles@gnu.org>
parents:
32758
diff
changeset
|
1269 (defsubst face-default-spec (face) |
975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
Miles Bader <miles@gnu.org>
parents:
32758
diff
changeset
|
1270 "Return the default face-spec for FACE, ignoring any user customization. |
975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
Miles Bader <miles@gnu.org>
parents:
32758
diff
changeset
|
1271 If there is no default for FACE, return nil." |
975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
Miles Bader <miles@gnu.org>
parents:
32758
diff
changeset
|
1272 (get face 'face-defface-spec)) |
975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
Miles Bader <miles@gnu.org>
parents:
32758
diff
changeset
|
1273 |
975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
Miles Bader <miles@gnu.org>
parents:
32758
diff
changeset
|
1274 (defsubst face-user-default-spec (face) |
32758
a0ca98ed466a
(face-user-default-spec, face-default-spec): New functions.
Miles Bader <miles@gnu.org>
parents:
32756
diff
changeset
|
1275 "Return the user's customized face-spec for FACE, or the default if none. |
a0ca98ed466a
(face-user-default-spec, face-default-spec): New functions.
Miles Bader <miles@gnu.org>
parents:
32756
diff
changeset
|
1276 If there is neither a user setting or a default for FACE, return nil." |
a0ca98ed466a
(face-user-default-spec, face-default-spec): New functions.
Miles Bader <miles@gnu.org>
parents:
32756
diff
changeset
|
1277 (or (get face 'saved-face) |
32795
975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
Miles Bader <miles@gnu.org>
parents:
32758
diff
changeset
|
1278 (face-default-spec face))) |
25012 | 1279 |
1280 | |
1281 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1282 ;;; Frame-type independent color support. |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1283 ;;; We keep the old x-* names as aliases for back-compatibility. |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1284 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1285 |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1286 (defun defined-colors (&optional frame) |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1287 "Return a list of colors supported for a particular frame. |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1288 The argument FRAME specifies which frame to try. |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1289 The value may be different for frames on different display types. |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1290 If FRAME doesn't support colors, the value is nil." |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32734
diff
changeset
|
1291 (if (memq (framep (or frame (selected-frame))) '(x w32 mac)) |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1292 (xw-defined-colors frame) |
27090
52e469fb402a
(read-face-attribute, defined-colors, color-defined-p):
Eli Zaretskii <eliz@gnu.org>
parents:
26927
diff
changeset
|
1293 (mapcar 'car (tty-color-alist frame)))) |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1294 (defalias 'x-defined-colors 'defined-colors) |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1295 |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1296 (defun color-defined-p (color &optional frame) |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1297 "Return non-nil if color COLOR is supported on frame FRAME. |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1298 If FRAME is omitted or nil, use the selected frame. |
27117
6838a53d4992
(face-read-integer, read-face-attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
27090
diff
changeset
|
1299 If COLOR is the symbol `unspecified' or one of the strings |
6838a53d4992
(face-read-integer, read-face-attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
27090
diff
changeset
|
1300 \"unspecified-fg\" or \"unspecified-bg\", the value is nil." |
32734
92b46ad86f6a
(color-values, color-defined-p): Use `member', not
Miles Bader <miles@gnu.org>
parents:
32649
diff
changeset
|
1301 (if (member color '(unspecified "unspecified-bg" "unspecified-fg")) |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1302 nil |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32734
diff
changeset
|
1303 (if (member (framep (or frame (selected-frame))) '(x w32 mac)) |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1304 (xw-color-defined-p color frame) |
27090
52e469fb402a
(read-face-attribute, defined-colors, color-defined-p):
Eli Zaretskii <eliz@gnu.org>
parents:
26927
diff
changeset
|
1305 (numberp (tty-color-translate color frame))))) |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1306 (defalias 'x-color-defined-p 'color-defined-p) |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1307 |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1308 (defun color-values (color &optional frame) |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1309 "Return a description of the color named COLOR on frame FRAME. |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1310 The value is a list of integer RGB values--\(RED GREEN BLUE\). |
31466 | 1311 These values appear to range from 0 65535; white is \(65535 65535 65535\). |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1312 If FRAME is omitted or nil, use the selected frame. |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1313 If FRAME cannot display COLOR, the value is nil. |
27117
6838a53d4992
(face-read-integer, read-face-attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
27090
diff
changeset
|
1314 If COLOR is the symbol `unspecified' or one of the strings |
6838a53d4992
(face-read-integer, read-face-attribute)
Eli Zaretskii <eliz@gnu.org>
parents:
27090
diff
changeset
|
1315 \"unspecified-fg\" or \"unspecified-bg\", the value is nil." |
32734
92b46ad86f6a
(color-values, color-defined-p): Use `member', not
Miles Bader <miles@gnu.org>
parents:
32649
diff
changeset
|
1316 (if (member color '(unspecified "unspecified-fg" "unspecified-bg")) |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1317 nil |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32734
diff
changeset
|
1318 (if (memq (framep (or frame (selected-frame))) '(x w32 mac)) |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1319 (xw-color-values color frame) |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1320 (tty-color-values color frame)))) |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1321 (defalias 'x-color-values 'color-values) |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1322 |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1323 (defun display-color-p (&optional display) |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1324 "Return t if DISPLAY supports color. |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1325 The optional argument DISPLAY specifies which display to ask about. |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1326 DISPLAY should be either a frame or a display name (a string). |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1327 If omitted or nil, that stands for the selected frame's display." |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32734
diff
changeset
|
1328 (if (memq (framep-on-display display) '(x w32 mac)) |
27571
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1329 (xw-display-color-p display) |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1330 (tty-display-color-p display))) |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1331 (defalias 'x-display-color-p 'display-color-p) |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1332 |
27571
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1333 (defun display-grayscale-p (&optional display) |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1334 "Return non-nil if frames on DISPLAY can display shades of gray." |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1335 (let ((frame-type (framep-on-display display))) |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1336 (cond |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1337 ((memq frame-type '(x w32 mac)) |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1338 (x-display-grayscale-p display)) |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1339 (t |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1340 (> (tty-color-gray-shades display) 2))))) |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1341 |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1342 |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1343 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
25012 | 1344 ;;; Background mode. |
1345 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1346 | |
1347 (defcustom frame-background-mode nil | |
1348 "*The brightness of the background. | |
1349 Set this to the symbol `dark' if your background color is dark, `light' if | |
1350 your background is light, or nil (default) if you want Emacs to | |
30188
d6809f9c7d37
(frame-background-mode): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
30010
diff
changeset
|
1351 examine the brightness for you. Don't set this variable with `setq'; |
d6809f9c7d37
(frame-background-mode): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
30010
diff
changeset
|
1352 this won't have the expected effect." |
25012 | 1353 :group 'faces |
1354 :set #'(lambda (var value) | |
29769
18a16ab69699
(frame-background-mode): Use set-default, not set, in setter.
Dave Love <fx@gnu.org>
parents:
29354
diff
changeset
|
1355 (set-default var value) |
31528
a461cad7a942
(face-x-resources): Make custom type more specific.
Dave Love <fx@gnu.org>
parents:
31500
diff
changeset
|
1356 (mapc 'frame-set-background-mode (frame-list))) |
25012 | 1357 :initialize 'custom-initialize-changed |
28840 | 1358 :type '(choice (choice-item dark) |
25012 | 1359 (choice-item light) |
1360 (choice-item :tag "default" nil))) | |
1361 | |
1362 | |
1363 (defun frame-set-background-mode (frame) | |
32649
47bf921bccd5
(frame-set-background-mode): `unspecified' &c are symbols, not strings.
Miles Bader <miles@gnu.org>
parents:
32641
diff
changeset
|
1364 "Set up display-dependent faces on FRAME. |
47bf921bccd5
(frame-set-background-mode): `unspecified' &c are symbols, not strings.
Miles Bader <miles@gnu.org>
parents:
32641
diff
changeset
|
1365 Display-dependent faces are those which have different definitions |
47bf921bccd5
(frame-set-background-mode): `unspecified' &c are symbols, not strings.
Miles Bader <miles@gnu.org>
parents:
32641
diff
changeset
|
1366 according to the `background-mode' and `display-type' frame parameters." |
25012 | 1367 (let* ((bg-resource |
1368 (and window-system | |
1369 (x-get-resource ".backgroundMode" "BackgroundMode"))) | |
32641
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1370 (bg-color (frame-parameter frame 'background-color)) |
32376 | 1371 (bg-mode |
1372 (cond (frame-background-mode) | |
32641
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1373 (bg-resource |
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1374 (intern (downcase bg-resource))) |
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1375 ((and (null window-system) (null bg-color)) |
32376 | 1376 ;; No way to determine this automatically (?). |
1377 'dark) | |
32641
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1378 ;; Unspecified frame background color can only happen |
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1379 ;; on tty's. |
32734
92b46ad86f6a
(color-values, color-defined-p): Use `member', not
Miles Bader <miles@gnu.org>
parents:
32649
diff
changeset
|
1380 ((member bg-color '(unspecified "unspecified-bg")) |
32641
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1381 'dark) |
32734
92b46ad86f6a
(color-values, color-defined-p): Use `member', not
Miles Bader <miles@gnu.org>
parents:
32649
diff
changeset
|
1382 ((equal bg-color "unspecified-fg") ; inverted colors |
32641
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1383 'light) |
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1384 ((>= (apply '+ (x-color-values bg-color frame)) |
32376 | 1385 ;; Just looking at the screen, colors whose |
1386 ;; values add up to .6 of the white total | |
1387 ;; still look dark to me. | |
1388 (* (apply '+ (x-color-values "white" frame)) .6)) | |
32641
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1389 'light) |
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1390 (t 'dark))) |
32376 | 1391 (display-type |
1392 (cond ((null window-system) | |
1393 (if (tty-display-color-p frame) 'color 'mono)) | |
1394 ((x-display-color-p frame) | |
1395 'color) | |
1396 ((x-display-grayscale-p frame) | |
1397 'grayscale) | |
1398 (t 'mono))) | |
1399 (old-bg-mode | |
1400 (frame-parameter frame 'background-mode)) | |
1401 (old-display-type | |
1402 (frame-parameter frame 'display-type))) | |
1403 | |
1404 (unless (and (eq bg-mode old-bg-mode) (eq display-type old-display-type)) | |
34246
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1405 (let ((locally-modified-faces nil)) |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1406 ;; Before modifying the frame parameters, we collect a list of |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1407 ;; faces that don't match what their face-spec says they should |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1408 ;; look like; we then avoid changing these faces below. A |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1409 ;; negative list is used on the assumption that most faces will |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1410 ;; be unmodified, so we can avoid consing in the common case. |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1411 (dolist (face (face-list)) |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1412 (when (not (face-spec-match-p face |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1413 (face-user-default-spec face) |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1414 (selected-frame))) |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1415 (push face locally-modified-faces))) |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1416 ;; Now change to the new frame parameters |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1417 (modify-frame-parameters frame |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1418 (list (cons 'background-mode bg-mode) |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1419 (cons 'display-type display-type))) |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1420 ;; For all named faces, choose face specs matching the new frame |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1421 ;; parameters, unless they have been locally modified. |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1422 (dolist (face (face-list)) |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1423 (unless (memq face locally-modified-faces) |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1424 (face-spec-set face (face-user-default-spec face) frame))))))) |
25012 | 1425 |
1426 | |
1427 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1428 ;;; Frame creation. | |
1429 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1430 | |
1431 (defun x-handle-named-frame-geometry (parameters) | |
1432 "Add geometry parameters for a named frame to parameter list PARAMETERS. | |
1433 Value is the new parameter list." | |
1434 (let* ((name (or (cdr (assq 'name parameters)) | |
1435 (cdr (assq 'name default-frame-alist)))) | |
1436 (x-resource-name name) | |
1437 (res-geometry (if name (x-get-resource "geometry" "Geometry")))) | |
1438 (when res-geometry | |
1439 (let ((parsed (x-parse-geometry res-geometry))) | |
1440 ;; If the resource specifies a position, call the position | |
1441 ;; and size "user-specified". | |
1442 (when (or (assq 'top parsed) | |
1443 (assq 'left parsed)) | |
1444 (setq parsed (append '((user-position . t) (user-size . t)) parsed))) | |
1445 ;; Put the geometry parameters at the end. Copy | |
1446 ;; default-frame-alist so that they go after it. | |
1447 (setq parameters (append parameters default-frame-alist parsed)))) | |
1448 parameters)) | |
1449 | |
1450 | |
1451 (defun x-handle-reverse-video (frame parameters) | |
1452 "Handle the reverse-video frame parameter and X resource. | |
1453 `x-create-frame' does not handle this one." | |
1454 (when (cdr (or (assq 'reverse parameters) | |
1455 (assq 'reverse default-frame-alist) | |
1456 (let ((resource (x-get-resource "reverseVideo" | |
1457 "ReverseVideo"))) | |
1458 (if resource | |
1459 (cons nil (member (downcase resource) | |
1460 '("on" "true"))))))) | |
1461 (let* ((params (frame-parameters frame)) | |
1462 (bg (cdr (assq 'foreground-color params))) | |
1463 (fg (cdr (assq 'background-color params)))) | |
1464 (modify-frame-parameters frame | |
1465 (list (cons 'foreground-color fg) | |
1466 (cons 'background-color bg))) | |
1467 (if (equal bg (cdr (assq 'border-color params))) | |
1468 (modify-frame-parameters frame | |
1469 (list (cons 'border-color fg)))) | |
1470 (if (equal bg (cdr (assq 'mouse-color params))) | |
1471 (modify-frame-parameters frame | |
1472 (list (cons 'mouse-color fg)))) | |
1473 (if (equal bg (cdr (assq 'cursor-color params))) | |
1474 (modify-frame-parameters frame | |
1475 (list (cons 'cursor-color fg))))))) | |
1476 | |
1477 | |
1478 (defun x-create-frame-with-faces (&optional parameters) | |
1479 "Create a frame from optional frame parameters PARAMETERS. | |
1480 Parameters not specified by PARAMETERS are taken from | |
1481 `default-frame-alist'. If PARAMETERS specify a frame name, | |
1482 handle X geometry resources for that name. If either PARAMETERS | |
1483 or `default-frame-alist' contains a `reverse' parameter, or | |
1484 the X resource ``reverseVideo'' is present, handle that. | |
1485 Value is the new frame created." | |
1486 (setq parameters (x-handle-named-frame-geometry parameters)) | |
1487 (let ((visibility-spec (assq 'visibility parameters)) | |
1488 (frame-list (frame-list)) | |
1489 (frame (x-create-frame (cons '(visibility . nil) parameters))) | |
1490 success) | |
1491 (unwind-protect | |
1492 (progn | |
1493 (x-handle-reverse-video frame parameters) | |
1494 (frame-set-background-mode frame) | |
1495 (face-set-after-frame-default frame) | |
1496 (if (or (null frame-list) (null visibility-spec)) | |
1497 (make-frame-visible frame) | |
1498 (modify-frame-parameters frame (list visibility-spec))) | |
1499 (setq success t)) | |
1500 (unless success | |
1501 (delete-frame frame))) | |
1502 frame)) | |
1503 | |
1504 | |
1505 (defun face-set-after-frame-default (frame) | |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1506 "Set frame-local faces of FRAME from face specs and resources. |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1507 Initialize colors of certain faces from frame parameters." |
25012 | 1508 (dolist (face (face-list)) |
32758
a0ca98ed466a
(face-user-default-spec, face-default-spec): New functions.
Miles Bader <miles@gnu.org>
parents:
32756
diff
changeset
|
1509 (face-spec-set face (face-user-default-spec face) frame) |
a0ca98ed466a
(face-user-default-spec, face-default-spec): New functions.
Miles Bader <miles@gnu.org>
parents:
32756
diff
changeset
|
1510 (internal-merge-in-global-face face frame) |
33507
5f71cb83e287
(face-set-after-frame-default): If
Gerd Moellmann <gerd@gnu.org>
parents:
33465
diff
changeset
|
1511 (when (and (memq window-system '(x w32 mac)) |
5f71cb83e287
(face-set-after-frame-default): If
Gerd Moellmann <gerd@gnu.org>
parents:
33465
diff
changeset
|
1512 (or (not (boundp 'inhibit-default-face-x-resources)) |
5f71cb83e287
(face-set-after-frame-default): If
Gerd Moellmann <gerd@gnu.org>
parents:
33465
diff
changeset
|
1513 (not (eq face 'default)))) |
32758
a0ca98ed466a
(face-user-default-spec, face-default-spec): New functions.
Miles Bader <miles@gnu.org>
parents:
32756
diff
changeset
|
1514 (make-face-x-resource-internal face frame))) |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1515 |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1516 ;; Initialize attributes from frame parameters. |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1517 (let ((params '((foreground-color default :foreground) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1518 (background-color default :background) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1519 (border-color border :background) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1520 (cursor-color cursor :background) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1521 (scroll-bar-foreground scroll-bar :foreground) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1522 (scroll-bar-background scroll-bar :background) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1523 (mouse-color mouse :background)))) |
33852
01da583dbe56
(face-set-after-frame-default): Let face attributes
Gerd Moellmann <gerd@gnu.org>
parents:
33756
diff
changeset
|
1524 (dolist (param params) |
01da583dbe56
(face-set-after-frame-default): Let face attributes
Gerd Moellmann <gerd@gnu.org>
parents:
33756
diff
changeset
|
1525 (let ((frame-param (frame-parameter frame (nth 0 param))) |
01da583dbe56
(face-set-after-frame-default): Let face attributes
Gerd Moellmann <gerd@gnu.org>
parents:
33756
diff
changeset
|
1526 (face (nth 1 param)) |
01da583dbe56
(face-set-after-frame-default): Let face attributes
Gerd Moellmann <gerd@gnu.org>
parents:
33756
diff
changeset
|
1527 (attr (nth 2 param))) |
01da583dbe56
(face-set-after-frame-default): Let face attributes
Gerd Moellmann <gerd@gnu.org>
parents:
33756
diff
changeset
|
1528 (when (and frame-param |
01da583dbe56
(face-set-after-frame-default): Let face attributes
Gerd Moellmann <gerd@gnu.org>
parents:
33756
diff
changeset
|
1529 ;; Don't override face attributes explicitly |
01da583dbe56
(face-set-after-frame-default): Let face attributes
Gerd Moellmann <gerd@gnu.org>
parents:
33756
diff
changeset
|
1530 ;; specified for new frames. |
01da583dbe56
(face-set-after-frame-default): Let face attributes
Gerd Moellmann <gerd@gnu.org>
parents:
33756
diff
changeset
|
1531 (eq (face-attribute face attr t) 'unspecified)) |
01da583dbe56
(face-set-after-frame-default): Let face attributes
Gerd Moellmann <gerd@gnu.org>
parents:
33756
diff
changeset
|
1532 (set-face-attribute face frame attr frame-param)))))) |
01da583dbe56
(face-set-after-frame-default): Let face attributes
Gerd Moellmann <gerd@gnu.org>
parents:
33756
diff
changeset
|
1533 |
25012 | 1534 |
33008
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1535 (defun tty-handle-reverse-video (frame parameters) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1536 "Handle the reverse-video frame parameter for terminal frames." |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1537 (when (cdr (or (assq 'reverse parameters) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1538 (assq 'reverse default-frame-alist))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1539 (if (null window-system) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1540 (setq inverse-video t)) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1541 (let* ((params (frame-parameters frame)) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1542 (bg (cdr (assq 'foreground-color params))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1543 (fg (cdr (assq 'background-color params)))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1544 (modify-frame-parameters frame |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1545 (list (cons 'foreground-color fg) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1546 (cons 'background-color bg))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1547 (if (equal bg (cdr (assq 'mouse-color params))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1548 (modify-frame-parameters frame |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1549 (list (cons 'mouse-color fg)))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1550 (if (equal bg (cdr (assq 'cursor-color params))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1551 (modify-frame-parameters frame |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1552 (list (cons 'cursor-color fg))))))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1553 |
25012 | 1554 |
1555 (defun tty-create-frame-with-faces (&optional parameters) | |
1556 "Create a frame from optional frame parameters PARAMETERS. | |
1557 Parameters not specified by PARAMETERS are taken from | |
1558 `default-frame-alist'. If either PARAMETERS or `default-frame-alist' | |
1559 contains a `reverse' parameter, handle that. Value is the new frame | |
1560 created." | |
1561 (let ((frame (make-terminal-frame parameters)) | |
1562 success) | |
1563 (unwind-protect | |
1564 (progn | |
33008
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
1565 (tty-handle-reverse-video frame (frame-parameters frame)) |
25012 | 1566 (frame-set-background-mode frame) |
1567 (face-set-after-frame-default frame) | |
1568 (setq success t)) | |
1569 (unless success | |
1570 (delete-frame frame))) | |
1571 frame)) | |
1572 | |
1573 | |
1574 ;; Called from C function init_display to initialize faces of the | |
1575 ;; dumped terminal frame on startup. | |
1576 | |
1577 (defun tty-set-up-initial-frame-faces () | |
1578 (let ((frame (selected-frame))) | |
1579 (frame-set-background-mode frame) | |
1580 (face-set-after-frame-default frame))) | |
1581 | |
1582 | |
1583 | |
1584 | |
1585 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1586 ;;; Compatiblity with 20.2 | |
1587 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1588 | |
1589 ;; Update a frame's faces when we change its default font. | |
1590 | |
29769
18a16ab69699
(frame-background-mode): Use set-default, not set, in setter.
Dave Love <fx@gnu.org>
parents:
29354
diff
changeset
|
1591 (defalias 'frame-update-faces 'ignore) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
1592 (make-obsolete 'frame-update-faces "No longer necessary" "21.1") |
25012 | 1593 |
1594 ;; Update the colors of FACE, after FRAME's own colors have been | |
1595 ;; changed. | |
1596 | |
29769
18a16ab69699
(frame-background-mode): Use set-default, not set, in setter.
Dave Love <fx@gnu.org>
parents:
29354
diff
changeset
|
1597 (defalias 'frame-update-face-colors 'frame-set-background-mode) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
1598 (make-obsolete 'frame-update-face-colors 'frame-set-background-mode "21.1") |
25012 | 1599 |
1600 | |
1601 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1602 ;;; Standard faces. | |
1603 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1604 | |
1605 (defgroup basic-faces nil | |
1606 "The standard faces of Emacs." | |
1607 :group 'faces) | |
1608 | |
1609 | |
1610 (defface default | |
1611 '((t nil)) | |
1612 "Basic default face." | |
1613 :group 'basic-faces) | |
1614 | |
1615 | |
25650
8b06b47a1fea
(mode-line): Replaces `modeline'.
Gerd Moellmann <gerd@gnu.org>
parents:
25616
diff
changeset
|
1616 (defface mode-line |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32734
diff
changeset
|
1617 '((((type x w32 mac) (class color)) |
36035
ed26bdb38c1f
(mode-line): Set :line-width property to -1.
Kenichi Handa <handa@m17n.org>
parents:
36009
diff
changeset
|
1618 (:box (:line-width -1 :style released-button) |
29880
3f21e1b9cc2e
(tool-bar, mode-line, header-line): Specify foreground
Gerd Moellmann <gerd@gnu.org>
parents:
29769
diff
changeset
|
1619 :background "grey75" :foreground "black")) |
25012 | 1620 (t |
1621 (:inverse-video t))) | |
1622 "Basic mode line face." | |
25687
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
1623 :version "21.1" |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1624 :group 'modeline |
25012 | 1625 :group 'basic-faces) |
1626 | |
25650
8b06b47a1fea
(mode-line): Replaces `modeline'.
Gerd Moellmann <gerd@gnu.org>
parents:
25616
diff
changeset
|
1627 ;; Make `modeline' an alias for `mode-line', for compatibility. |
8b06b47a1fea
(mode-line): Replaces `modeline'.
Gerd Moellmann <gerd@gnu.org>
parents:
25616
diff
changeset
|
1628 (put 'modeline 'face-alias 'mode-line) |
25012 | 1629 |
25545
b0a117037bde
(header-line): Renamed from `top-line'.
Gerd Moellmann <gerd@gnu.org>
parents:
25542
diff
changeset
|
1630 (defface header-line |
31662
08829d842312
(header-line): Change defaults to be less confusing when mixed with mode-lines.
Miles Bader <miles@gnu.org>
parents:
31528
diff
changeset
|
1631 '((((type tty)) |
32404
d355f52b4497
(header-line): Change tty-variant to use underlining.
Miles Bader <miles@gnu.org>
parents:
32378
diff
changeset
|
1632 ;; This used to be `:inverse-video t', but that doesn't look very |
d355f52b4497
(header-line): Change tty-variant to use underlining.
Miles Bader <miles@gnu.org>
parents:
32378
diff
changeset
|
1633 ;; good when combined with inverse-video mode-lines and multiple |
d355f52b4497
(header-line): Change tty-variant to use underlining.
Miles Bader <miles@gnu.org>
parents:
32378
diff
changeset
|
1634 ;; windows. Underlining looks better, and is more consistent with |
d355f52b4497
(header-line): Change tty-variant to use underlining.
Miles Bader <miles@gnu.org>
parents:
32378
diff
changeset
|
1635 ;; the window-system face variants, which deemphasize the |
d355f52b4497
(header-line): Change tty-variant to use underlining.
Miles Bader <miles@gnu.org>
parents:
32378
diff
changeset
|
1636 ;; header-line in relation to the mode-line face. If a terminal |
d355f52b4497
(header-line): Change tty-variant to use underlining.
Miles Bader <miles@gnu.org>
parents:
32378
diff
changeset
|
1637 ;; can't underline, then the header-line will end up without any |
d355f52b4497
(header-line): Change tty-variant to use underlining.
Miles Bader <miles@gnu.org>
parents:
32378
diff
changeset
|
1638 ;; highlighting; this may be too confusing in general, although it |
d355f52b4497
(header-line): Change tty-variant to use underlining.
Miles Bader <miles@gnu.org>
parents:
32378
diff
changeset
|
1639 ;; happens to look good with the only current use of header-lines, |
d355f52b4497
(header-line): Change tty-variant to use underlining.
Miles Bader <miles@gnu.org>
parents:
32378
diff
changeset
|
1640 ;; the info browser. XXX |
33465
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1641 :underline t) |
32756
ccfb1ed059ca
(header-line): Make more reasonable on mono/grayscale displays.
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
1642 (((class color grayscale) (background light)) |
33465
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1643 :inherit mode-line |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1644 :background "grey90" :foreground "grey20" |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1645 :box nil) |
32756
ccfb1ed059ca
(header-line): Make more reasonable on mono/grayscale displays.
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
1646 (((class color grayscale) (background dark)) |
33465
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1647 :inherit mode-line |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1648 :background "grey20" :foreground "grey90" |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1649 :box nil) |
32756
ccfb1ed059ca
(header-line): Make more reasonable on mono/grayscale displays.
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
1650 (((class mono) (background light)) |
33465
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1651 :inherit mode-line |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1652 :background "white" :foreground "black" |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1653 :inverse-video nil |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1654 :box nil |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1655 :underline t) |
32756
ccfb1ed059ca
(header-line): Make more reasonable on mono/grayscale displays.
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
1656 (((class mono) (background dark)) |
33465
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1657 :inherit mode-line |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1658 :background "black" :foreground "white" |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1659 :inverse-video nil |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1660 :box nil |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1661 :underline t) |
25012 | 1662 (t |
33465
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
1663 :inverse-video t)) |
25545
b0a117037bde
(header-line): Renamed from `top-line'.
Gerd Moellmann <gerd@gnu.org>
parents:
25542
diff
changeset
|
1664 "Basic header-line face." |
25687
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
1665 :version "21.1" |
25012 | 1666 :group 'basic-faces) |
1667 | |
1668 | |
25542
047532b73119
(tool-bar): Change face `toolbar' to `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25494
diff
changeset
|
1669 (defface tool-bar |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32734
diff
changeset
|
1670 '((((type x w32 mac) (class color)) |
29880
3f21e1b9cc2e
(tool-bar, mode-line, header-line): Specify foreground
Gerd Moellmann <gerd@gnu.org>
parents:
29769
diff
changeset
|
1671 (:box (:line-width 1 :style released-button) |
3f21e1b9cc2e
(tool-bar, mode-line, header-line): Specify foreground
Gerd Moellmann <gerd@gnu.org>
parents:
29769
diff
changeset
|
1672 :background "grey75" :foreground "black")) |
25090
4cd409210c7f
(toolbar): Add face definition for mono displays.
Gerd Moellmann <gerd@gnu.org>
parents:
25070
diff
changeset
|
1673 (((type x) (class mono)) |
29880
3f21e1b9cc2e
(tool-bar, mode-line, header-line): Specify foreground
Gerd Moellmann <gerd@gnu.org>
parents:
29769
diff
changeset
|
1674 (:box (:line-width 1 :style released-button) |
3f21e1b9cc2e
(tool-bar, mode-line, header-line): Specify foreground
Gerd Moellmann <gerd@gnu.org>
parents:
29769
diff
changeset
|
1675 :background "grey" :foreground "black")) |
25012 | 1676 (t |
1677 ())) | |
25542
047532b73119
(tool-bar): Change face `toolbar' to `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25494
diff
changeset
|
1678 "Basic tool-bar face." |
25687
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
1679 :version "21.1" |
25012 | 1680 :group 'basic-faces) |
1681 | |
1682 | |
1683 (defface region | |
1684 '((((type tty) (class color)) | |
1685 (:background "blue" :foreground "white")) | |
1686 (((type tty) (class mono)) | |
1687 (:inverse-video t)) | |
1688 (((class color) (background dark)) | |
32378
df733fbcda8a
(region): Make dark-background `region' face less in-your-face.
Miles Bader <miles@gnu.org>
parents:
32376
diff
changeset
|
1689 (:background "blue3")) |
25012 | 1690 (((class color) (background light)) |
29976
293c4c4ee387
(region): Change background color for light background.
Gerd Moellmann <gerd@gnu.org>
parents:
29943
diff
changeset
|
1691 (:background "light goldenrod yellow")) |
25012 | 1692 (t (:background "gray"))) |
25947 | 1693 "Basic face for highlighting the region." |
31528
a461cad7a942
(face-x-resources): Make custom type more specific.
Dave Love <fx@gnu.org>
parents:
31500
diff
changeset
|
1694 :version "21.1" |
25012 | 1695 :group 'basic-faces) |
1696 | |
1697 | |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1698 (defface fringe |
29943
b8314fd10792
(fringe): Change face for different backgrounds.
Gerd Moellmann <gerd@gnu.org>
parents:
29880
diff
changeset
|
1699 '((((class color) (background light)) |
b8314fd10792
(fringe): Change face for different backgrounds.
Gerd Moellmann <gerd@gnu.org>
parents:
29880
diff
changeset
|
1700 (:background "grey95")) |
b8314fd10792
(fringe): Change face for different backgrounds.
Gerd Moellmann <gerd@gnu.org>
parents:
29880
diff
changeset
|
1701 (((class color) (background dark)) |
b8314fd10792
(fringe): Change face for different backgrounds.
Gerd Moellmann <gerd@gnu.org>
parents:
29880
diff
changeset
|
1702 (:background "grey10")) |
b8314fd10792
(fringe): Change face for different backgrounds.
Gerd Moellmann <gerd@gnu.org>
parents:
29880
diff
changeset
|
1703 (t |
b8314fd10792
(fringe): Change face for different backgrounds.
Gerd Moellmann <gerd@gnu.org>
parents:
29880
diff
changeset
|
1704 (:background "gray"))) |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1705 "Basic face for the fringes to the left and right of windows under X." |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1706 :version "21.1" |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1707 :group 'frames |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1708 :group 'basic-faces) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1709 |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1710 |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1711 (defface scroll-bar '() |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1712 "Basic face for the scroll bar colors under X." |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1713 :version "21.1" |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1714 :group 'frames |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1715 :group 'basic-faces) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1716 |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1717 |
25887
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1718 (defface menu |
33756
b7c2175f13ac
(menu): Make inverse-video on ttys too.
Miles Bader <miles@gnu.org>
parents:
33507
diff
changeset
|
1719 '((((type tty)) |
b7c2175f13ac
(menu): Make inverse-video on ttys too.
Miles Bader <miles@gnu.org>
parents:
33507
diff
changeset
|
1720 :inverse-video t) |
b7c2175f13ac
(menu): Make inverse-video on ttys too.
Miles Bader <miles@gnu.org>
parents:
33507
diff
changeset
|
1721 (((type x-toolkit)) |
b7c2175f13ac
(menu): Make inverse-video on ttys too.
Miles Bader <miles@gnu.org>
parents:
33507
diff
changeset
|
1722 ) |
b7c2175f13ac
(menu): Make inverse-video on ttys too.
Miles Bader <miles@gnu.org>
parents:
33507
diff
changeset
|
1723 (t |
b7c2175f13ac
(menu): Make inverse-video on ttys too.
Miles Bader <miles@gnu.org>
parents:
33507
diff
changeset
|
1724 :inverse-video t)) |
25887
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1725 "Basic menu face." |
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1726 :version "21.1" |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1727 :group 'menu |
25887
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1728 :group 'basic-faces) |
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1729 |
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1730 |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1731 (defface border '() |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1732 "Basic face for the frame border under X." |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1733 :version "21.1" |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1734 :group 'frames |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1735 :group 'basic-faces) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1736 |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1737 |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1738 (defface cursor '() |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1739 "Basic face for the cursor color under X." |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1740 :version "21.1" |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1741 :group 'cursor |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1742 :group 'basic-faces) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1743 |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1744 |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1745 (defface mouse '() |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
1746 "Basic face for the mouse color under X." |
25137 | 1747 :version "21.1" |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1748 :group 'mouse |
25012 | 1749 :group 'basic-faces) |
1750 | |
1751 | |
1752 (defface bold '((t (:weight bold))) | |
1753 "Basic bold face." | |
1754 :group 'basic-faces) | |
1755 | |
1756 | |
1757 (defface italic '((t (:slant italic))) | |
1758 "Basic italic font." | |
1759 :group 'basic-faces) | |
1760 | |
1761 | |
1762 (defface bold-italic '((t (:weight bold :slant italic))) | |
1763 "Basic bold-italic face." | |
1764 :group 'basic-faces) | |
1765 | |
1766 | |
1767 (defface underline '((t (:underline t))) | |
1768 "Basic underlined face." | |
1769 :group 'basic-faces) | |
1770 | |
1771 | |
1772 (defface highlight | |
1773 '((((type tty) (class color)) | |
1774 (:background "green")) | |
1775 (((class color) (background light)) | |
1776 (:background "darkseagreen2")) | |
1777 (((class color) (background dark)) | |
1778 (:background "darkolivegreen")) | |
1779 (t (:inverse-video t))) | |
25687
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
1780 "Basic face for highlighting." |
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
1781 :group 'basic-faces) |
25012 | 1782 |
1783 | |
1784 (defface secondary-selection | |
1785 '((((type tty) (class color)) | |
32264
af7fbf03c35c
(secondary-selection): Make foreground visible on tty.
Miles Bader <miles@gnu.org>
parents:
31756
diff
changeset
|
1786 (:background "cyan" :foreground "black")) |
25012 | 1787 (((class color) (background light)) |
26353
f9c908630f61
(secondary-selection): Fix wrong color name.
Gerd Moellmann <gerd@gnu.org>
parents:
26343
diff
changeset
|
1788 (:background "yellow")) |
25012 | 1789 (((class color) (background dark)) |
31681
f89c2fe5fb38
(secondary-selection): Make dark-background variant sane.
Miles Bader <miles@gnu.org>
parents:
31667
diff
changeset
|
1790 (:background "SkyBlue4")) |
25012 | 1791 (t (:inverse-video t))) |
25687
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
1792 "Basic face for displaying the secondary selection." |
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
1793 :group 'basic-faces) |
25012 | 1794 |
1795 | |
27888
3e1c17057b79
(face-font-family-alternatives): Add arial to helv.
Jason Rumney <jasonr@gnu.org>
parents:
27831
diff
changeset
|
1796 (defface fixed-pitch '((t (:family "courier"))) |
25012 | 1797 "The basic fixed-pitch face." |
1798 :group 'basic-faces) | |
1799 | |
1800 | |
27888
3e1c17057b79
(face-font-family-alternatives): Add arial to helv.
Jason Rumney <jasonr@gnu.org>
parents:
27831
diff
changeset
|
1801 (defface variable-pitch '((t (:family "helv"))) |
25012 | 1802 "The basic variable-pitch face." |
1803 :group 'basic-faces) | |
1804 | |
1805 | |
1806 (defface trailing-whitespace | |
1807 '((((class color) (background light)) | |
1808 (:background "red")) | |
1809 (((class color) (background dark)) | |
1810 (:background "red")) | |
1811 (t (:inverse-video t))) | |
25687
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
1812 "Basic face for highlighting trailing whitespace." |
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
1813 :version "21.1" |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1814 :group 'font-lock ; like `show-trailing-whitespace' |
25687
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
1815 :group 'basic-faces) |
25012 | 1816 |
1817 | |
1818 | |
1819 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1820 ;;; Manipulating font names. | |
1821 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1822 | |
1823 ;; This is here for compatibilty with Emacs 20.2. For example, | |
28907 | 1824 ;; international/fontset.el uses x-resolve-font-name. The following |
1825 ;; functions are not used in the face implementation itself. | |
2456 | 1826 |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16590
diff
changeset
|
1827 (defvar x-font-regexp nil) |
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16590
diff
changeset
|
1828 (defvar x-font-regexp-head nil) |
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16590
diff
changeset
|
1829 (defvar x-font-regexp-weight nil) |
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16590
diff
changeset
|
1830 (defvar x-font-regexp-slant nil) |
2456 | 1831 |
12668
7660e82d0346
(x-font-regexp-weight-subnum, x-font-regexp-slant-subnum)
Karl Heuer <kwzh@gnu.org>
parents:
12651
diff
changeset
|
1832 (defconst x-font-regexp-weight-subnum 1) |
7660e82d0346
(x-font-regexp-weight-subnum, x-font-regexp-slant-subnum)
Karl Heuer <kwzh@gnu.org>
parents:
12651
diff
changeset
|
1833 (defconst x-font-regexp-slant-subnum 2) |
7660e82d0346
(x-font-regexp-weight-subnum, x-font-regexp-slant-subnum)
Karl Heuer <kwzh@gnu.org>
parents:
12651
diff
changeset
|
1834 (defconst x-font-regexp-swidth-subnum 3) |
7660e82d0346
(x-font-regexp-weight-subnum, x-font-regexp-slant-subnum)
Karl Heuer <kwzh@gnu.org>
parents:
12651
diff
changeset
|
1835 (defconst x-font-regexp-adstyle-subnum 4) |
7660e82d0346
(x-font-regexp-weight-subnum, x-font-regexp-slant-subnum)
Karl Heuer <kwzh@gnu.org>
parents:
12651
diff
changeset
|
1836 |
2456 | 1837 ;;; Regexps matching font names in "Host Portable Character Representation." |
1838 ;;; | |
1839 (let ((- "[-?]") | |
1840 (foundry "[^-]+") | |
1841 (family "[^-]+") | |
1842 (weight "\\(bold\\|demibold\\|medium\\)") ; 1 | |
1843 ; (weight\? "\\(\\*\\|bold\\|demibold\\|medium\\|\\)") ; 1 | |
1844 (weight\? "\\([^-]*\\)") ; 1 | |
1845 (slant "\\([ior]\\)") ; 2 | |
1846 ; (slant\? "\\([ior?*]?\\)") ; 2 | |
1847 (slant\? "\\([^-]?\\)") ; 2 | |
1848 ; (swidth "\\(\\*\\|normal\\|semicondensed\\|\\)") ; 3 | |
1849 (swidth "\\([^-]*\\)") ; 3 | |
1850 ; (adstyle "\\(\\*\\|sans\\|\\)") ; 4 | |
12690
e2d3fa52d100
(x-font-regexp): Add \\(\\) for substring extraction.
Karl Heuer <kwzh@gnu.org>
parents:
12668
diff
changeset
|
1851 (adstyle "\\([^-]*\\)") ; 4 |
2456 | 1852 (pixelsize "[0-9]+") |
1853 (pointsize "[0-9][0-9]+") | |
1854 (resx "[0-9][0-9]+") | |
1855 (resy "[0-9][0-9]+") | |
1856 (spacing "[cmp?*]") | |
1857 (avgwidth "[0-9]+") | |
1858 (registry "[^-]+") | |
1859 (encoding "[^-]+") | |
1860 ) | |
1861 (setq x-font-regexp | |
1862 (concat "\\`\\*?[-?*]" | |
1863 foundry - family - weight\? - slant\? - swidth - adstyle - | |
12475
eb436b0c4ab3
(x-font-regexp): Include the avgwidth.
Richard M. Stallman <rms@gnu.org>
parents:
12460
diff
changeset
|
1864 pixelsize - pointsize - resx - resy - spacing - avgwidth - |
eb436b0c4ab3
(x-font-regexp): Include the avgwidth.
Richard M. Stallman <rms@gnu.org>
parents:
12460
diff
changeset
|
1865 registry - encoding "\\*?\\'" |
2456 | 1866 )) |
1867 (setq x-font-regexp-head | |
1868 (concat "\\`[-?*]" foundry - family - weight\? - slant\? | |
1869 "\\([-*?]\\|\\'\\)")) | |
1870 (setq x-font-regexp-slant (concat - slant -)) | |
1871 (setq x-font-regexp-weight (concat - weight -)) | |
28840 | 1872 nil) |
2456 | 1873 |
25012 | 1874 |
3071
68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
Jim Blandy <jimb@redhat.com>
parents:
3049
diff
changeset
|
1875 (defun x-resolve-font-name (pattern &optional face frame) |
68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
Jim Blandy <jimb@redhat.com>
parents:
3049
diff
changeset
|
1876 "Return a font name matching PATTERN. |
28849
76e727bc0dfd
Fix make-obsolete for internal-get-face.
Dave Love <fx@gnu.org>
parents:
28840
diff
changeset
|
1877 All wildcards in PATTERN are instantiated. |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
1878 If PATTERN is nil, return the name of the frame's base font, which never |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
1879 contains wildcards. |
10170
5fc240a3e4a0
(face-initialize): Test for framep not t or nil.
Richard M. Stallman <rms@gnu.org>
parents:
10107
diff
changeset
|
1880 Given optional arguments FACE and FRAME, return a font which is |
5fc240a3e4a0
(face-initialize): Test for framep not t or nil.
Richard M. Stallman <rms@gnu.org>
parents:
10107
diff
changeset
|
1881 also the same size as FACE on FRAME, or fail." |
3233
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
1882 (or (symbolp face) |
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
1883 (setq face (face-name face))) |
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
1884 (and (eq frame t) |
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
1885 (setq frame nil)) |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
1886 (if pattern |
5092
36508a7c0a3f
(x-resolve-font-name): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5081
diff
changeset
|
1887 ;; Note that x-list-fonts has code to handle a face with nil as its font. |
16002
c8cbde1d3f11
(internal-set-face-1): When calling x-list-fonts, ask for just one match.
Richard M. Stallman <rms@gnu.org>
parents:
15884
diff
changeset
|
1888 (let ((fonts (x-list-fonts pattern face frame 1))) |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
1889 (or fonts |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
1890 (if face |
10584 | 1891 (if (string-match "\\*" pattern) |
1892 (if (null (face-font face)) | |
1893 (error "No matching fonts are the same height as the frame default font") | |
1894 (error "No matching fonts are the same height as face `%s'" face)) | |
1895 (if (null (face-font face)) | |
1896 (error "Height of font `%s' doesn't match the frame default font" | |
1897 pattern) | |
1898 (error "Height of font `%s' doesn't match face `%s'" | |
1899 pattern face))) | |
3353
8cbd38886eef
(x-resolve-font-name): Clean up error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3298
diff
changeset
|
1900 (error "No fonts match `%s'" pattern))) |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
1901 (car fonts)) |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
1902 (cdr (assq 'font (frame-parameters (selected-frame)))))) |
3071
68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
Jim Blandy <jimb@redhat.com>
parents:
3049
diff
changeset
|
1903 |
25012 | 1904 |
2456 | 1905 (defun x-frob-font-weight (font which) |
13704
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1906 (let ((case-fold-search t)) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1907 (cond ((string-match x-font-regexp font) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1908 (concat (substring font 0 |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1909 (match-beginning x-font-regexp-weight-subnum)) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1910 which |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1911 (substring font (match-end x-font-regexp-weight-subnum) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1912 (match-beginning x-font-regexp-adstyle-subnum)) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1913 ;; Replace the ADD_STYLE_NAME field with * |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1914 ;; because the info in it may not be the same |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1915 ;; for related fonts. |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1916 "*" |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1917 (substring font (match-end x-font-regexp-adstyle-subnum)))) |
14880
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
1918 ((string-match x-font-regexp-head font) |
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
1919 (concat (substring font 0 (match-beginning 1)) which |
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
1920 (substring font (match-end 1)))) |
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
1921 ((string-match x-font-regexp-weight font) |
13704
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1922 (concat (substring font 0 (match-beginning 1)) which |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1923 (substring font (match-end 1))))))) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
1924 (make-obsolete 'x-frob-font-weight 'make-face-... "21.1") |
25012 | 1925 |
2456 | 1926 (defun x-frob-font-slant (font which) |
13704
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1927 (let ((case-fold-search t)) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1928 (cond ((string-match x-font-regexp font) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1929 (concat (substring font 0 |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1930 (match-beginning x-font-regexp-slant-subnum)) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1931 which |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1932 (substring font (match-end x-font-regexp-slant-subnum) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1933 (match-beginning x-font-regexp-adstyle-subnum)) |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1934 ;; Replace the ADD_STYLE_NAME field with * |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1935 ;; because the info in it may not be the same |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1936 ;; for related fonts. |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1937 "*" |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1938 (substring font (match-end x-font-regexp-adstyle-subnum)))) |
14880
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
1939 ((string-match x-font-regexp-head font) |
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
1940 (concat (substring font 0 (match-beginning 2)) which |
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
1941 (substring font (match-end 2)))) |
b405f39b5493
(x-frob-font-slant): Properly handle a match against
Richard M. Stallman <rms@gnu.org>
parents:
14409
diff
changeset
|
1942 ((string-match x-font-regexp-slant font) |
13704
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1943 (concat (substring font 0 (match-beginning 1)) which |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
1944 (substring font (match-end 1))))))) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
1945 (make-obsolete 'x-frob-font-slant 'make-face-... "21.1") |
25012 | 1946 |
2456 | 1947 (defun x-make-font-bold (font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1948 "Given an X font specification, make a bold version of it. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1949 If that can't be done, return nil." |
2456 | 1950 (x-frob-font-weight font "bold")) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
1951 (make-obsolete 'x-make-font-bold 'make-face-bold "21.1") |
25012 | 1952 |
2456 | 1953 (defun x-make-font-demibold (font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1954 "Given an X font specification, make a demibold version of it. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1955 If that can't be done, return nil." |
2456 | 1956 (x-frob-font-weight font "demibold")) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
1957 (make-obsolete 'x-make-font-demibold 'make-face-bold "21.1") |
25012 | 1958 |
2456 | 1959 (defun x-make-font-unbold (font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1960 "Given an X font specification, make a non-bold version of it. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1961 If that can't be done, return nil." |
2456 | 1962 (x-frob-font-weight font "medium")) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
1963 (make-obsolete 'x-make-font-unbold 'make-face-unbold "21.1") |
25012 | 1964 |
2456 | 1965 (defun x-make-font-italic (font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1966 "Given an X font specification, make an italic version of it. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1967 If that can't be done, return nil." |
2456 | 1968 (x-frob-font-slant font "i")) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
1969 (make-obsolete 'x-make-font-italic 'make-face-italic "21.1") |
25012 | 1970 |
2456 | 1971 (defun x-make-font-oblique (font) ; you say tomayto... |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1972 "Given an X font specification, make an oblique version of it. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1973 If that can't be done, return nil." |
2456 | 1974 (x-frob-font-slant font "o")) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
1975 (make-obsolete 'x-make-font-oblique 'make-face-italic "21.1") |
25012 | 1976 |
2456 | 1977 (defun x-make-font-unitalic (font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1978 "Given an X font specification, make a non-italic version of it. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
1979 If that can't be done, return nil." |
2456 | 1980 (x-frob-font-slant font "r")) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
1981 (make-obsolete 'x-make-font-unitalic 'make-face-unitalic "21.1") |
25012 | 1982 |
17752
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
1983 (defun x-make-font-bold-italic (font) |
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
1984 "Given an X font specification, make a bold and italic version of it. |
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
1985 If that can't be done, return nil." |
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
1986 (and (setq font (x-make-font-bold font)) |
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
1987 (x-make-font-italic font))) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
1988 (make-obsolete 'x-make-font-bold-italic 'make-face-bold-italic "21.1") |
2456 | 1989 |
2715
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
1990 (provide 'faces) |
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
1991 |
28840 | 1992 ;;; faces.el ends here |