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