Mercurial > emacs
annotate lisp/faces.el @ 8109:9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
(make-face-bold-internal, make-face-italic-internal): Bind f2 here.
(make-face-bold-italic-internal, make-face-italic-internal)
(make-face-bold-internal): New arg `font'. Callers changed.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 01 Jul 1994 17:31:42 +0000 |
parents | 0885b28decc6 |
children | 5e27997957db |
rev | line source |
---|---|
2456 | 1 ;;; faces.el --- Lisp interface to the c "face" structure |
2 | |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
3 ;; Copyright (C) 1992, 1993, 1994 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 | |
18 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
19 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
20 | |
21 ;;; Commentary: | |
22 | |
23 ;; Mostly derived from Lucid. | |
24 | |
25 ;;; Code: | |
26 | |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
27 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
28 ;;;; 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
|
29 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
30 ;;; A face vector is a vector of the form: |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
31 ;;; [face NAME ID FONT FOREGROUND BACKGROUND BACKGROUND-PIXMAP UNDERLINE] |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
32 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
33 ;;; Type checkers. |
2456 | 34 (defsubst internal-facep (x) |
35 (and (vectorp x) (= (length x) 8) (eq (aref x 0) 'face))) | |
36 | |
37 (defmacro internal-check-face (face) | |
38 (` (while (not (internal-facep (, face))) | |
39 (setq (, face) (signal 'wrong-type-argument (list 'internal-facep (, face))))))) | |
40 | |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
41 ;;; Accessors. |
2456 | 42 (defsubst face-name (face) |
43 "Return the name of face FACE." | |
44 (aref (internal-get-face face) 1)) | |
45 | |
46 (defsubst face-id (face) | |
47 "Return the internal ID number of face FACE." | |
48 (aref (internal-get-face face) 2)) | |
49 | |
50 (defsubst face-font (face &optional frame) | |
51 "Return the font name of face FACE, or nil if it is unspecified. | |
52 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
|
53 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
|
54 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
|
55 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
|
56 If FRAME is omitted or nil, use the selected frame." |
2456 | 57 (aref (internal-get-face face frame) 3)) |
58 | |
59 (defsubst face-foreground (face &optional frame) | |
60 "Return the foreground color name of face FACE, or nil if unspecified. | |
61 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
|
62 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
|
63 If FRAME is omitted or nil, use the selected frame." |
2456 | 64 (aref (internal-get-face face frame) 4)) |
65 | |
66 (defsubst face-background (face &optional frame) | |
67 "Return the background color name of face FACE, or nil if unspecified. | |
68 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
|
69 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
|
70 If FRAME is omitted or nil, use the selected frame." |
2456 | 71 (aref (internal-get-face face frame) 5)) |
72 | |
3812
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
73 ;;(defsubst face-background-pixmap (face &optional frame) |
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
74 ;; "Return the background pixmap name of face FACE, or nil if unspecified. |
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
75 ;;If the optional argument FRAME is given, report on face FACE in that frame. |
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
76 ;;Otherwise report on the defaults for face FACE (for new frames)." |
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
77 ;; (aref (internal-get-face face frame) 6)) |
2456 | 78 |
79 (defsubst face-underline-p (face &optional frame) | |
80 "Return t if face FACE is underlined. | |
81 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
|
82 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
|
83 If FRAME is omitted or nil, use the selected frame." |
2456 | 84 (aref (internal-get-face face frame) 7)) |
85 | |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
86 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
87 ;;; Mutators. |
2456 | 88 |
89 (defsubst set-face-font (face font &optional frame) | |
90 "Change the font of face FACE to FONT (a string). | |
91 If the optional FRAME argument is provided, change only | |
92 in that frame; otherwise change each frame." | |
93 (interactive (internal-face-interactive "font")) | |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
94 (if (stringp font) (setq font (x-resolve-font-name font face frame))) |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
95 (internal-set-face-1 face 'font font 3 frame)) |
2456 | 96 |
97 (defsubst set-face-foreground (face color &optional frame) | |
98 "Change the foreground color of face FACE to COLOR (a string). | |
99 If the optional FRAME argument is provided, change only | |
100 in that frame; otherwise change each frame." | |
101 (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
|
102 (internal-set-face-1 face 'foreground color 4 frame)) |
2456 | 103 |
104 (defsubst set-face-background (face color &optional frame) | |
105 "Change the background color of face FACE to COLOR (a string). | |
106 If the optional FRAME argument is provided, change only | |
107 in that frame; otherwise change each frame." | |
108 (interactive (internal-face-interactive "background")) | |
2715
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
109 (internal-set-face-1 face 'background color 5 frame)) |
2456 | 110 |
3812
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
111 ;;(defsubst set-face-background-pixmap (face name &optional frame) |
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
112 ;; "Change the background pixmap of face FACE to PIXMAP. |
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
113 ;;PIXMAP should be a string, the name of a file of pixmap data. |
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
114 ;;The directories listed in the `x-bitmap-file-path' variable are searched. |
2456 | 115 |
3812
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
116 ;;Alternatively, PIXMAP may be a list of the form (WIDTH HEIGHT DATA) |
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
117 ;;where WIDTH and HEIGHT are the size in pixels, |
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
118 ;;and DATA is a string, containing the raw bits of the bitmap. |
2456 | 119 |
3812
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
120 ;;If the optional FRAME argument is provided, change only |
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
121 ;;in that frame; otherwise change each frame." |
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
122 ;; (interactive (internal-face-interactive "background-pixmap")) |
0bc757649dd7
(set-face-background-pixmap, face-background-pixmap): Functions commented out.
Richard M. Stallman <rms@gnu.org>
parents:
3555
diff
changeset
|
123 ;; (internal-set-face-1 face 'background-pixmap name 6 frame)) |
2456 | 124 |
125 (defsubst set-face-underline-p (face underline-p &optional frame) | |
126 "Specify whether face FACE is underlined. (Yes if UNDERLINE-P is non-nil.) | |
127 If the optional FRAME argument is provided, change only | |
128 in that frame; otherwise change each frame." | |
129 (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
|
130 (internal-set-face-1 face 'underline underline-p 7 frame)) |
2456 | 131 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
132 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
133 ;;;; 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
|
134 |
3925
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
135 (defvar global-face-data nil |
f286657c098e
* faces.el (global-face-data): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
3911
diff
changeset
|
136 "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
|
137 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
|
138 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
|
139 |
2744
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
140 (defun face-list () |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
141 "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
|
142 (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
|
143 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
144 (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
|
145 "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
|
146 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
|
147 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
|
148 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
|
149 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
|
150 (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
|
151 (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
|
152 (if (symbolp name) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
153 (cdr (assq name |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
154 (if (eq frame t) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
155 global-face-data |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
156 (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
|
157 (internal-check-face name) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
158 name)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
159 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
160 (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
|
161 "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
|
162 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
|
163 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
|
164 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
|
165 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
|
166 (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
|
167 (internal-check-face name))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
168 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
169 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
170 (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
|
171 (let ((inhibit-quit t)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
172 (if (null frame) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
173 (let ((frames (frame-list))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
174 (while frames |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
175 (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
|
176 (setq frames (cdr frames))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
177 (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
|
178 index value) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
179 value) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
180 (or (eq frame t) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
181 (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
|
182 (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
|
183 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
184 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
185 (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
|
186 (let (face) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
187 (while (= (length face) 0) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
188 (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
|
189 (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
|
190 (face-list)) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
191 nil t))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
192 (intern face))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
193 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
194 (defun internal-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
|
195 (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
|
196 (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
|
197 (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
|
198 (default (if (fboundp fn) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
199 (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
|
200 (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
|
201 (value (if bool |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
202 (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
|
203 " be " bool "? ")) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
204 (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
|
205 default)))) |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
206 (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
|
207 |
f4fc0c4c76f9
Re-arranged stuff to put defsubst accessors at the top
Jim Blandy <jimb@redhat.com>
parents:
2715
diff
changeset
|
208 |
2456 | 209 |
210 (defun make-face (name) | |
211 "Define a new FACE on all frames. | |
212 You can modify the font, color, etc of this face with the set-face- functions. | |
213 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
|
214 (interactive "SMake face: ") |
2456 | 215 (or (internal-find-face name) |
216 (let ((face (make-vector 8 nil))) | |
217 (aset face 0 'face) | |
218 (aset face 1 name) | |
219 (let* ((frames (frame-list)) | |
220 (inhibit-quit t) | |
221 (id (internal-next-face-id))) | |
222 (make-face-internal id) | |
223 (aset face 2 id) | |
224 (while frames | |
225 (set-frame-face-alist (car frames) | |
226 (cons (cons name (copy-sequence face)) | |
227 (frame-face-alist (car frames)))) | |
228 (setq frames (cdr frames))) | |
229 (setq global-face-data (cons (cons name face) global-face-data))) | |
230 ;; when making a face after frames already exist | |
231 (if (eq window-system 'x) | |
232 (make-face-x-resource-internal face)) | |
8011
1bb462fc29fc
(make-face): Return the face name, not the vector.
Richard M. Stallman <rms@gnu.org>
parents:
8000
diff
changeset
|
233 face)) |
1bb462fc29fc
(make-face): Return the face name, not the vector.
Richard M. Stallman <rms@gnu.org>
parents:
8000
diff
changeset
|
234 name) |
2456 | 235 |
236 ;; Fill in a face by default based on X resources, for all existing frames. | |
237 ;; This has to be done when a new face is made. | |
238 (defun make-face-x-resource-internal (face &optional frame set-anyway) | |
239 (cond ((null frame) | |
240 (let ((frames (frame-list))) | |
241 (while frames | |
6873
086e14489073
(make-face-x-resource-internal): Don't mess with terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
6871
diff
changeset
|
242 (if (eq (framep (car frames)) 'x) |
086e14489073
(make-face-x-resource-internal): Don't mess with terminal frames.
Richard M. Stallman <rms@gnu.org>
parents:
6871
diff
changeset
|
243 (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
|
244 (car frames) set-anyway)) |
2456 | 245 (setq frames (cdr frames))))) |
246 (t | |
247 (setq face (internal-get-face (face-name face) frame)) | |
248 ;; | |
249 ;; These are things like "attributeForeground" instead of simply | |
250 ;; "foreground" because people tend to do things like "*foreground", | |
251 ;; which would cause all faces to be fully qualified, making faces | |
252 ;; inherit attributes in a non-useful way. So we've made them slightly | |
253 ;; less obvious to specify in order to make them work correctly in | |
254 ;; more random environments. | |
255 ;; | |
256 ;; I think these should be called "face.faceForeground" instead of | |
257 ;; "face.attributeForeground", but they're the way they are for | |
258 ;; hysterical reasons. | |
259 ;; | |
260 (let* ((name (symbol-name (face-name face))) | |
261 (fn (or (x-get-resource (concat name ".attributeFont") | |
262 "Face.AttributeFont") | |
263 (and set-anyway (face-font face)))) | |
264 (fg (or (x-get-resource (concat name ".attributeForeground") | |
265 "Face.AttributeForeground") | |
266 (and set-anyway (face-foreground face)))) | |
267 (bg (or (x-get-resource (concat name ".attributeBackground") | |
268 "Face.AttributeBackground") | |
269 (and set-anyway (face-background face)))) | |
270 ;; (bgp (or (x-get-resource (concat name ".attributeBackgroundPixmap") | |
271 ;; "Face.AttributeBackgroundPixmap") | |
272 ;; (and set-anyway (face-background-pixmap face)))) | |
273 (ulp (or (x-get-resource (concat name ".attributeUnderline") | |
274 "Face.AttributeUnderline") | |
275 (and set-anyway (face-underline-p face)))) | |
276 ) | |
277 (if fn | |
278 (condition-case () | |
279 (set-face-font face fn frame) | |
280 (error (message "font `%s' not found for face `%s'" fn name)))) | |
281 (if fg | |
282 (condition-case () | |
283 (set-face-foreground face fg frame) | |
284 (error (message "color `%s' not allocated for face `%s'" fg name)))) | |
285 (if bg | |
286 (condition-case () | |
287 (set-face-background face bg frame) | |
288 (error (message "color `%s' not allocated for face `%s'" bg name)))) | |
289 ;; (if bgp | |
290 ;; (condition-case () | |
291 ;; (set-face-background-pixmap face bgp frame) | |
292 ;; (error (message "pixmap `%s' not found for face `%s'" bgp name)))) | |
293 (if (or ulp set-anyway) | |
294 (set-face-underline-p face ulp frame)) | |
295 ))) | |
296 face) | |
297 | |
5849 | 298 (defun copy-face (old-face new-face &optional frame new-frame) |
299 "Define a face just like OLD-FACE, with name NEW-FACE. | |
300 If NEW-FACE already exists as a face, it is modified to be like OLD-FACE. | |
301 If it doesn't already exist, it is created. | |
302 | |
303 If the optional argument FRAME is given as a frame, | |
304 NEW-FACE is changed on FRAME only. | |
305 If FRAME is t, the frame-independent default specification for OLD-FACE | |
306 is copied to NEW-FACE. | |
307 If FRAME is nil, copying is done for the frame-independent defaults | |
308 and for each existing frame. | |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
309 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
|
310 copy the information from face OLD-FACE on frame FRAME |
5849 | 311 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
|
312 (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
|
313 (let ((inhibit-quit t)) |
2456 | 314 (if (null frame) |
315 (let ((frames (frame-list))) | |
316 (while frames | |
5849 | 317 (copy-face old-face new-face (car frames)) |
2456 | 318 (setq frames (cdr frames))) |
5849 | 319 (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
|
320 (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
|
321 (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
|
322 (make-face new-face))) |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
323 (set-face-font new-face (face-font old-face frame) new-frame) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
324 (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
|
325 (set-face-background new-face (face-background old-face frame) new-frame) |
2800
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
326 ;;; (set-face-background-pixmap |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
327 ;;; new-face (face-background-pixmap old-face frame) new-frame) |
2456 | 328 (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
|
329 new-frame)) |
2456 | 330 new-face)) |
331 | |
332 (defun face-equal (face1 face2 &optional frame) | |
2906
ca9bf00d4b19
* xfaces.el (face-equal): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2826
diff
changeset
|
333 "True if the faces FACE1 and FACE2 display in the same way." |
2456 | 334 (setq face1 (internal-get-face face1 frame) |
335 face2 (internal-get-face face2 frame)) | |
336 (and (equal (face-foreground face1 frame) (face-foreground face2 frame)) | |
337 (equal (face-background face1 frame) (face-background face2 frame)) | |
338 (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
|
339 (eq (face-underline-p face1 frame) (face-underline-p face2 frame)) |
4122
82f0b478a551
(face-equal): Don't mess with face-background-pixmap.
Richard M. Stallman <rms@gnu.org>
parents:
4083
diff
changeset
|
340 ;; (equal (face-background-pixmap face1 frame) |
82f0b478a551
(face-equal): Don't mess with face-background-pixmap.
Richard M. Stallman <rms@gnu.org>
parents:
4083
diff
changeset
|
341 ;; (face-background-pixmap face2 frame)) |
82f0b478a551
(face-equal): Don't mess with face-background-pixmap.
Richard M. Stallman <rms@gnu.org>
parents:
4083
diff
changeset
|
342 )) |
2456 | 343 |
344 (defun face-differs-from-default-p (face &optional frame) | |
345 "True if face FACE displays differently from the default face, on FRAME. | |
346 A face is considered to be ``the same'' as the default face if it is | |
347 actually specified in the same way (equivalent fonts, etc) or if it is | |
348 fully unspecified, and thus inherits the attributes of any face it | |
349 is displayed on top of." | |
350 (let ((default (internal-get-face 'default frame))) | |
351 (setq face (internal-get-face face frame)) | |
352 (not (and (or (equal (face-foreground default frame) | |
353 (face-foreground face frame)) | |
354 (null (face-foreground face frame))) | |
355 (or (equal (face-background default frame) | |
356 (face-background face frame)) | |
357 (null (face-background face frame))) | |
358 (or (equal (face-font default frame) (face-font face frame)) | |
359 (null (face-font face frame))) | |
2800
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
360 ;;; (or (equal (face-background-pixmap default frame) |
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
361 ;;; (face-background-pixmap face frame)) |
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
362 ;;; (null (face-background-pixmap face frame))) |
2456 | 363 (equal (face-underline-p default frame) |
364 (face-underline-p face frame)) | |
365 )))) | |
366 | |
367 | |
368 (defun invert-face (face &optional frame) | |
369 "Swap the foreground and background colors of face FACE. | |
370 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
|
371 set its foreground and background to the default background and foreground." |
2456 | 372 (interactive (list (read-face-name "Invert face: "))) |
373 (setq face (internal-get-face face frame)) | |
374 (let ((fg (face-foreground face frame)) | |
375 (bg (face-background face frame))) | |
376 (if (or fg bg) | |
377 (progn | |
378 (set-face-foreground face bg frame) | |
379 (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
|
380 (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
|
381 (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
|
382 frame) |
a7b260d27c2c
(face-initialize): Don't create the `modeline' face.
Richard M. Stallman <rms@gnu.org>
parents:
2764
diff
changeset
|
383 (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
|
384 (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
|
385 frame))) |
2456 | 386 face) |
387 | |
388 | |
389 (defun internal-try-face-font (face font &optional frame) | |
390 "Like set-face-font, but returns nil on failure instead of an error." | |
391 (condition-case () | |
392 (set-face-font face font frame) | |
393 (error nil))) | |
394 | |
395 ;; Manipulating font names. | |
396 | |
397 (defconst x-font-regexp nil) | |
398 (defconst x-font-regexp-head nil) | |
399 (defconst x-font-regexp-weight nil) | |
400 (defconst x-font-regexp-slant nil) | |
401 | |
402 ;;; Regexps matching font names in "Host Portable Character Representation." | |
403 ;;; | |
404 (let ((- "[-?]") | |
405 (foundry "[^-]+") | |
406 (family "[^-]+") | |
407 (weight "\\(bold\\|demibold\\|medium\\)") ; 1 | |
408 ; (weight\? "\\(\\*\\|bold\\|demibold\\|medium\\|\\)") ; 1 | |
409 (weight\? "\\([^-]*\\)") ; 1 | |
410 (slant "\\([ior]\\)") ; 2 | |
411 ; (slant\? "\\([ior?*]?\\)") ; 2 | |
412 (slant\? "\\([^-]?\\)") ; 2 | |
413 ; (swidth "\\(\\*\\|normal\\|semicondensed\\|\\)") ; 3 | |
414 (swidth "\\([^-]*\\)") ; 3 | |
415 ; (adstyle "\\(\\*\\|sans\\|\\)") ; 4 | |
416 (adstyle "[^-]*") ; 4 | |
417 (pixelsize "[0-9]+") | |
418 (pointsize "[0-9][0-9]+") | |
419 (resx "[0-9][0-9]+") | |
420 (resy "[0-9][0-9]+") | |
421 (spacing "[cmp?*]") | |
422 (avgwidth "[0-9]+") | |
423 (registry "[^-]+") | |
424 (encoding "[^-]+") | |
425 ) | |
426 (setq x-font-regexp | |
427 (concat "\\`\\*?[-?*]" | |
428 foundry - family - weight\? - slant\? - swidth - adstyle - | |
429 pixelsize - pointsize - resx - resy - spacing - registry - | |
430 encoding "[-?*]\\*?\\'" | |
431 )) | |
432 (setq x-font-regexp-head | |
433 (concat "\\`[-?*]" foundry - family - weight\? - slant\? | |
434 "\\([-*?]\\|\\'\\)")) | |
435 (setq x-font-regexp-slant (concat - slant -)) | |
436 (setq x-font-regexp-weight (concat - weight -)) | |
437 nil) | |
438 | |
3071
68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
Jim Blandy <jimb@redhat.com>
parents:
3049
diff
changeset
|
439 (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
|
440 "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
|
441 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
|
442 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
|
443 contains wildcards. |
3071
68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
Jim Blandy <jimb@redhat.com>
parents:
3049
diff
changeset
|
444 Given optional arguments FACE and FRAME, try to return a font which is |
3130
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
445 also the same size as FACE on FRAME." |
3233
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
446 (or (symbolp face) |
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
447 (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
|
448 (and (eq frame t) |
28b2df35c33e
(x-resolve-font-name): Allow symbol as FACE arg.
Richard M. Stallman <rms@gnu.org>
parents:
3182
diff
changeset
|
449 (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
|
450 (if pattern |
5092
36508a7c0a3f
(x-resolve-font-name): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
5081
diff
changeset
|
451 ;; 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
|
452 (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
|
453 (or fonts |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
454 (if face |
3353
8cbd38886eef
(x-resolve-font-name): Clean up error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3298
diff
changeset
|
455 (error "No fonts matching pattern are the same size as `%s'" |
3298
0b96c67ca1c5
* faces.el (x-resolve-font-name): Give correct error message
Jim Blandy <jimb@redhat.com>
parents:
3297
diff
changeset
|
456 face) |
3353
8cbd38886eef
(x-resolve-font-name): Clean up error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3298
diff
changeset
|
457 (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
|
458 (car fonts)) |
82c29bacb6b3
* faces.el (x-resolve-font-name): If PATTERN is nil, return the
Jim Blandy <jimb@redhat.com>
parents:
3071
diff
changeset
|
459 (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
|
460 |
2456 | 461 (defun x-frob-font-weight (font which) |
462 (if (or (string-match x-font-regexp font) | |
463 (string-match x-font-regexp-head font) | |
464 (string-match x-font-regexp-weight font)) | |
465 (concat (substring font 0 (match-beginning 1)) which | |
466 (substring font (match-end 1))) | |
467 nil)) | |
468 | |
469 (defun x-frob-font-slant (font which) | |
470 (cond ((or (string-match x-font-regexp font) | |
471 (string-match x-font-regexp-head font)) | |
472 (concat (substring font 0 (match-beginning 2)) which | |
473 (substring font (match-end 2)))) | |
474 ((string-match x-font-regexp-slant font) | |
475 (concat (substring font 0 (match-beginning 1)) which | |
476 (substring font (match-end 1)))) | |
477 (t nil))) | |
478 | |
479 | |
480 (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
|
481 "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
|
482 If that can't be done, return nil." |
2456 | 483 (x-frob-font-weight font "bold")) |
484 | |
485 (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
|
486 "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
|
487 If that can't be done, return nil." |
2456 | 488 (x-frob-font-weight font "demibold")) |
489 | |
490 (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
|
491 "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
|
492 If that can't be done, return nil." |
2456 | 493 (x-frob-font-weight font "medium")) |
494 | |
495 (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
|
496 "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
|
497 If that can't be done, return nil." |
2456 | 498 (x-frob-font-slant font "i")) |
499 | |
500 (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
|
501 "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
|
502 If that can't be done, return nil." |
2456 | 503 (x-frob-font-slant font "o")) |
504 | |
505 (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
|
506 "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
|
507 If that can't be done, return nil." |
2456 | 508 (x-frob-font-slant font "r")) |
509 | |
510 ;;; non-X-specific interface | |
511 | |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
512 (defun make-face-bold (face &optional frame noerror) |
2456 | 513 "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
|
514 If NOERROR is non-nil, return nil on failure." |
2456 | 515 (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
|
516 (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
|
517 (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
|
518 '(bold italic) '(bold)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
519 t) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
520 (let ((ofont (face-font face frame)) |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
521 font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
522 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
523 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
524 ;; 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
|
525 (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
|
526 ;; 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
|
527 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
528 (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
|
529 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
530 (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
|
531 (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
|
532 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
533 (if (listp font) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
534 (setq font nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
535 (setq font (or font |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
536 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
537 (cdr (assq 'font (frame-parameters frame))))) |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
538 (make-face-bold-internal face frame font)) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
539 (or (not (equal ofont (face-font face))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
540 (and (not noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
541 (error "No bold version of %S" font)))))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
542 |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
543 (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
|
544 (let (f2) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
545 (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
|
546 (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
|
547 (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
|
548 (internal-try-face-font face f2 frame))))) |
2456 | 549 |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
550 (defun make-face-italic (face &optional frame noerror) |
2456 | 551 "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
|
552 If NOERROR is non-nil, return nil on failure." |
2456 | 553 (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
|
554 (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
|
555 (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
|
556 '(bold italic) '(italic)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
557 t) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
558 (let ((ofont (face-font face frame)) |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
559 font) |
4439
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
560 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
561 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
562 ;; 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
|
563 (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
|
564 ;; 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
|
565 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
566 (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
|
567 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
568 (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
|
569 (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
|
570 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
571 (if (listp font) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
572 (setq font nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
573 (setq font (or font |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
574 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
575 (cdr (assq 'font (frame-parameters frame))))) |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
576 (make-face-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
|
577 (or (not (equal ofont (face-font face))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
578 (and (not noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
579 (error "No italic version of %S" font)))))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
580 |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
581 (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
|
582 (let (f2) |
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
583 (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
|
584 (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
|
585 (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
|
586 (internal-try-face-font face f2 frame))))) |
2456 | 587 |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
588 (defun make-face-bold-italic (face &optional frame noerror) |
2456 | 589 "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
|
590 If NOERROR is non-nil, return nil on failure." |
2456 | 591 (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
|
592 (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
|
593 (set-face-font face '(bold italic) t) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
594 (let ((ofont (face-font face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
595 font) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
596 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
597 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
598 ;; 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
|
599 (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
|
600 ;; 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
|
601 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
602 (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
|
603 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
604 (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
|
605 (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
|
606 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
607 (if (listp font) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
608 (setq font nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
609 (setq font (or font |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
610 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
611 (cdr (assq 'font (frame-parameters frame))))) |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
612 (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
|
613 (or (not (equal ofont (face-font face))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
614 (and (not noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
615 (error "No bold italic version of %S" font)))))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
616 |
8109
9bc00e1f0f3e
(make-face-italic, make-face-bold): Don't bind f2 here.
Richard M. Stallman <rms@gnu.org>
parents:
8107
diff
changeset
|
617 (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
|
618 (let (f2 f3) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
619 (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
|
620 (not (equal font f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
621 (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
|
622 (not (equal f2 f3)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
623 (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
|
624 (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
|
625 (not (equal font f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
626 (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
|
627 (not (equal f2 f3)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
628 (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
|
629 (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
|
630 (not (equal font f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
631 (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
|
632 (not (equal f2 f3)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
633 (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
|
634 (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
|
635 (not (equal font f2)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
636 (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
|
637 (not (equal f2 f3)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
638 (internal-try-face-font face f3 frame))))) |
2456 | 639 |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
640 (defun make-face-unbold (face &optional frame noerror) |
2456 | 641 "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
|
642 If NOERROR is non-nil, return nil on failure." |
2456 | 643 (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
|
644 (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
|
645 (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
|
646 '(italic) nil) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
647 t) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
648 (let ((ofont (face-font face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
649 font font1) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
650 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
651 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
652 ;; 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
|
653 (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
|
654 ;; 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
|
655 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
656 (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
|
657 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
658 (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
|
659 (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
|
660 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
661 (if (listp font1) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
662 (setq font1 nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
663 (setq font1 (or font1 |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
664 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
665 (cdr (assq 'font (frame-parameters frame))))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
666 (setq font (x-make-font-unbold font1)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
667 (if font (internal-try-face-font face font frame))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
668 (or (not (equal ofont (face-font face))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
669 (and (not noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
670 (error "No unbold version of %S" font1)))))) |
2456 | 671 |
2714
bfe999b19082
* faces.el (read-face-name): Call face-list, not list-faces.
Jim Blandy <jimb@redhat.com>
parents:
2456
diff
changeset
|
672 (defun make-face-unitalic (face &optional frame noerror) |
2456 | 673 "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
|
674 If NOERROR is non-nil, return nil on failure." |
2456 | 675 (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
|
676 (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
|
677 (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
|
678 '(bold) nil) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
679 t) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
680 (let ((ofont (face-font face frame)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
681 font font1) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
682 (if (null frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
683 (let ((frames (frame-list))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
684 ;; 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
|
685 (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
|
686 ;; 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
|
687 (while frames |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
688 (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
|
689 (setq frames (cdr frames)))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
690 (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
|
691 (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
|
692 (face-font face t))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
693 (if (listp font1) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
694 (setq font1 nil)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
695 (setq font1 (or font1 |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
696 (face-font 'default frame) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
697 (cdr (assq 'font (frame-parameters frame))))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
698 (setq font (x-make-font-unitalic font1)) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
699 (if font (internal-try-face-font face font frame))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
700 (or (not (equal ofont (face-font face))) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
701 (and (not noerror) |
e7ab04f23df5
Make boldness and italicness affect subsequently created frames.
Richard M. Stallman <rms@gnu.org>
parents:
4122
diff
changeset
|
702 (error "No unitalic version of %S" font1)))))) |
2456 | 703 |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
704 (defvar list-faces-sample-text |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
705 "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ" |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
706 "*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
|
707 |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
708 ;; 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
|
709 ;; with Lucid, which uses that name differently. |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
710 (defun list-faces-display () |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
711 "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
|
712 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
|
713 `list-faces-sample-text'. |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
714 |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
715 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
|
716 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
|
717 selected frame." |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
718 (interactive) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
719 (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
|
720 (face nil) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
721 (frame (selected-frame)) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
722 disp-frame window) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
723 (with-output-to-temp-buffer "*Faces*" |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
724 (save-excursion |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
725 (set-buffer standard-output) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
726 (setq truncate-lines t) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
727 (while faces |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
728 (setq face (car faces)) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
729 (setq faces (cdr faces)) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
730 (insert (format "%25s " (symbol-name face))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
731 (let ((beg (point))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
732 (insert list-faces-sample-text) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
733 (insert "\n") |
8107
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
734 (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
|
735 ;; 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
|
736 (goto-char beg) |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
737 (forward-line 1) |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
738 (while (not (eobp)) |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
739 (insert " ") |
0885b28decc6
(list-faces-display): Line up multiple lines in sample.
Richard M. Stallman <rms@gnu.org>
parents:
8011
diff
changeset
|
740 (forward-line 1)))) |
4083
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
741 (goto-char (point-min)))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
742 ;; 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
|
743 ;; copy all the face definitions from FRAME, |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
744 ;; 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
|
745 (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
|
746 (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
|
747 (car (frame-list)))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
748 (or (eq frame disp-frame) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
749 (let ((faces (face-list))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
750 (while faces |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
751 (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
|
752 (setq faces (cdr faces))))))) |
465c6787d6dd
(copy-face): New arg NEW-FRAME.
Richard M. Stallman <rms@gnu.org>
parents:
3969
diff
changeset
|
753 |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
754 ;;; Make the standard faces. |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
755 ;;; 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
|
756 ;;; 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
|
757 (defun face-initialize () |
2456 | 758 (make-face 'default) |
2826
9c22af6d7885
(face-initialize): Do make the modeline face.
Richard M. Stallman <rms@gnu.org>
parents:
2807
diff
changeset
|
759 (make-face 'modeline) |
2456 | 760 (make-face 'highlight) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
761 |
2456 | 762 ;; 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
|
763 |
2456 | 764 (make-face 'bold) |
765 (make-face 'italic) | |
766 (make-face 'bold-italic) | |
2807
9e8635dafd40
Rename `primary-selection' to `region'.
Richard M. Stallman <rms@gnu.org>
parents:
2800
diff
changeset
|
767 (make-face 'region) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
768 (make-face 'secondary-selection) |
3911
06dbadd0e4a7
(face-initialize): Create `underline' face.
Richard M. Stallman <rms@gnu.org>
parents:
3910
diff
changeset
|
769 (make-face 'underline) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
770 |
2807
9e8635dafd40
Rename `primary-selection' to `region'.
Richard M. Stallman <rms@gnu.org>
parents:
2800
diff
changeset
|
771 (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
|
772 |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
773 ;; Specify the global properties of these faces |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
774 ;; 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
|
775 |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
776 (make-face-bold 'bold t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
777 (make-face-italic 'italic t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
778 (make-face-bold-italic 'bold-italic t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
779 |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
780 (set-face-background 'highlight '("darkseagreen2" "green" t) t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
781 (set-face-background 'region '("gray" t) t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
782 (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
|
783 (set-face-background 'modeline '(t) t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
784 (set-face-underline-p 'underline t t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
785 |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
786 ;; 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
|
787 ;; 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
|
788 |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
789 (let ((frames (frame-list))) |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
790 (while frames |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
791 (if (eq (framep (car frames)) 'x) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
792 (let ((frame (car frames)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
793 (rest global-face-data)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
794 (while rest |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
795 (let ((face (car (car rest)))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
796 (or (face-differs-from-default-p face) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
797 (face-fill-in face (cdr (car rest)) frame))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
798 (setq rest (cdr rest))))) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
799 (setq frames (cdr frames))))) |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
800 |
2456 | 801 |
802 ;; Like x-create-frame but also set up the faces. | |
803 | |
804 (defun x-create-frame-with-faces (&optional parameters) | |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
805 (if (null global-face-data) |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
806 (x-create-frame parameters) |
6871
54d45937d243
(x-create-frame-with-faces): Create frame invisible,
Richard M. Stallman <rms@gnu.org>
parents:
6145
diff
changeset
|
807 (let* ((visibility-spec (assq 'visibility parameters)) |
54d45937d243
(x-create-frame-with-faces): Create frame invisible,
Richard M. Stallman <rms@gnu.org>
parents:
6145
diff
changeset
|
808 (frame (x-create-frame (cons '(visibility . nil) parameters))) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
809 (faces (copy-alist global-face-data)) |
2826
9c22af6d7885
(face-initialize): Do make the modeline face.
Richard M. Stallman <rms@gnu.org>
parents:
2807
diff
changeset
|
810 (rest faces)) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
811 (set-frame-face-alist frame faces) |
2456 | 812 |
3049
314cb8d34dcd
(x-create-frame-with-faces): Handle `reverse' as parameter.
Richard M. Stallman <rms@gnu.org>
parents:
3001
diff
changeset
|
813 (if (cdr (or (assq 'reverse parameters) |
3182
d38749acdf27
(x-create-frame-with-faces): Handle reverseVideo resource.
Richard M. Stallman <rms@gnu.org>
parents:
3130
diff
changeset
|
814 (assq 'reverse default-frame-alist) |
d38749acdf27
(x-create-frame-with-faces): Handle reverseVideo resource.
Richard M. Stallman <rms@gnu.org>
parents:
3130
diff
changeset
|
815 (cons nil |
4624
62564c5e2df7
(x-create-frame-with-faces): Check for `on' or `true'
Richard M. Stallman <rms@gnu.org>
parents:
4439
diff
changeset
|
816 (member (x-get-resource "reverseVideo" "ReverseVideo") |
62564c5e2df7
(x-create-frame-with-faces): Check for `on' or `true'
Richard M. Stallman <rms@gnu.org>
parents:
4439
diff
changeset
|
817 '("on" "true"))))) |
3049
314cb8d34dcd
(x-create-frame-with-faces): Handle `reverse' as parameter.
Richard M. Stallman <rms@gnu.org>
parents:
3001
diff
changeset
|
818 (let ((params (frame-parameters frame))) |
314cb8d34dcd
(x-create-frame-with-faces): Handle `reverse' as parameter.
Richard M. Stallman <rms@gnu.org>
parents:
3001
diff
changeset
|
819 (modify-frame-parameters |
314cb8d34dcd
(x-create-frame-with-faces): Handle `reverse' as parameter.
Richard M. Stallman <rms@gnu.org>
parents:
3001
diff
changeset
|
820 frame |
314cb8d34dcd
(x-create-frame-with-faces): Handle `reverse' as parameter.
Richard M. Stallman <rms@gnu.org>
parents:
3001
diff
changeset
|
821 (list (cons 'foreground-color (cdr (assq 'background-color params))) |
314cb8d34dcd
(x-create-frame-with-faces): Handle `reverse' as parameter.
Richard M. Stallman <rms@gnu.org>
parents:
3001
diff
changeset
|
822 (cons 'background-color (cdr (assq 'foreground-color params))) |
314cb8d34dcd
(x-create-frame-with-faces): Handle `reverse' as parameter.
Richard M. Stallman <rms@gnu.org>
parents:
3001
diff
changeset
|
823 (cons 'mouse-color (cdr (assq 'background-color params))) |
7936
a64f4117dc04
(x-create-frame-with-faces): Set the cursor color last.
Richard M. Stallman <rms@gnu.org>
parents:
7120
diff
changeset
|
824 (cons 'border-color (cdr (assq 'background-color params))))) |
a64f4117dc04
(x-create-frame-with-faces): Set the cursor color last.
Richard M. Stallman <rms@gnu.org>
parents:
7120
diff
changeset
|
825 (modify-frame-parameters |
a64f4117dc04
(x-create-frame-with-faces): Set the cursor color last.
Richard M. Stallman <rms@gnu.org>
parents:
7120
diff
changeset
|
826 frame |
a64f4117dc04
(x-create-frame-with-faces): Set the cursor color last.
Richard M. Stallman <rms@gnu.org>
parents:
7120
diff
changeset
|
827 (list (cons 'cursor-color (cdr (assq 'background-color params))))))) |
3049
314cb8d34dcd
(x-create-frame-with-faces): Handle `reverse' as parameter.
Richard M. Stallman <rms@gnu.org>
parents:
3001
diff
changeset
|
828 |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
829 ;; Copy the vectors that represent the faces. |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
830 ;; Also fill them in from X resources. |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
831 (while rest |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
832 (let ((global (cdr (car rest)))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
833 (setcdr (car rest) (vector 'face |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
834 (face-name (cdr (car rest))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
835 (face-id (cdr (car rest))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
836 nil nil nil nil nil)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
837 (face-fill-in (car (car rest)) global frame)) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
838 (make-face-x-resource-internal (cdr (car rest)) frame t) |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
839 (setq rest (cdr rest))) |
6871
54d45937d243
(x-create-frame-with-faces): Create frame invisible,
Richard M. Stallman <rms@gnu.org>
parents:
6145
diff
changeset
|
840 (if (null visibility-spec) |
54d45937d243
(x-create-frame-with-faces): Create frame invisible,
Richard M. Stallman <rms@gnu.org>
parents:
6145
diff
changeset
|
841 (make-frame-visible frame) |
54d45937d243
(x-create-frame-with-faces): Create frame invisible,
Richard M. Stallman <rms@gnu.org>
parents:
6145
diff
changeset
|
842 (modify-frame-parameters frame (list visibility-spec))) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
843 frame))) |
2456 | 844 |
7019
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
845 ;; 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
|
846 (defun frame-update-faces (frame) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
847 (let* ((faces global-face-data) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
848 (rest faces)) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
849 (while rest |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
850 (let* ((face (car (car rest))) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
851 (font (face-font face t))) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
852 (if (listp font) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
853 (let ((bold (memq 'bold font)) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
854 (italic (memq 'italic font))) |
7120
a03d341e9594
(frame-update-faces): Unset old font.
Karl Heuer <kwzh@gnu.org>
parents:
7019
diff
changeset
|
855 ;; 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
|
856 ;; be the right size anymore. |
a03d341e9594
(frame-update-faces): Unset old font.
Karl Heuer <kwzh@gnu.org>
parents:
7019
diff
changeset
|
857 (set-face-font face nil frame) |
7019
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
858 (cond ((and bold italic) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
859 (make-face-bold-italic face frame t)) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
860 (bold |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
861 (make-face-bold face frame t)) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
862 (italic |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
863 (make-face-italic face frame t))))) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
864 (setq rest (cdr rest))) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
865 frame))) |
74edb669a7e9
(frame-update-faces): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6873
diff
changeset
|
866 |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
867 ;; 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
|
868 ;; 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
|
869 ;; 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
|
870 ;; 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
|
871 (defun face-fill-in (face data frame) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
872 (condition-case nil |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
873 (let ((foreground (face-foreground data)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
874 (background (face-background data)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
875 (font (face-font data))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
876 (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
|
877 (if foreground |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
878 (face-try-color-list 'set-face-foreground |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
879 face foreground frame)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
880 (if background |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
881 (face-try-color-list 'set-face-background |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
882 face background frame)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
883 (if (listp font) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
884 (let ((bold (memq 'bold font)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
885 (italic (memq 'italic font))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
886 (cond ((and bold italic) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
887 (make-face-bold-italic face frame)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
888 (bold |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
889 (make-face-bold face frame)) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
890 (italic |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
891 (make-face-italic face frame)))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
892 (if font |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
893 (set-face-font face font frame)))) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
894 (error nil))) |
2456 | 895 |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
896 ;; 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
|
897 ;; 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
|
898 ;; 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
|
899 ;; 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
|
900 ;; 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
|
901 ;; 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
|
902 (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
|
903 (if (stringp colors) |
5955
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
904 (if (or (and (not (x-display-color-p)) (not (string= colors "gray"))) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
905 (= (x-display-planes) 1)) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
906 nil |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
907 (funcall function face colors frame)) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
908 (if (eq colors t) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
909 (invert-face face frame) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
910 (let (done) |
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
911 (while (and colors (not done)) |
5955
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
912 (if (and (stringp (car colors)) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
913 (or (and (not (x-display-color-p)) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
914 (not (string= (car colors) "gray"))) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
915 (= (x-display-planes) 1))) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
916 nil |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
917 (if (cdr colors) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
918 ;; If there are more colors to try, catch errors |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
919 ;; and set `done' if we succeed. |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
920 (condition-case nil |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
921 (progn |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
922 (if (eq (car colors) t) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
923 (invert-face face frame) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
924 (funcall function face (car colors) frame)) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
925 (setq done t)) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
926 (error nil)) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
927 ;; If this is the last color, let the error get out if it fails. |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
928 ;; If it succeeds, we will exit anyway after this iteration. |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
929 (if (eq (car colors) t) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
930 (invert-face face frame) |
459bb5807c0b
(face-try-color-list): Don't rely on errors from using
Richard M. Stallman <rms@gnu.org>
parents:
5929
diff
changeset
|
931 (funcall function face (car colors) frame)))) |
5929
2538d44f96d4
(face-initialize): Specify default characteristics
Richard M. Stallman <rms@gnu.org>
parents:
5849
diff
changeset
|
932 (setq colors (cdr colors))))))) |
2764
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
933 |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
934 ;; If we are already using x-window frames, initialize faces for them. |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
935 (if (eq (framep (selected-frame)) 'x) |
17c322204ce3
(face-initialize): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2744
diff
changeset
|
936 (face-initialize)) |
2456 | 937 |
2715
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
938 (provide 'faces) |
9caee9338229
* faces.el: Call internal-set-face-1, not internat-set-face-1.
Jim Blandy <jimb@redhat.com>
parents:
2714
diff
changeset
|
939 |
2456 | 940 ;;; faces.el ends here |