Mercurial > emacs
annotate lisp/faces.el @ 14756:aabf776c3b6a
Global var `misc' renamed.
(desktop-buffer-misc): Renamed from misc. Add defvar.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 05 Mar 1996 16:42:06 +0000 |
parents | 11a297676bda |
children | b405f39b5493 |
rev | line source |
---|---|
2456 | 1 ;;; faces.el --- Lisp interface to the c "face" structure |
2 | |
14169 | 3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. |
2456 | 4 |
5 ;; This file is part of GNU Emacs. | |
6 | |
7 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
8 ;; it under the terms of the GNU General Public License as published by | |
9 ;; the Free Software Foundation; either version 2, or (at your option) | |
10 ;; any later version. | |
11 | |
12 ;; GNU Emacs is distributed in the hope that it will be useful, | |
13 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 ;; GNU General Public License for more details. | |
16 | |
17 ;; You should have received a copy of the GNU General Public License | |
14169 | 18 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
19 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
20 ;; Boston, MA 02111-1307, USA. | |
2456 | 21 |
22 ;;; Commentary: | |
23 | |
24 ;; Mostly derived from Lucid. | |
25 | |
26 ;;; Code: | |
27 | |
10107
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
28 (eval-when-compile |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
29 ;; These used to be defsubsts, now they're subrs. Avoid losing if we're |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
30 ;; being compiled with an old Emacs that still has defsubrs in it. |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
31 (put 'face-name 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
32 (put 'face-id 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
33 (put 'face-font 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
34 (put 'face-foreground 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
35 (put 'face-background 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
36 (put 'face-stipple 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
37 (put 'face-underline-p 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
38 (put 'set-face-font 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
39 (put 'set-face-foreground 'byte-optimizer nil) |
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
40 (put 'set-face-background 'byte-optimizer nil) |
11850
f9174d73e755
Put property on set-face-stipple, not set-stipple.
Karl Heuer <kwzh@gnu.org>
parents:
11464
diff
changeset
|
41 (put 'set-face-stipple 'byte-optimizer nil) |
10107
2af74ff52cd0
At compile time, discard any defsubr definitions
Richard M. Stallman <rms@gnu.org>
parents:
10105
diff
changeset
|
42 (put 'set-face-underline-p 'byte-optimizer nil)) |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
43 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
44 ;;;; Functions for manipulating face vectors. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
45 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
46 ;;; A face vector is a vector of the form: |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
47 ;;; [face NAME ID FONT FOREGROUND BACKGROUND STIPPLE UNDERLINE] |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
48 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
49 ;;; Type checkers. |
2456 | 50 (defsubst internal-facep (x) |
51 (and (vectorp x) (= (length x) 8) (eq (aref x 0) 'face))) | |
52 | |
10584 | 53 (defun facep (x) |
54 "Return t if X is a face name or an internal face vector." | |
55 (and (or (internal-facep x) | |
56 (and (symbolp x) (assq x global-face-data))) | |
57 t)) | |
58 | |
2456 | 59 (defmacro internal-check-face (face) |
10584 | 60 (` (or (internal-facep (, face)) |
61 (signal 'wrong-type-argument (list 'internal-facep (, face)))))) | |
2456 | 62 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
63 ;;; Accessors. |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
64 (defun face-name (face) |
2456 | 65 "Return the name of face FACE." |
66 (aref (internal-get-face face) 1)) | |
67 | |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
68 (defun face-id (face) |
2456 | 69 "Return the internal ID number of face FACE." |
70 (aref (internal-get-face face) 2)) | |
71 | |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
72 (defun face-font (face &optional frame) |
2456 | 73 "Return the font name of face FACE, or nil if it is unspecified. |
74 If the optional argument FRAME is given, report on face FACE in that frame. | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
75 If FRAME is t, report on the defaults for face FACE (for new frames). |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
76 The font default for a face is either nil, or a list |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
77 of the form (bold), (italic) or (bold italic). |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
78 If FRAME is omitted or nil, use the selected frame." |
2456 | 79 (aref (internal-get-face face frame) 3)) |
80 | |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
81 (defun face-foreground (face &optional frame) |
2456 | 82 "Return the foreground color name of face FACE, or nil if unspecified. |
83 If the optional argument FRAME is given, report on face FACE in that frame. | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
84 If FRAME is t, report on the defaults for face FACE (for new frames). |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
85 If FRAME is omitted or nil, use the selected frame." |
2456 | 86 (aref (internal-get-face face frame) 4)) |
87 | |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
88 (defun face-background (face &optional frame) |
2456 | 89 "Return the background color name of face FACE, or nil if unspecified. |
90 If the optional argument FRAME is given, report on face FACE in that frame. | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
91 If FRAME is t, report on the defaults for face FACE (for new frames). |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
92 If FRAME is omitted or nil, use the selected frame." |
2456 | 93 (aref (internal-get-face face frame) 5)) |
94 | |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
95 (defun face-stipple (face &optional frame) |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
96 "Return the stipple pixmap name of face FACE, or nil if unspecified. |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
97 If the optional argument FRAME is given, report on face FACE in that frame. |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
98 If FRAME is t, report on the defaults for face FACE (for new frames). |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
99 If FRAME is omitted or nil, use the selected frame." |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
100 (aref (internal-get-face face frame) 6)) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
101 |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
102 (defalias 'face-background-pixmap 'face-stipple) |
2456 | 103 |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
104 (defun face-underline-p (face &optional frame) |
2456 | 105 "Return t if face FACE is underlined. |
106 If the optional argument FRAME is given, report on face FACE in that frame. | |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
107 If FRAME is t, report on the defaults for face FACE (for new frames). |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
108 If FRAME is omitted or nil, use the selected frame." |
2456 | 109 (aref (internal-get-face face frame) 7)) |
110 | |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
111 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
112 ;;; Mutators. |
2456 | 113 |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
114 (defun set-face-font (face font &optional frame) |
2456 | 115 "Change the font of face FACE to FONT (a string). |
116 If the optional FRAME argument is provided, change only | |
117 in that frame; otherwise change each frame." | |
118 (interactive (internal-face-interactive "font")) | |
10170
5fc240a3e4a0
(face-initialize): Test for framep not t or nil.
Richard M. Stallman <rms@gnu.org>
parents:
10107
diff
changeset
|
119 (if (stringp font) (setq font (x-resolve-font-name font 'default frame))) |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
120 (internal-set-face-1 face 'font font 3 frame)) |
2456 | 121 |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
122 (defun set-face-foreground (face color &optional frame) |
2456 | 123 "Change the foreground color of face FACE to COLOR (a string). |
124 If the optional FRAME argument is provided, change only | |
125 in that frame; otherwise change each frame." | |
126 (interactive (internal-face-interactive "foreground")) | |
2715
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
127 (internal-set-face-1 face 'foreground color 4 frame)) |
2456 | 128 |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
129 (defvar face-default-stipple "gray3" |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
130 "Default stipple pattern used on monochrome displays. |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
131 This stipple pattern is used on monochrome displays |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
132 instead of shades of gray for a face background color. |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
133 See `set-face-stipple' for possible values for this variable.") |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
134 |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
135 (defun face-color-gray-p (color &optional frame) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
136 "Return t if COLOR is a shade of gray (or white or black). |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
137 FRAME specifies the frame and thus the display for interpreting COLOR." |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
138 (let* ((values (x-color-values color frame)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
139 (r (nth 0 values)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
140 (g (nth 1 values)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
141 (b (nth 2 values))) |
14409
11a297676bda
(face-color-gray-p): Return nil if x-color-values does.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
142 (and values |
11a297676bda
(face-color-gray-p): Return nil if x-color-values does.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
143 (< (abs (- r g)) (/ (max 1 (abs r) (abs g)) 20)) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
144 (< (abs (- g b)) (/ (max 1 (abs g) (abs b)) 20)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
145 (< (abs (- b r)) (/ (max 1 (abs b) (abs r)) 20))))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
146 |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
147 (defun set-face-background (face color &optional frame) |
2456 | 148 "Change the background color of face FACE to COLOR (a string). |
149 If the optional FRAME argument is provided, change only | |
150 in that frame; otherwise change each frame." | |
151 (interactive (internal-face-interactive "background")) | |
9665
36bdda3a1dc9
(set-face-background): Set either stipple or color,
Richard M. Stallman <rms@gnu.org>
parents:
9661
diff
changeset
|
152 ;; For a specific frame, use gray stipple instead of gray color |
36bdda3a1dc9
(set-face-background): Set either stipple or color,
Richard M. Stallman <rms@gnu.org>
parents:
9661
diff
changeset
|
153 ;; if the display does not support a gray color. |
12725
968d38f57f3a
(set-face-background): Don't treat nil as a color.
Richard M. Stallman <rms@gnu.org>
parents:
12690
diff
changeset
|
154 (if (and frame (not (eq frame t)) color |
14040 | 155 ;; Check for support for foreground, not for background! |
12776
d69a2d6d1ae9
(set-face-background): When using face-color-supported-p,
Richard M. Stallman <rms@gnu.org>
parents:
12725
diff
changeset
|
156 ;; face-color-supported-p is smart enough to know |
d69a2d6d1ae9
(set-face-background): When using face-color-supported-p,
Richard M. Stallman <rms@gnu.org>
parents:
12725
diff
changeset
|
157 ;; that grays are "supported" as background |
d69a2d6d1ae9
(set-face-background): When using face-color-supported-p,
Richard M. Stallman <rms@gnu.org>
parents:
12725
diff
changeset
|
158 ;; because we are supposed to use stipple for them! |
d69a2d6d1ae9
(set-face-background): When using face-color-supported-p,
Richard M. Stallman <rms@gnu.org>
parents:
12725
diff
changeset
|
159 (not (face-color-supported-p frame color nil))) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
160 (set-face-stipple face face-default-stipple frame) |
11464
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
161 (if (null frame) |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
162 (let ((frames (frame-list))) |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
163 (while frames |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
164 (set-face-background (face-name face) color (car frames)) |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
165 (setq frames (cdr frames))) |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
166 (set-face-background face color t) |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
167 color) |
4921121fbdc0
(set-face-background): Handle FRAME = nil directly
Richard M. Stallman <rms@gnu.org>
parents:
11234
diff
changeset
|
168 (internal-set-face-1 face 'background color 5 frame)))) |
2456 | 169 |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
170 (defun set-face-stipple (face pixmap &optional frame) |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
171 "Change the stipple pixmap of face FACE to PIXMAP. |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
172 PIXMAP should be a string, the name of a file of pixmap data. |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
173 The directories listed in the `x-bitmap-file-path' variable are searched. |
2456 | 174 |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
175 Alternatively, PIXMAP may be a list of the form (WIDTH HEIGHT DATA) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
176 where WIDTH and HEIGHT are the size in pixels, |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
177 and DATA is a string, containing the raw bits of the bitmap. |
2456 | 178 |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
179 If the optional FRAME argument is provided, change only |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
180 in that frame; otherwise change each frame." |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
181 (interactive (internal-face-interactive "stipple")) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
182 (internal-set-face-1 face 'background-pixmap pixmap 6 frame)) |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
183 |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
184 (defalias 'set-face-background-pixmap 'set-face-stipple) |
2456 | 185 |
10105
249d94c7e4f1
(face-name, face-id, face-foreground, face-background)
Richard M. Stallman <rms@gnu.org>
parents:
10022
diff
changeset
|
186 (defun set-face-underline-p (face underline-p &optional frame) |
2456 | 187 "Specify whether face FACE is underlined. (Yes if UNDERLINE-P is non-nil.) |
188 If the optional FRAME argument is provided, change only | |
189 in that frame; otherwise change each frame." | |
190 (interactive (internal-face-interactive "underline-p" "underlined")) | |
2715
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
191 (internal-set-face-1 face 'underline underline-p 7 frame)) |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
192 |
11153 | 193 (defun modify-face-read-string (face default name alist) |
11152
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
194 (let ((value |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
195 (completing-read |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
196 (if default |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
197 (format "Set face %s %s (default %s): " |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
198 face name (downcase default)) |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
199 (format "Set face %s %s: " face name)) |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
200 alist))) |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
201 (cond ((equal value "none") |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
202 nil) |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
203 ((equal value "") |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
204 default) |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
205 (t value)))) |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
206 |
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
207 (defun modify-face (face foreground background stipple |
13725 | 208 bold-p italic-p underline-p &optional frame) |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
209 "Change the display attributes for face FACE. |
13725 | 210 If the optional FRAME argument is provided, change only |
211 in that frame; otherwise change each frame. | |
212 | |
213 FOREGROUND and BACKGROUND should be a colour name string (or list of strings to | |
214 try) or nil. STIPPLE should be a stipple pattern name string or nil. | |
215 If nil, means do not change the display attribute corresponding to that arg. | |
216 | |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
217 BOLD-P, ITALIC-P, and UNDERLINE-P specify whether the face should be set bold, |
13725 | 218 in italic, and underlined, respectively. If neither nil or t, means do not |
219 change the display attribute corresponding to that arg. | |
220 | |
221 If called interactively, prompts for a face name and face attributes." | |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
222 (interactive |
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
223 (let* ((completion-ignore-case t) |
13725 | 224 (face (symbol-name (read-face-name "Modify face: "))) |
225 (colors (mapcar 'list x-colors)) | |
226 (stipples (mapcar 'list (apply 'nconc | |
227 (mapcar 'directory-files | |
228 x-bitmap-file-path)))) | |
229 (foreground (modify-face-read-string | |
230 face (face-foreground (intern face)) | |
231 "foreground" colors)) | |
232 (background (modify-face-read-string | |
233 face (face-background (intern face)) | |
234 "background" colors)) | |
235 (stipple (modify-face-read-string | |
236 face (face-stipple (intern face)) | |
237 "stipple" stipples)) | |
238 (bold-p (y-or-n-p (concat "Set face " face " bold "))) | |
239 (italic-p (y-or-n-p (concat "Set face " face " italic "))) | |
240 (underline-p (y-or-n-p (concat "Set face " face " underline "))) | |
241 (all-frames-p (y-or-n-p (concat "Modify face " face " in all frames ")))) | |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
242 (message "Face %s: %s" face |
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
243 (mapconcat 'identity |
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
244 (delq nil |
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
245 (list (and foreground (concat (downcase foreground) " foreground")) |
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
246 (and background (concat (downcase background) " background")) |
11152
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
247 (and stipple (concat (downcase stipple) " stipple")) |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
248 (and bold-p "bold") (and italic-p "italic") |
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
249 (and underline-p "underline"))) ", ")) |
11152
eb26f12a8be6
(modify-face): Handle stipple. Handle defaulting properly.
Richard M. Stallman <rms@gnu.org>
parents:
10598
diff
changeset
|
250 (list (intern face) foreground background stipple |
13725 | 251 bold-p italic-p underline-p |
252 (if all-frames-p nil (selected-frame))))) | |
253 (condition-case nil | |
254 (face-try-color-list 'set-face-foreground face foreground frame) | |
255 (error nil)) | |
256 (condition-case nil | |
257 (face-try-color-list 'set-face-background face background frame) | |
258 (error nil)) | |
259 (condition-case nil | |
260 (set-face-stipple face stipple frame) | |
261 (error nil)) | |
262 (cond ((eq bold-p nil) (make-face-unbold face frame t)) | |
263 ((eq bold-p t) (make-face-bold face frame t))) | |
264 (cond ((eq italic-p nil) (make-face-unitalic face frame t)) | |
265 ((eq italic-p t) (make-face-italic face frame t))) | |
266 (if (memq underline-p '(nil t)) | |
267 (set-face-underline-p face underline-p frame)) | |
9197
3fe469325a8b
(modify-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
8999
diff
changeset
|
268 (and (interactive-p) (redraw-display))) |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
269 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
270 ;;;; Associating face names (symbols) with their face vectors. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
271 |
3925
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
272 (defvar global-face-data nil |
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
273 "Internal data for face support functions. Not for external use. |
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
274 This is an alist associating face names with the default values for |
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
275 their parameters. Newly created frames get their data from here.") |
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
276 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
277 (defun face-list () |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
278 "Returns a list of all defined face names." |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
279 (mapcar 'car global-face-data)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
280 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
281 (defun internal-find-face (name &optional frame) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
282 "Retrieve the face named NAME. Return nil if there is no such face. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
283 If the optional argument FRAME is given, this gets the face NAME for |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
284 that frame; otherwise, it uses the selected frame. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
285 If FRAME is the symbol t, then the global, non-frame face is returned. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
286 If NAME is already a face, it is simply returned." |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
287 (if (and (eq frame t) (not (symbolp name))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
288 (setq name (face-name name))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
289 (if (symbolp name) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
290 (cdr (assq name |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
291 (if (eq frame t) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
292 global-face-data |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
293 (frame-face-alist (or frame (selected-frame)))))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
294 (internal-check-face name) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
295 name)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
296 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
297 (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
|
298 "Retrieve the face named NAME; error if there is none. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
299 If the optional argument FRAME is given, this gets the face NAME for |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
300 that frame; otherwise, it uses the selected frame. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
301 If FRAME is the symbol t, then the global, non-frame face is returned. |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
302 If NAME is already a face, it is simply returned." |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
303 (or (internal-find-face name frame) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
304 (internal-check-face name))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
305 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
306 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
307 (defun internal-set-face-1 (face name value index frame) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
308 (let ((inhibit-quit t)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
309 (if (null frame) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
310 (let ((frames (frame-list))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
311 (while frames |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
312 (internal-set-face-1 (face-name face) name value index (car frames)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
313 (setq frames (cdr frames))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
314 (aset (internal-get-face (if (symbolp face) face (face-name face)) t) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
315 index value) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
316 value) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
317 (or (eq frame t) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
318 (set-face-attribute-internal (face-id face) name value frame)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
319 (aset (internal-get-face face frame) index value)))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
320 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
321 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
322 (defun read-face-name (prompt) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
323 (let (face) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
324 (while (= (length face) 0) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
325 (setq face (completing-read prompt |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
326 (mapcar '(lambda (x) (list (symbol-name x))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
327 (face-list)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
328 nil t))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
329 (intern face))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
330 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
331 (defun internal-face-interactive (what &optional bool) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
332 (let* ((fn (intern (concat "face-" what))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
333 (prompt (concat "Set " what " of face")) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
334 (face (read-face-name (concat prompt ": "))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
335 (default (if (fboundp fn) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
336 (or (funcall fn face (selected-frame)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
337 (funcall fn 'default (selected-frame))))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
338 (value (if bool |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
339 (y-or-n-p (concat "Should face " (symbol-name face) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
340 " be " bool "? ")) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
341 (read-string (concat prompt " " (symbol-name face) " to: ") |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
342 default)))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
343 (list face (if (equal value "") nil value)))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
344 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
345 |
2456 | 346 |
347 (defun make-face (name) | |
348 "Define a new FACE on all frames. | |
349 You can modify the font, color, etc of this face with the set-face- functions. | |
350 If the face already exists, it is unmodified." | |
3001
c6c6e476d93d
* faces.el (make-face): Change interactive spec to 'S'.
Jim Blandy <jimb@redhat.com>
parents:
2906
diff
changeset
|
351 (interactive "SMake face: ") |
2456 | 352 (or (internal-find-face name) |
353 (let ((face (make-vector 8 nil))) | |
354 (aset face 0 'face) | |
355 (aset face 1 name) | |
356 (let* ((frames (frame-list)) | |
357 (inhibit-quit t) | |
358 (id (internal-next-face-id))) | |
359 (make-face-internal id) | |
360 (aset face 2 id) | |
361 (while frames | |
362 (set-frame-face-alist (car frames) | |
363 (cons (cons name (copy-sequence face)) | |
364 (frame-face-alist (car frames)))) | |
365 (setq frames (cdr frames))) | |
366 (setq global-face-data (cons (cons name face) global-face-data))) | |
367 ;; when making a face after frames already exist | |
13432
c0c8b0a210e0
[win32] (make-face, make-face-x-resource-internal):
Geoff Voelker <voelker@cs.washington.edu>
parents:
12776
diff
changeset
|
368 (if (or (eq window-system 'x) (eq window-system 'win32)) |
2456 | 369 (make-face-x-resource-internal face)) |
9622
14e1032a7ae7
(make-face): Add new face to Face menu on creation. -- Bng
Boris Goldowsky <boris@gnu.org>
parents:
9572
diff
changeset
|
370 ;; add to menu |
14e1032a7ae7
(make-face): Add new face to Face menu on creation. -- Bng
Boris Goldowsky <boris@gnu.org>
parents:
9572
diff
changeset
|
371 (if (fboundp 'facemenu-add-new-face) |
14e1032a7ae7
(make-face): Add new face to Face menu on creation. -- Bng
Boris Goldowsky <boris@gnu.org>
parents:
9572
diff
changeset
|
372 (facemenu-add-new-face name)) |
8011
1bb462fc29fc
(make-face): Return the face name, not the vector.
Richard M. Stallman <rms@gnu.org>
parents:
8000
diff
changeset
|
373 face)) |
1bb462fc29fc
(make-face): Return the face name, not the vector.
Richard M. Stallman <rms@gnu.org>
parents:
8000
diff
changeset
|
374 name) |
2456 | 375 |
376 ;; Fill in a face by default based on X resources, for all existing frames. | |
377 ;; This has to be done when a new face is made. | |
378 (defun make-face-x-resource-internal (face &optional frame set-anyway) | |
379 (cond ((null frame) | |
380 (let ((frames (frame-list))) | |
381 (while frames | |
13432
c0c8b0a210e0
[win32] (make-face, make-face-x-resource-internal):
Geoff Voelker <voelker@cs.washington.edu>
parents:
12776
diff
changeset
|
382 (if (or (eq (framep (car frames)) 'x) (eq (framep (car frames)) 'win32)) |
6873
086e14489073
(make-face-x-resource-internal): Don't mess with terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
6871
diff
changeset
|
383 (make-face-x-resource-internal (face-name face) |
086e14489073
(make-face-x-resource-internal): Don't mess with terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
6871
diff
changeset
|
384 (car frames) set-anyway)) |
2456 | 385 (setq frames (cdr frames))))) |
386 (t | |
387 (setq face (internal-get-face (face-name face) frame)) | |
388 ;; | |
389 ;; These are things like "attributeForeground" instead of simply | |
390 ;; "foreground" because people tend to do things like "*foreground", | |
391 ;; which would cause all faces to be fully qualified, making faces | |
392 ;; inherit attributes in a non-useful way. So we've made them slightly | |
393 ;; less obvious to specify in order to make them work correctly in | |
394 ;; more random environments. | |
395 ;; | |
396 ;; I think these should be called "face.faceForeground" instead of | |
397 ;; "face.attributeForeground", but they're the way they are for | |
398 ;; hysterical reasons. | |
399 ;; | |
400 (let* ((name (symbol-name (face-name face))) | |
401 (fn (or (x-get-resource (concat name ".attributeFont") | |
402 "Face.AttributeFont") | |
403 (and set-anyway (face-font face)))) | |
404 (fg (or (x-get-resource (concat name ".attributeForeground") | |
405 "Face.AttributeForeground") | |
406 (and set-anyway (face-foreground face)))) | |
407 (bg (or (x-get-resource (concat name ".attributeBackground") | |
408 "Face.AttributeBackground") | |
409 (and set-anyway (face-background face)))) | |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
410 (bgp (or (x-get-resource (concat name ".attributeStipple") |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
411 "Face.AttributeStipple") |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
412 (x-get-resource (concat name ".attributeBackgroundPixmap") |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
413 "Face.AttributeBackgroundPixmap") |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
414 (and set-anyway (face-stipple face)))) |
8149
5e27997957db
(x-create-frame-with-faces): Ignore case in X resource.
Richard M. Stallman <rms@gnu.org>
parents:
8109
diff
changeset
|
415 (ulp (let ((resource (x-get-resource |
5e27997957db
(x-create-frame-with-faces): Ignore case in X resource.
Richard M. Stallman <rms@gnu.org>
parents:
8109
diff
changeset
|
416 (concat name ".attributeUnderline") |
5e27997957db
(x-create-frame-with-faces): Ignore case in X resource.
Richard M. Stallman <rms@gnu.org>
parents:
8109
diff
changeset
|
417 "Face.AttributeUnderline"))) |
5e27997957db
(x-create-frame-with-faces): Ignore case in X resource.
Richard M. Stallman <rms@gnu.org>
parents:
8109
diff
changeset
|
418 (if resource |
5e27997957db
(x-create-frame-with-faces): Ignore case in X resource.
Richard M. Stallman <rms@gnu.org>
parents:
8109
diff
changeset
|
419 (member (downcase resource) '("on" "true")) |
5e27997957db
(x-create-frame-with-faces): Ignore case in X resource.
Richard M. Stallman <rms@gnu.org>
parents:
8109
diff
changeset
|
420 (and set-anyway (face-underline-p face))))) |
2456 | 421 ) |
422 (if fn | |
423 (condition-case () | |
12460
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
424 (cond ((string= fn "italic") |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
425 (make-face-italic face)) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
426 ((string= fn "bold") |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
427 (make-face-bold face)) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
428 ((string= fn "bold-italic") |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
429 (make-face-bold-italic face)) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
430 (t |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
431 (set-face-font face fn frame))) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
432 (error |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
433 (if (member fn '("italic" "bold" "bold-italic")) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
434 (message "no %s version found for face `%s'" fn name) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
435 (message "font `%s' not found for face `%s'" fn name))))) |
2456 | 436 (if fg |
437 (condition-case () | |
438 (set-face-foreground face fg frame) | |
439 (error (message "color `%s' not allocated for face `%s'" fg name)))) | |
440 (if bg | |
441 (condition-case () | |
442 (set-face-background face bg frame) | |
443 (error (message "color `%s' not allocated for face `%s'" bg name)))) | |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
444 (if bgp |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
445 (condition-case () |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
446 (set-face-stipple face bgp frame) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
447 (error (message "pixmap `%s' not found for face `%s'" bgp name)))) |
2456 | 448 (if (or ulp set-anyway) |
449 (set-face-underline-p face ulp frame)) | |
450 ))) | |
451 face) | |
452 | |
5849 | 453 (defun copy-face (old-face new-face &optional frame new-frame) |
454 "Define a face just like OLD-FACE, with name NEW-FACE. | |
455 If NEW-FACE already exists as a face, it is modified to be like OLD-FACE. | |
456 If it doesn't already exist, it is created. | |
457 | |
458 If the optional argument FRAME is given as a frame, | |
459 NEW-FACE is changed on FRAME only. | |
460 If FRAME is t, the frame-independent default specification for OLD-FACE | |
461 is copied to NEW-FACE. | |
462 If FRAME is nil, copying is done for the frame-independent defaults | |
463 and for each existing frame. | |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
464 If the optional fourth argument NEW-FRAME is given, |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
465 copy the information from face OLD-FACE on frame FRAME |
5849 | 466 to NEW-FACE on frame NEW-FRAME." |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
467 (or new-frame (setq new-frame frame)) |
6145
843ce3f872c2
(copy-face): Don't change old-face and new-face before the frame loop.
Karl Heuer <kwzh@gnu.org>
parents:
5955
diff
changeset
|
468 (let ((inhibit-quit t)) |
2456 | 469 (if (null frame) |
470 (let ((frames (frame-list))) | |
471 (while frames | |
5849 | 472 (copy-face old-face new-face (car frames)) |
2456 | 473 (setq frames (cdr frames))) |
5849 | 474 (copy-face old-face new-face t)) |
6145
843ce3f872c2
(copy-face): Don't change old-face and new-face before the frame loop.
Karl Heuer <kwzh@gnu.org>
parents:
5955
diff
changeset
|
475 (setq old-face (internal-get-face old-face frame)) |
843ce3f872c2
(copy-face): Don't change old-face and new-face before the frame loop.
Karl Heuer <kwzh@gnu.org>
parents:
5955
diff
changeset
|
476 (setq new-face (or (internal-find-face new-face new-frame) |
843ce3f872c2
(copy-face): Don't change old-face and new-face before the frame loop.
Karl Heuer <kwzh@gnu.org>
parents:
5955
diff
changeset
|
477 (make-face new-face))) |
8515
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
478 (condition-case nil |
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
479 ;; A face that has a global symbolic font modifier such as `bold' |
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
480 ;; might legitimately get an error here. |
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
481 ;; Use the frame's default font in that case. |
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
482 (set-face-font new-face (face-font old-face frame) new-frame) |
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
483 (error |
3043fef029a7
(copy-face): Ignore errors in set-face-font.
Richard M. Stallman <rms@gnu.org>
parents:
8377
diff
changeset
|
484 (set-face-font new-face nil new-frame))) |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
485 (set-face-foreground new-face (face-foreground old-face frame) new-frame) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
486 (set-face-background new-face (face-background old-face frame) new-frame) |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
487 (set-face-stipple new-face |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
488 (face-stipple old-face frame) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
489 new-frame) |
2456 | 490 (set-face-underline-p new-face (face-underline-p old-face frame) |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
491 new-frame)) |
2456 | 492 new-face)) |
493 | |
494 (defun face-equal (face1 face2 &optional frame) | |
2906
ca9bf00d4b19
* xfaces.el (face-equal): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2826
diff
changeset
|
495 "True if the faces FACE1 and FACE2 display in the same way." |
2456 | 496 (setq face1 (internal-get-face face1 frame) |
497 face2 (internal-get-face face2 frame)) | |
498 (and (equal (face-foreground face1 frame) (face-foreground face2 frame)) | |
499 (equal (face-background face1 frame) (face-background face2 frame)) | |
500 (equal (face-font face1 frame) (face-font face2 frame)) | |
8000
6d0a448be1ec
(face-equal): Do check the underline attribute.
Richard M. Stallman <rms@gnu.org>
parents:
7936
diff
changeset
|
501 (eq (face-underline-p face1 frame) (face-underline-p face2 frame)) |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
502 (equal (face-stipple face1 frame) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
503 (face-stipple face2 frame)))) |
2456 | 504 |
505 (defun face-differs-from-default-p (face &optional frame) | |
506 "True if face FACE displays differently from the default face, on FRAME. | |
507 A face is considered to be ``the same'' as the default face if it is | |
508 actually specified in the same way (equivalent fonts, etc) or if it is | |
509 fully unspecified, and thus inherits the attributes of any face it | |
10379
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
510 is displayed on top of. |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
511 |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
512 The optional argument FRAME specifies which frame to test; |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
513 if FRAME is t, test the default for new frames. |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
514 If FRAME is nil or omitted, test the selected frame." |
2456 | 515 (let ((default (internal-get-face 'default frame))) |
516 (setq face (internal-get-face face frame)) | |
517 (not (and (or (equal (face-foreground default frame) | |
518 (face-foreground face frame)) | |
519 (null (face-foreground face frame))) | |
520 (or (equal (face-background default frame) | |
521 (face-background face frame)) | |
522 (null (face-background face frame))) | |
523 (or (equal (face-font default frame) (face-font face frame)) | |
524 (null (face-font face frame))) | |
9569
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
525 (or (equal (face-stipple default frame) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
526 (face-stipple face frame)) |
943acba6d366
(set-face-stipple): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9197
diff
changeset
|
527 (null (face-stipple face frame))) |
2456 | 528 (equal (face-underline-p default frame) |
529 (face-underline-p face frame)) | |
530 )))) | |
531 | |
10379
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
532 (defun face-nontrivial-p (face &optional frame) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
533 "True if face FACE has some non-nil attribute. |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
534 The optional argument FRAME specifies which frame to test; |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
535 if FRAME is t, test the default for new frames. |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
536 If FRAME is nil or omitted, test the selected frame." |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
537 (setq face (internal-get-face face frame)) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
538 (or (face-foreground face frame) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
539 (face-background face frame) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
540 (face-font face frame) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
541 (face-stipple face frame) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
542 (face-underline-p face frame))) |
f9d713e8c77c
(face-nontrivial-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10375
diff
changeset
|
543 |
2456 | 544 |
545 (defun invert-face (face &optional frame) | |
546 "Swap the foreground and background colors of face FACE. | |
547 If the face doesn't specify both foreground and background, then | |
2800
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
548 set its foreground and background to the default background and foreground." |
2456 | 549 (interactive (list (read-face-name "Invert face: "))) |
550 (setq face (internal-get-face face frame)) | |
551 (let ((fg (face-foreground face frame)) | |
552 (bg (face-background face frame))) | |
553 (if (or fg bg) | |
554 (progn | |
555 (set-face-foreground face bg frame) | |
556 (set-face-background face fg frame)) | |
2800
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
557 (set-face-foreground face (or (face-background 'default frame) |
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
558 (cdr (assq 'background-color (frame-parameters frame)))) |
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
559 frame) |
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
560 (set-face-background face (or (face-foreground 'default frame) |
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
561 (cdr (assq 'foreground-color (frame-parameters frame)))) |
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
562 frame))) |
2456 | 563 face) |
564 | |
565 | |
566 (defun internal-try-face-font (face font &optional frame) | |
567 "Like set-face-font, but returns nil on failure instead of an error." | |
568 (condition-case () | |
569 (set-face-font face font frame) | |
570 (error nil))) | |
571 | |
572 ;; Manipulating font names. | |
573 | |
574 (defconst x-font-regexp nil) | |
575 (defconst x-font-regexp-head nil) | |
576 (defconst x-font-regexp-weight nil) | |
577 (defconst x-font-regexp-slant nil) | |
578 | |
12668
7660e82d0346
(x-font-regexp-weight-subnum, x-font-regexp-slant-subnum)
Karl Heuer <kwzh@gnu.org>
parents:
12651
diff
changeset
|
579 (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
|
580 (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
|
581 (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
|
582 (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
|
583 |
2456 | 584 ;;; Regexps matching font names in "Host Portable Character Representation." |
585 ;;; | |
586 (let ((- "[-?]") | |
587 (foundry "[^-]+") | |
588 (family "[^-]+") | |
589 (weight "\\(bold\\|demibold\\|medium\\)") ; 1 | |
590 ; (weight\? "\\(\\*\\|bold\\|demibold\\|medium\\|\\)") ; 1 | |
591 (weight\? "\\([^-]*\\)") ; 1 | |
592 (slant "\\([ior]\\)") ; 2 | |
593 ; (slant\? "\\([ior?*]?\\)") ; 2 | |
594 (slant\? "\\([^-]?\\)") ; 2 | |
595 ; (swidth "\\(\\*\\|normal\\|semicondensed\\|\\)") ; 3 | |
596 (swidth "\\([^-]*\\)") ; 3 | |
597 ; (adstyle "\\(\\*\\|sans\\|\\)") ; 4 | |
12690
e2d3fa52d100
(x-font-regexp): Add \\(\\) for substring extraction.
Karl Heuer <kwzh@gnu.org>
parents:
12668
diff
changeset
|
598 (adstyle "\\([^-]*\\)") ; 4 |
2456 | 599 (pixelsize "[0-9]+") |
600 (pointsize "[0-9][0-9]+") | |
601 (resx "[0-9][0-9]+") | |
602 (resy "[0-9][0-9]+") | |
603 (spacing "[cmp?*]") | |
604 (avgwidth "[0-9]+") | |
605 (registry "[^-]+") | |
606 (encoding "[^-]+") | |
607 ) | |
608 (setq x-font-regexp | |
609 (concat "\\`\\*?[-?*]" | |
610 foundry - family - weight\? - slant\? - swidth - adstyle - | |
12475
eb436b0c4ab3
(x-font-regexp): Include the avgwidth.
Richard M. Stallman <rms@gnu.org>
parents:
12460
diff
changeset
|
611 pixelsize - pointsize - resx - resy - spacing - avgwidth - |
eb436b0c4ab3
(x-font-regexp): Include the avgwidth.
Richard M. Stallman <rms@gnu.org>
parents:
12460
diff
changeset
|
612 registry - encoding "\\*?\\'" |
2456 | 613 )) |
614 (setq x-font-regexp-head | |
615 (concat "\\`[-?*]" foundry - family - weight\? - slant\? | |
616 "\\([-*?]\\|\\'\\)")) | |
617 (setq x-font-regexp-slant (concat - slant -)) | |
618 (setq x-font-regexp-weight (concat - weight -)) | |
619 nil) | |
620 | |
3071
68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
Jim Blandy <jimb@redhat.com>
parents:
3049
diff
changeset
|
621 (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
|
622 "Return a font name matching PATTERN. |
68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
Jim Blandy <jimb@redhat.com>
parents:
3049
diff
changeset
|
623 All wildcards in PATTERN become substantiated. |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
624 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
|
625 contains wildcards. |
10170
5fc240a3e4a0
(face-initialize): Test for framep not t or nil.
Richard M. Stallman <rms@gnu.org>
parents:
10107
diff
changeset
|
626 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
|
627 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
|
628 (or (symbolp face) |
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
629 (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
|
630 (and (eq frame t) |
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
631 (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
|
632 (if pattern |
5092
36508a7c0a3f
(x-resolve-font-name): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5081
diff
changeset
|
633 ;; Note that x-list-fonts has code to handle a face with nil as its font. |
36508a7c0a3f
(x-resolve-font-name): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5081
diff
changeset
|
634 (let ((fonts (x-list-fonts pattern face frame))) |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
635 (or fonts |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
636 (if face |
10584 | 637 (if (string-match "\\*" pattern) |
638 (if (null (face-font face)) | |
639 (error "No matching fonts are the same height as the frame default font") | |
640 (error "No matching fonts are the same height as face `%s'" face)) | |
641 (if (null (face-font face)) | |
642 (error "Height of font `%s' doesn't match the frame default font" | |
643 pattern) | |
644 (error "Height of font `%s' doesn't match face `%s'" | |
645 pattern face))) | |
3353
8cbd38886eef
(x-resolve-font-name): Clean up error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3298
diff
changeset
|
646 (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
|
647 (car fonts)) |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
648 (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
|
649 |
2456 | 650 (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
|
651 (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
|
652 (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
|
653 (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
|
654 (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
|
655 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
|
656 (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
|
657 (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
|
658 ;; 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
|
659 ;; 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
|
660 ;; 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
|
661 "*" |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
662 (substring font (match-end 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
|
663 ((or (string-match x-font-regexp-head 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
|
664 (string-match x-font-regexp-weight 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
|
665 (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
|
666 (substring font (match-end 1))))))) |
2456 | 667 |
668 (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
|
669 (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
|
670 (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
|
671 (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
|
672 (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
|
673 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
|
674 (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
|
675 (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
|
676 ;; 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
|
677 ;; 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
|
678 ;; 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
|
679 "*" |
3dcaddea344a
Wrap case-fold-search for x-frob-font-weight and x-frob-font-slant.
Simon Marshall <simon@gnu.org>
parents:
13609
diff
changeset
|
680 (substring font (match-end 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
|
681 ((or (string-match x-font-regexp-head 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
|
682 (string-match x-font-regexp-slant 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
|
683 (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
|
684 (substring font (match-end 1))))))) |
2456 | 685 |
686 (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
|
687 "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
|
688 If that can't be done, return nil." |
2456 | 689 (x-frob-font-weight font "bold")) |
690 | |
691 (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
|
692 "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
|
693 If that can't be done, return nil." |
2456 | 694 (x-frob-font-weight font "demibold")) |
695 | |
696 (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
|
697 "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
|
698 If that can't be done, return nil." |
2456 | 699 (x-frob-font-weight font "medium")) |
700 | |
701 (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
|
702 "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
|
703 If that can't be done, return nil." |
2456 | 704 (x-frob-font-slant font "i")) |
705 | |
706 (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
|
707 "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
|
708 If that can't be done, return nil." |
2456 | 709 (x-frob-font-slant font "o")) |
710 | |
711 (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
|
712 "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
|
713 If that can't be done, return nil." |
2456 | 714 (x-frob-font-slant font "r")) |
715 | |
716 ;;; non-X-specific interface | |
717 | |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
718 (defun make-face-bold (face &optional frame noerror) |
2456 | 719 "Make the font of the given face be bold, if possible. |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
720 If NOERROR is non-nil, return nil on failure." |
2456 | 721 (interactive (list (read-face-name "Make which face bold: "))) |
5199
b8b8063551e1
(make-face-unitalic, make-face-unbold, make-face-bold)
Richard M. Stallman <rms@gnu.org>
parents:
5092
diff
changeset
|
722 (if (and (eq frame t) (listp (face-font face t))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
723 (set-face-font face (if (memq 'italic (face-font face t)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
724 '(bold italic) '(bold)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
725 t) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
726 (let (font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
727 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
728 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
729 ;; Make this face bold in global-face-data. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
730 (make-face-bold face t noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
731 ;; Make this face bold in each frame. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
732 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
733 (make-face-bold face (car frames) noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
734 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
735 (setq face (internal-get-face face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
736 (setq font (or (face-font face frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
737 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
738 (if (listp font) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
739 (setq font nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
740 (setq font (or font |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
741 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
742 (cdr (assq 'font (frame-parameters frame))))) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
743 (or (and font (make-face-bold-internal face frame font)) |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
744 ;; We failed to find a bold version of the font. |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
745 noerror |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
746 (error "No bold version of %S" font)))))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
747 |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
748 (defun make-face-bold-internal (face frame font) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
749 (let (f2) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
750 (or (and (setq f2 (x-make-font-bold font)) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
751 (internal-try-face-font face f2 frame)) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
752 (and (setq f2 (x-make-font-demibold font)) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
753 (internal-try-face-font face f2 frame))))) |
2456 | 754 |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
755 (defun make-face-italic (face &optional frame noerror) |
2456 | 756 "Make the font of the given face be italic, if possible. |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
757 If NOERROR is non-nil, return nil on failure." |
2456 | 758 (interactive (list (read-face-name "Make which face italic: "))) |
5199
b8b8063551e1
(make-face-unitalic, make-face-unbold, make-face-bold)
Richard M. Stallman <rms@gnu.org>
parents:
5092
diff
changeset
|
759 (if (and (eq frame t) (listp (face-font face t))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
760 (set-face-font face (if (memq 'bold (face-font face t)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
761 '(bold italic) '(italic)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
762 t) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
763 (let (font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
764 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
765 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
766 ;; Make this face italic in global-face-data. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
767 (make-face-italic face t noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
768 ;; Make this face italic in each frame. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
769 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
770 (make-face-italic face (car frames) noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
771 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
772 (setq face (internal-get-face face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
773 (setq font (or (face-font face frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
774 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
775 (if (listp font) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
776 (setq font nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
777 (setq font (or font |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
778 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
779 (cdr (assq 'font (frame-parameters frame))))) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
780 (or (and font (make-face-italic-internal face frame font)) |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
781 ;; We failed to find an italic version of the font. |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
782 noerror |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
783 (error "No italic version of %S" font)))))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
784 |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
785 (defun make-face-italic-internal (face frame font) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
786 (let (f2) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
787 (or (and (setq f2 (x-make-font-italic font)) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
788 (internal-try-face-font face f2 frame)) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
789 (and (setq f2 (x-make-font-oblique font)) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
790 (internal-try-face-font face f2 frame))))) |
2456 | 791 |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
792 (defun make-face-bold-italic (face &optional frame noerror) |
2456 | 793 "Make the font of the given face be bold and italic, if possible. |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
794 If NOERROR is non-nil, return nil on failure." |
2456 | 795 (interactive (list (read-face-name "Make which face bold-italic: "))) |
5199
b8b8063551e1
(make-face-unitalic, make-face-unbold, make-face-bold)
Richard M. Stallman <rms@gnu.org>
parents:
5092
diff
changeset
|
796 (if (and (eq frame t) (listp (face-font face t))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
797 (set-face-font face '(bold italic) t) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
798 (let (font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
799 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
800 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
801 ;; Make this face bold-italic in global-face-data. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
802 (make-face-bold-italic face t noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
803 ;; Make this face bold in each frame. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
804 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
805 (make-face-bold-italic face (car frames) noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
806 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
807 (setq face (internal-get-face face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
808 (setq font (or (face-font face frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
809 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
810 (if (listp font) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
811 (setq font nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
812 (setq font (or font |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
813 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
814 (cdr (assq 'font (frame-parameters frame))))) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
815 (or (and font (make-face-bold-italic-internal face frame font)) |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
816 ;; We failed to find a bold italic version. |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
817 noerror |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
818 (error "No bold italic version of %S" font)))))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
819 |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
820 (defun make-face-bold-italic-internal (face frame font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
821 (let (f2 f3) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
822 (or (and (setq f2 (x-make-font-italic font)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
823 (not (equal font f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
824 (setq f3 (x-make-font-bold f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
825 (not (equal f2 f3)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
826 (internal-try-face-font face f3 frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
827 (and (setq f2 (x-make-font-oblique font)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
828 (not (equal font f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
829 (setq f3 (x-make-font-bold f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
830 (not (equal f2 f3)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
831 (internal-try-face-font face f3 frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
832 (and (setq f2 (x-make-font-italic font)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
833 (not (equal font f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
834 (setq f3 (x-make-font-demibold f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
835 (not (equal f2 f3)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
836 (internal-try-face-font face f3 frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
837 (and (setq f2 (x-make-font-oblique font)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
838 (not (equal font f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
839 (setq f3 (x-make-font-demibold f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
840 (not (equal f2 f3)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
841 (internal-try-face-font face f3 frame))))) |
2456 | 842 |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
843 (defun make-face-unbold (face &optional frame noerror) |
2456 | 844 "Make the font of the given face be non-bold, if possible. |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
845 If NOERROR is non-nil, return nil on failure." |
2456 | 846 (interactive (list (read-face-name "Make which face non-bold: "))) |
5199
b8b8063551e1
(make-face-unitalic, make-face-unbold, make-face-bold)
Richard M. Stallman <rms@gnu.org>
parents:
5092
diff
changeset
|
847 (if (and (eq frame t) (listp (face-font face t))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
848 (set-face-font face (if (memq 'italic (face-font face t)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
849 '(italic) nil) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
850 t) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
851 (let (font font1) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
852 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
853 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
854 ;; Make this face unbold in global-face-data. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
855 (make-face-unbold face t noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
856 ;; Make this face unbold in each frame. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
857 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
858 (make-face-unbold face (car frames) noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
859 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
860 (setq face (internal-get-face face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
861 (setq font1 (or (face-font face frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
862 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
863 (if (listp font1) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
864 (setq font1 nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
865 (setq font1 (or font1 |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
866 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
867 (cdr (assq 'font (frame-parameters frame))))) |
8732
58d6dc80af5c
(make-face-unbold, make-face-unitalic, make-face-bold, make-face-italic,
Karl Heuer <kwzh@gnu.org>
parents:
8515
diff
changeset
|
868 (setq font (and font1 (x-make-font-unbold font1))) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
869 (or (if font (internal-try-face-font face font frame)) |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
870 noerror |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
871 (error "No unbold version of %S" font1)))))) |
2456 | 872 |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
873 (defun make-face-unitalic (face &optional frame noerror) |
2456 | 874 "Make the font of the given face be non-italic, if possible. |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
875 If NOERROR is non-nil, return nil on failure." |
2456 | 876 (interactive (list (read-face-name "Make which face non-italic: "))) |
5199
b8b8063551e1
(make-face-unitalic, make-face-unbold, make-face-bold)
Richard M. Stallman <rms@gnu.org>
parents:
5092
diff
changeset
|
877 (if (and (eq frame t) (listp (face-font face t))) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
878 (set-face-font face (if (memq 'bold (face-font face t)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
879 '(bold) nil) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
880 t) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
881 (let (font font1) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
882 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
883 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
884 ;; Make this face unitalic in global-face-data. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
885 (make-face-unitalic face t noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
886 ;; Make this face unitalic in each frame. |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
887 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
888 (make-face-unitalic face (car frames) noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
889 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
890 (setq face (internal-get-face face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
891 (setq font1 (or (face-font face frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
892 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
893 (if (listp font1) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
894 (setq font1 nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
895 (setq font1 (or font1 |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
896 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
897 (cdr (assq 'font (frame-parameters frame))))) |
8732
58d6dc80af5c
(make-face-unbold, make-face-unitalic, make-face-bold, make-face-italic,
Karl Heuer <kwzh@gnu.org>
parents:
8515
diff
changeset
|
898 (setq font (and font1 (x-make-font-unitalic font1))) |
12651
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
899 (or (if font (internal-try-face-font face font frame)) |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
900 noerror |
4bb00f26c714
(make-face-bold, make-face-italic, make-face-bold-italic)
Richard M. Stallman <rms@gnu.org>
parents:
12581
diff
changeset
|
901 (error "No unitalic version of %S" font1)))))) |
2456 | 902 |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
903 (defvar list-faces-sample-text |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
904 "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ" |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
905 "*Text string to display as the sample text for `list-faces-display'.") |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
906 |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
907 ;; The name list-faces would be more consistent, but let's avoid a conflict |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
908 ;; with Lucid, which uses that name differently. |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
909 (defun list-faces-display () |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
910 "List all faces, using the same sample text in each. |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
911 The sample text is a string that comes from the variable |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
912 `list-faces-sample-text'. |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
913 |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
914 It is possible to give a particular face name different appearances in |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
915 different frames. This command shows the appearance in the |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
916 selected frame." |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
917 (interactive) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
918 (let ((faces (sort (face-list) (function string-lessp))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
919 (face nil) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
920 (frame (selected-frame)) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
921 disp-frame window) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
922 (with-output-to-temp-buffer "*Faces*" |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
923 (save-excursion |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
924 (set-buffer standard-output) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
925 (setq truncate-lines t) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
926 (while faces |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
927 (setq face (car faces)) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
928 (setq faces (cdr faces)) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
929 (insert (format "%25s " (symbol-name face))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
930 (let ((beg (point))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
931 (insert list-faces-sample-text) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
932 (insert "\n") |
8107
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
933 (put-text-property beg (1- (point)) 'face face) |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
934 ;; If the sample text has multiple lines, line up all of them. |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
935 (goto-char beg) |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
936 (forward-line 1) |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
937 (while (not (eobp)) |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
938 (insert " ") |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
939 (forward-line 1)))) |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
940 (goto-char (point-min)))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
941 ;; If the *Faces* buffer appears in a different frame, |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
942 ;; copy all the face definitions from FRAME, |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
943 ;; so that the display will reflect the frame that was selected. |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
944 (setq window (get-buffer-window (get-buffer "*Faces*") t)) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
945 (setq disp-frame (if window (window-frame window) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
946 (car (frame-list)))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
947 (or (eq frame disp-frame) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
948 (let ((faces (face-list))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
949 (while faces |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
950 (copy-face (car faces) (car faces) frame disp-frame) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
951 (setq faces (cdr faces))))))) |
12460
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
952 |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
953 (defun describe-face (face) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
954 "Display the properties of face FACE." |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
955 (interactive (list (read-face-name "Describe face: "))) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
956 (with-output-to-temp-buffer "*Help*" |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
957 (princ "Properties of face `") |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
958 (princ (face-name face)) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
959 (princ "':") (terpri) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
960 (princ "Foreground: ") (princ (face-foreground face)) (terpri) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
961 (princ "Background: ") (princ (face-background face)) (terpri) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
962 (princ " Font: ") (princ (face-font face)) (terpri) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
963 (princ "Underlined: ") (princ (if (face-underline-p face) "yes" "no")) (terpri) |
1e12a802df2b
(describe-face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12169
diff
changeset
|
964 (princ " Stipple: ") (princ (or (face-stipple face) "none")))) |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
965 |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
966 ;;; Make the standard faces. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
967 ;;; The C code knows the default and modeline faces as faces 0 and 1, |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
968 ;;; so they must be the first two faces made. |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
969 (defun face-initialize () |
2456 | 970 (make-face 'default) |
2826
9c22af6d7885
(face-initialize): Do make the modeline face.
Richard M. Stallman <rms@gnu.org>
parents:
2807
diff
changeset
|
971 (make-face 'modeline) |
2456 | 972 (make-face 'highlight) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
973 |
2456 | 974 ;; These aren't really special in any way, but they're nice to have around. |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
975 |
2456 | 976 (make-face 'bold) |
977 (make-face 'italic) | |
978 (make-face 'bold-italic) | |
2807
9e8635dafd40
Rename `primary-selection' to `region'.
Richard M. Stallman <rms@gnu.org>
parents:
2800
diff
changeset
|
979 (make-face 'region) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
980 (make-face 'secondary-selection) |
3911
06dbadd0e4a7
(face-initialize): Create `underline' face.
Richard M. Stallman <rms@gnu.org>
parents:
3910
diff
changeset
|
981 (make-face 'underline) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
982 |
2807
9e8635dafd40
Rename `primary-selection' to `region'.
Richard M. Stallman <rms@gnu.org>
parents:
2800
diff
changeset
|
983 (setq region-face (face-id 'region)) |
2800
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
984 |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
985 ;; Specify the global properties of these faces |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
986 ;; so they will come out right on new frames. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
987 |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
988 (make-face-bold 'bold t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
989 (make-face-italic 'italic t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
990 (make-face-bold-italic 'bold-italic t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
991 |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
992 (set-face-background 'highlight '("darkseagreen2" "green" t) t) |
8377
4ac21edb9f78
(face-initialize): Use underlining for region face
Richard M. Stallman <rms@gnu.org>
parents:
8186
diff
changeset
|
993 (set-face-background 'region '("gray" underline) t) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
994 (set-face-background 'secondary-selection '("paleturquoise" "green" t) t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
995 (set-face-background 'modeline '(t) t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
996 (set-face-underline-p 'underline t t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
997 |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
998 ;; Set up the faces of all existing X Window frames |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
999 ;; from those global properties, unless already set in a given frame. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1000 |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
1001 (let ((frames (frame-list))) |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
1002 (while frames |
10170
5fc240a3e4a0
(face-initialize): Test for framep not t or nil.
Richard M. Stallman <rms@gnu.org>
parents:
10107
diff
changeset
|
1003 (if (not (memq (framep (car frames)) '(t nil))) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1004 (let ((frame (car frames)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1005 (rest global-face-data)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1006 (while rest |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1007 (let ((face (car (car rest)))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1008 (or (face-differs-from-default-p face) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1009 (face-fill-in face (cdr (car rest)) frame))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1010 (setq rest (cdr rest))))) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
1011 (setq frames (cdr frames))))) |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
1012 |
2456 | 1013 |
1014 ;; Like x-create-frame but also set up the faces. | |
1015 | |
1016 (defun x-create-frame-with-faces (&optional parameters) | |
11927
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1017 ;; Read this frame's geometry resource, if it has an explicit name, |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1018 ;; and put the specs into PARAMETERS. |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1019 (let* ((name (or (cdr (assq 'name parameters)) |
12169
67f9dfb23d7c
(x-create-frame-with-faces): Don't use initial-frame-alist
Karl Heuer <kwzh@gnu.org>
parents:
12168
diff
changeset
|
1020 (cdr (assq 'name default-frame-alist)))) |
11927
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1021 (x-resource-name name) |
12168
40be3e73cfb0
(x-create-frame-with-faces): Don't look for geometry
Karl Heuer <kwzh@gnu.org>
parents:
11927
diff
changeset
|
1022 (res-geometry (if name (x-get-resource "geometry" "Geometry"))) |
11927
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1023 parsed) |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1024 (if res-geometry |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1025 (progn |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1026 (setq parsed (x-parse-geometry res-geometry)) |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1027 ;; If the resource specifies a position, |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1028 ;; call the position and size "user-specified". |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1029 (if (or (assq 'top parsed) (assq 'left parsed)) |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1030 (setq parsed (cons '(user-position . t) |
20eae371b3f0
(x-create-frame-with-faces): Read geometry resource
Karl Heuer <kwzh@gnu.org>
parents:
11850
diff
changeset
|
1031 (cons '(user-size . t) parsed)))) |
12169
67f9dfb23d7c
(x-create-frame-with-faces): Don't use initial-frame-alist
Karl Heuer <kwzh@gnu.org>
parents:
12168
diff
changeset
|
1032 ;; Put the geometry parameters at the end. |
67f9dfb23d7c
(x-create-frame-with-faces): Don't use initial-frame-alist
Karl Heuer <kwzh@gnu.org>
parents:
12168
diff
changeset
|
1033 ;; Copy default-frame-alist so that they go after it. |
67f9dfb23d7c
(x-create-frame-with-faces): Don't use initial-frame-alist
Karl Heuer <kwzh@gnu.org>
parents:
12168
diff
changeset
|
1034 (setq parameters (append parameters |
67f9dfb23d7c
(x-create-frame-with-faces): Don't use initial-frame-alist
Karl Heuer <kwzh@gnu.org>
parents:
12168
diff
changeset
|
1035 default-frame-alist |
67f9dfb23d7c
(x-create-frame-with-faces): Don't use initial-frame-alist
Karl Heuer <kwzh@gnu.org>
parents:
12168
diff
changeset
|
1036 parsed))))) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1037 (let (frame) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1038 (if (null global-face-data) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1039 (setq frame (x-create-frame parameters)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1040 (let* ((visibility-spec (assq 'visibility parameters)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1041 (faces (copy-alist global-face-data)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1042 success |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1043 (rest faces)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1044 (setq frame (x-create-frame (cons '(visibility . nil) parameters))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1045 (unwind-protect |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1046 (progn |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1047 (set-frame-face-alist frame faces) |
2456 | 1048 |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1049 (if (cdr (or (assq 'reverse parameters) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1050 (assq 'reverse default-frame-alist) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1051 (let ((resource (x-get-resource "reverseVideo" |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1052 "ReverseVideo"))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1053 (if resource |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1054 (cons nil (member (downcase resource) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1055 '("on" "true"))))))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1056 (let* ((params (frame-parameters frame)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1057 (bg (cdr (assq 'foreground-color params))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1058 (fg (cdr (assq 'background-color params)))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1059 (modify-frame-parameters frame |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1060 (list (cons 'foreground-color fg) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1061 (cons 'background-color bg))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1062 (if (equal bg (cdr (assq 'border-color params))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1063 (modify-frame-parameters frame |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1064 (list (cons 'border-color fg)))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1065 (if (equal bg (cdr (assq 'mouse-color params))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1066 (modify-frame-parameters frame |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1067 (list (cons 'mouse-color fg)))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1068 (if (equal bg (cdr (assq 'cursor-color params))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1069 (modify-frame-parameters frame |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1070 (list (cons 'cursor-color fg)))))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1071 ;; Copy the vectors that represent the faces. |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1072 ;; Also fill them in from X resources. |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1073 (while rest |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1074 (let ((global (cdr (car rest)))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1075 (setcdr (car rest) (vector 'face |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1076 (face-name (cdr (car rest))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1077 (face-id (cdr (car rest))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1078 nil nil nil nil nil)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1079 (face-fill-in (car (car rest)) global frame)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1080 (make-face-x-resource-internal (cdr (car rest)) frame t) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1081 (setq rest (cdr rest))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1082 (if (null visibility-spec) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1083 (make-frame-visible frame) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1084 (modify-frame-parameters frame (list visibility-spec))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1085 (setq success t)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1086 (or success |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1087 (delete-frame frame))))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1088 ;; Set up the background-mode frame parameter |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1089 ;; so that programs can decide good ways of highlighting |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1090 ;; on this frame. |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1091 (let ((bg-resource (x-get-resource ".backgroundMode" |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1092 "BackgroundMode")) |
12581
8e4a75fa4b5b
(x-create-frame-with-faces):
Richard M. Stallman <rms@gnu.org>
parents:
12562
diff
changeset
|
1093 (params (frame-parameters frame)) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1094 (bg-mode)) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1095 (setq bg-mode |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1096 (cond (bg-resource (intern (downcase bg-resource))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1097 ((< (apply '+ (x-color-values |
12581
8e4a75fa4b5b
(x-create-frame-with-faces):
Richard M. Stallman <rms@gnu.org>
parents:
12562
diff
changeset
|
1098 (cdr (assq 'background-color params)) |
8e4a75fa4b5b
(x-create-frame-with-faces):
Richard M. Stallman <rms@gnu.org>
parents:
12562
diff
changeset
|
1099 frame)) |
8e4a75fa4b5b
(x-create-frame-with-faces):
Richard M. Stallman <rms@gnu.org>
parents:
12562
diff
changeset
|
1100 (/ (apply '+ (x-color-values "white" frame)) 3)) |
12562
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1101 'dark) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1102 (t 'light))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1103 (modify-frame-parameters frame |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1104 (list (cons 'background-mode bg-mode) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1105 (cons 'display-type |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1106 (cond ((x-display-color-p frame) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1107 'color) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1108 ((x-display-grayscale-p frame) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1109 'grayscale) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1110 (t 'mono)))))) |
a9b08e50d6ec
(x-create-frame-with-faces): Set background-mode
Karl Heuer <kwzh@gnu.org>
parents:
12475
diff
changeset
|
1111 frame)) |
2456 | 1112 |
7019
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1113 ;; Update a frame's faces when we change its default font. |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1114 (defun frame-update-faces (frame) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1115 (let* ((faces global-face-data) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1116 (rest faces)) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1117 (while rest |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1118 (let* ((face (car (car rest))) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1119 (font (face-font face t))) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1120 (if (listp font) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1121 (let ((bold (memq 'bold font)) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1122 (italic (memq 'italic font))) |
7120
a03d341e9594
(frame-update-faces): Unset old font.
Karl Heuer <kwzh@gnu.org>
parents:
7019
diff
changeset
|
1123 ;; Ignore any previous (string-valued) font, it might not even |
a03d341e9594
(frame-update-faces): Unset old font.
Karl Heuer <kwzh@gnu.org>
parents:
7019
diff
changeset
|
1124 ;; be the right size anymore. |
a03d341e9594
(frame-update-faces): Unset old font.
Karl Heuer <kwzh@gnu.org>
parents:
7019
diff
changeset
|
1125 (set-face-font face nil frame) |
7019
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1126 (cond ((and bold italic) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1127 (make-face-bold-italic face frame t)) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1128 (bold |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1129 (make-face-bold face frame t)) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1130 (italic |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1131 (make-face-italic face frame t))))) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1132 (setq rest (cdr rest))) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1133 frame))) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
1134 |
10193
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1135 ;; Update the colors of FACE, after FRAME's own colors have been changed. |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1136 ;; This applies only to faces with global color specifications |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1137 ;; that are not simple constants. |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1138 (defun frame-update-face-colors (frame) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1139 (let ((faces global-face-data)) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1140 (while faces |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1141 (condition-case nil |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1142 (let* ((data (cdr (car faces))) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1143 (face (car (car faces))) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1144 (foreground (face-foreground data)) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1145 (background (face-background data))) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1146 ;; If the global spec is a specific color, |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1147 ;; which doesn't depend on the frame's attributes, |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1148 ;; we don't need to recalculate it now. |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1149 (or (listp foreground) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1150 (setq foreground nil)) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1151 (or (listp background) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1152 (setq background nil)) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1153 ;; If we are going to frob this face at all, |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1154 ;; reinitialize it first. |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1155 (if (or foreground background) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1156 (progn (set-face-foreground face nil frame) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1157 (set-face-background face nil frame))) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1158 (if foreground |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1159 (face-try-color-list 'set-face-foreground |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1160 face foreground frame)) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1161 (if background |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1162 (face-try-color-list 'set-face-background |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1163 face background frame))) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1164 (error nil)) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1165 (setq faces (cdr faces))))) |
6efa61f222cb
(frame-update-face-colors): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10170
diff
changeset
|
1166 |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1167 ;; Fill in the face FACE from frame-independent face data DATA. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1168 ;; DATA should be the non-frame-specific ("global") face vector |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1169 ;; for the face. FACE should be a face name or face object. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1170 ;; FRAME is the frame to act on; it must be an actual frame, not nil or t. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1171 (defun face-fill-in (face data frame) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1172 (condition-case nil |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1173 (let ((foreground (face-foreground data)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1174 (background (face-background data)) |
11850
f9174d73e755
Put property on set-face-stipple, not set-stipple.
Karl Heuer <kwzh@gnu.org>
parents:
11464
diff
changeset
|
1175 (font (face-font data)) |
f9174d73e755
Put property on set-face-stipple, not set-stipple.
Karl Heuer <kwzh@gnu.org>
parents:
11464
diff
changeset
|
1176 (stipple (face-stipple data))) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1177 (set-face-underline-p face (face-underline-p data) frame) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1178 (if foreground |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1179 (face-try-color-list 'set-face-foreground |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1180 face foreground frame)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1181 (if background |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1182 (face-try-color-list 'set-face-background |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1183 face background frame)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1184 (if (listp font) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1185 (let ((bold (memq 'bold font)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1186 (italic (memq 'italic font))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1187 (cond ((and bold italic) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1188 (make-face-bold-italic face frame)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1189 (bold |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1190 (make-face-bold face frame)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1191 (italic |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1192 (make-face-italic face frame)))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1193 (if font |
11850
f9174d73e755
Put property on set-face-stipple, not set-stipple.
Karl Heuer <kwzh@gnu.org>
parents:
11464
diff
changeset
|
1194 (set-face-font face font frame))) |
f9174d73e755
Put property on set-face-stipple, not set-stipple.
Karl Heuer <kwzh@gnu.org>
parents:
11464
diff
changeset
|
1195 (if stipple |
f9174d73e755
Put property on set-face-stipple, not set-stipple.
Karl Heuer <kwzh@gnu.org>
parents:
11464
diff
changeset
|
1196 (set-face-stipple face stipple frame))) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1197 (error nil))) |
2456 | 1198 |
10022
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1199 ;; Assuming COLOR is a valid color name, |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1200 ;; return t if it can be displayed on FRAME. |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1201 (defun face-color-supported-p (frame color background-p) |
13609
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1202 (and window-system |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1203 (or (x-display-color-p frame) |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1204 ;; A black-and-white display can implement these. |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1205 (member color '("black" "white")) |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1206 ;; A black-and-white display can fake gray for background. |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1207 (and background-p |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1208 (face-color-gray-p color frame)) |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1209 ;; A grayscale display can implement colors that are gray (more or less). |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1210 (and (x-display-grayscale-p frame) |
eb141cf52779
(face-color-supported-p): Return nil if no window system.
Richard M. Stallman <rms@gnu.org>
parents:
13432
diff
changeset
|
1211 (face-color-gray-p color frame))))) |
10022
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1212 |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1213 ;; Use FUNCTION to store a color in FACE on FRAME. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1214 ;; COLORS is either a single color or a list of colors. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1215 ;; If it is a list, try the colors one by one until one of them |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1216 ;; succeeds. We signal an error only if all the colors failed. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1217 ;; t as COLORS or as an element of COLORS means to invert the face. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1218 ;; That can't fail, so any subsequent elements after the t are ignored. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1219 (defun face-try-color-list (function face colors frame) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1220 (if (stringp colors) |
10022
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1221 (if (face-color-supported-p frame colors |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1222 (eq function 'set-face-background)) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1223 (funcall function face colors frame)) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1224 (if (eq colors t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1225 (invert-face face frame) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1226 (let (done) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1227 (while (and colors (not done)) |
10375
8652c7b84a5f
(face-try-color-list): Treat `underline' as valid.
Richard M. Stallman <rms@gnu.org>
parents:
10193
diff
changeset
|
1228 (if (or (memq (car colors) '(t underline)) |
10022
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1229 (face-color-supported-p frame (car colors) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1230 (eq function 'set-face-background))) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1231 (if (cdr colors) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1232 ;; If there are more colors to try, catch errors |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1233 ;; and set `done' if we succeed. |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1234 (condition-case nil |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1235 (progn |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1236 (cond ((eq (car colors) t) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1237 (invert-face face frame)) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1238 ((eq (car colors) 'underline) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1239 (set-face-underline-p face t frame)) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1240 (t |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1241 (funcall function face (car colors) frame))) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1242 (setq done t)) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1243 (error nil)) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1244 ;; If this is the last color, let the error get out if it fails. |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1245 ;; If it succeeds, we will exit anyway after this iteration. |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1246 (cond ((eq (car colors) t) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1247 (invert-face face frame)) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1248 ((eq (car colors) 'underline) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1249 (set-face-underline-p face t frame)) |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1250 (t |
30e0dc7c07cd
(face-color-supported-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9665
diff
changeset
|
1251 (funcall function face (car colors) frame))))) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
1252 (setq colors (cdr colors))))))) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
1253 |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
1254 ;; If we are already using x-window frames, initialize faces for them. |
13432
c0c8b0a210e0
[win32] (make-face, make-face-x-resource-internal):
Geoff Voelker <voelker@cs.washington.edu>
parents:
12776
diff
changeset
|
1255 (if (or (eq (framep (selected-frame)) 'x) (eq (framep (selected-frame)) 'win32)) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
1256 (face-initialize)) |
2456 | 1257 |
2715
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
1258 (provide 'faces) |
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
1259 |
2456 | 1260 ;;; faces.el ends here |