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