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