Mercurial > emacs
annotate lisp/faces.el @ 95809:1d1f23bbdc81
(fortran-end-of-subprogram): Check for a match before trying to move there.
(fortran-calculate-indent): When fortran-check-all-num-for-matching-do
is non-nil, indent most terminating statements like loop body.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Wed, 11 Jun 2008 02:56:03 +0000 |
parents | 09e6bd8a641a |
children | b4e36ff621b3 |
rev | line source |
---|---|
25012 | 1 ;;; faces.el --- Lisp faces |
2456 | 2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64724
diff
changeset
|
3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
79721 | 4 ;; 2002, 2003, 2004, 2005, 2006, 2007, 2008 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 |
45078 | 7 ;; Keywords: internal |
38697
a19197c6442f
Keyword added and FSF specified as Maintainer.
Pavel Janík <Pavel@Janik.cz>
parents:
38233
diff
changeset
|
8 |
2456 | 9 ;; This file is part of GNU Emacs. |
10 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94054
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
2456 | 12 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94054
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94054
diff
changeset
|
14 ;; (at your option) any later version. |
2456 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94054
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
2456 | 23 |
24 ;;; Commentary: | |
25 | |
26 ;;; Code: | |
27 | |
10107
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
28 (eval-when-compile |
92948
73a01bf5cb80
* faces.el (xw-defined-colors):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92717
diff
changeset
|
29 (require 'cl)) |
73a01bf5cb80
* faces.el (xw-defined-colors):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92717
diff
changeset
|
30 |
73a01bf5cb80
* faces.el (xw-defined-colors):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92717
diff
changeset
|
31 (declare-function xw-defined-colors "term/x-win" (&optional frame)) |
2456 | 32 |
65289
f6a81af3abe8
(help-xref-stack-item): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
65084
diff
changeset
|
33 (defvar help-xref-stack-item) |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
34 |
25012 | 35 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
36 ;;; Font selection. | |
37 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2456 | 38 |
25012 | 39 (defgroup font-selection nil |
40 "Influencing face font selection." | |
41 :group 'faces) | |
2456 | 42 |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
43 |
25012 | 44 (defcustom face-font-selection-order |
45 '(:width :height :weight :slant) | |
46 "*A list specifying how face font selection chooses fonts. | |
47 Each of the four symbols `:width', `:height', `:weight', and `:slant' | |
48 must appear once in the list, and the list must not contain any other | |
79031
7a1822d578cf
(face-font-selection-order): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
79026
diff
changeset
|
49 elements. Font selection first tries to find a best matching font |
79026
ebc0c510ff84
(face-font-selection-order): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
78374
diff
changeset
|
50 for those face attributes that appear before in the list. For |
25012 | 51 example, if `:slant' appears before `:height', font selection first |
52 tries to find a font with a suitable slant, even if this results in | |
53 a font height that isn't optimal." | |
48713
a91fa6973510
(face-font-selection-order)
Andreas Schwab <schwab@suse.de>
parents:
48522
diff
changeset
|
54 :tag "Font selection order" |
30306
7a694e8efd12
(face-font-selection-order)
Gerd Moellmann <gerd@gnu.org>
parents:
30188
diff
changeset
|
55 :type '(list symbol symbol symbol symbol) |
25012 | 56 :group 'font-selection |
57 :set #'(lambda (symbol value) | |
58 (set-default symbol value) | |
59 (internal-set-font-selection-order value))) | |
17522
209c61e51bd0
(frame-set-background-mode): New function.
Richard M. Stallman <rms@gnu.org>
parents:
17386
diff
changeset
|
60 |
33371
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
61 |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
62 ;; This is defined originally in xfaces.c. |
25012 | 63 (defcustom face-font-family-alternatives |
64 '(("courier" "fixed") | |
27888
3e1c17057b79
(face-font-family-alternatives): Add arial to helv.
Jason Rumney <jasonr@gnu.org>
parents:
27831
diff
changeset
|
65 ("helv" "helvetica" "arial" "fixed")) |
25012 | 66 "*Alist of alternative font family names. |
42705 | 67 Each element has the form (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...). |
25012 | 68 If fonts of family FAMILY can't be loaded, try ALTERNATIVE1, then |
69 ALTERNATIVE2 etc." | |
48713
a91fa6973510
(face-font-selection-order)
Andreas Schwab <schwab@suse.de>
parents:
48522
diff
changeset
|
70 :tag "Alternative font families to try" |
30306
7a694e8efd12
(face-font-selection-order)
Gerd Moellmann <gerd@gnu.org>
parents:
30188
diff
changeset
|
71 :type '(repeat (repeat string)) |
25012 | 72 :group 'font-selection |
73 :set #'(lambda (symbol value) | |
74 (set-default symbol value) | |
75 (internal-set-alternative-font-family-alist value))) | |
13725 | 76 |
25012 | 77 |
33371
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
78 ;; This is defined originally in xfaces.c. |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
79 (defcustom face-font-registry-alternatives |
39549
044b46ec5fff
(face-font-registry-alternatives) [windows-nt]: Make
Andrew Innes <andrewi@gnu.org>
parents:
38697
diff
changeset
|
80 (if (eq system-type 'windows-nt) |
42969
bdcf2b5f4ae2
(face-font-registry-alternatives) [windows-nt]: Add
Jason Rumney <jasonr@gnu.org>
parents:
42705
diff
changeset
|
81 '(("iso8859-1" "ms-oemlatin") |
90682
df64e21eebd0
(face-font-registry-alternatives): Add gb18030.
Kenichi Handa <handa@m17n.org>
parents:
90650
diff
changeset
|
82 ("gb2312.1980" "gb2312" "gbk" "gb18030") |
39549
044b46ec5fff
(face-font-registry-alternatives) [windows-nt]: Make
Andrew Innes <andrewi@gnu.org>
parents:
38697
diff
changeset
|
83 ("jisx0208.1990" "jisx0208.1983" "jisx0208.1978") |
044b46ec5fff
(face-font-registry-alternatives) [windows-nt]: Make
Andrew Innes <andrewi@gnu.org>
parents:
38697
diff
changeset
|
84 ("ksc5601.1989" "ksx1001.1992" "ksc5601.1987") |
044b46ec5fff
(face-font-registry-alternatives) [windows-nt]: Make
Andrew Innes <andrewi@gnu.org>
parents:
38697
diff
changeset
|
85 ("muletibetan-2" "muletibetan-0")) |
90682
df64e21eebd0
(face-font-registry-alternatives): Add gb18030.
Kenichi Handa <handa@m17n.org>
parents:
90650
diff
changeset
|
86 '(("gb2312.1980" "gb2312.80&gb8565.88" "gbk" "gb18030") |
39549
044b46ec5fff
(face-font-registry-alternatives) [windows-nt]: Make
Andrew Innes <andrewi@gnu.org>
parents:
38697
diff
changeset
|
87 ("jisx0208.1990" "jisx0208.1983" "jisx0208.1978") |
044b46ec5fff
(face-font-registry-alternatives) [windows-nt]: Make
Andrew Innes <andrewi@gnu.org>
parents:
38697
diff
changeset
|
88 ("ksc5601.1989" "ksx1001.1992" "ksc5601.1987") |
044b46ec5fff
(face-font-registry-alternatives) [windows-nt]: Make
Andrew Innes <andrewi@gnu.org>
parents:
38697
diff
changeset
|
89 ("muletibetan-2" "muletibetan-0"))) |
33371
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
90 "*Alist of alternative font registry names. |
42705 | 91 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
|
92 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
|
93 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
|
94 REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc." |
48713
a91fa6973510
(face-font-selection-order)
Andreas Schwab <schwab@suse.de>
parents:
48522
diff
changeset
|
95 :tag "Alternative font registries to try" |
33371
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
96 :type '(repeat (repeat string)) |
33419
21ac2c51ac59
(face-font-registry-alternatives): Add :version.
Dave Love <fx@gnu.org>
parents:
33371
diff
changeset
|
97 :version "21.1" |
33371
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
98 :group 'font-selection |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
99 :set #'(lambda (symbol value) |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
100 (set-default symbol value) |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
101 (internal-set-alternative-font-registry-alist value))) |
8259eb8d96c2
(face-font-registry-alternatives): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
33008
diff
changeset
|
102 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
103 |
25012 | 104 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
105 ;;; Creation, copying. | |
106 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
107 |
3925
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
108 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
109 (defun face-list () |
25012 | 110 "Return a list of all defined face names." |
111 (mapcar #'car face-new-frame-defaults)) | |
112 | |
113 | |
114 ;;; ### If not frame-local initialize by what X resources? | |
115 | |
116 (defun make-face (face &optional no-init-from-resources) | |
117 "Define a new face with name FACE, a symbol. | |
118 NO-INIT-FROM-RESOURCES non-nil means don't initialize frame-local | |
119 variants of FACE from X resources. (X resources recognized are found | |
120 in the global variable `face-x-resources'.) If FACE is already known | |
121 as a face, leave it unmodified. Value is FACE." | |
122 (interactive "SMake face: ") | |
123 (unless (facep face) | |
124 ;; Make frame-local faces (this also makes the global one). | |
125 (dolist (frame (frame-list)) | |
126 (internal-make-lisp-face face frame)) | |
127 ;; Add the face to the face menu. | |
128 (when (fboundp 'facemenu-add-new-face) | |
129 (facemenu-add-new-face face)) | |
130 ;; Define frame-local faces for all frames from X resources. | |
131 (unless no-init-from-resources | |
132 (make-face-x-resource-internal face))) | |
133 face) | |
134 | |
135 | |
136 (defun make-empty-face (face) | |
137 "Define a new, empty face with name FACE. | |
138 If the face already exists, it is left unmodified. Value is FACE." | |
139 (interactive "SMake empty face: ") | |
140 (make-face face 'no-init-from-resources)) | |
141 | |
142 | |
143 (defun copy-face (old-face new-face &optional frame new-frame) | |
144 "Define a face just like OLD-FACE, with name NEW-FACE. | |
145 | |
146 If NEW-FACE already exists as a face, it is modified to be like | |
147 OLD-FACE. If it doesn't already exist, it is created. | |
148 | |
47258
86c1fc3c48f5
(copy-face): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents:
46267
diff
changeset
|
149 If the optional argument FRAME is given as a frame, NEW-FACE is |
25012 | 150 changed on FRAME only. |
151 If FRAME is t, the frame-independent default specification for OLD-FACE | |
152 is copied to NEW-FACE. | |
153 If FRAME is nil, copying is done for the frame-independent defaults | |
154 and for each existing frame. | |
155 | |
156 If the optional fourth argument NEW-FRAME is given, | |
157 copy the information from face OLD-FACE on frame FRAME | |
79615
c70a8429c7d8
(copy-face): Create the new face explicitly if it does not exist already.
Richard M. Stallman <rms@gnu.org>
parents:
79354
diff
changeset
|
158 to NEW-FACE on frame NEW-FRAME. In this case, FRAME may not be nil." |
25012 | 159 (let ((inhibit-quit t)) |
160 (if (null frame) | |
161 (progn | |
79615
c70a8429c7d8
(copy-face): Create the new face explicitly if it does not exist already.
Richard M. Stallman <rms@gnu.org>
parents:
79354
diff
changeset
|
162 (when new-frame |
c70a8429c7d8
(copy-face): Create the new face explicitly if it does not exist already.
Richard M. Stallman <rms@gnu.org>
parents:
79354
diff
changeset
|
163 (error "Copying face %s from all frames to one frame" |
c70a8429c7d8
(copy-face): Create the new face explicitly if it does not exist already.
Richard M. Stallman <rms@gnu.org>
parents:
79354
diff
changeset
|
164 old-face)) |
c70a8429c7d8
(copy-face): Create the new face explicitly if it does not exist already.
Richard M. Stallman <rms@gnu.org>
parents:
79354
diff
changeset
|
165 (make-empty-face new-face) |
25012 | 166 (dolist (frame (frame-list)) |
167 (copy-face old-face new-face frame)) | |
168 (copy-face old-face new-face t)) | |
79615
c70a8429c7d8
(copy-face): Create the new face explicitly if it does not exist already.
Richard M. Stallman <rms@gnu.org>
parents:
79354
diff
changeset
|
169 (make-empty-face new-face) |
25012 | 170 (internal-copy-lisp-face old-face new-face frame new-frame)) |
171 new-face)) | |
172 | |
173 | |
174 | |
175 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
176 ;;; Obsolete functions | |
177 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
178 | |
179 ;; The functions in this section are defined because Lisp packages use | |
180 ;; them, despite the prefix `internal-' suggesting that they are | |
28840 | 181 ;; 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
|
182 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
183 (defun internal-find-face (name &optional frame) |
25012 | 184 "Retrieve the face named NAME. |
185 Return nil if there is no such face. | |
75579
5e69c78ab3f4
(internal-find-face, internal-get-face): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
75566
diff
changeset
|
186 If NAME is already a face, it is simply returned. |
5e69c78ab3f4
(internal-find-face, internal-get-face): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
75566
diff
changeset
|
187 The optional argument FRAME is ignored." |
25012 | 188 (facep name)) |
29354
4ed4a700358b
Update calls to make-obsolete with a WHEN argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28907
diff
changeset
|
189 (make-obsolete 'internal-find-face 'facep "21.1") |
25012 | 190 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
191 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
192 (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
|
193 "Retrieve the face named NAME; error if there is none. |
75579
5e69c78ab3f4
(internal-find-face, internal-get-face): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
75566
diff
changeset
|
194 If NAME is already a face, it is simply returned. |
5e69c78ab3f4
(internal-find-face, internal-get-face): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
75566
diff
changeset
|
195 The optional argument FRAME is ignored." |
40351
a44d4a7dd8de
(internal-get-face): Use facep instead of the obsolete
Eli Zaretskii <eliz@gnu.org>
parents:
39830
diff
changeset
|
196 (or (facep name) |
25012 | 197 (check-face name))) |
46053
ef0684c3e07b
(frame-update-faces): Fix obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
46041
diff
changeset
|
198 (make-obsolete 'internal-get-face "see `facep' and `check-face'." "21.1") |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
199 |
25012 | 200 |
201 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
202 ;;; Predicates, type checks. | |
203 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
204 | |
205 (defun facep (face) | |
79651 | 206 "Return non-nil if FACE is a face name; nil otherwise. |
207 A face name can be a string or a symbol." | |
25012 | 208 (internal-lisp-face-p face)) |
209 | |
210 | |
211 (defun check-face (face) | |
212 "Signal an error if FACE doesn't name a face. | |
213 Value is FACE." | |
214 (unless (facep face) | |
215 (error "Not a face: %s" face)) | |
216 face) | |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
217 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
218 |
25012 | 219 ;; The ID returned is not to be confused with the internally used IDs |
220 ;; of realized faces. The ID assigned to Lisp faces is used to | |
221 ;; support faces in display table entries. | |
17386
b251c8820860
(make-face): New arg no-resources.
Richard M. Stallman <rms@gnu.org>
parents:
17173
diff
changeset
|
222 |
25012 | 223 (defun face-id (face &optional frame) |
46267
cd9282aa1d8a
(face-id): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
46146
diff
changeset
|
224 "Return the internal ID of face with name FACE. |
81148
afd58ab52ea7
(face-id): If the argument is a face alias, return the ID of the target face.
Juanma Barranquero <lekktu@gmail.com>
parents:
76731
diff
changeset
|
225 If FACE is a face-alias, return the ID of the target face. |
60495 | 226 The optional argument FRAME is ignored, since the internal face ID |
227 of a face name is the same for all frames." | |
25012 | 228 (check-face face) |
81148
afd58ab52ea7
(face-id): If the argument is a face alias, return the ID of the target face.
Juanma Barranquero <lekktu@gmail.com>
parents:
76731
diff
changeset
|
229 (or (get face 'face) |
afd58ab52ea7
(face-id): If the argument is a face alias, return the ID of the target face.
Juanma Barranquero <lekktu@gmail.com>
parents:
76731
diff
changeset
|
230 (face-id (get face 'face-alias)))) |
2456 | 231 |
232 (defun face-equal (face1 face2 &optional frame) | |
25012 | 233 "Non-nil if faces FACE1 and FACE2 are equal. |
234 Faces are considered equal if all their attributes are equal. | |
62968
88922a349851
(face-equal): Improve argument/docstring consistency.
Juanma Barranquero <lekktu@gmail.com>
parents:
62947
diff
changeset
|
235 If the optional argument FRAME is given, report on FACE1 and FACE2 in that frame. |
88922a349851
(face-equal): Improve argument/docstring consistency.
Juanma Barranquero <lekktu@gmail.com>
parents:
62947
diff
changeset
|
236 If FRAME is t, report on the defaults for FACE1 and FACE2 (for new frames). |
25012 | 237 If FRAME is omitted or nil, use the selected frame." |
238 (internal-lisp-face-equal-p face1 face2 frame)) | |
239 | |
2456 | 240 |
241 (defun face-differs-from-default-p (face &optional frame) | |
55899
4592654cd2e9
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-369
Miles Bader <miles@gnu.org>
parents:
55898
diff
changeset
|
242 "Return non-nil if FACE displays differently from the default face. |
25012 | 243 If the optional argument FRAME is given, report on face FACE in that frame. |
244 If FRAME is t, report on the defaults for face FACE (for new frames). | |
55899
4592654cd2e9
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-369
Miles Bader <miles@gnu.org>
parents:
55898
diff
changeset
|
245 If FRAME is omitted or nil, use the selected frame." |
55902
084530cb1b2f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Miles Bader <miles@gnu.org>
parents:
55901
diff
changeset
|
246 (let ((attrs |
87494
26eb0118cbc6
(face-all-attributes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87483
diff
changeset
|
247 (delq :inherit (mapcar 'car face-attribute-name-alist))) |
55902
084530cb1b2f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Miles Bader <miles@gnu.org>
parents:
55901
diff
changeset
|
248 (differs nil)) |
084530cb1b2f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Miles Bader <miles@gnu.org>
parents:
55901
diff
changeset
|
249 (while (and attrs (not differs)) |
084530cb1b2f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Miles Bader <miles@gnu.org>
parents:
55901
diff
changeset
|
250 (let* ((attr (pop attrs)) |
084530cb1b2f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Miles Bader <miles@gnu.org>
parents:
55901
diff
changeset
|
251 (attr-val (face-attribute face attr frame t))) |
084530cb1b2f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Miles Bader <miles@gnu.org>
parents:
55901
diff
changeset
|
252 (when (and |
084530cb1b2f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Miles Bader <miles@gnu.org>
parents:
55901
diff
changeset
|
253 (not (eq attr-val 'unspecified)) |
084530cb1b2f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Miles Bader <miles@gnu.org>
parents:
55901
diff
changeset
|
254 (display-supports-face-attributes-p (list attr attr-val) |
084530cb1b2f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Miles Bader <miles@gnu.org>
parents:
55901
diff
changeset
|
255 frame)) |
084530cb1b2f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Miles Bader <miles@gnu.org>
parents:
55901
diff
changeset
|
256 (setq differs attr)))) |
084530cb1b2f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Miles Bader <miles@gnu.org>
parents:
55901
diff
changeset
|
257 differs)) |
10379
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
258 |
2456 | 259 |
10379
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
260 (defun face-nontrivial-p (face &optional frame) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
261 "True if face FACE has some non-nil attribute. |
25012 | 262 If the optional argument FRAME is given, report on face FACE in that frame. |
263 If FRAME is t, report on the defaults for face FACE (for new frames). | |
264 If FRAME is omitted or nil, use the selected frame." | |
265 (not (internal-lisp-face-empty-p face frame))) | |
266 | |
267 | |
268 | |
269 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
270 ;;; Setting face attributes from X resources. | |
271 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
272 | |
273 (defcustom face-x-resources | |
274 '((:family (".attributeFamily" . "Face.AttributeFamily")) | |
275 (:width (".attributeWidth" . "Face.AttributeWidth")) | |
276 (:height (".attributeHeight" . "Face.AttributeHeight")) | |
277 (:weight (".attributeWeight" . "Face.AttributeWeight")) | |
278 (:slant (".attributeSlant" . "Face.AttributeSlant")) | |
279 (:foreground (".attributeForeground" . "Face.AttributeForeground")) | |
280 (:background (".attributeBackground" . "Face.AttributeBackground")) | |
281 (:overline (".attributeOverline" . "Face.AttributeOverline")) | |
282 (:strike-through (".attributeStrikeThrough" . "Face.AttributeStrikeThrough")) | |
283 (:box (".attributeBox" . "Face.AttributeBox")) | |
284 (:underline (".attributeUnderline" . "Face.AttributeUnderline")) | |
285 (:inverse-video (".attributeInverse" . "Face.AttributeInverse")) | |
286 (:stipple | |
287 (".attributeStipple" . "Face.AttributeStipple") | |
288 (".attributeBackgroundPixmap" . "Face.AttributeBackgroundPixmap")) | |
289 (:bold (".attributeBold" . "Face.AttributeBold")) | |
290 (:italic (".attributeItalic" . "Face.AttributeItalic")) | |
31193
a15c5cb8ec71
(face-x-resources): Add entry for :inherit.
Miles Bader <miles@gnu.org>
parents:
31190
diff
changeset
|
291 (:font (".attributeFont" . "Face.AttributeFont")) |
a15c5cb8ec71
(face-x-resources): Add entry for :inherit.
Miles Bader <miles@gnu.org>
parents:
31190
diff
changeset
|
292 (:inherit (".attributeInherit" . "Face.AttributeInherit"))) |
25012 | 293 "*List of X resources and classes for face attributes. |
294 Each element has the form (ATTRIBUTE ENTRY1 ENTRY2...) where ATTRIBUTE is | |
295 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
|
296 \(RESOURCE . CLASS) with RESOURCE being the resource and CLASS being the |
25012 | 297 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
|
298 :type '(repeat (cons symbol (repeat (cons string string)))) |
25012 | 299 :group 'faces) |
300 | |
301 | |
302 (defun set-face-attribute-from-resource (face attribute resource class frame) | |
303 "Set FACE's ATTRIBUTE from X resource RESOURCE, class CLASS on FRAME. | |
304 Value is the attribute value specified by the resource, or nil | |
305 if not present. This function displays a message if the resource | |
306 specifies an invalid attribute." | |
307 (let* ((face-name (face-name face)) | |
308 (value (internal-face-x-get-resource (concat face-name resource) | |
309 class frame))) | |
310 (when value | |
311 (condition-case () | |
312 (internal-set-lisp-face-attribute-from-resource | |
313 face attribute (downcase value) frame) | |
314 (error | |
315 (message "Face %s, frame %s: invalid attribute %s %s from X resource" | |
316 face-name frame attribute value)))) | |
317 value)) | |
318 | |
319 | |
320 (defun set-face-attributes-from-resources (face frame) | |
321 "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
|
322 (when (memq (framep frame) '(x w32 mac)) |
25012 | 323 (dolist (definition face-x-resources) |
324 (let ((attribute (car definition))) | |
325 (dolist (entry (cdr definition)) | |
326 (set-face-attribute-from-resource face attribute (car entry) | |
327 (cdr entry) frame)))))) | |
37943 | 328 |
329 | |
25012 | 330 (defun make-face-x-resource-internal (face &optional frame) |
331 "Fill frame-local FACE on FRAME from X resources. | |
332 FRAME nil or not specified means do it for all frames." | |
333 (if (null frame) | |
334 (dolist (frame (frame-list)) | |
335 (set-face-attributes-from-resources face frame)) | |
336 (set-face-attributes-from-resources face frame))) | |
337 | |
338 | |
339 | |
340 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
341 ;;; Retrieving face attributes. | |
342 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
343 | |
344 (defun face-name (face) | |
345 "Return the name of face FACE." | |
346 (symbol-name (check-face face))) | |
347 | |
348 | |
87494
26eb0118cbc6
(face-all-attributes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87483
diff
changeset
|
349 (defun face-all-attributes (face &optional frame) |
26eb0118cbc6
(face-all-attributes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87483
diff
changeset
|
350 "Return an alist stating the attributes of FACE. |
26eb0118cbc6
(face-all-attributes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87483
diff
changeset
|
351 Each element of the result has the form (ATTR-NAME . ATTR-VALUE). |
26eb0118cbc6
(face-all-attributes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87483
diff
changeset
|
352 Normally the value describes the default attributes, |
26eb0118cbc6
(face-all-attributes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87483
diff
changeset
|
353 but if you specify FRAME, the value describes the attributes |
26eb0118cbc6
(face-all-attributes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87483
diff
changeset
|
354 of FACE on FRAME." |
87502
a6788888f377
(face-all-attributes): If FRAME is nil, return defaults.
Richard M. Stallman <rms@gnu.org>
parents:
87494
diff
changeset
|
355 (mapcar (lambda (pair) |
a6788888f377
(face-all-attributes): If FRAME is nil, return defaults.
Richard M. Stallman <rms@gnu.org>
parents:
87494
diff
changeset
|
356 (let ((attr (car pair))) |
a6788888f377
(face-all-attributes): If FRAME is nil, return defaults.
Richard M. Stallman <rms@gnu.org>
parents:
87494
diff
changeset
|
357 (cons attr (face-attribute face attr (or frame t))))) |
87494
26eb0118cbc6
(face-all-attributes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87483
diff
changeset
|
358 face-attribute-name-alist)) |
26eb0118cbc6
(face-all-attributes): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87483
diff
changeset
|
359 |
40399
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
360 (defun face-attribute (face attribute &optional frame inherit) |
25012 | 361 "Return the value of FACE's ATTRIBUTE on FRAME. |
362 If the optional argument FRAME is given, report on face FACE in that frame. | |
363 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
|
364 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
|
365 |
67049
580816de789f
* faces.el: Revert 2005-11-17 change. :ignore-defface is now
Chong Yidong <cyd@stupidchicken.com>
parents:
66975
diff
changeset
|
366 If INHERIT is nil, only attributes directly defined by FACE are considered, |
580816de789f
* faces.el: Revert 2005-11-17 change. :ignore-defface is now
Chong Yidong <cyd@stupidchicken.com>
parents:
66975
diff
changeset
|
367 so the return value may be `unspecified', or a relative value. |
40399
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
368 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
|
369 faces specified by its `:inherit' attribute; however the return value |
67049
580816de789f
* faces.el: Revert 2005-11-17 change. :ignore-defface is now
Chong Yidong <cyd@stupidchicken.com>
parents:
66975
diff
changeset
|
370 may still be `unspecified' or relative. |
40399
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
371 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
|
372 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
|
373 |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
374 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
|
375 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
|
376 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
|
377 completely specified)." |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
378 (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
|
379 (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
|
380 ;; 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
|
381 (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
|
382 (unless (or (null inh-from) (eq inh-from 'unspecified)) |
66596
56a63119fa20
(face-attribute): Handle the case where a face inherits from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66360
diff
changeset
|
383 (condition-case nil |
56a63119fa20
(face-attribute): Handle the case where a face inherits from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66360
diff
changeset
|
384 (setq value |
56a63119fa20
(face-attribute): Handle the case where a face inherits from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66360
diff
changeset
|
385 (face-attribute-merged-with attribute value inh-from frame)) |
56a63119fa20
(face-attribute): Handle the case where a face inherits from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66360
diff
changeset
|
386 ;; The `inherit' attribute may point to non existent faces. |
56a63119fa20
(face-attribute): Handle the case where a face inherits from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66360
diff
changeset
|
387 (error nil))))) |
40399
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
388 (when (and inherit |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
389 (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
|
390 (face-attribute-relative-p attribute value)) |
43711
d15360503e4e
(face-spec-choose): Allow `t' to appear before the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43550
diff
changeset
|
391 ;; We should merge with INHERIT as well |
40399
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
392 (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
|
393 value)) |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
394 |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
395 (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
|
396 "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
|
397 FACES may be either a single face or a list of faces. |
64539
c94d5f576885
(describe-face): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents:
64497
diff
changeset
|
398 \[This is an internal function.]" |
40399
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
399 (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
|
400 value) |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
401 ((null faces) |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
402 value) |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
403 ((consp faces) |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
404 (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
|
405 attribute |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
406 (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
|
407 (cdr faces) |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
408 frame)) |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
409 (t |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
410 (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
|
411 value |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
412 (face-attribute faces attribute frame t))))) |
25012 | 413 |
414 | |
40399
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
415 (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
|
416 "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
|
417 (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
|
418 `(let ((,temp ,value)) |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
419 (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
|
420 ,temp |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
421 ,@body)))) |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
422 |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
423 (defun face-foreground (face &optional frame inherit) |
25012 | 424 "Return the foreground color name of FACE, or nil if unspecified. |
425 If the optional argument FRAME is given, report on face FACE in that frame. | |
426 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
|
427 If FRAME is omitted or nil, use the selected frame. |
25012 | 428 |
40399
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
429 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
|
430 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
|
431 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
|
432 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
|
433 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
|
434 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
|
435 resolve an unspecified foreground color. |
25012 | 436 |
40399
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
437 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
|
438 `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
|
439 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
|
440 (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
|
441 nil)) |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
442 |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
443 (defun face-background (face &optional frame inherit) |
25012 | 444 "Return the background color name of FACE, or nil if unspecified. |
445 If the optional argument FRAME is given, report on face FACE in that frame. | |
446 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
|
447 If FRAME is omitted or nil, use the selected frame. |
25012 | 448 |
40399
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
449 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
|
450 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
|
451 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
|
452 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
|
453 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
|
454 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
|
455 resolve an unspecified background color. |
25012 | 456 |
40399
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
457 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
|
458 `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
|
459 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
|
460 (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
|
461 nil)) |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
462 |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
463 (defun face-stipple (face &optional frame inherit) |
25012 | 464 "Return the stipple pixmap name of FACE, or nil if unspecified. |
465 If the optional argument FRAME is given, report on face FACE in that frame. | |
466 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
|
467 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
|
468 |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
469 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
|
470 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
|
471 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
|
472 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
|
473 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
|
474 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
|
475 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
|
476 |
3e67855bb4bf
(face-attribute): Add INHERIT argument, consider face inheritance if non-nil.
Miles Bader <miles@gnu.org>
parents:
40351
diff
changeset
|
477 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
|
478 `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
|
479 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
|
480 (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
|
481 nil)) |
25012 | 482 |
483 | |
484 (defalias 'face-background-pixmap 'face-stipple) | |
485 | |
486 | |
487 (defun face-underline-p (face &optional frame) | |
488 "Return non-nil if FACE is underlined. | |
489 If the optional argument FRAME is given, report on face FACE in that frame. | |
490 If FRAME is t, report on the defaults for face FACE (for new frames). | |
491 If FRAME is omitted or nil, use the selected frame." | |
492 (eq (face-attribute face :underline frame) t)) | |
493 | |
494 | |
495 (defun face-inverse-video-p (face &optional frame) | |
496 "Return non-nil if FACE is in inverse video on FRAME. | |
497 If the optional argument FRAME is given, report on face FACE in that frame. | |
498 If FRAME is t, report on the defaults for face FACE (for new frames). | |
499 If FRAME is omitted or nil, use the selected frame." | |
500 (eq (face-attribute face :inverse-video frame) t)) | |
501 | |
502 | |
503 (defun face-bold-p (face &optional frame) | |
504 "Return non-nil if the font of FACE is bold on FRAME. | |
505 If the optional argument FRAME is given, report on face FACE in that frame. | |
506 If FRAME is t, report on the defaults for face FACE (for new frames). | |
507 If FRAME is omitted or nil, use the selected frame. | |
508 Use `face-attribute' for finer control." | |
509 (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
|
510 (memq bold '(semi-bold bold extra-bold ultra-bold)))) |
25012 | 511 |
512 | |
513 (defun face-italic-p (face &optional frame) | |
514 "Return non-nil if the font of FACE is italic on FRAME. | |
515 If the optional argument FRAME is given, report on face FACE in that frame. | |
516 If FRAME is t, report on the defaults for face FACE (for new frames). | |
517 If FRAME is omitted or nil, use the selected frame. | |
518 Use `face-attribute' for finer control." | |
519 (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
|
520 (memq italic '(italic oblique)))) |
37943 | 521 |
25012 | 522 |
523 | |
524 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
525 ;;; Face documentation. | |
526 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
527 | |
528 (defun face-documentation (face) | |
63660
47c90f7c23df
(face-documentation, set-face-attribute)
Glenn Morris <rgm@gnu.org>
parents:
63650
diff
changeset
|
529 "Get the documentation string for FACE. |
47c90f7c23df
(face-documentation, set-face-attribute)
Glenn Morris <rgm@gnu.org>
parents:
63650
diff
changeset
|
530 If FACE is a face-alias, get the documentation for the target face." |
47c90f7c23df
(face-documentation, set-face-attribute)
Glenn Morris <rgm@gnu.org>
parents:
63650
diff
changeset
|
531 (let ((alias (get face 'face-alias)) |
47c90f7c23df
(face-documentation, set-face-attribute)
Glenn Morris <rgm@gnu.org>
parents:
63650
diff
changeset
|
532 doc) |
47c90f7c23df
(face-documentation, set-face-attribute)
Glenn Morris <rgm@gnu.org>
parents:
63650
diff
changeset
|
533 (if alias |
47c90f7c23df
(face-documentation, set-face-attribute)
Glenn Morris <rgm@gnu.org>
parents:
63650
diff
changeset
|
534 (progn |
47c90f7c23df
(face-documentation, set-face-attribute)
Glenn Morris <rgm@gnu.org>
parents:
63650
diff
changeset
|
535 (setq doc (get alias 'face-documentation)) |
47c90f7c23df
(face-documentation, set-face-attribute)
Glenn Morris <rgm@gnu.org>
parents:
63650
diff
changeset
|
536 (format "%s is an alias for the face `%s'.%s" face alias |
47c90f7c23df
(face-documentation, set-face-attribute)
Glenn Morris <rgm@gnu.org>
parents:
63650
diff
changeset
|
537 (if doc (format "\n%s" doc) |
47c90f7c23df
(face-documentation, set-face-attribute)
Glenn Morris <rgm@gnu.org>
parents:
63650
diff
changeset
|
538 ""))) |
47c90f7c23df
(face-documentation, set-face-attribute)
Glenn Morris <rgm@gnu.org>
parents:
63650
diff
changeset
|
539 (get face 'face-documentation)))) |
25012 | 540 |
541 | |
542 (defun set-face-documentation (face string) | |
543 "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
|
544 ;; Perhaps the text should go in DOC. |
26657
b5c0d55411ad
(set-face-documentation): Purecopy STRING.
Dave Love <fx@gnu.org>
parents:
26353
diff
changeset
|
545 (put face 'face-documentation (purecopy string))) |
25012 | 546 |
547 | |
548 (defalias 'face-doc-string 'face-documentation) | |
549 (defalias 'set-face-doc-string 'set-face-documentation) | |
550 | |
551 | |
552 | |
553 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
554 ;; Setting face attributes. | |
555 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
556 | |
557 | |
66360
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
558 (defvar inhibit-face-set-after-frame-default nil |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
559 "If non-nil, that tells `face-set-after-frame-default' to do nothing.") |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
560 |
25012 | 561 (defun set-face-attribute (face frame &rest args) |
562 "Set attributes of FACE on FRAME from ARGS. | |
563 | |
564 FRAME nil means change attributes on all frames. FRAME t means change | |
565 the default for new frames (this is done automatically each time an | |
566 attribute is changed on all frames). | |
567 | |
568 ARGS must come in pairs ATTRIBUTE VALUE. ATTRIBUTE must be a valid | |
67049
580816de789f
* faces.el: Revert 2005-11-17 change. :ignore-defface is now
Chong Yidong <cyd@stupidchicken.com>
parents:
66975
diff
changeset
|
569 face attribute name. All attributes can be set to `unspecified'; |
580816de789f
* faces.el: Revert 2005-11-17 change. :ignore-defface is now
Chong Yidong <cyd@stupidchicken.com>
parents:
66975
diff
changeset
|
570 this fact is not further mentioned below. |
25012 | 571 |
572 The following attributes are recognized: | |
573 | |
574 `:family' | |
575 | |
576 VALUE must be a string specifying the font family, e.g. ``courier'', | |
577 or a fontset alias name. If a font family is specified, wild-cards `*' | |
578 and `?' are allowed. | |
579 | |
580 `:width' | |
581 | |
582 VALUE specifies the relative proportionate width of the font to use. | |
583 It must be one of the symbols `ultra-condensed', `extra-condensed', | |
584 `condensed', `semi-condensed', `normal', `semi-expanded', `expanded', | |
585 `extra-expanded', or `ultra-expanded'. | |
586 | |
587 `:height' | |
588 | |
31190 | 589 VALUE must be either an integer specifying the height of the font to use |
590 in 1/10 pt, a floating point number specifying the amount by which to | |
591 scale any underlying face, or a function, which is called with the old | |
592 height (from the underlying face), and should return the new height. | |
25012 | 593 |
594 `:weight' | |
595 | |
596 VALUE specifies the weight of the font to use. It must be one of the | |
597 symbols `ultra-bold', `extra-bold', `bold', `semi-bold', `normal', | |
598 `semi-light', `light', `extra-light', `ultra-light'. | |
599 | |
600 `:slant' | |
601 | |
602 VALUE specifies the slant of the font to use. It must be one of the | |
603 symbols `italic', `oblique', `normal', `reverse-italic', or | |
604 `reverse-oblique'. | |
605 | |
606 `:foreground', `:background' | |
607 | |
608 VALUE must be a color name, a string. | |
609 | |
610 `:underline' | |
611 | |
612 VALUE specifies whether characters in FACE should be underlined. If | |
613 VALUE is t, underline with foreground color of the face. If VALUE is | |
614 a string, underline with that color. If VALUE is nil, explicitly | |
615 don't underline. | |
616 | |
617 `:overline' | |
618 | |
619 VALUE specifies whether characters in FACE should be overlined. If | |
620 VALUE is t, overline with foreground color of the face. If VALUE is a | |
621 string, overline with that color. If VALUE is nil, explicitly don't | |
622 overline. | |
623 | |
624 `:strike-through' | |
625 | |
626 VALUE specifies whether characters in FACE should be drawn with a line | |
627 striking through them. If VALUE is t, use the foreground color of the | |
628 face. If VALUE is a string, strike-through with that color. If VALUE | |
629 is nil, explicitly don't strike through. | |
630 | |
631 `:box' | |
632 | |
633 VALUE specifies whether characters in FACE should have a box drawn | |
634 around them. If VALUE is nil, explicitly don't draw boxes. If | |
635 VALUE is t, draw a box with lines of width 1 in the foreground color | |
636 of the face. If VALUE is a string, the string must be a color name, | |
637 and the box is drawn in that color with a line width of 1. Otherwise, | |
638 VALUE must be a property list of the form `(:line-width WIDTH | |
639 :color COLOR :style STYLE)'. If a keyword/value pair is missing from | |
640 the property list, a default value will be used for the value, as | |
641 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
|
642 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
|
643 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
|
644 not around it. COLOR is the name of the color to draw in, default is |
25012 | 645 the foreground color of the face for simple boxes, and the background |
646 color of the face for 3D boxes. STYLE specifies whether a 3D box | |
647 should be draw. If STYLE is `released-button', draw a box looking | |
648 like a released 3D button. If STYLE is `pressed-button' draw a box | |
649 that appears like a pressed button. If STYLE is nil, the default if | |
650 the property list doesn't contain a style specification, draw a 2D | |
651 box. | |
652 | |
653 `:inverse-video' | |
654 | |
655 VALUE specifies whether characters in FACE should be displayed in | |
28840 | 656 inverse video. VALUE must be one of t or nil. |
25012 | 657 |
658 `:stipple' | |
659 | |
660 If VALUE is a string, it must be the name of a file of pixmap data. | |
661 The directories listed in the `x-bitmap-file-path' variable are | |
662 searched. Alternatively, VALUE may be a list of the form (WIDTH | |
663 HEIGHT DATA) where WIDTH and HEIGHT are the size in pixels, and DATA | |
664 is a string containing the raw bits of the bitmap. VALUE nil means | |
665 explicitly don't use a stipple pattern. | |
666 | |
667 For convenience, attributes `:family', `:width', `:height', `:weight', | |
668 and `:slant' may also be set in one step from an X font name: | |
669 | |
670 `:font' | |
671 | |
672 Set font-related face attributes from VALUE. VALUE must be a valid | |
673 XLFD font name. If it is a font name pattern, the first matching font | |
674 will be used. | |
675 | |
676 For compatibility with Emacs 20, keywords `:bold' and `:italic' can | |
677 be used to specify that a bold or italic font should be used. VALUE | |
31190 | 678 must be t or nil in that case. A value of `unspecified' is not allowed. |
679 | |
680 `:inherit' | |
681 | |
682 VALUE is the name of a face from which to inherit attributes, or a list | |
683 of face names. Attributes from inherited faces are merged into the face | |
684 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
|
685 (let ((where (if (null frame) 0 frame))) |
d7a98f35b441
(set-face-attribute): Simplify by calling
Gerd Moellmann <gerd@gnu.org>
parents:
31401
diff
changeset
|
686 (setq args (purecopy args)) |
51280
c2efaecb5d8f
(set-face-attribute): Set face-modified prop to t
Richard M. Stallman <rms@gnu.org>
parents:
51248
diff
changeset
|
687 ;; If we set the new-frame defaults, this face is modified outside Custom. |
c2efaecb5d8f
(set-face-attribute): Set face-modified prop to t
Richard M. Stallman <rms@gnu.org>
parents:
51248
diff
changeset
|
688 (if (memq where '(0 t)) |
63660
47c90f7c23df
(face-documentation, set-face-attribute)
Glenn Morris <rgm@gnu.org>
parents:
63650
diff
changeset
|
689 (put (or (get face 'face-alias) face) 'face-modified t)) |
31439
d7a98f35b441
(set-face-attribute): Simplify by calling
Gerd Moellmann <gerd@gnu.org>
parents:
31401
diff
changeset
|
690 (while args |
66360
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
691 ;; Don't recursively set the attributes from the frame's font param |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
692 ;; when we update the frame's font param fro the attributes. |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
693 (let ((inhibit-face-set-after-frame-default t)) |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
694 (internal-set-lisp-face-attribute face (car args) |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
695 (purecopy (cadr args)) |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
696 where)) |
31439
d7a98f35b441
(set-face-attribute): Simplify by calling
Gerd Moellmann <gerd@gnu.org>
parents:
31401
diff
changeset
|
697 (setq args (cdr (cdr args)))))) |
25012 | 698 |
699 | |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
700 (defun make-face-bold (face &optional frame noerror) |
25012 | 701 "Make the font of FACE be bold, if possible. |
702 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
|
703 Argument NOERROR is ignored and retained for compatibility. |
25012 | 704 Use `set-face-attribute' for finer control of the font weight." |
40456 | 705 (interactive (list (read-face-name "Make which face bold"))) |
25012 | 706 (set-face-attribute face frame :weight 'bold)) |
707 | |
708 | |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
709 (defun make-face-unbold (face &optional frame noerror) |
25012 | 710 "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
|
711 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
|
712 Argument NOERROR is ignored and retained for compatibility." |
40456 | 713 (interactive (list (read-face-name "Make which face non-bold"))) |
25012 | 714 (set-face-attribute face frame :weight 'normal)) |
715 | |
37943 | 716 |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
717 (defun make-face-italic (face &optional frame noerror) |
25012 | 718 "Make the font of FACE be italic, if possible. |
719 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
|
720 Argument NOERROR is ignored and retained for compatibility. |
25012 | 721 Use `set-face-attribute' for finer control of the font slant." |
40456 | 722 (interactive (list (read-face-name "Make which face italic"))) |
25012 | 723 (set-face-attribute face frame :slant 'italic)) |
724 | |
725 | |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
726 (defun make-face-unitalic (face &optional frame noerror) |
25012 | 727 "Make the font of FACE be non-italic, if possible. |
28840 | 728 FRAME nil or not specified means change face on all frames. |
729 Argument NOERROR is ignored and retained for compatibility." | |
40456 | 730 (interactive (list (read-face-name "Make which face non-italic"))) |
25012 | 731 (set-face-attribute face frame :slant 'normal)) |
732 | |
37943 | 733 |
26337
6bf33b333eb2
(make-face-bold, make-face-unbold, make-face-italic)
Gerd Moellmann <gerd@gnu.org>
parents:
25947
diff
changeset
|
734 (defun make-face-bold-italic (face &optional frame noerror) |
25012 | 735 "Make the font of FACE be bold and italic, if possible. |
736 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
|
737 Argument NOERROR is ignored and retained for compatibility. |
25012 | 738 Use `set-face-attribute' for finer control of font weight and slant." |
40456 | 739 (interactive (list (read-face-name "Make which face bold-italic"))) |
25012 | 740 (set-face-attribute face frame :weight 'bold :slant 'italic)) |
741 | |
742 | |
743 (defun set-face-font (face font &optional frame) | |
744 "Change font-related attributes of FACE to those of FONT (a string). | |
745 FRAME nil or not specified means change face on all frames. | |
746 This sets the attributes `:family', `:width', `:height', `:weight', | |
747 and `:slant'. When called interactively, prompt for the face and font." | |
748 (interactive (read-face-and-attribute :font)) | |
749 (set-face-attribute face frame :font font)) | |
750 | |
751 | |
752 ;; Implementation note: Emulating gray background colors with a | |
753 ;; stipple pattern is now part of the face realization process, and is | |
754 ;; done in C depending on the frame on which the face is realized. | |
755 | |
756 (defun set-face-background (face color &optional frame) | |
757 "Change the background color of face FACE to COLOR (a string). | |
758 FRAME nil or not specified means change face on all frames. | |
59281
95516eef1d5b
(set-face-background, set-face-foreground): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59262
diff
changeset
|
759 COLOR can be a system-defined color name (see `list-colors-display') |
95516eef1d5b
(set-face-background, set-face-foreground): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59262
diff
changeset
|
760 or a hex spec of the form #RRGGBB. |
95516eef1d5b
(set-face-background, set-face-foreground): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59262
diff
changeset
|
761 When called interactively, prompts for the face and color." |
25012 | 762 (interactive (read-face-and-attribute :background)) |
36060
d9b4d1370073
(set-face-background, set-face-foreground)
Miles Bader <miles@gnu.org>
parents:
36035
diff
changeset
|
763 (set-face-attribute face frame :background (or color 'unspecified))) |
25012 | 764 |
765 | |
766 (defun set-face-foreground (face color &optional frame) | |
767 "Change the foreground color of face FACE to COLOR (a string). | |
768 FRAME nil or not specified means change face on all frames. | |
59281
95516eef1d5b
(set-face-background, set-face-foreground): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59262
diff
changeset
|
769 COLOR can be a system-defined color name (see `list-colors-display') |
95516eef1d5b
(set-face-background, set-face-foreground): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59262
diff
changeset
|
770 or a hex spec of the form #RRGGBB. |
95516eef1d5b
(set-face-background, set-face-foreground): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
59262
diff
changeset
|
771 When called interactively, prompts for the face and color." |
25012 | 772 (interactive (read-face-and-attribute :foreground)) |
36060
d9b4d1370073
(set-face-background, set-face-foreground)
Miles Bader <miles@gnu.org>
parents:
36035
diff
changeset
|
773 (set-face-attribute face frame :foreground (or color 'unspecified))) |
25012 | 774 |
775 | |
776 (defun set-face-stipple (face stipple &optional frame) | |
777 "Change the stipple pixmap of face FACE to STIPPLE. | |
778 FRAME nil or not specified means change face on all frames. | |
28840 | 779 STIPPLE should be a string, the name of a file of pixmap data. |
25012 | 780 The directories listed in the `x-bitmap-file-path' variable are searched. |
781 | |
782 Alternatively, STIPPLE may be a list of the form (WIDTH HEIGHT DATA) | |
783 where WIDTH and HEIGHT are the size in pixels, | |
784 and DATA is a string, containing the raw bits of the bitmap." | |
785 (interactive (read-face-and-attribute :stipple)) | |
36060
d9b4d1370073
(set-face-background, set-face-foreground)
Miles Bader <miles@gnu.org>
parents:
36035
diff
changeset
|
786 (set-face-attribute face frame :stipple (or stipple 'unspecified))) |
25012 | 787 |
788 | |
75591
a0f90fb2d33d
(set-face-underline-p, modify-face): Rename arg UNDERLINE-P
Juanma Barranquero <lekktu@gmail.com>
parents:
75579
diff
changeset
|
789 (defun set-face-underline-p (face underline &optional frame) |
25012 | 790 "Specify whether face FACE is underlined. |
791 UNDERLINE nil means FACE explicitly doesn't underline. | |
792 UNDERLINE non-nil means FACE explicitly does underlining | |
793 with the same of the foreground color. | |
794 If UNDERLINE is a string, underline with the color named UNDERLINE. | |
795 FRAME nil or not specified means change face on all frames. | |
796 Use `set-face-attribute' to ``unspecify'' underlining." | |
797 (interactive | |
798 (let ((list (read-face-and-attribute :underline))) | |
799 (list (car list) (eq (car (cdr list)) t)))) | |
75591
a0f90fb2d33d
(set-face-underline-p, modify-face): Rename arg UNDERLINE-P
Juanma Barranquero <lekktu@gmail.com>
parents:
75579
diff
changeset
|
800 (set-face-attribute face frame :underline underline)) |
25012 | 801 |
65068
6606e83775f0
(set-face-underline): Delete this duplicate function
Juri Linkov <juri@jurta.org>
parents:
64762
diff
changeset
|
802 (define-obsolete-function-alias 'set-face-underline |
6606e83775f0
(set-face-underline): Delete this duplicate function
Juri Linkov <juri@jurta.org>
parents:
64762
diff
changeset
|
803 'set-face-underline-p "22.1") |
25012 | 804 |
805 | |
806 (defun set-face-inverse-video-p (face inverse-video-p &optional frame) | |
807 "Specify whether face FACE is in inverse video. | |
808 INVERSE-VIDEO-P non-nil means FACE displays explicitly in inverse video. | |
809 INVERSE-VIDEO-P nil means FACE explicitly is not in inverse video. | |
810 FRAME nil or not specified means change face on all frames. | |
811 Use `set-face-attribute' to ``unspecify'' the inverse video attribute." | |
812 (interactive | |
813 (let ((list (read-face-and-attribute :inverse-video))) | |
814 (list (car list) (eq (car (cdr list)) t)))) | |
815 (set-face-attribute face frame :inverse-video inverse-video-p)) | |
816 | |
817 | |
818 (defun set-face-bold-p (face bold-p &optional frame) | |
819 "Specify whether face FACE is bold. | |
820 BOLD-P non-nil means FACE should explicitly display bold. | |
821 BOLD-P nil means FACE should explicitly display non-bold. | |
822 FRAME nil or not specified means change face on all frames. | |
823 Use `set-face-attribute' or `modify-face' for finer control." | |
824 (if (null bold-p) | |
825 (make-face-unbold face frame) | |
826 (make-face-bold face frame))) | |
827 | |
828 | |
829 (defun set-face-italic-p (face italic-p &optional frame) | |
830 "Specify whether face FACE is italic. | |
831 ITALIC-P non-nil means FACE should explicitly display italic. | |
832 ITALIC-P nil means FACE should explicitly display non-italic. | |
833 FRAME nil or not specified means change face on all frames. | |
834 Use `set-face-attribute' or `modify-face' for finer control." | |
835 (if (null italic-p) | |
836 (make-face-unitalic face frame) | |
837 (make-face-italic face frame))) | |
838 | |
839 | |
840 (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
|
841 |
2456 | 842 |
843 (defun invert-face (face &optional frame) | |
25012 | 844 "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
|
845 If FRAME is omitted or nil, it means change face on all frames. |
25012 | 846 If FACE specifies neither foreground nor background color, |
847 set its foreground and background to the background and foreground | |
848 of the default face. Value is FACE." | |
40456 | 849 (interactive (list (read-face-name "Invert face"))) |
25012 | 850 (let ((fg (face-attribute face :foreground frame)) |
851 (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
|
852 (if (not (and (eq fg 'unspecified) (eq bg 'unspecified))) |
25012 | 853 (set-face-attribute face frame :foreground bg :background fg) |
854 (set-face-attribute face frame | |
855 :foreground | |
856 (face-attribute 'default :background frame) | |
857 :background | |
858 (face-attribute 'default :foreground frame)))) | |
2456 | 859 face) |
860 | |
25012 | 861 |
862 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
863 ;;; Interactively modifying faces. | |
864 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2456 | 865 |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
866 (defun read-face-name (prompt &optional string-describing-default multiple) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
867 "Read a face, defaulting to the face or faces on the char after point. |
71521
1109575a2873
* help-mode.el (help-xref-symbol-regexp): Add property as a keyword
Nick Roberts <nickrob@snap.net.nz>
parents:
71231
diff
changeset
|
868 If it has the property `read-face-name', that overrides the `face' property. |
71591
defa6bf31164
(read-face-name): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71521
diff
changeset
|
869 PROMPT should be a string that describes what the caller will do with the face; |
defa6bf31164
(read-face-name): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71521
diff
changeset
|
870 it should not end in a space. |
defa6bf31164
(read-face-name): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71521
diff
changeset
|
871 STRING-DESCRIBING-DEFAULT should describe what default the caller will use if |
defa6bf31164
(read-face-name): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71521
diff
changeset
|
872 the user just types RET; you can omit it. |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
873 If MULTIPLE is non-nil, return a list of faces (possibly only one). |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
874 Otherwise, return a single face." |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
875 (let ((faceprop (or (get-char-property (point) 'read-face-name) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
876 (get-char-property (point) 'face))) |
63382
9cbfa983c1cf
(read-face-name): Use complete-in-turn complete non-aliases
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63311
diff
changeset
|
877 (aliasfaces nil) |
9cbfa983c1cf
(read-face-name): Use complete-in-turn complete non-aliases
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63311
diff
changeset
|
878 (nonaliasfaces nil) |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
879 faces) |
63984
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
880 ;; Try to get a face name from the buffer. |
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
881 (if (memq (intern-soft (thing-at-point 'symbol)) (face-list)) |
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
882 (setq faces (list (intern-soft (thing-at-point 'symbol))))) |
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
883 ;; Add the named faces that the `face' property uses. |
59262
c9bf2e1b7e1a
(read-face-name): Don't treat an attribute spec as a list of faces.
Richard M. Stallman <rms@gnu.org>
parents:
59077
diff
changeset
|
884 (if (and (listp faceprop) |
c9bf2e1b7e1a
(read-face-name): Don't treat an attribute spec as a list of faces.
Richard M. Stallman <rms@gnu.org>
parents:
59077
diff
changeset
|
885 ;; Don't treat an attribute spec as a list of faces. |
c9bf2e1b7e1a
(read-face-name): Don't treat an attribute spec as a list of faces.
Richard M. Stallman <rms@gnu.org>
parents:
59077
diff
changeset
|
886 (not (keywordp (car faceprop))) |
c9bf2e1b7e1a
(read-face-name): Don't treat an attribute spec as a list of faces.
Richard M. Stallman <rms@gnu.org>
parents:
59077
diff
changeset
|
887 (not (memq (car faceprop) '(foreground-color background-color)))) |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
888 (dolist (f faceprop) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
889 (if (symbolp f) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
890 (push f faces))) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
891 (if (symbolp faceprop) |
59262
c9bf2e1b7e1a
(read-face-name): Don't treat an attribute spec as a list of faces.
Richard M. Stallman <rms@gnu.org>
parents:
59077
diff
changeset
|
892 (push faceprop faces))) |
64724
719375653e09
(read-face-name): Delete duplicate faces.
Juri Linkov <juri@jurta.org>
parents:
64539
diff
changeset
|
893 (delete-dups faces) |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
894 |
63382
9cbfa983c1cf
(read-face-name): Use complete-in-turn complete non-aliases
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63311
diff
changeset
|
895 ;; Build up the completion tables. |
9cbfa983c1cf
(read-face-name): Use complete-in-turn complete non-aliases
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63311
diff
changeset
|
896 (mapatoms (lambda (s) |
9cbfa983c1cf
(read-face-name): Use complete-in-turn complete non-aliases
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63311
diff
changeset
|
897 (if (custom-facep s) |
9cbfa983c1cf
(read-face-name): Use complete-in-turn complete non-aliases
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63311
diff
changeset
|
898 (if (get s 'face-alias) |
9cbfa983c1cf
(read-face-name): Use complete-in-turn complete non-aliases
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63311
diff
changeset
|
899 (push (symbol-name s) aliasfaces) |
9cbfa983c1cf
(read-face-name): Use complete-in-turn complete non-aliases
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63311
diff
changeset
|
900 (push (symbol-name s) nonaliasfaces))))) |
9cbfa983c1cf
(read-face-name): Use complete-in-turn complete non-aliases
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63311
diff
changeset
|
901 |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
902 ;; If we only want one, and the default is more than one, |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
903 ;; discard the unwanted ones now. |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
904 (unless multiple |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
905 (if faces |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
906 (setq faces (list (car faces))))) |
63984
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
907 (require 'crm) |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
908 (let* ((input |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
909 ;; Read the input. |
63984
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
910 (completing-read-multiple |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
911 (if (or faces string-describing-default) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
912 (format "%s (default %s): " prompt |
63984
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
913 (if faces (mapconcat 'symbol-name faces ",") |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
914 string-describing-default)) |
44896
fc1fdc78c3eb
(read-face-name): Format the prompt correctly when there's no default.
Miles Bader <miles@gnu.org>
parents:
44892
diff
changeset
|
915 (format "%s: " prompt)) |
94054
41482de59a50
(read-face-name): Use `completion-table-in-turn', not `complete-in-turn'.
Juanma Barranquero <lekktu@gmail.com>
parents:
93834
diff
changeset
|
916 (completion-table-in-turn nonaliasfaces aliasfaces) |
63984
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
917 nil t nil nil |
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
918 (if faces (mapconcat 'symbol-name faces ",")))) |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
919 ;; Canonicalize the output. |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
920 (output |
63984
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
921 (cond ((or (equal input "") (equal input '(""))) |
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
922 faces) |
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
923 ((stringp input) |
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
924 (mapcar 'intern (split-string input ", *" t))) |
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
925 ((listp input) |
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
926 (mapcar 'intern input)) |
37ff9b4c3659
(read-face-name): Put the code for getting a face name
Juri Linkov <juri@jurta.org>
parents:
63881
diff
changeset
|
927 (input)))) |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
928 ;; Return either a list of faces or just one face. |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
929 (if multiple |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
930 output |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
931 (car output))))) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
932 |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
933 |
25012 | 934 (defun face-valid-attribute-values (attribute &optional frame) |
935 "Return valid values for face attribute ATTRIBUTE. | |
936 The optional argument FRAME is used to determine available fonts | |
937 and colors. If it is nil or not specified, the selected frame is | |
938 used. Value is an alist of (NAME . VALUE) if ATTRIBUTE expects a value | |
939 out of a set of discrete values. Value is `integerp' if ATTRIBUTE expects | |
940 an integer value." | |
37943 | 941 (let ((valid |
942 (case attribute | |
943 (:family | |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
944 (if (window-system frame) |
37943 | 945 (mapcar #'(lambda (x) (cons (car x) (car x))) |
94956
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
946 (font-family-list)) |
37943 | 947 ;; Only one font on TTYs. |
948 (list (cons "default" "default")))) | |
94956
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
949 (:width |
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
950 (mapcar #'(lambda (x) (cons (symbol-name (car x)) (car x))) |
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
951 font-width-table)) |
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
952 (:weight |
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
953 (mapcar #'(lambda (x) (cons (symbol-name (car x)) (car x))) |
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
954 font-weight-table)) |
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
955 (:slant |
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
956 (mapcar #'(lambda (x) (cons (symbol-name (car x)) (car x))) |
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
957 font-slant-table)) |
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
958 (:inverse-video |
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
959 (mapcar #'(lambda (x) (cons (symbol-name x) x)) |
442dd15b3a1d
(font-weight-table, font-slant-table)
Kenichi Handa <handa@m17n.org>
parents:
94678
diff
changeset
|
960 (internal-lisp-face-attribute-values attribute))) |
37943 | 961 ((:underline :overline :strike-through :box) |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
962 (if (window-system frame) |
37943 | 963 (nconc (mapcar #'(lambda (x) (cons (symbol-name x) x)) |
964 (internal-lisp-face-attribute-values attribute)) | |
965 (mapcar #'(lambda (c) (cons c c)) | |
75703
374c5b932d28
(face-valid-attribute-values): Use `defined-colors',
Juanma Barranquero <lekktu@gmail.com>
parents:
75696
diff
changeset
|
966 (defined-colors frame))) |
37943 | 967 (mapcar #'(lambda (x) (cons (symbol-name x) x)) |
968 (internal-lisp-face-attribute-values attribute)))) | |
969 ((:foreground :background) | |
970 (mapcar #'(lambda (c) (cons c c)) | |
971 (defined-colors frame))) | |
972 ((:height) | |
973 'integerp) | |
974 (:stipple | |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
975 (and (memq (window-system frame) '(x w32 mac)) |
37943 | 976 (mapcar #'list |
977 (apply #'nconc | |
978 (mapcar (lambda (dir) | |
979 (and (file-readable-p dir) | |
980 (file-directory-p dir) | |
981 (directory-files dir))) | |
982 x-bitmap-file-path))))) | |
983 (:inherit | |
984 (cons '("none" . nil) | |
985 (mapcar #'(lambda (c) (cons (symbol-name c) c)) | |
986 (face-list)))) | |
987 (t | |
988 (error "Internal error"))))) | |
31190 | 989 (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
|
990 (nconc (list (cons "unspecified" 'unspecified)) valid) |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
991 valid))) |
25012 | 992 |
993 | |
994 (defvar face-attribute-name-alist | |
995 '((:family . "font family") | |
996 (:width . "character set width") | |
997 (:height . "height in 1/10 pt") | |
998 (:weight . "weight") | |
999 (:slant . "slant") | |
1000 (:underline . "underline") | |
1001 (:overline . "overline") | |
1002 (:strike-through . "strike-through") | |
1003 (:box . "box") | |
1004 (:inverse-video . "inverse-video display") | |
1005 (:foreground . "foreground color") | |
1006 (:background . "background color") | |
31190 | 1007 (:stipple . "background stipple") |
1008 (:inherit . "inheritance")) | |
25012 | 1009 "An alist of descriptive names for face attributes. |
1010 Each element has the form (ATTRIBUTE-NAME . DESCRIPTION) where | |
1011 ATTRIBUTE-NAME is a face attribute name (a keyword symbol), and | |
1012 DESCRIPTION is a descriptive name for ATTRIBUTE-NAME.") | |
1013 | |
1014 | |
1015 (defun face-descriptive-attribute-name (attribute) | |
1016 "Return a descriptive name for ATTRIBUTE." | |
1017 (cdr (assq attribute face-attribute-name-alist))) | |
1018 | |
1019 | |
1020 (defun face-read-string (face default name &optional completion-alist) | |
1021 "Interactively read a face attribute string value. | |
31190 | 1022 FACE is the face whose attribute is read. If non-nil, DEFAULT is the |
1023 default string to return if no new value is entered. NAME is a | |
1024 descriptive name of the attribute for prompting. COMPLETION-ALIST is an | |
1025 alist of valid values, if non-nil. | |
25012 | 1026 |
31190 | 1027 Entering nothing accepts the default string DEFAULT. |
25012 | 1028 Value is the new attribute value." |
31190 | 1029 ;; Capitalize NAME (we don't use `capitalize' because that capitalizes |
1030 ;; each word in a string separately). | |
1031 (setq name (concat (upcase (substring name 0 1)) (substring name 1))) | |
25012 | 1032 (let* ((completion-ignore-case t) |
1033 (value (completing-read | |
1034 (if default | |
31190 | 1035 (format "%s for face `%s' (default %s): " |
1036 name face default) | |
1037 (format "%s for face `%s': " name face)) | |
66959
35ab5e34fdf5
(face-read-string): Set the default value arg of completing-read.
Juri Linkov <juri@jurta.org>
parents:
66717
diff
changeset
|
1038 completion-alist nil nil nil nil default))) |
25245
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
1039 (if (equal value "") default value))) |
25012 | 1040 |
1041 | |
1042 (defun face-read-integer (face default name) | |
1043 "Interactively read an integer face attribute value. | |
1044 FACE is the face whose attribute is read. DEFAULT is the default | |
1045 value to return if no new value is entered. NAME is a descriptive | |
1046 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
|
1047 (let ((new-value |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
1048 (face-read-string face |
31190 | 1049 (format "%s" default) |
25245
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
1050 name |
ef080d2576f9
(face-valid-attribute-values): Return an alist for
Gerd Moellmann <gerd@gnu.org>
parents:
25210
diff
changeset
|
1051 (list (cons "unspecified" 'unspecified))))) |
31190 | 1052 (cond ((equal new-value "unspecified") |
1053 'unspecified) | |
1054 ((member new-value '("unspecified-fg" "unspecified-bg")) | |
1055 new-value) | |
1056 (t | |
62402
a7e02ef1e3d6
Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents:
62386
diff
changeset
|
1057 (string-to-number new-value))))) |
25012 | 1058 |
1059 | |
1060 (defun read-face-attribute (face attribute &optional frame) | |
1061 "Interactively read a new value for FACE's ATTRIBUTE. | |
1062 Optional argument FRAME nil or unspecified means read an attribute value | |
1063 of a global face. Value is the new attribute value." | |
1064 (let* ((old-value (face-attribute face attribute frame)) | |
1065 (attribute-name (face-descriptive-attribute-name attribute)) | |
1066 (valid (face-valid-attribute-values attribute frame)) | |
1067 new-value) | |
1068 ;; Represent complex attribute values as strings by printing them | |
1069 ;; out. Stipple can be a vector; (WIDTH HEIGHT DATA). Box can be | |
1070 ;; a list `(:width WIDTH :color COLOR)' or `(:width WIDTH :shadow | |
1071 ;; SHADOW)'. | |
1072 (when (and (or (eq attribute :stipple) | |
1073 (eq attribute :box)) | |
1074 (or (consp old-value) | |
1075 (vectorp old-value))) | |
1076 (setq old-value (prin1-to-string old-value))) | |
1077 (cond ((listp valid) | |
31190 | 1078 (let ((default |
1079 (or (car (rassoc old-value valid)) | |
1080 (format "%s" old-value)))) | |
1081 (setq new-value | |
1082 (face-read-string face default attribute-name valid)) | |
1083 (if (equal new-value default) | |
1084 ;; Nothing changed, so don't bother with all the stuff | |
1085 ;; below. In particular, this avoids a non-tty color | |
1086 ;; from being canonicalized for a tty when the user | |
1087 ;; just uses the default. | |
1088 (setq new-value old-value) | |
1089 ;; Terminal frames can support colors that don't appear | |
1090 ;; explicitly in VALID, using color approximation code | |
1091 ;; 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
|
1092 (when (and (memq attribute '(:foreground :background)) |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
1093 (not (memq (window-system frame) '(x w32 mac))) |
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
|
1094 (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
|
1095 '("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
|
1096 "unspecified-fg" "unspecified-bg")))) |
34587 | 1097 (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
|
1098 (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
|
1099 (setq new-value (cdr (assoc new-value valid))))))) |
25012 | 1100 ((eq valid 'integerp) |
1101 (setq new-value (face-read-integer face old-value attribute-name))) | |
1102 (t (error "Internal error"))) | |
1103 ;; Convert stipple and box value text we read back to a list or | |
1104 ;; vector if it looks like one. This makes the assumption that a | |
1105 ;; pixmap file name won't start with an open-paren. | |
1106 (when (and (or (eq attribute :stipple) | |
1107 (eq attribute :box)) | |
1108 (stringp new-value) | |
1109 (string-match "^[[(]" new-value)) | |
1110 (setq new-value (read new-value))) | |
1111 new-value)) | |
1112 | |
1113 | |
1114 (defun read-face-font (face &optional frame) | |
1115 "Read the name of a font for FACE on FRAME. | |
64539
c94d5f576885
(describe-face): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents:
64497
diff
changeset
|
1116 If optional argument FRAME is nil or omitted, use the selected frame." |
25012 | 1117 (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
|
1118 (completing-read (format "Set font attributes of face `%s' from font: " face) |
89909 | 1119 (append (fontset-list) (x-list-fonts "*" nil frame))))) |
25012 | 1120 |
1121 | |
1122 (defun read-all-face-attributes (face &optional frame) | |
1123 "Interactively read all attributes for FACE. | |
64539
c94d5f576885
(describe-face): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents:
64497
diff
changeset
|
1124 If optional argument FRAME is nil or omitted, use the selected frame. |
25012 | 1125 Value is a property list of attribute names and new values." |
1126 (let (result) | |
1127 (dolist (attribute face-attribute-name-alist result) | |
1128 (setq result (cons (car attribute) | |
1129 (cons (read-face-attribute face (car attribute) frame) | |
1130 result)))))) | |
1131 | |
37467
342409bb6b91
(modify-face): Add compatibility for non-interactive use.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37294
diff
changeset
|
1132 (defun modify-face (&optional face foreground background stipple |
75591
a0f90fb2d33d
(set-face-underline-p, modify-face): Rename arg UNDERLINE-P
Juanma Barranquero <lekktu@gmail.com>
parents:
75579
diff
changeset
|
1133 bold-p italic-p underline inverse-p frame) |
25012 | 1134 "Modify attributes of faces interactively. |
1135 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
|
1136 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
|
1137 For non-interactive use, `set-face-attribute' is preferred. |
64539
c94d5f576885
(describe-face): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents:
64497
diff
changeset
|
1138 When called from Lisp, if FACE is nil, all arguments but FRAME are ignored |
37467
342409bb6b91
(modify-face): Add compatibility for non-interactive use.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37294
diff
changeset
|
1139 and the face and its settings are obtained by querying the user." |
25012 | 1140 (interactive) |
37467
342409bb6b91
(modify-face): Add compatibility for non-interactive use.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37294
diff
changeset
|
1141 (if face |
342409bb6b91
(modify-face): Add compatibility for non-interactive use.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37294
diff
changeset
|
1142 (set-face-attribute face frame |
342409bb6b91
(modify-face): Add compatibility for non-interactive use.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37294
diff
changeset
|
1143 :foreground (or foreground 'unspecified) |
342409bb6b91
(modify-face): Add compatibility for non-interactive use.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37294
diff
changeset
|
1144 :background (or background 'unspecified) |
342409bb6b91
(modify-face): Add compatibility for non-interactive use.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37294
diff
changeset
|
1145 :stipple stipple |
342409bb6b91
(modify-face): Add compatibility for non-interactive use.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37294
diff
changeset
|
1146 :bold bold-p |
342409bb6b91
(modify-face): Add compatibility for non-interactive use.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37294
diff
changeset
|
1147 :italic italic-p |
75591
a0f90fb2d33d
(set-face-underline-p, modify-face): Rename arg UNDERLINE-P
Juanma Barranquero <lekktu@gmail.com>
parents:
75579
diff
changeset
|
1148 :underline underline |
37467
342409bb6b91
(modify-face): Add compatibility for non-interactive use.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37294
diff
changeset
|
1149 :inverse-video inverse-p) |
342409bb6b91
(modify-face): Add compatibility for non-interactive use.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37294
diff
changeset
|
1150 (setq face (read-face-name "Modify face")) |
25012 | 1151 (apply #'set-face-attribute face frame |
1152 (read-all-face-attributes face frame)))) | |
1153 | |
1154 (defun read-face-and-attribute (attribute &optional frame) | |
1155 "Read face name and face attribute value. | |
1156 ATTRIBUTE is the attribute whose new value is read. | |
1157 FRAME nil or unspecified means read attribute value of global face. | |
1158 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
|
1159 \(a symbol), and NEW-VALUE is value read." |
25012 | 1160 (cond ((eq attribute :font) |
31197
39d437913f44
(read-face-font, read-face-and-attribute): Tweak prompts.
Miles Bader <miles@gnu.org>
parents:
31193
diff
changeset
|
1161 (let* ((prompt "Set font-related attributes of face") |
25012 | 1162 (face (read-face-name prompt)) |
1163 (font (read-face-font face frame))) | |
1164 (list face font))) | |
1165 (t | |
1166 (let* ((attribute-name (face-descriptive-attribute-name attribute)) | |
31190 | 1167 (prompt (format "Set %s of face" attribute-name)) |
25012 | 1168 (face (read-face-name prompt)) |
1169 (new-value (read-face-attribute face attribute frame))) | |
1170 (list face new-value))))) | |
1171 | |
1172 | |
1173 | |
1174 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1175 ;;; Listing faces. | |
1176 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1177 | |
1178 (defvar list-faces-sample-text | |
1179 "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ" | |
1180 "*Text string to display as the sample text for `list-faces-display'.") | |
1181 | |
1182 | |
1183 ;; The name list-faces would be more consistent, but let's avoid a | |
1184 ;; conflict with Lucid, which uses that name differently. | |
1185 | |
48914
bb52f186fa1e
(help-xref-stack): Add defvar to avoid warning.
Richard M. Stallman <rms@gnu.org>
parents:
48713
diff
changeset
|
1186 (defvar help-xref-stack) |
59872
d7da3e10bfef
(list-faces-display): Add optional argument.
Richard M. Stallman <rms@gnu.org>
parents:
59281
diff
changeset
|
1187 (defun list-faces-display (&optional regexp) |
25012 | 1188 "List all faces, using the same sample text in each. |
1189 The sample text is a string that comes from the variable | |
59872
d7da3e10bfef
(list-faces-display): Add optional argument.
Richard M. Stallman <rms@gnu.org>
parents:
59281
diff
changeset
|
1190 `list-faces-sample-text'. |
d7da3e10bfef
(list-faces-display): Add optional argument.
Richard M. Stallman <rms@gnu.org>
parents:
59281
diff
changeset
|
1191 |
d7da3e10bfef
(list-faces-display): Add optional argument.
Richard M. Stallman <rms@gnu.org>
parents:
59281
diff
changeset
|
1192 If REGEXP is non-nil, list only those faces with names matching |
d7da3e10bfef
(list-faces-display): Add optional argument.
Richard M. Stallman <rms@gnu.org>
parents:
59281
diff
changeset
|
1193 this regular expression. When called interactively with a prefix |
d7da3e10bfef
(list-faces-display): Add optional argument.
Richard M. Stallman <rms@gnu.org>
parents:
59281
diff
changeset
|
1194 arg, prompt for a regular expression." |
d7da3e10bfef
(list-faces-display): Add optional argument.
Richard M. Stallman <rms@gnu.org>
parents:
59281
diff
changeset
|
1195 (interactive (list (and current-prefix-arg |
d7da3e10bfef
(list-faces-display): Add optional argument.
Richard M. Stallman <rms@gnu.org>
parents:
59281
diff
changeset
|
1196 (read-string "List faces matching regexp: ")))) |
62947
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1197 (let ((all-faces (zerop (length regexp))) |
25012 | 1198 (frame (selected-frame)) |
62947
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1199 (max-length 0) |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1200 faces line-format |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1201 disp-frame window face-name) |
62947
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1202 ;; We filter and take the max length in one pass |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1203 (setq faces |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1204 (delq nil |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1205 (mapcar (lambda (f) |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1206 (let ((s (symbol-name f))) |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1207 (when (or all-faces (string-match regexp s)) |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1208 (setq max-length (max (length s) max-length)) |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1209 f))) |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1210 (sort (face-list) #'string-lessp)))) |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1211 (unless faces |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1212 (error "No faces matching \"%s\"" regexp)) |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1213 (setq max-length (1+ max-length) |
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1214 line-format (format "%%-%ds" max-length)) |
86010
d42c1cd75af4
(list-faces-display, describe-face):
Martin Rudalics <rudalics@gmx.at>
parents:
85996
diff
changeset
|
1215 (with-help-window "*Faces*" |
25012 | 1216 (save-excursion |
1217 (set-buffer standard-output) | |
1218 (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
|
1219 (insert |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1220 (substitute-command-keys |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1221 (concat |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1222 "Use " |
27736
b4d0a1247b35
(list-faces-display): Use display-mouse-p, not window-system.
Eli Zaretskii <eliz@gnu.org>
parents:
27716
diff
changeset
|
1223 (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
|
1224 "\\[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
|
1225 "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
|
1226 (setq help-xref-stack nil) |
59872
d7da3e10bfef
(list-faces-display): Add optional argument.
Richard M. Stallman <rms@gnu.org>
parents:
59281
diff
changeset
|
1227 (dolist (face faces) |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1228 (setq face-name (symbol-name face)) |
62947
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1229 (insert (format line-format face-name)) |
27716
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1230 ;; 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
|
1231 ;; 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
|
1232 (save-excursion |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1233 (save-match-data |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1234 (search-backward face-name) |
62534
bf6a0cd0e835
(list-faces-display): Make back button respect optional regexp arg.
Nick Roberts <nickrob@snap.net.nz>
parents:
62498
diff
changeset
|
1235 (setq help-xref-stack-item `(list-faces-display ,regexp)) |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1236 (help-xref-button 0 'help-customize-face face))) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1237 (let ((beg (point)) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1238 (line-beg (line-beginning-position))) |
25012 | 1239 (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
|
1240 ;; 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
|
1241 (save-excursion |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1242 (save-match-data |
a3d981ee3185
Don't require custom. Add more specific :groups to various deffaces.
Dave Love <fx@gnu.org>
parents:
27571
diff
changeset
|
1243 (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
|
1244 (help-xref-button 0 'help-face face))) |
25012 | 1245 (insert "\n") |
1246 (put-text-property beg (1- (point)) 'face face) | |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1247 ;; Make all face commands default to the proper face |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1248 ;; anywhere in the line. |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1249 (put-text-property line-beg (1- (point)) 'read-face-name face) |
25012 | 1250 ;; If the sample text has multiple lines, line up all of them. |
1251 (goto-char beg) | |
1252 (forward-line 1) | |
1253 (while (not (eobp)) | |
62947
2a5dbdf6d22a
(list-faces-display): Improve the formatting by computing the maximum length
Juanma Barranquero <lekktu@gmail.com>
parents:
62922
diff
changeset
|
1254 (insert-char ?\s max-length) |
25012 | 1255 (forward-line 1)))) |
86010
d42c1cd75af4
(list-faces-display, describe-face):
Martin Rudalics <rudalics@gmx.at>
parents:
85996
diff
changeset
|
1256 (goto-char (point-min)))) |
25012 | 1257 ;; If the *Faces* buffer appears in a different frame, |
1258 ;; copy all the face definitions from FRAME, | |
1259 ;; so that the display will reflect the frame that was selected. | |
1260 (setq window (get-buffer-window (get-buffer "*Faces*") t)) | |
1261 (setq disp-frame (if window (window-frame window) | |
1262 (car (frame-list)))) | |
1263 (or (eq frame disp-frame) | |
1264 (let ((faces (face-list))) | |
1265 (while faces | |
1266 (copy-face (car faces) (car faces) frame disp-frame) | |
1267 (setq faces (cdr faces))))))) | |
1268 | |
59872
d7da3e10bfef
(list-faces-display): Add optional argument.
Richard M. Stallman <rms@gnu.org>
parents:
59281
diff
changeset
|
1269 |
25012 | 1270 (defun describe-face (face &optional frame) |
1271 "Display the properties of face FACE on FRAME. | |
45314
d752ae89321a
(describe-face): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
45255
diff
changeset
|
1272 Interactively, FACE defaults to the faces of the character after point |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1273 and FRAME defaults to the selected frame. |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1274 |
25012 | 1275 If the optional argument FRAME is given, report on face FACE in that frame. |
1276 If FRAME is t, report on the defaults for face FACE (for new frames). | |
1277 If FRAME is omitted or nil, use the selected frame." | |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1278 (interactive (list (read-face-name "Describe face" "= `default' face" t))) |
25012 | 1279 (let* ((attrs '((:family . "Family") |
1280 (:width . "Width") | |
1281 (:height . "Height") | |
1282 (:weight . "Weight") | |
1283 (:slant . "Slant") | |
1284 (:foreground . "Foreground") | |
1285 (:background . "Background") | |
1286 (:underline . "Underline") | |
1287 (:overline . "Overline") | |
1288 (:strike-through . "Strike-through") | |
1289 (:box . "Box") | |
1290 (:inverse-video . "Inverse") | |
28214
73c16c6e401e
(read-face-font): Fix TABLE arg to completing-read.
Kenichi Handa <handa@m17n.org>
parents:
27928
diff
changeset
|
1291 (:stipple . "Stipple") |
89129
ed1d9d1cfc71
(describe-face): Describe :fontset property too.
Kenichi Handa <handa@m17n.org>
parents:
43550
diff
changeset
|
1292 (:font . "Font") |
ed1d9d1cfc71
(describe-face): Describe :fontset property too.
Kenichi Handa <handa@m17n.org>
parents:
43550
diff
changeset
|
1293 (:fontset . "Fontset") |
31179
354c781f2864
(describe-face): Add support for :inherit attribute.
Miles Bader <miles@gnu.org>
parents:
30971
diff
changeset
|
1294 (:inherit . "Inherit"))) |
25012 | 1295 (max-width (apply #'max (mapcar #'(lambda (x) (length (cdr x))) |
1296 attrs)))) | |
39830
aed9c3afb7ed
(describe-face): Call help-setup-xref earlier.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39799
diff
changeset
|
1297 (help-setup-xref (list #'describe-face face) (interactive-p)) |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1298 (unless face |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1299 (setq face 'default)) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1300 (if (not (listp face)) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1301 (setq face (list face))) |
86010
d42c1cd75af4
(list-faces-display, describe-face):
Martin Rudalics <rudalics@gmx.at>
parents:
85996
diff
changeset
|
1302 (with-help-window (help-buffer) |
25012 | 1303 (save-excursion |
1304 (set-buffer standard-output) | |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1305 (dolist (f face) |
85297
01f68ac2fb98
(describe-face): Allow handling a string as the face name.
Juri Linkov <juri@jurta.org>
parents:
85272
diff
changeset
|
1306 (if (stringp f) (setq f (intern f))) |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1307 (insert "Face: " (symbol-name f)) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1308 (if (not (facep f)) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1309 (insert " undefined face.\n") |
62386
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1310 (let ((customize-label "customize this face") |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1311 file-name) |
73668
1d779fbeeaef
(faces-sample-overlay, describe-face): Revert last changes.
Eli Zaretskii <eliz@gnu.org>
parents:
73580
diff
changeset
|
1312 (insert (concat " (" (propertize "sample" 'font-lock-face f) ")")) |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1313 (princ (concat " (" customize-label ")\n")) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1314 (insert "Documentation: " |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1315 (or (face-documentation f) |
46041
53b3233b2574
(describe-face): Capitalize "not documented" message.
Juanma Barranquero <lekktu@gmail.com>
parents:
45722
diff
changeset
|
1316 "Not documented as a face.") |
62386
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1317 "\n") |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1318 (with-current-buffer standard-output |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1319 (save-excursion |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1320 (re-search-backward |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1321 (concat "\\(" customize-label "\\)") nil t) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1322 (help-xref-button 1 'help-customize-face f))) |
62386
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1323 ;; The next 4 sexps are copied from describe-function-1 |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1324 ;; and simplified. |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1325 (setq file-name (symbol-file f 'defface)) |
66351
fc5672d9fc45
(describe-face): Use describe-simplify-lib-file-name.
Richard M. Stallman <rms@gnu.org>
parents:
65730
diff
changeset
|
1326 (setq file-name (describe-simplify-lib-file-name file-name)) |
62386
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1327 (when file-name |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1328 (princ "Defined in `") |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1329 (princ file-name) |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1330 (princ "'") |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1331 ;; Make a hyperlink to the library. |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1332 (save-excursion |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1333 (re-search-backward "`\\([^`']+\\)'" nil t) |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1334 (help-xref-button 1 'help-face-def f file-name)) |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1335 (princ ".") |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1336 (terpri) |
3eeae124dcab
(describe-face): Output a definition link button.
Richard M. Stallman <rms@gnu.org>
parents:
61481
diff
changeset
|
1337 (terpri)) |
44886
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1338 (dolist (a attrs) |
fe167023fdf0
(read-face-name): New defaulting features.
Richard M. Stallman <rms@gnu.org>
parents:
44590
diff
changeset
|
1339 (let ((attr (face-attribute f (car a) frame))) |
64539
c94d5f576885
(describe-face): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents:
64497
diff
changeset
|
1340 (insert (make-string (- max-width (length (cdr a))) ?\s) |
65068
6606e83775f0
(set-face-underline): Delete this duplicate function
Juri Linkov <juri@jurta.org>
parents:
64762
diff
changeset
|
1341 (cdr a) ": " (format "%s" attr)) |
6606e83775f0
(set-face-underline): Delete this duplicate function
Juri Linkov <juri@jurta.org>
parents:
64762
diff
changeset
|
1342 (if (and (eq (car a) :inherit) |
6606e83775f0
(set-face-underline): Delete this duplicate function
Juri Linkov <juri@jurta.org>
parents:
64762
diff
changeset
|
1343 (not (eq attr 'unspecified))) |
6606e83775f0
(set-face-underline): Delete this duplicate function
Juri Linkov <juri@jurta.org>
parents:
64762
diff
changeset
|
1344 ;; Make a hyperlink to the parent face. |
6606e83775f0
(set-face-underline): Delete this duplicate function
Juri Linkov <juri@jurta.org>
parents:
64762
diff
changeset
|
1345 (save-excursion |
6606e83775f0
(set-face-underline): Delete this duplicate function
Juri Linkov <juri@jurta.org>
parents:
64762
diff
changeset
|
1346 (re-search-backward ": \\([^:]+\\)" nil t) |
6606e83775f0
(set-face-underline): Delete this duplicate function
Juri Linkov <juri@jurta.org>
parents:
64762
diff
changeset
|
1347 (help-xref-button 1 'help-face attr))) |
6606e83775f0
(set-face-underline): Delete this duplicate function
Juri Linkov <juri@jurta.org>
parents:
64762
diff
changeset
|
1348 (insert "\n"))))) |
86010
d42c1cd75af4
(list-faces-display, describe-face):
Martin Rudalics <rudalics@gmx.at>
parents:
85996
diff
changeset
|
1349 (terpri)))))) |
39799
99f30ac48ec0
(list-faces-display, describe-face): Fix args to `help-xref-button'.
Miles Bader <miles@gnu.org>
parents:
39549
diff
changeset
|
1350 |
2456 | 1351 |
25012 | 1352 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
1353 ;;; Face specifications (defface). | |
1354 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1355 | |
1356 ;; Parameter FRAME Is kept for call compatibility to with previous | |
1357 ;; face implementation. | |
1358 | |
1359 (defun face-attr-construct (face &optional frame) | |
64539
c94d5f576885
(describe-face): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents:
64497
diff
changeset
|
1360 "Return a `defface'-style attribute list for FACE on FRAME. |
25012 | 1361 Value is a property list of pairs ATTRIBUTE VALUE for all specified |
1362 face attributes of FACE where ATTRIBUTE is the attribute name and | |
1363 VALUE is the specified value of that attribute." | |
1364 (let (result) | |
1365 (dolist (entry face-attribute-name-alist result) | |
1366 (let* ((attribute (car entry)) | |
1367 (value (face-attribute face attribute))) | |
1368 (unless (eq value 'unspecified) | |
1369 (setq result (nconc (list attribute value) result))))))) | |
37943 | 1370 |
25012 | 1371 |
1372 (defun face-spec-set-match-display (display frame) | |
1373 "Non-nil if DISPLAY matches FRAME. | |
1374 DISPLAY is part of a spec such as can be used in `defface'. | |
1375 If FRAME is nil, the current FRAME is used." | |
1376 (let* ((conjuncts display) | |
1377 conjunct req options | |
1378 ;; t means we have succeeded against all the conjuncts in | |
1379 ;; DISPLAY that have been tested so far. | |
1380 (match t)) | |
1381 (if (eq conjuncts t) | |
1382 (setq conjuncts nil)) | |
1383 (while (and conjuncts match) | |
1384 (setq conjunct (car conjuncts) | |
1385 conjuncts (cdr conjuncts) | |
1386 req (car conjunct) | |
1387 options (cdr conjunct) | |
1388 match (cond ((eq req 'type) | |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
1389 (or (memq (window-system frame) options) |
33447
45961172564e
(face-spec-set-match-display): Revert the change from
Eli Zaretskii <eliz@gnu.org>
parents:
33419
diff
changeset
|
1390 ;; 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
|
1391 ;; 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
|
1392 ;; 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
|
1393 ;; 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
|
1394 ;; 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
|
1395 ;; instead of (type graphic) etc. |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
1396 (and (null (window-system frame)) |
33447
45961172564e
(face-spec-set-match-display): Revert the change from
Eli Zaretskii <eliz@gnu.org>
parents:
33419
diff
changeset
|
1397 (memq 'tty options)) |
25887
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1398 (and (memq 'motif options) |
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1399 (featurep 'motif)) |
55545
70c4138d3b8d
* custom.el (defface): Document that type can have value gtk.
Jan Djärv <jan.h.d@swipnet.se>
parents:
54574
diff
changeset
|
1400 (and (memq 'gtk options) |
70c4138d3b8d
* custom.el (defface): Document that type can have value gtk.
Jan Djärv <jan.h.d@swipnet.se>
parents:
54574
diff
changeset
|
1401 (featurep 'gtk)) |
25887
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1402 (and (memq 'lucid options) |
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1403 (featurep 'x-toolkit) |
55545
70c4138d3b8d
* custom.el (defface): Document that type can have value gtk.
Jan Djärv <jan.h.d@swipnet.se>
parents:
54574
diff
changeset
|
1404 (not (featurep 'motif)) |
70c4138d3b8d
* custom.el (defface): Document that type can have value gtk.
Jan Djärv <jan.h.d@swipnet.se>
parents:
54574
diff
changeset
|
1405 (not (featurep 'gtk))) |
25887
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1406 (and (memq 'x-toolkit options) |
099a3776ff00
(face-spec-set-match-display): Recognize `type' of
Gerd Moellmann <gerd@gnu.org>
parents:
25814
diff
changeset
|
1407 (featurep 'x-toolkit)))) |
54151
9a5c3b661a40
(face-spec-set-match-display): Add a new attribute, `min-colors'.
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1408 ((eq req 'min-colors) |
9a5c3b661a40
(face-spec-set-match-display): Add a new attribute, `min-colors'.
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
1409 (>= (display-color-cells frame) (car options))) |
25012 | 1410 ((eq req 'class) |
1411 (memq (frame-parameter frame 'display-type) options)) | |
1412 ((eq req 'background) | |
1413 (memq (frame-parameter frame 'background-mode) | |
1414 options)) | |
45722
c553d91619aa
(display-supports-face-attributes-p): Work correctly if DISPLAY is a frame.
Miles Bader <miles@gnu.org>
parents:
45717
diff
changeset
|
1415 ((eq req 'supports) |
c553d91619aa
(display-supports-face-attributes-p): Work correctly if DISPLAY is a frame.
Miles Bader <miles@gnu.org>
parents:
45717
diff
changeset
|
1416 (display-supports-face-attributes-p options frame)) |
28840 | 1417 (t (error "Unknown req `%S' with options `%S'" |
25012 | 1418 req options))))) |
1419 match)) | |
1420 | |
1421 | |
1422 (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
|
1423 "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
|
1424 If SPEC is nil, return nil." |
25012 | 1425 (unless frame |
1426 (setq frame (selected-frame))) | |
1427 (let ((tail spec) | |
58935
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1428 result defaults) |
25012 | 1429 (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
|
1430 (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
|
1431 (display (car entry)) |
58935
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1432 (attrs (cdr entry)) |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1433 thisval) |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1434 ;; Get the attributes as actually specified by this alternative. |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1435 (setq thisval |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1436 (if (null (cdr attrs)) ;; was (listp (car attrs)) |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1437 ;; Old-style entry, the attribute list is the |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1438 ;; first element. |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1439 (car attrs) |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1440 attrs)) |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1441 |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1442 ;; If the condition is `default', that sets the default |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1443 ;; for following conditions. |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1444 (if (eq display 'default) |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1445 (setq defaults thisval) |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1446 ;; Otherwise, if it matches, use it. |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1447 (when (face-spec-set-match-display display frame) |
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1448 (setq result thisval) |
43711
d15360503e4e
(face-spec-choose): Allow `t' to appear before the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43550
diff
changeset
|
1449 (setq tail nil))))) |
58935
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
1450 (if defaults (append result defaults) result))) |
25012 | 1451 |
1452 | |
1453 (defun face-spec-reset-face (face &optional frame) | |
1454 "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
|
1455 (let ((attrs face-attribute-name-alist)) |
25012 | 1456 (while attrs |
1457 (let ((attr-and-name (car attrs))) | |
31401
0b8165a82e34
(set-face-attribute, face-spec-reset-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31197
diff
changeset
|
1458 (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
|
1459 (setq attrs (cdr attrs))))) |
25012 | 1460 |
1461 | |
87483
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1462 (defun face-spec-set (face spec &optional for-defface) |
92446
43421f91b96e
(face-spec-set): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
92115
diff
changeset
|
1463 "Set FACE's face spec, which controls its appearance, to SPEC. |
87483
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1464 If FOR-DEFFACE is t, set the base spec, the one that `defface' |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1465 and Custom set. (In that case, the caller must put it in the |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1466 appropriate property, because that depends on the caller.) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1467 If FOR-DEFFACE is nil, set the overriding spec (and store it |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1468 in the `face-override-spec' property of FACE). |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1469 |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1470 The appearance of FACE is controlled by the base spec, |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1471 by any custom theme specs on top of that, and by the |
92446
43421f91b96e
(face-spec-set): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
92115
diff
changeset
|
1472 overriding spec on top of all the rest. |
87483
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1473 |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1474 FOR-DEFFACE can also be a frame, in which case we set the |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1475 frame-specific attributes of FACE for that frame based on SPEC. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1476 That usage is deprecated. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1477 |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1478 See `defface' for information about the format and meaning of SPEC." |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1479 (if (framep for-defface) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1480 ;; Handle the deprecated case where third arg is a frame. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1481 (face-spec-set-2 face for-defface spec) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1482 (if for-defface |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1483 ;; When we reset the face based on its custom spec, then it is |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1484 ;; unmodified as far as Custom is concerned. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1485 (put (or (get face 'face-alias) face) 'face-modified nil) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1486 ;; When we change a face based on a spec from outside custom, |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1487 ;; record it for future frames. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1488 (put (or (get face 'face-alias) face) 'face-override-spec spec)) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1489 ;;; RMS 29 dec 2007: Perhaps this code should be reinstated. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1490 ;;; That depends on whether the overriding spec |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1491 ;;; or the default face attributes |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1492 ;;; should take priority. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1493 ;;; ;; Clear all the new-frame default attributes for this face. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1494 ;;; ;; face-spec-reset-face won't do it right. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1495 ;;; (let ((facevec (cdr (assq face face-new-frame-defaults)))) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1496 ;;; (dotimes (i (length facevec)) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1497 ;;; (unless (= i 0) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1498 ;;; (aset facevec i 'unspecified)))) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1499 ;; Reset each frame according to the rules implied by all its specs. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1500 (dolist (frame (frame-list)) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1501 (face-spec-recalc face frame)))) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1502 |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1503 (defun face-spec-recalc (face frame) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1504 "Reset the face attributes of FACE on FRAME according to its specs. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1505 This applies the defface/custom spec first, then the custom theme specs, |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1506 then the override spec." |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1507 (face-spec-reset-face face frame) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1508 (let ((face-sym (or (get face 'face-alias) face))) |
95787
09e6bd8a641a
(face-spec-recalc): When the face is set using Customize, avoid
Chong Yidong <cyd@stupidchicken.com>
parents:
95184
diff
changeset
|
1509 (or (get face 'customized-face) |
09e6bd8a641a
(face-spec-recalc): When the face is set using Customize, avoid
Chong Yidong <cyd@stupidchicken.com>
parents:
95184
diff
changeset
|
1510 (get face 'saved-face) |
09e6bd8a641a
(face-spec-recalc): When the face is set using Customize, avoid
Chong Yidong <cyd@stupidchicken.com>
parents:
95184
diff
changeset
|
1511 (face-spec-set-2 face frame (face-default-spec face))) |
87483
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1512 (let ((theme-faces (reverse (get face-sym 'theme-face)))) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1513 (dolist (spec theme-faces) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1514 (face-spec-set-2 face frame (cadr spec)))) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1515 (face-spec-set-2 face frame (get face-sym 'face-override-spec)))) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1516 |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1517 (defun face-spec-set-2 (face frame spec) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1518 "Set the face attributes of FACE on FRAME according to SPEC." |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1519 (let* ((attrs (face-spec-choose spec frame))) |
25012 | 1520 (while attrs |
1521 (let ((attribute (car attrs)) | |
1522 (value (car (cdr attrs)))) | |
1523 ;; Support some old-style attribute names and values. | |
1524 (case attribute | |
1525 (: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
|
1526 (: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
|
1527 ((:foreground :background) |
37943 | 1528 ;; 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
|
1529 ;; 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
|
1530 (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
|
1531 (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
|
1532 (setq attribute nil)))) |
281fa98f5c87
(face-spec-set): Ignore invalid attributes like 20.x.
Gerd Moellmann <gerd@gnu.org>
parents:
29976
diff
changeset
|
1533 (when attribute |
31401
0b8165a82e34
(set-face-attribute, face-spec-reset-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31197
diff
changeset
|
1534 (set-face-attribute face frame attribute value))) |
87483
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1535 (setq attrs (cdr (cdr attrs)))))) |
25012 | 1536 |
1537 (defun face-attr-match-p (face attrs &optional frame) | |
30971 | 1538 "Return t if attributes of FACE match values in plist ATTRS. |
25012 | 1539 Optional parameter FRAME is the frame whose definition of FACE |
1540 is used. If nil or omitted, use the selected frame." | |
1541 (unless frame | |
1542 (setq frame (selected-frame))) | |
1543 (let ((list face-attribute-name-alist) | |
1544 (match t)) | |
1545 (while (and match (not (null list))) | |
1546 (let* ((attr (car (car list))) | |
30971 | 1547 (specified-value |
1548 (if (plist-member attrs attr) | |
1549 (plist-get attrs attr) | |
1550 'unspecified)) | |
25012 | 1551 (value-now (face-attribute face attr frame))) |
30971 | 1552 (setq match (equal specified-value value-now)) |
25012 | 1553 (setq list (cdr list)))) |
1554 match)) | |
1555 | |
1556 (defun face-spec-match-p (face spec &optional frame) | |
1557 "Return t if FACE, on FRAME, matches what SPEC says it should look like." | |
1558 (face-attr-match-p face (face-spec-choose spec frame) frame)) | |
1559 | |
32795
975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
Miles Bader <miles@gnu.org>
parents:
32758
diff
changeset
|
1560 (defsubst face-default-spec (face) |
975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
Miles Bader <miles@gnu.org>
parents:
32758
diff
changeset
|
1561 "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
|
1562 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
|
1563 (get face 'face-defface-spec)) |
975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
Miles Bader <miles@gnu.org>
parents:
32758
diff
changeset
|
1564 |
975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
Miles Bader <miles@gnu.org>
parents:
32758
diff
changeset
|
1565 (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
|
1566 "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
|
1567 If there is neither a user setting nor a default for FACE, return nil." |
63637
de897c139738
(face-user-default-spec): Try getting `customized-face' prior to `saved-face'.
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
1568 (or (get face 'customized-face) |
de897c139738
(face-user-default-spec): Try getting `customized-face' prior to `saved-face'.
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
1569 (get face 'saved-face) |
32795
975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
Miles Bader <miles@gnu.org>
parents:
32758
diff
changeset
|
1570 (face-default-spec face))) |
25012 | 1571 |
1572 | |
1573 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1574 ;;; 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
|
1575 ;;; 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
|
1576 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1577 |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1578 (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
|
1579 "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
|
1580 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
|
1581 The value may be different for frames on different display types. |
71231
f91f3db3c52a
(defined-colors): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70178
diff
changeset
|
1582 If FRAME doesn't support colors, the value is nil. |
f91f3db3c52a
(defined-colors): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70178
diff
changeset
|
1583 If FRAME is nil, that stands for the selected frame." |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32734
diff
changeset
|
1584 (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
|
1585 (xw-defined-colors frame) |
27090
52e469fb402a
(read-face-attribute, defined-colors, color-defined-p):
Eli Zaretskii <eliz@gnu.org>
parents:
26927
diff
changeset
|
1586 (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
|
1587 (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
|
1588 |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1589 (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
|
1590 "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
|
1591 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
|
1592 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
|
1593 \"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
|
1594 (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
|
1595 nil |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32734
diff
changeset
|
1596 (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
|
1597 (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
|
1598 (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
|
1599 (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
|
1600 |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1601 (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
|
1602 "Return a description of the color named COLOR on frame FRAME. |
75884
ab51c2b6faf8
(color-values): Revert changes to docstring from 2007-01-31 and 2000-09-07.
Juanma Barranquero <lekktu@gmail.com>
parents:
75705
diff
changeset
|
1603 The value is a list of integer RGB values--(RED GREEN BLUE). |
ab51c2b6faf8
(color-values): Revert changes to docstring from 2007-01-31 and 2000-09-07.
Juanma Barranquero <lekktu@gmail.com>
parents:
75705
diff
changeset
|
1604 These values appear to range from 0 to 65280 or 65535, depending |
ab51c2b6faf8
(color-values): Revert changes to docstring from 2007-01-31 and 2000-09-07.
Juanma Barranquero <lekktu@gmail.com>
parents:
75705
diff
changeset
|
1605 on the system; white is \(65280 65280 65280\) or \(65535 65535 65535\). |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1606 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
|
1607 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
|
1608 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
|
1609 \"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
|
1610 (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
|
1611 nil |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32734
diff
changeset
|
1612 (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
|
1613 (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
|
1614 (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
|
1615 (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
|
1616 |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1617 (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
|
1618 "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
|
1619 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
|
1620 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
|
1621 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
|
1622 (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
|
1623 (xw-display-color-p display) |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1624 (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
|
1625 (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
|
1626 |
27571
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1627 (defun display-grayscale-p (&optional display) |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1628 "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
|
1629 (let ((frame-type (framep-on-display display))) |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1630 (cond |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1631 ((memq frame-type '(x w32 mac)) |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1632 (x-display-grayscale-p display)) |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1633 (t |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1634 (> (tty-color-gray-shades display) 2))))) |
4a4f7f602836
(display-color-p): Use framep-on-display.
Eli Zaretskii <eliz@gnu.org>
parents:
27117
diff
changeset
|
1635 |
85758
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1636 (defun read-color (&optional prompt convert-to-RGB-p allow-empty-name-p msg-p) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1637 "Read a color name or RGB hex value: #RRRRGGGGBBBB. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1638 Completion is available for color names, but not for RGB hex strings. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1639 If the user inputs an RGB hex string, it must have the form |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1640 #XXXXXXXXXXXX or XXXXXXXXXXXX, where each X is a hex digit. The |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1641 number of Xs must be a multiple of 3, with the same number of Xs for |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1642 each of red, green, and blue. The order is red, green, blue. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1643 |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1644 In addition to standard color names and RGB hex values, the following |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1645 are available as color candidates. In each case, the corresponding |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1646 color is used. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1647 |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1648 * `foreground at point' - foreground under the cursor |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1649 * `background at point' - background under the cursor |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1650 |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1651 Checks input to be sure it represents a valid color. If not, raises |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1652 an error (but see exception for empty input with non-nil |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1653 ALLOW-EMPTY-NAME-P). |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1654 |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1655 Optional arg PROMPT is the prompt; if nil, uses a default prompt. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1656 |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1657 Interactively, or with optional arg CONVERT-TO-RGB-P non-nil, converts |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1658 an input color name to an RGB hex string. Returns the RGB hex string. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1659 |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1660 Optional arg ALLOW-EMPTY-NAME-P controls what happens if the user |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1661 enters an empty color name (that is, just hits `RET'). If non-nil, |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1662 then returns an empty color name, \"\". If nil, then raises an error. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1663 Programs must test for \"\" if ALLOW-EMPTY-NAME-P is non-nil. They |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1664 can then perform an appropriate action in case of empty input. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1665 |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1666 Interactively, or with optional arg MSG-P non-nil, echoes the color in |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1667 a message." |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1668 (interactive "i\np\ni\np") ; Always convert to RGB interactively. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1669 (let* ((completion-ignore-case t) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1670 (colors (append '("foreground at point" "background at point") |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1671 (defined-colors))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1672 (color (completing-read (or prompt "Color (name or #R+G+B+): ") |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1673 colors)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1674 hex-string) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1675 (cond ((string= "foreground at point" color) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1676 (setq color (foreground-color-at-point))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1677 ((string= "background at point" color) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1678 (setq color (background-color-at-point)))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1679 (unless color |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1680 (setq color "")) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1681 (setq hex-string |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1682 (string-match "^#?\\([a-fA-F0-9][a-fA-F0-9][a-fA-F0-9]\\)+$" color)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1683 (if (and allow-empty-name-p (string= "" color)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1684 "" |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1685 (when (and hex-string (not (eq (aref color 0) ?#))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1686 (setq color (concat "#" color))) ; No #; add it. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1687 (unless hex-string |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1688 (when (or (string= "" color) (not (test-completion color colors))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1689 (error "No such color: %S" color)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1690 (when convert-to-RGB-p |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1691 (let ((components (x-color-values color))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1692 (unless components (error "No such color: %S" color)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1693 (unless (string-match "^#\\([a-fA-F0-9][a-fA-F0-9][a-fA-F0-9]\\)+$" color) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1694 (setq color (format "#%04X%04X%04X" |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1695 (logand 65535 (nth 0 components)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1696 (logand 65535 (nth 1 components)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1697 (logand 65535 (nth 2 components)))))))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1698 (when msg-p (message "Color: `%s'" color)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1699 color))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1700 |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1701 ;; Commented out because I decided it is better to include the |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1702 ;; duplicates in read-color's completion list. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1703 |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1704 ;; (defun defined-colors-without-duplicates () |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1705 ;; "Return the list of defined colors, without the no-space versions. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1706 ;; For each color name, we keep the variant that DOES have spaces." |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1707 ;; (let ((result (copy-sequence (defined-colors))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1708 ;; to-be-rejected) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1709 ;; (save-match-data |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1710 ;; (dolist (this result) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1711 ;; (if (string-match " " this) |
92115
b4b2ac0c80f8
(font-weight-table): Fix value of `semi-light'.
Juanma Barranquero <lekktu@gmail.com>
parents:
92112
diff
changeset
|
1712 ;; (push (replace-regexp-in-string " " "" |
85758
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1713 ;; this) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1714 ;; to-be-rejected))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1715 ;; (dolist (elt to-be-rejected) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1716 ;; (let ((as-found (car (member-ignore-case elt result)))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1717 ;; (setq result (delete as-found result))))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1718 ;; result)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1719 |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1720 (defun face-at-point () |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1721 "Return the face of the character after point. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1722 If it has more than one face, return the first one. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1723 Return nil if it has no specified face." |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1724 (let* ((faceprop (or (get-char-property (point) 'read-face-name) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1725 (get-char-property (point) 'face) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1726 'default)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1727 (face (cond ((symbolp faceprop) faceprop) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1728 ;; List of faces (don't treat an attribute spec). |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1729 ;; Just use the first face. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1730 ((and (consp faceprop) (not (keywordp (car faceprop))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1731 (not (memq (car faceprop) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1732 '(foreground-color background-color)))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1733 (car faceprop)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1734 (t nil)))) ; Invalid face value. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1735 (if (facep face) face nil))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1736 |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1737 (defun foreground-color-at-point () |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1738 "Return the foreground color of the character after point." |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1739 ;; `face-at-point' alone is not sufficient. It only gets named faces. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1740 ;; Need also pick up any face properties that are not associated with named faces. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1741 (let ((face (or (face-at-point) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1742 (get-char-property (point) 'read-face-name) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1743 (get-char-property (point) 'face)))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1744 (cond ((and face (symbolp face)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1745 (let ((value (face-foreground face nil 'default))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1746 (if (member value '("unspecified-fg" "unspecified-bg")) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1747 nil |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1748 value))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1749 ((consp face) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1750 (cond ((memq 'foreground-color face) (cdr (memq 'foreground-color face))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1751 ((memq ':foreground face) (cadr (memq ':foreground face))))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1752 (t nil)))) ; Invalid face value. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1753 |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1754 (defun background-color-at-point () |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1755 "Return the background color of the character after point." |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1756 ;; `face-at-point' alone is not sufficient. It only gets named faces. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1757 ;; Need also pick up any face properties that are not associated with named faces. |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1758 (let ((face (or (face-at-point) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1759 (get-char-property (point) 'read-face-name) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1760 (get-char-property (point) 'face)))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1761 (cond ((and face (symbolp face)) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1762 (let ((value (face-background face nil 'default))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1763 (if (member value '("unspecified-fg" "unspecified-bg")) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1764 nil |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1765 value))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1766 ((consp face) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1767 (cond ((memq 'background-color face) (cdr (memq 'background-color face))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1768 ((memq ':background face) (cadr (memq ':background face))))) |
674b001d26e1
(read-color): New function.
Richard M. Stallman <rms@gnu.org>
parents:
85415
diff
changeset
|
1769 (t nil)))) ; Invalid face value. |
26736
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1770 |
a0674327c167
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26657
diff
changeset
|
1771 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
25012 | 1772 ;;; Background mode. |
1773 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1774 | |
1775 (defcustom frame-background-mode nil | |
1776 "*The brightness of the background. | |
63637
de897c139738
(face-user-default-spec): Try getting `customized-face' prior to `saved-face'.
Juri Linkov <juri@jurta.org>
parents:
63594
diff
changeset
|
1777 Set this to the symbol `dark' if your background color is dark, |
67503
71e68cea180c
(frame-background-mode): Replace `choice-item' keywords
Juri Linkov <juri@jurta.org>
parents:
67049
diff
changeset
|
1778 `light' if your background is light, or nil (automatic by default) |
71e68cea180c
(frame-background-mode): Replace `choice-item' keywords
Juri Linkov <juri@jurta.org>
parents:
67049
diff
changeset
|
1779 if you want Emacs to examine the brightness for you. Don't set this |
71e68cea180c
(frame-background-mode): Replace `choice-item' keywords
Juri Linkov <juri@jurta.org>
parents:
67049
diff
changeset
|
1780 variable with `setq'; this won't have the expected effect." |
25012 | 1781 :group 'faces |
1782 :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
|
1783 (set-default var value) |
31528
a461cad7a942
(face-x-resources): Make custom type more specific.
Dave Love <fx@gnu.org>
parents:
31500
diff
changeset
|
1784 (mapc 'frame-set-background-mode (frame-list))) |
25012 | 1785 :initialize 'custom-initialize-changed |
67503
71e68cea180c
(frame-background-mode): Replace `choice-item' keywords
Juri Linkov <juri@jurta.org>
parents:
67049
diff
changeset
|
1786 :type '(choice (const dark) |
71e68cea180c
(frame-background-mode): Replace `choice-item' keywords
Juri Linkov <juri@jurta.org>
parents:
67049
diff
changeset
|
1787 (const light) |
71e68cea180c
(frame-background-mode): Replace `choice-item' keywords
Juri Linkov <juri@jurta.org>
parents:
67049
diff
changeset
|
1788 (const :tag "automatic" nil))) |
25012 | 1789 |
1790 | |
1791 (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
|
1792 "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
|
1793 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
|
1794 according to the `background-mode' and `display-type' frame parameters." |
25012 | 1795 (let* ((bg-resource |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
1796 (and (window-system frame) |
50025
ffbc79f0f914
(frame-set-background-mode): Fix reference to attribute "backgroundMode".
Juanma Barranquero <lekktu@gmail.com>
parents:
48914
diff
changeset
|
1797 (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
|
1798 (bg-color (frame-parameter frame 'background-color)) |
83524
673d62ad74b5
Fix and/or simplify terminal initialization files.
Karoly Lorentey <lorentey@elte.hu>
parents:
83523
diff
changeset
|
1799 (terminal-bg-mode (terminal-parameter frame 'background-mode)) |
673d62ad74b5
Fix and/or simplify terminal initialization files.
Karoly Lorentey <lorentey@elte.hu>
parents:
83523
diff
changeset
|
1800 (tty-type (tty-type frame)) |
32376 | 1801 (bg-mode |
1802 (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
|
1803 (bg-resource |
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1804 (intern (downcase bg-resource))) |
83524
673d62ad74b5
Fix and/or simplify terminal initialization files.
Karoly Lorentey <lorentey@elte.hu>
parents:
83523
diff
changeset
|
1805 (terminal-bg-mode) |
83074
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1806 ((and (null (window-system frame)) |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1807 ;; Unspecified frame background color can only |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1808 ;; happen on tty's. |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1809 (member bg-color '(nil unspecified "unspecified-bg"))) |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1810 ;; There is no way to determine the background mode |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1811 ;; automatically, so we make a guess based on the |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1812 ;; terminal type. |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1813 (if (and tty-type |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1814 (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)" |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1815 tty-type)) |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1816 'light |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1817 'dark)) |
32734
92b46ad86f6a
(color-values, color-defined-p): Use `member', not
Miles Bader <miles@gnu.org>
parents:
32649
diff
changeset
|
1818 ((equal bg-color "unspecified-fg") ; inverted colors |
83074
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1819 (if (and tty-type |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1820 (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)" |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1821 tty-type)) |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1822 'dark |
34a7a8f40548
Fix background-mode on terminal frames (Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents:
83067
diff
changeset
|
1823 'light)) |
75705
6c6d674034cd
(frame-set-background-mode): Use `color-values' and `display-color-p',
Juanma Barranquero <lekktu@gmail.com>
parents:
75703
diff
changeset
|
1824 ((>= (apply '+ (color-values bg-color frame)) |
32376 | 1825 ;; Just looking at the screen, colors whose |
1826 ;; values add up to .6 of the white total | |
1827 ;; still look dark to me. | |
75705
6c6d674034cd
(frame-set-background-mode): Use `color-values' and `display-color-p',
Juanma Barranquero <lekktu@gmail.com>
parents:
75703
diff
changeset
|
1828 (* (apply '+ (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
|
1829 'light) |
48709f040160
(frame-set-background-mode): If a tty frame defines a
Eli Zaretskii <eliz@gnu.org>
parents:
32404
diff
changeset
|
1830 (t 'dark))) |
32376 | 1831 (display-type |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
1832 (cond ((null (window-system frame)) |
32376 | 1833 (if (tty-display-color-p frame) 'color 'mono)) |
75705
6c6d674034cd
(frame-set-background-mode): Use `color-values' and `display-color-p',
Juanma Barranquero <lekktu@gmail.com>
parents:
75703
diff
changeset
|
1834 ((display-color-p frame) |
32376 | 1835 'color) |
1836 ((x-display-grayscale-p frame) | |
1837 'grayscale) | |
1838 (t 'mono))) | |
1839 (old-bg-mode | |
1840 (frame-parameter frame 'background-mode)) | |
1841 (old-display-type | |
1842 (frame-parameter frame 'display-type))) | |
1843 | |
1844 (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
|
1845 (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
|
1846 ;; 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
|
1847 ;; faces that don't match what their face-spec says they should |
87483
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1848 ;; look like; we then avoid changing these faces below. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1849 ;; These are the faces whose attributes were modified on FRAME. |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1850 ;; We use a negative list on the assumption that most faces will |
34246
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1851 ;; 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
|
1852 (dolist (face (face-list)) |
87483
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1853 (and (not (get face 'face-override-spec)) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1854 (not (face-spec-match-p face |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1855 (face-user-default-spec face) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1856 (selected-frame))) |
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1857 (push face locally-modified-faces))) |
34246
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1858 ;; 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
|
1859 (modify-frame-parameters frame |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1860 (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
|
1861 (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
|
1862 ;; 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
|
1863 ;; 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
|
1864 (dolist (face (face-list)) |
e7acfcef56ae
(frame-set-background-mode): Avoid stomping on locally modified faces.
Miles Bader <miles@gnu.org>
parents:
34162
diff
changeset
|
1865 (unless (memq face locally-modified-faces) |
87483
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
1866 (face-spec-recalc face frame))))))) |
25012 | 1867 |
1868 | |
1869 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1870 ;;; Frame creation. | |
1871 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
1872 | |
1873 (defun x-handle-named-frame-geometry (parameters) | |
1874 "Add geometry parameters for a named frame to parameter list PARAMETERS. | |
1875 Value is the new parameter list." | |
1876 (let* ((name (or (cdr (assq 'name parameters)) | |
1877 (cdr (assq 'name default-frame-alist)))) | |
1878 (x-resource-name name) | |
1879 (res-geometry (if name (x-get-resource "geometry" "Geometry")))) | |
1880 (when res-geometry | |
1881 (let ((parsed (x-parse-geometry res-geometry))) | |
1882 ;; If the resource specifies a position, call the position | |
1883 ;; and size "user-specified". | |
1884 (when (or (assq 'top parsed) | |
1885 (assq 'left parsed)) | |
1886 (setq parsed (append '((user-position . t) (user-size . t)) parsed))) | |
1887 ;; Put the geometry parameters at the end. Copy | |
1888 ;; default-frame-alist so that they go after it. | |
1889 (setq parameters (append parameters default-frame-alist parsed)))) | |
1890 parameters)) | |
1891 | |
1892 | |
1893 (defun x-handle-reverse-video (frame parameters) | |
1894 "Handle the reverse-video frame parameter and X resource. | |
1895 `x-create-frame' does not handle this one." | |
1896 (when (cdr (or (assq 'reverse parameters) | |
1897 (assq 'reverse default-frame-alist) | |
1898 (let ((resource (x-get-resource "reverseVideo" | |
1899 "ReverseVideo"))) | |
1900 (if resource | |
1901 (cons nil (member (downcase resource) | |
1902 '("on" "true"))))))) | |
1903 (let* ((params (frame-parameters frame)) | |
1904 (bg (cdr (assq 'foreground-color params))) | |
1905 (fg (cdr (assq 'background-color params)))) | |
1906 (modify-frame-parameters frame | |
1907 (list (cons 'foreground-color fg) | |
1908 (cons 'background-color bg))) | |
1909 (if (equal bg (cdr (assq 'border-color params))) | |
1910 (modify-frame-parameters frame | |
1911 (list (cons 'border-color fg)))) | |
1912 (if (equal bg (cdr (assq 'mouse-color params))) | |
1913 (modify-frame-parameters frame | |
1914 (list (cons 'mouse-color fg)))) | |
1915 (if (equal bg (cdr (assq 'cursor-color params))) | |
1916 (modify-frame-parameters frame | |
1917 (list (cons 'cursor-color fg))))))) | |
1918 | |
1919 | |
1920 (defun x-create-frame-with-faces (&optional parameters) | |
1921 "Create a frame from optional frame parameters PARAMETERS. | |
1922 Parameters not specified by PARAMETERS are taken from | |
1923 `default-frame-alist'. If PARAMETERS specify a frame name, | |
1924 handle X geometry resources for that name. If either PARAMETERS | |
1925 or `default-frame-alist' contains a `reverse' parameter, or | |
1926 the X resource ``reverseVideo'' is present, handle that. | |
1927 Value is the new frame created." | |
1928 (setq parameters (x-handle-named-frame-geometry parameters)) | |
1929 (let ((visibility-spec (assq 'visibility parameters)) | |
83016
1d7467694692
Fix initialization of the window-system variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
83014
diff
changeset
|
1930 (frame (x-create-frame `((visibility . nil) . ,parameters))) |
25012 | 1931 success) |
1932 (unwind-protect | |
1933 (progn | |
83316
102194c6d773
Update Lisp code for a terminal-local `function-key-map'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83314
diff
changeset
|
1934 (x-setup-function-keys frame) |
25012 | 1935 (x-handle-reverse-video frame parameters) |
1936 (frame-set-background-mode frame) | |
51248
e21b4eb91135
(x-create-frame-with-faces): Call `face-set-after-frame-default'.
John Paul Wallington <jpw@pobox.com>
parents:
51095
diff
changeset
|
1937 (face-set-after-frame-default frame) |
83496
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83488
diff
changeset
|
1938 ;; Make sure the tool-bar is ready to be enabled. The |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83488
diff
changeset
|
1939 ;; `tool-bar-lines' frame parameter will not take effect |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83488
diff
changeset
|
1940 ;; without this call. |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83488
diff
changeset
|
1941 (tool-bar-setup frame) |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83488
diff
changeset
|
1942 (if (null visibility-spec) |
25012 | 1943 (make-frame-visible frame) |
1944 (modify-frame-parameters frame (list visibility-spec))) | |
1945 (setq success t)) | |
1946 (unless success | |
1947 (delete-frame frame))) | |
1948 frame)) | |
1949 | |
1950 (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
|
1951 "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
|
1952 Initialize colors of certain faces from frame parameters." |
66360
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1953 (unless inhibit-face-set-after-frame-default |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1954 (if (face-attribute 'default :font t) |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1955 (set-face-attribute 'default frame :font |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1956 (face-attribute 'default :font t)) |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1957 (set-face-attribute 'default frame :family |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1958 (face-attribute 'default :family t)) |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1959 (set-face-attribute 'default frame :height |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1960 (face-attribute 'default :height t)) |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1961 (set-face-attribute 'default frame :slant |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1962 (face-attribute 'default :slant t)) |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1963 (set-face-attribute 'default frame :weight |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1964 (face-attribute 'default :weight t)) |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1965 (set-face-attribute 'default frame :width |
fcb2ec449238
(inhibit-face-set-after-frame-default): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66351
diff
changeset
|
1966 (face-attribute 'default :width t)))) |
75696
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1967 ;; Find attributes that should be initialized from frame parameters. |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1968 (let ((face-params '((foreground-color default :foreground) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1969 (background-color default :background) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1970 (border-color border :background) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1971 (cursor-color cursor :background) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1972 (scroll-bar-foreground scroll-bar :foreground) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1973 (scroll-bar-background scroll-bar :background) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1974 (mouse-color mouse :background))) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1975 apply-params) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1976 (dolist (param face-params) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1977 (let* ((value (frame-parameter frame (nth 0 param))) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1978 (face (nth 1 param)) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1979 (attr (nth 2 param)) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1980 (default-value (face-attribute face attr t))) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1981 ;; Compile a list of face attributes to set, but don't set |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1982 ;; them yet. The call to make-face-x-resource-internal, |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1983 ;; below, can change frame parameters, and the final set of |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1984 ;; frame parameters should be the ones acquired at this step. |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1985 (if (eq default-value 'unspecified) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1986 ;; The face spec does not specify a new-frame value for |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1987 ;; this attribute. Check if the existing frame parameter |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1988 ;; specifies it. |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1989 (if value |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1990 (push (list face frame attr value) apply-params)) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1991 ;; The face spec specifies a value for this attribute, to be |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1992 ;; applied to the face on all new frames. |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1993 (push (list face frame attr default-value) apply-params)))) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1994 ;; Initialize faces from face specs and X resources. The |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1995 ;; condition-case prevents invalid specs from causing frame |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1996 ;; creation to fail. |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1997 (dolist (face (delq 'default (face-list))) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1998 (condition-case () |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
1999 (progn |
87483
bdb419612503
(face-spec-set): Third arg is now FOR-DEFFACE.
Richard M. Stallman <rms@gnu.org>
parents:
87453
diff
changeset
|
2000 (face-spec-recalc face frame) |
83556 | 2001 (if (memq (window-system frame) '(x w32 mac)) |
76447
6da62180836c
(face-set-after-frame-default): Recalculate face customizations after
Chong Yidong <cyd@stupidchicken.com>
parents:
76292
diff
changeset
|
2002 (make-face-x-resource-internal face frame)) |
76731
e3710dba6329
(face-set-after-frame-default): Revert 2007-03-10 change. Merge in X
Chong Yidong <cyd@stupidchicken.com>
parents:
76585
diff
changeset
|
2003 (internal-merge-in-global-face face frame)) |
75696
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
2004 (error nil))) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
2005 ;; Apply the attributes specified by frame parameters. This |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
2006 ;; rewrites parameters changed by make-face-x-resource-internal |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
2007 (dolist (param apply-params) |
97897143b20e
(face-set-after-frame-default): Compile attributes to be set by frame
Chong Yidong <cyd@stupidchicken.com>
parents:
75591
diff
changeset
|
2008 (apply 'set-face-attribute param)))) |
25012 | 2009 |
33008
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2010 (defun tty-handle-reverse-video (frame parameters) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2011 "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
|
2012 (when (cdr (or (assq 'reverse parameters) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2013 (assq 'reverse default-frame-alist))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2014 (let* ((params (frame-parameters frame)) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2015 (bg (cdr (assq 'foreground-color params))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2016 (fg (cdr (assq 'background-color params)))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2017 (modify-frame-parameters frame |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2018 (list (cons 'foreground-color fg) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2019 (cons 'background-color bg))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2020 (if (equal bg (cdr (assq 'mouse-color params))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2021 (modify-frame-parameters frame |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2022 (list (cons 'mouse-color fg)))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2023 (if (equal bg (cdr (assq 'cursor-color params))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2024 (modify-frame-parameters frame |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2025 (list (cons 'cursor-color fg))))))) |
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2026 |
25012 | 2027 |
2028 (defun tty-create-frame-with-faces (&optional parameters) | |
2029 "Create a frame from optional frame parameters PARAMETERS. | |
2030 Parameters not specified by PARAMETERS are taken from | |
2031 `default-frame-alist'. If either PARAMETERS or `default-frame-alist' | |
2032 contains a `reverse' parameter, handle that. Value is the new frame | |
2033 created." | |
2034 (let ((frame (make-terminal-frame parameters)) | |
2035 success) | |
2036 (unwind-protect | |
83129
b1ded6fb31d1
Use with-selected-frame.
Karoly Lorentey <lorentey@elte.hu>
parents:
83123
diff
changeset
|
2037 (with-selected-frame frame |
33008
c30c394884b8
(tty-handle-reverse-video): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
32940
diff
changeset
|
2038 (tty-handle-reverse-video frame (frame-parameters frame)) |
83359
8f0c7632f259
Slightly refactor the terminal initialization code for simplicity.
Karoly Lorentey <lorentey@elte.hu>
parents:
83358
diff
changeset
|
2039 |
85415
b1e285a2d293
(tty-create-frame-with-faces): Make sure not only
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85311
diff
changeset
|
2040 (unless (terminal-parameter frame 'terminal-initted) |
b1e285a2d293
(tty-create-frame-with-faces): Make sure not only
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85311
diff
changeset
|
2041 (set-terminal-parameter frame 'terminal-initted t) |
b1e285a2d293
(tty-create-frame-with-faces): Make sure not only
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85311
diff
changeset
|
2042 (set-locale-environment nil frame) |
b1e285a2d293
(tty-create-frame-with-faces): Make sure not only
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85311
diff
changeset
|
2043 (tty-run-terminal-initialization frame)) |
25012 | 2044 (frame-set-background-mode frame) |
2045 (face-set-after-frame-default frame) | |
2046 (setq success t)) | |
2047 (unless success | |
2048 (delete-frame frame))) | |
2049 frame)) | |
2050 | |
83523
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2051 (defun tty-find-type (pred type) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2052 "Return the longest prefix of TYPE to which PRED returns non-nil. |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2053 TYPE should be a tty type name such as \"xterm-16color\". |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2054 |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2055 The function tries only those prefixes that are followed by a |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2056 dash or underscore in the original type name, like \"xterm\" in |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2057 the above example." |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2058 (let (hyphend) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2059 (while (and type |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2060 (not (funcall pred type))) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2061 ;; Strip off last hyphen and what follows, then try again |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2062 (setq type |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2063 (if (setq hyphend (string-match "[-_][^-_]+$" type)) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2064 (substring type 0 hyphend) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2065 nil)))) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2066 type) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2067 |
83524
673d62ad74b5
Fix and/or simplify terminal initialization files.
Karoly Lorentey <lorentey@elte.hu>
parents:
83523
diff
changeset
|
2068 (defun tty-run-terminal-initialization (frame &optional type) |
673d62ad74b5
Fix and/or simplify terminal initialization files.
Karoly Lorentey <lorentey@elte.hu>
parents:
83523
diff
changeset
|
2069 "Run the special initialization code for the terminal type of FRAME. |
673d62ad74b5
Fix and/or simplify terminal initialization files.
Karoly Lorentey <lorentey@elte.hu>
parents:
83523
diff
changeset
|
2070 The optional TYPE parameter may be used to override the autodetected |
673d62ad74b5
Fix and/or simplify terminal initialization files.
Karoly Lorentey <lorentey@elte.hu>
parents:
83523
diff
changeset
|
2071 terminal type to a different value." |
673d62ad74b5
Fix and/or simplify terminal initialization files.
Karoly Lorentey <lorentey@elte.hu>
parents:
83523
diff
changeset
|
2072 (setq type (or type (tty-type frame))) |
83359
8f0c7632f259
Slightly refactor the terminal initialization code for simplicity.
Karoly Lorentey <lorentey@elte.hu>
parents:
83358
diff
changeset
|
2073 ;; Load library for our terminal type. |
8f0c7632f259
Slightly refactor the terminal initialization code for simplicity.
Karoly Lorentey <lorentey@elte.hu>
parents:
83358
diff
changeset
|
2074 ;; User init file can set term-file-prefix to nil to prevent this. |
8f0c7632f259
Slightly refactor the terminal initialization code for simplicity.
Karoly Lorentey <lorentey@elte.hu>
parents:
83358
diff
changeset
|
2075 (with-selected-frame frame |
85415
b1e285a2d293
(tty-create-frame-with-faces): Make sure not only
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85311
diff
changeset
|
2076 (unless (null term-file-prefix) |
83523
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2077 (let* (term-init-func) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2078 ;; First, load the terminal initialization file, if it is |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2079 ;; available and it hasn't been loaded already. |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2080 (tty-find-type #'(lambda (type) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2081 (let ((file (locate-library (concat term-file-prefix type)))) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2082 (and file |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2083 (or (assoc file load-history) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2084 (load file t t))))) |
83524
673d62ad74b5
Fix and/or simplify terminal initialization files.
Karoly Lorentey <lorentey@elte.hu>
parents:
83523
diff
changeset
|
2085 type) |
83523
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2086 ;; Next, try to find a matching initialization function, and call it. |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2087 (tty-find-type #'(lambda (type) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2088 (fboundp (setq term-init-func |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2089 (intern (concat "terminal-init-" type))))) |
83524
673d62ad74b5
Fix and/or simplify terminal initialization files.
Karoly Lorentey <lorentey@elte.hu>
parents:
83523
diff
changeset
|
2090 type) |
83380
94f174e5569d
Merged from miles@gnu.org--gnu-2005 (patch 543)
Karoly Lorentey <lorentey@elte.hu>
parents:
83359
diff
changeset
|
2091 (when (fboundp term-init-func) |
83523
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2092 (funcall term-init-func)) |
6ce7108f7eef
Don't load terminit files repeatedly. Also, don't call terminit functions more than once per terminal.
Karoly Lorentey <lorentey@elte.hu>
parents:
83513
diff
changeset
|
2093 (set-terminal-parameter frame 'terminal-initted term-init-func))))) |
25012 | 2094 |
2095 ;; Called from C function init_display to initialize faces of the | |
2096 ;; dumped terminal frame on startup. | |
2097 | |
2098 (defun tty-set-up-initial-frame-faces () | |
2099 (let ((frame (selected-frame))) | |
2100 (frame-set-background-mode frame) | |
2101 (face-set-after-frame-default frame))) | |
37943 | 2102 |
25012 | 2103 |
2104 | |
2105 | |
2106 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2107 ;;; Compatiblity with 20.2 | |
2108 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2109 | |
2110 ;; Update a frame's faces when we change its default font. | |
2111 | |
55883
cde9d1fff89c
(frame-update-faces): Add empty docstring so the one for `ignore' doesn't
Juanma Barranquero <lekktu@gmail.com>
parents:
55545
diff
changeset
|
2112 (defalias 'frame-update-faces 'ignore "") |
46053
ef0684c3e07b
(frame-update-faces): Fix obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
46041
diff
changeset
|
2113 (make-obsolete 'frame-update-faces "no longer necessary." "21.1") |
25012 | 2114 |
2115 ;; Update the colors of FACE, after FRAME's own colors have been | |
2116 ;; changed. | |
2117 | |
64539
c94d5f576885
(describe-face): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents:
64497
diff
changeset
|
2118 (define-obsolete-function-alias 'frame-update-face-colors |
c94d5f576885
(describe-face): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents:
64497
diff
changeset
|
2119 'frame-set-background-mode "21.1") |
25012 | 2120 |
2121 | |
2122 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2123 ;;; Standard faces. | |
2124 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2125 | |
2126 (defgroup basic-faces nil | |
2127 "The standard faces of Emacs." | |
2128 :group 'faces) | |
2129 | |
93694
a60642ce1ede
(default): Ensure the face-defface-spec property is set.
Chong Yidong <cyd@stupidchicken.com>
parents:
92948
diff
changeset
|
2130 (defface default |
a60642ce1ede
(default): Ensure the face-defface-spec property is set.
Chong Yidong <cyd@stupidchicken.com>
parents:
92948
diff
changeset
|
2131 '((t nil)) ; If this were nil, face-defface-spec would not be set. |
25012 | 2132 "Basic default face." |
2133 :group 'basic-faces) | |
2134 | |
65730
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2135 (defface bold |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2136 '((t :weight bold)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2137 "Basic bold face." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2138 :group 'basic-faces) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2139 |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2140 (defface italic |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2141 '((((supports :slant italic)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2142 :slant italic) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2143 (((supports :underline t)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2144 :underline t) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2145 (t |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2146 ;; default to italic, even it doesn't appear to be supported, |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2147 ;; because in some cases the display engine will do it's own |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2148 ;; workaround (to `dim' on ttys) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2149 :slant italic)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2150 "Basic italic face." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2151 :group 'basic-faces) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2152 |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2153 (defface bold-italic |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2154 '((t :weight bold :slant italic)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2155 "Basic bold-italic face." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2156 :group 'basic-faces) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2157 |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2158 (defface underline |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2159 '((((supports :underline t)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2160 :underline t) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2161 (((supports :weight bold)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2162 :weight bold) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2163 (t :underline t)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2164 "Basic underlined face." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2165 :group 'basic-faces) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2166 |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2167 (defface fixed-pitch |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2168 '((t :family "courier")) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2169 "The basic fixed-pitch face." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2170 :group 'basic-faces) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2171 |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2172 (defface variable-pitch |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2173 '((t :family "helv")) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2174 "The basic variable-pitch face." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2175 :group 'basic-faces) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2176 |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2177 (defface shadow |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2178 '((((class color grayscale) (min-colors 88) (background light)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2179 :foreground "grey50") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2180 (((class color grayscale) (min-colors 88) (background dark)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2181 :foreground "grey70") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2182 (((class color) (min-colors 8) (background light)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2183 :foreground "green") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2184 (((class color) (min-colors 8) (background dark)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2185 :foreground "yellow")) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2186 "Basic face for shadowed text." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2187 :group 'basic-faces |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2188 :version "22.1") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2189 |
68341
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2190 (defface link |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2191 '((((class color) (min-colors 88) (background light)) |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2192 :foreground "blue1" :underline t) |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2193 (((class color) (background light)) |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2194 :foreground "blue" :underline t) |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2195 (((class color) (min-colors 88) (background dark)) |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2196 :foreground "cyan1" :underline t) |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2197 (((class color) (background dark)) |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2198 :foreground "cyan" :underline t) |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2199 (t :inherit underline)) |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2200 "Basic face for unvisited links." |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2201 :group 'basic-faces |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2202 :version "22.1") |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2203 |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2204 (defface link-visited |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2205 '((default :inherit link) |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2206 (((class color) (background light)) :foreground "magenta4") |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2207 (((class color) (background dark)) :foreground "violet")) |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2208 "Basic face for visited links." |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2209 :group 'basic-faces |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2210 :version "22.1") |
acccd9689759
(link, link-visited): New faces based on default values
Juri Linkov <juri@jurta.org>
parents:
68214
diff
changeset
|
2211 |
65730
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2212 (defface highlight |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2213 '((((class color) (min-colors 88) (background light)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2214 :background "darkseagreen2") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2215 (((class color) (min-colors 88) (background dark)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2216 :background "darkolivegreen") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2217 (((class color) (min-colors 16) (background light)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2218 :background "darkseagreen2") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2219 (((class color) (min-colors 16) (background dark)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2220 :background "darkolivegreen") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2221 (((class color) (min-colors 8)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2222 :background "green" :foreground "black") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2223 (t :inverse-video t)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2224 "Basic face for highlighting." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2225 :group 'basic-faces) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2226 |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2227 (defface region |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2228 '((((class color) (min-colors 88) (background dark)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2229 :background "blue3") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2230 (((class color) (min-colors 88) (background light)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2231 :background "lightgoldenrod2") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2232 (((class color) (min-colors 16) (background dark)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2233 :background "blue3") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2234 (((class color) (min-colors 16) (background light)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2235 :background "lightgoldenrod2") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2236 (((class color) (min-colors 8)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2237 :background "blue" :foreground "white") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2238 (((type tty) (class mono)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2239 :inverse-video t) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2240 (t :background "gray")) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2241 "Basic face for highlighting the region." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2242 :version "21.1" |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2243 :group 'basic-faces) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2244 |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2245 (defface secondary-selection |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2246 '((((class color) (min-colors 88) (background light)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2247 :background "yellow1") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2248 (((class color) (min-colors 88) (background dark)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2249 :background "SkyBlue4") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2250 (((class color) (min-colors 16) (background light)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2251 :background "yellow") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2252 (((class color) (min-colors 16) (background dark)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2253 :background "SkyBlue4") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2254 (((class color) (min-colors 8)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2255 :background "cyan" :foreground "black") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2256 (t :inverse-video t)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2257 "Basic face for displaying the secondary selection." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2258 :group 'basic-faces) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2259 |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2260 (defface trailing-whitespace |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2261 '((((class color) (background light)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2262 :background "red1") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2263 (((class color) (background dark)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2264 :background "red1") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2265 (t :inverse-video t)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2266 "Basic face for highlighting trailing whitespace." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2267 :version "21.1" |
67503
71e68cea180c
(frame-background-mode): Replace `choice-item' keywords
Juri Linkov <juri@jurta.org>
parents:
67049
diff
changeset
|
2268 :group 'whitespace-faces ; like `show-trailing-whitespace' |
65730
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2269 :group 'basic-faces) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2270 |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2271 (defface escape-glyph |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2272 '((((background dark)) :foreground "cyan") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2273 ;; See the comment in minibuffer-prompt for |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2274 ;; the reason not to use blue on MS-DOS. |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2275 (((type pc)) :foreground "magenta") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2276 ;; red4 is too dark, but some say blue is too loud. |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2277 ;; brown seems to work ok. -- rms. |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2278 (t :foreground "brown")) |
72280
67323a6ea60e
(escape-glyph): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
71591
diff
changeset
|
2279 "Face for characters displayed as sequences using `^' or `\\'." |
65730
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2280 :group 'basic-faces |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2281 :version "22.1") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2282 |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2283 (defface nobreak-space |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2284 '((((class color) (min-colors 88)) :inherit escape-glyph :underline t) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2285 (((class color) (min-colors 8)) :background "magenta") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2286 (t :inverse-video t)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2287 "Face for displaying nobreak space." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2288 :group 'basic-faces |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2289 :version "22.1") |
25012 | 2290 |
68214
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2291 (defgroup mode-line-faces nil |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2292 "Faces used in the mode line." |
72879
3931d05c811a
(mode-line-faces): Group mode-line instead of modeline.
Richard M. Stallman <rms@gnu.org>
parents:
72280
diff
changeset
|
2293 :group 'mode-line |
68214
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2294 :group 'faces |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2295 :version "22.1") |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2296 |
25650
8b06b47a1fea
(mode-line): Replaces `modeline'.
Gerd Moellmann <gerd@gnu.org>
parents:
25616
diff
changeset
|
2297 (defface mode-line |
59077
294a7f7e3daf
(mode-line, mode-line-inactive): Use min-colors.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
59054
diff
changeset
|
2298 '((((class color) (min-colors 88)) |
43711
d15360503e4e
(face-spec-choose): Allow `t' to appear before the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43550
diff
changeset
|
2299 :box (:line-width -1 :style released-button) |
d15360503e4e
(face-spec-choose): Allow `t' to appear before the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43550
diff
changeset
|
2300 :background "grey75" :foreground "black") |
25012 | 2301 (t |
43711
d15360503e4e
(face-spec-choose): Allow `t' to appear before the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43550
diff
changeset
|
2302 :inverse-video t)) |
43204
1b0f33edf842
(mode-line-inactive): New face for mode-line for
Kim F. Storm <storm@cua.dk>
parents:
42969
diff
changeset
|
2303 "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
|
2304 :version "21.1" |
68214
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2305 :group 'mode-line-faces |
25012 | 2306 :group 'basic-faces) |
2307 | |
43204
1b0f33edf842
(mode-line-inactive): New face for mode-line for
Kim F. Storm <storm@cua.dk>
parents:
42969
diff
changeset
|
2308 (defface mode-line-inactive |
58935
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
2309 '((default |
43711
d15360503e4e
(face-spec-choose): Allow `t' to appear before the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43550
diff
changeset
|
2310 :inherit mode-line) |
59077
294a7f7e3daf
(mode-line, mode-line-inactive): Use min-colors.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
59054
diff
changeset
|
2311 (((class color) (min-colors 88) (background light)) |
43204
1b0f33edf842
(mode-line-inactive): New face for mode-line for
Kim F. Storm <storm@cua.dk>
parents:
42969
diff
changeset
|
2312 :weight light |
1b0f33edf842
(mode-line-inactive): New face for mode-line for
Kim F. Storm <storm@cua.dk>
parents:
42969
diff
changeset
|
2313 :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
|
2314 :foreground "grey20" :background "grey90") |
59077
294a7f7e3daf
(mode-line, mode-line-inactive): Use min-colors.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
59054
diff
changeset
|
2315 (((class color) (min-colors 88) (background dark) ) |
43247
4c5a2e2ddf43
(mode-line-inactive): Add dark-background variant.
Miles Bader <miles@gnu.org>
parents:
43204
diff
changeset
|
2316 :weight light |
4c5a2e2ddf43
(mode-line-inactive): Add dark-background variant.
Miles Bader <miles@gnu.org>
parents:
43204
diff
changeset
|
2317 :box (:line-width -1 :color "grey40" :style nil) |
43711
d15360503e4e
(face-spec-choose): Allow `t' to appear before the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43550
diff
changeset
|
2318 :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
|
2319 "Basic mode line face for non-selected windows." |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59872
diff
changeset
|
2320 :version "22.1" |
68214
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2321 :group 'mode-line-faces |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2322 :group 'basic-faces) |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2323 |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2324 (defface mode-line-highlight |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2325 '((((class color) (min-colors 88)) |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2326 :box (:line-width 2 :color "grey40" :style released-button)) |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2327 (t |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2328 :inherit highlight)) |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2329 "Basic mode line face for highlighting." |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2330 :version "22.1" |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2331 :group 'mode-line-faces |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2332 :group 'basic-faces) |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2333 |
92717
fec088bf4a02
(mode-line-emphasis): New face.
Glenn Morris <rgm@gnu.org>
parents:
92446
diff
changeset
|
2334 (defface mode-line-emphasis |
fec088bf4a02
(mode-line-emphasis): New face.
Glenn Morris <rgm@gnu.org>
parents:
92446
diff
changeset
|
2335 '((t (:weight bold))) |
fec088bf4a02
(mode-line-emphasis): New face.
Glenn Morris <rgm@gnu.org>
parents:
92446
diff
changeset
|
2336 "Face used to emphasize certain mode line features. |
fec088bf4a02
(mode-line-emphasis): New face.
Glenn Morris <rgm@gnu.org>
parents:
92446
diff
changeset
|
2337 Use the face `mode-line-highlight' for features that can be selected." |
fec088bf4a02
(mode-line-emphasis): New face.
Glenn Morris <rgm@gnu.org>
parents:
92446
diff
changeset
|
2338 :version "23.1" |
fec088bf4a02
(mode-line-emphasis): New face.
Glenn Morris <rgm@gnu.org>
parents:
92446
diff
changeset
|
2339 :group 'mode-line-faces |
fec088bf4a02
(mode-line-emphasis): New face.
Glenn Morris <rgm@gnu.org>
parents:
92446
diff
changeset
|
2340 :group 'basic-faces) |
fec088bf4a02
(mode-line-emphasis): New face.
Glenn Morris <rgm@gnu.org>
parents:
92446
diff
changeset
|
2341 |
68214
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2342 (defface mode-line-buffer-id |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2343 '((t (:weight bold))) |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2344 "Face used for buffer identification parts of the mode line." |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2345 :version "22.1" |
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2346 :group 'mode-line-faces |
43204
1b0f33edf842
(mode-line-inactive): New face for mode-line for
Kim F. Storm <storm@cua.dk>
parents:
42969
diff
changeset
|
2347 :group 'basic-faces) |
1b0f33edf842
(mode-line-inactive): New face for mode-line for
Kim F. Storm <storm@cua.dk>
parents:
42969
diff
changeset
|
2348 |
25650
8b06b47a1fea
(mode-line): Replaces `modeline'.
Gerd Moellmann <gerd@gnu.org>
parents:
25616
diff
changeset
|
2349 ;; Make `modeline' an alias for `mode-line', for compatibility. |
8b06b47a1fea
(mode-line): Replaces `modeline'.
Gerd Moellmann <gerd@gnu.org>
parents:
25616
diff
changeset
|
2350 (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
|
2351 (put 'modeline-inactive 'face-alias 'mode-line-inactive) |
63311
212616057d0b
(modeline-highlight): Rename from (the erroneous) `modeline-higilight'.
Eli Zaretskii <eliz@gnu.org>
parents:
63140
diff
changeset
|
2352 (put 'modeline-highlight 'face-alias 'mode-line-highlight) |
68214
7943b5aaa49d
(mode-line-faces): New defgroup.
Juri Linkov <juri@jurta.org>
parents:
67503
diff
changeset
|
2353 (put 'modeline-buffer-id 'face-alias 'mode-line-buffer-id) |
25012 | 2354 |
25545
b0a117037bde
(header-line): Renamed from `top-line'.
Gerd Moellmann <gerd@gnu.org>
parents:
25542
diff
changeset
|
2355 (defface header-line |
58935
95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Richard M. Stallman <rms@gnu.org>
parents:
58851
diff
changeset
|
2356 '((default |
54574
76b831799f4d
(read-face-font): Don't cons up unnecessarily.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54161
diff
changeset
|
2357 :inherit mode-line) |
76b831799f4d
(read-face-font): Don't cons up unnecessarily.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54161
diff
changeset
|
2358 (((type tty)) |
32404
d355f52b4497
(header-line): Change tty-variant to use underlining.
Miles Bader <miles@gnu.org>
parents:
32378
diff
changeset
|
2359 ;; 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
|
2360 ;; 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
|
2361 ;; 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
|
2362 ;; 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
|
2363 ;; 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
|
2364 ;; 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
|
2365 ;; 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
|
2366 ;; 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
|
2367 ;; the info browser. XXX |
54574
76b831799f4d
(read-face-font): Don't cons up unnecessarily.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54161
diff
changeset
|
2368 :inverse-video nil ;Override the value inherited from mode-line. |
46146
f883ac732e39
(header-line): Don't use a `common' clause for inheriting from the mode-line
Miles Bader <miles@gnu.org>
parents:
46145
diff
changeset
|
2369 :underline t) |
32756
ccfb1ed059ca
(header-line): Make more reasonable on mono/grayscale displays.
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
2370 (((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
|
2371 :background "grey90" :foreground "grey20" |
54574
76b831799f4d
(read-face-font): Don't cons up unnecessarily.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54161
diff
changeset
|
2372 :box nil) |
32756
ccfb1ed059ca
(header-line): Make more reasonable on mono/grayscale displays.
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
2373 (((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
|
2374 :background "grey20" :foreground "grey90" |
54574
76b831799f4d
(read-face-font): Don't cons up unnecessarily.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54161
diff
changeset
|
2375 :box nil) |
32756
ccfb1ed059ca
(header-line): Make more reasonable on mono/grayscale displays.
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
2376 (((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
|
2377 :background "white" :foreground "black" |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
2378 :inverse-video nil |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
2379 :box nil |
54574
76b831799f4d
(read-face-font): Don't cons up unnecessarily.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54161
diff
changeset
|
2380 :underline t) |
32756
ccfb1ed059ca
(header-line): Make more reasonable on mono/grayscale displays.
Miles Bader <miles@gnu.org>
parents:
32752
diff
changeset
|
2381 (((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
|
2382 :background "black" :foreground "white" |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
2383 :inverse-video nil |
900ca3da6e01
(header-line): Use `:box nil' for color/gs displays too.
Miles Bader <miles@gnu.org>
parents:
33447
diff
changeset
|
2384 :box nil |
54574
76b831799f4d
(read-face-font): Don't cons up unnecessarily.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54161
diff
changeset
|
2385 :underline t)) |
25545
b0a117037bde
(header-line): Renamed from `top-line'.
Gerd Moellmann <gerd@gnu.org>
parents:
25542
diff
changeset
|
2386 "Basic header-line face." |
25687
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
2387 :version "21.1" |
25012 | 2388 :group 'basic-faces) |
2389 | |
75166
d9e4f75aee3d
(momentary): Change :group to basic-faces where all
Juri Linkov <juri@jurta.org>
parents:
75109
diff
changeset
|
2390 (defface vertical-border |
d9e4f75aee3d
(momentary): Change :group to basic-faces where all
Juri Linkov <juri@jurta.org>
parents:
75109
diff
changeset
|
2391 '((((type tty)) :inherit mode-line-inactive)) |
d9e4f75aee3d
(momentary): Change :group to basic-faces where all
Juri Linkov <juri@jurta.org>
parents:
75109
diff
changeset
|
2392 "Face used for vertical window dividers on ttys." |
d9e4f75aee3d
(momentary): Change :group to basic-faces where all
Juri Linkov <juri@jurta.org>
parents:
75109
diff
changeset
|
2393 :version "22.1" |
d9e4f75aee3d
(momentary): Change :group to basic-faces where all
Juri Linkov <juri@jurta.org>
parents:
75109
diff
changeset
|
2394 :group 'basic-faces) |
d9e4f75aee3d
(momentary): Change :group to basic-faces where all
Juri Linkov <juri@jurta.org>
parents:
75109
diff
changeset
|
2395 |
65084
87a66a9a9328
(minibuffer-prompt): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
65068
diff
changeset
|
2396 (defface minibuffer-prompt |
87a66a9a9328
(minibuffer-prompt): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
65068
diff
changeset
|
2397 '((((background dark)) :foreground "cyan") |
87a66a9a9328
(minibuffer-prompt): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
65068
diff
changeset
|
2398 ;; Don't use blue because many users of the MS-DOS port customize |
87a66a9a9328
(minibuffer-prompt): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
65068
diff
changeset
|
2399 ;; their foreground color to be blue. |
87a66a9a9328
(minibuffer-prompt): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
65068
diff
changeset
|
2400 (((type pc)) :foreground "magenta") |
76292
81d50597174e
(minibuffer-prompt): Use medium blue by default.
Richard M. Stallman <rms@gnu.org>
parents:
75884
diff
changeset
|
2401 (t :foreground "medium blue")) |
65084
87a66a9a9328
(minibuffer-prompt): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
65068
diff
changeset
|
2402 "Face for minibuffer prompts. |
87a66a9a9328
(minibuffer-prompt): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
65068
diff
changeset
|
2403 By default, Emacs automatically adds this face to the value of |
87a66a9a9328
(minibuffer-prompt): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
65068
diff
changeset
|
2404 `minibuffer-prompt-properties', which is a list of text properties |
87a66a9a9328
(minibuffer-prompt): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
65068
diff
changeset
|
2405 used to display the prompt text." |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59872
diff
changeset
|
2406 :version "22.1" |
42298
d020b569f212
(minibuffer-prompt): New face.
Richard M. Stallman <rms@gnu.org>
parents:
40456
diff
changeset
|
2407 :group 'basic-faces) |
d020b569f212
(minibuffer-prompt): New face.
Richard M. Stallman <rms@gnu.org>
parents:
40456
diff
changeset
|
2408 |
d020b569f212
(minibuffer-prompt): New face.
Richard M. Stallman <rms@gnu.org>
parents:
40456
diff
changeset
|
2409 (setq minibuffer-prompt-properties |
d020b569f212
(minibuffer-prompt): New face.
Richard M. Stallman <rms@gnu.org>
parents:
40456
diff
changeset
|
2410 (append minibuffer-prompt-properties (list 'face 'minibuffer-prompt))) |
d020b569f212
(minibuffer-prompt): New face.
Richard M. Stallman <rms@gnu.org>
parents:
40456
diff
changeset
|
2411 |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2412 (defface fringe |
29943
b8314fd10792
(fringe): Change face for different backgrounds.
Gerd Moellmann <gerd@gnu.org>
parents:
29880
diff
changeset
|
2413 '((((class color) (background light)) |
43711
d15360503e4e
(face-spec-choose): Allow `t' to appear before the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43550
diff
changeset
|
2414 :background "grey95") |
d15360503e4e
(face-spec-choose): Allow `t' to appear before the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43550
diff
changeset
|
2415 (((class color) (background dark)) |
d15360503e4e
(face-spec-choose): Allow `t' to appear before the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43550
diff
changeset
|
2416 :background "grey10") |
d15360503e4e
(face-spec-choose): Allow `t' to appear before the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43550
diff
changeset
|
2417 (t |
d15360503e4e
(face-spec-choose): Allow `t' to appear before the end.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43550
diff
changeset
|
2418 :background "gray")) |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2419 "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
|
2420 :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
|
2421 :group 'frames |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2422 :group 'basic-faces) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2423 |
70178
667cd756c089
(scroll-bar, border, cursor, mouse): Avoid nil spec in defface.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
2424 (defface scroll-bar '((t nil)) |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2425 "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
|
2426 :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
|
2427 :group 'frames |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2428 :group 'basic-faces) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2429 |
70178
667cd756c089
(scroll-bar, border, cursor, mouse): Avoid nil spec in defface.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
2430 (defface border '((t nil)) |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2431 "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
|
2432 :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
|
2433 :group 'frames |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2434 :group 'basic-faces) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2435 |
70178
667cd756c089
(scroll-bar, border, cursor, mouse): Avoid nil spec in defface.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
2436 (defface cursor '((t nil)) |
57105
8f14c8ea51a1
(cursor): Add face-no-inherit property. Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
55902
diff
changeset
|
2437 "Basic face for the cursor color under X. |
8f14c8ea51a1
(cursor): Add face-no-inherit property. Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
55902
diff
changeset
|
2438 Note: Other faces cannot inherit from the cursor face." |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2439 :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
|
2440 :group 'cursor |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2441 :group 'basic-faces) |
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2442 |
57105
8f14c8ea51a1
(cursor): Add face-no-inherit property. Doc fix.
Kim F. Storm <storm@cua.dk>
parents:
55902
diff
changeset
|
2443 (put 'cursor 'face-no-inherit t) |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2444 |
70178
667cd756c089
(scroll-bar, border, cursor, mouse): Avoid nil spec in defface.
Luc Teirlinck <teirllm@auburn.edu>
parents:
68651
diff
changeset
|
2445 (defface mouse '((t nil)) |
25588
1d8ba3dd04e9
(face-set-after-frame-default): Initialize some
Gerd Moellmann <gerd@gnu.org>
parents:
25561
diff
changeset
|
2446 "Basic face for the mouse color under X." |
25137 | 2447 :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
|
2448 :group 'mouse |
25012 | 2449 :group 'basic-faces) |
2450 | |
65730
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2451 (defface tool-bar |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2452 '((default |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2453 :box (:line-width 1 :style released-button) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2454 :foreground "black") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2455 (((type x w32 mac) (class color)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2456 :background "grey75") |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2457 (((type x) (class mono)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2458 :background "grey")) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2459 "Basic tool-bar face." |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2460 :version "21.1" |
25687
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
2461 :group 'basic-faces) |
25012 | 2462 |
65730
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2463 (defface menu |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2464 '((((type tty)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2465 :inverse-video t) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2466 (((type x-toolkit)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2467 ) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2468 (t |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2469 :inverse-video t)) |
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2470 "Basic face for the font and colors of the menu bar and popup menus." |
25687
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
2471 :version "21.1" |
65730
a9f7501916e6
Rearrange face definitions to be in the same order as
Juri Linkov <juri@jurta.org>
parents:
65289
diff
changeset
|
2472 :group 'menu |
25687
afad62240679
(mode-line, header-line, tool-bar, ): Add :version.
Dave Love <fx@gnu.org>
parents:
25650
diff
changeset
|
2473 :group 'basic-faces) |
25012 | 2474 |
2475 | |
2476 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2477 ;;; Manipulating font names. | |
2478 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
2479 | |
2480 ;; This is here for compatibilty with Emacs 20.2. For example, | |
28907 | 2481 ;; international/fontset.el uses x-resolve-font-name. The following |
2482 ;; functions are not used in the face implementation itself. | |
2456 | 2483 |
16687
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16590
diff
changeset
|
2484 (defvar x-font-regexp nil) |
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16590
diff
changeset
|
2485 (defvar x-font-regexp-head nil) |
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16590
diff
changeset
|
2486 (defvar x-font-regexp-weight nil) |
049c87a96dca
Change defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16590
diff
changeset
|
2487 (defvar x-font-regexp-slant nil) |
2456 | 2488 |
12668
7660e82d0346
(x-font-regexp-weight-subnum, x-font-regexp-slant-subnum)
Karl Heuer <kwzh@gnu.org>
parents:
12651
diff
changeset
|
2489 (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
|
2490 (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
|
2491 (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
|
2492 (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
|
2493 |
2456 | 2494 ;;; Regexps matching font names in "Host Portable Character Representation." |
2495 ;;; | |
2496 (let ((- "[-?]") | |
2497 (foundry "[^-]+") | |
2498 (family "[^-]+") | |
2499 (weight "\\(bold\\|demibold\\|medium\\)") ; 1 | |
2500 ; (weight\? "\\(\\*\\|bold\\|demibold\\|medium\\|\\)") ; 1 | |
2501 (weight\? "\\([^-]*\\)") ; 1 | |
2502 (slant "\\([ior]\\)") ; 2 | |
2503 ; (slant\? "\\([ior?*]?\\)") ; 2 | |
2504 (slant\? "\\([^-]?\\)") ; 2 | |
2505 ; (swidth "\\(\\*\\|normal\\|semicondensed\\|\\)") ; 3 | |
2506 (swidth "\\([^-]*\\)") ; 3 | |
2507 ; (adstyle "\\(\\*\\|sans\\|\\)") ; 4 | |
12690
e2d3fa52d100
(x-font-regexp): Add \\(\\) for substring extraction.
Karl Heuer <kwzh@gnu.org>
parents:
12668
diff
changeset
|
2508 (adstyle "\\([^-]*\\)") ; 4 |
2456 | 2509 (pixelsize "[0-9]+") |
2510 (pointsize "[0-9][0-9]+") | |
2511 (resx "[0-9][0-9]+") | |
2512 (resy "[0-9][0-9]+") | |
2513 (spacing "[cmp?*]") | |
2514 (avgwidth "[0-9]+") | |
2515 (registry "[^-]+") | |
2516 (encoding "[^-]+") | |
2517 ) | |
2518 (setq x-font-regexp | |
2519 (concat "\\`\\*?[-?*]" | |
2520 foundry - family - weight\? - slant\? - swidth - adstyle - | |
12475
eb436b0c4ab3
(x-font-regexp): Include the avgwidth.
Richard M. Stallman <rms@gnu.org>
parents:
12460
diff
changeset
|
2521 pixelsize - pointsize - resx - resy - spacing - avgwidth - |
eb436b0c4ab3
(x-font-regexp): Include the avgwidth.
Richard M. Stallman <rms@gnu.org>
parents:
12460
diff
changeset
|
2522 registry - encoding "\\*?\\'" |
2456 | 2523 )) |
2524 (setq x-font-regexp-head | |
2525 (concat "\\`[-?*]" foundry - family - weight\? - slant\? | |
2526 "\\([-*?]\\|\\'\\)")) | |
2527 (setq x-font-regexp-slant (concat - slant -)) | |
2528 (setq x-font-regexp-weight (concat - weight -)) | |
28840 | 2529 nil) |
2456 | 2530 |
25012 | 2531 |
3071
68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
Jim Blandy <jimb@redhat.com>
parents:
3049
diff
changeset
|
2532 (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
|
2533 "Return a font name matching PATTERN. |
28849
76e727bc0dfd
Fix make-obsolete for internal-get-face.
Dave Love <fx@gnu.org>
parents:
28840
diff
changeset
|
2534 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
|
2535 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
|
2536 contains wildcards. |
10170
5fc240a3e4a0
(face-initialize): Test for framep not t or nil.
Richard M. Stallman <rms@gnu.org>
parents:
10107
diff
changeset
|
2537 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
|
2538 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
|
2539 (or (symbolp face) |
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
2540 (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
|
2541 (and (eq frame t) |
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
2542 (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
|
2543 (if pattern |
5092
36508a7c0a3f
(x-resolve-font-name): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5081
diff
changeset
|
2544 ;; 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
|
2545 (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
|
2546 (or fonts |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
2547 (if face |
10584 | 2548 (if (string-match "\\*" pattern) |
2549 (if (null (face-font face)) | |
2550 (error "No matching fonts are the same height as the frame default font") | |
2551 (error "No matching fonts are the same height as face `%s'" face)) | |
2552 (if (null (face-font face)) | |
2553 (error "Height of font `%s' doesn't match the frame default font" | |
2554 pattern) | |
2555 (error "Height of font `%s' doesn't match face `%s'" | |
2556 pattern face))) | |
3353
8cbd38886eef
(x-resolve-font-name): Clean up error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3298
diff
changeset
|
2557 (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
|
2558 (car fonts)) |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
2559 (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
|
2560 |
25012 | 2561 |
2456 | 2562 (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
|
2563 (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
|
2564 (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
|
2565 (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
|
2566 (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
|
2567 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
|
2568 (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
|
2569 (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
|
2570 ;; 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
|
2571 ;; 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
|
2572 ;; 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
|
2573 "*" |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
2574 (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
|
2575 ((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
|
2576 (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
|
2577 (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
|
2578 ((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
|
2579 (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
|
2580 (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
|
2581 (make-obsolete 'x-frob-font-weight 'make-face-... "21.1") |
25012 | 2582 |
2456 | 2583 (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
|
2584 (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
|
2585 (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
|
2586 (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
|
2587 (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
|
2588 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
|
2589 (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
|
2590 (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
|
2591 ;; 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
|
2592 ;; 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
|
2593 ;; 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
|
2594 "*" |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
2595 (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
|
2596 ((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
|
2597 (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
|
2598 (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
|
2599 ((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
|
2600 (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
|
2601 (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
|
2602 (make-obsolete 'x-frob-font-slant 'make-face-... "21.1") |
25012 | 2603 |
40351
a44d4a7dd8de
(internal-get-face): Use facep instead of the obsolete
Eli Zaretskii <eliz@gnu.org>
parents:
39830
diff
changeset
|
2604 ;; 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
|
2605 ;; functions from the byte compiler. |
a44d4a7dd8de
(internal-get-face): Use facep instead of the obsolete
Eli Zaretskii <eliz@gnu.org>
parents:
39830
diff
changeset
|
2606 (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
|
2607 (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
|
2608 |
2456 | 2609 (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
|
2610 "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
|
2611 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
|
2612 (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
|
2613 (make-obsolete 'x-make-font-bold 'make-face-bold "21.1") |
25012 | 2614 |
2456 | 2615 (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
|
2616 "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
|
2617 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
|
2618 (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
|
2619 (make-obsolete 'x-make-font-demibold 'make-face-bold "21.1") |
25012 | 2620 |
2456 | 2621 (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
|
2622 "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
|
2623 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
|
2624 (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
|
2625 (make-obsolete 'x-make-font-unbold 'make-face-unbold "21.1") |
25012 | 2626 |
2456 | 2627 (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
|
2628 "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
|
2629 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
|
2630 (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
|
2631 (make-obsolete 'x-make-font-italic 'make-face-italic "21.1") |
25012 | 2632 |
2456 | 2633 (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
|
2634 "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
|
2635 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
|
2636 (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
|
2637 (make-obsolete 'x-make-font-oblique 'make-face-italic "21.1") |
25012 | 2638 |
2456 | 2639 (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
|
2640 "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
|
2641 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
|
2642 (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
|
2643 (make-obsolete 'x-make-font-unitalic 'make-face-unitalic "21.1") |
25012 | 2644 |
17752
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
2645 (defun x-make-font-bold-italic (font) |
2687f3d7c191
(x-make-font-bold-italic): New function.
Kenichi Handa <handa@m17n.org>
parents:
17560
diff
changeset
|
2646 "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
|
2647 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
|
2648 (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
|
2649 (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
|
2650 (make-obsolete 'x-make-font-bold-italic 'make-face-bold-italic "21.1") |
2456 | 2651 |
2715
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
2652 (provide 'faces) |
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
2653 |
63382
9cbfa983c1cf
(read-face-name): Use complete-in-turn complete non-aliases
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
63311
diff
changeset
|
2654 ;; arch-tag: 19a4759f-2963-445f-b004-425b9aadd7d6 |
28840 | 2655 ;;; faces.el ends here |