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