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