annotate lisp/w3/font.el @ 120:cca96a509cfe r20-1b12

Import from CVS: tag r20-1b12
author cvs
date Mon, 13 Aug 2007 09:25:29 +0200
parents 7d55a9ba150c
children b980b6286996
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1 ;;; font.el --- New font model
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 ;; Author: wmperry
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
3 ;; Created: 1997/04/04 16:02:58
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
4 ;; Version: 1.44
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 ;; Keywords: faces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
8 ;;; Copyright (c) 1995, 1996 by William M. Perry (wmperry@cs.indiana.edu)
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
9 ;;; Copyright (c) 1996, 1997 Free Software Foundation, Inc.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 ;;;
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
11 ;;; This file is part of GNU Emacs.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 ;;; GNU Emacs is free software; you can redistribute it and/or modify
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 ;;; it under the terms of the GNU General Public License as published by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 ;;; the Free Software Foundation; either version 2, or (at your option)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 ;;; any later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 ;;; GNU Emacs is distributed in the hope that it will be useful,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 ;;; GNU General Public License for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 ;;; You should have received a copy of the GNU General Public License
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
24 ;;; along with GNU Emacs; see the file COPYING. If not, write to the
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
25 ;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
26 ;;; Boston, MA 02111-1307, USA.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 ;;; The emacsen compatibility package - load it up before anything else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
32 (require 'cl)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
33
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 (eval-and-compile
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
35 (if (not (and (string-match "XEmacs" emacs-version)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
36 (or (> emacs-major-version 19)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
37 (>= emacs-minor-version 14))))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
38 (require 'w3-sysdp)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
40 (require 'disp-table)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 (if (not (fboundp '<<)) (fset '<< 'lsh))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 (if (not (fboundp '&)) (fset '& 'logand))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 (if (not (fboundp '|)) (fset '| 'logior))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 (if (not (fboundp '~)) (fset '~ 'lognot))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 (if (not (fboundp '>>)) (defun >> (value count) (<< value (- count))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 ;;; Lots of variables / keywords for use later in the program
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 ;;; Not much should need to be modified
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 (defconst font-running-xemacs (string-match "XEmacs" (emacs-version))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 "Whether we are running in XEmacs or not.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
55 (defmacro define-font-keywords (&rest keys)
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
56 (`
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
57 (eval-and-compile
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
58 (let ((keywords (quote (, keys))))
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
59 (while keywords
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
60 (or (boundp (car keywords))
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
61 (set (car keywords) (car keywords)))
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
62 (setq keywords (cdr keywords)))))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 (defconst font-window-system-mappings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 '((x . (x-font-create-name x-font-create-object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 (ns . (ns-font-create-name ns-font-create-object))
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
67 (win32 . (x-font-create-name x-font-create-object))
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
68 (pm . (x-font-create-name x-font-create-object)) ; Change? FIXME
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 (tty . (tty-font-create-plist tty-font-create-object)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 "An assoc list mapping device types to the function used to create
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 a font name from a font structure.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 (defconst ns-font-weight-mappings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 '((:extra-light . "extralight")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 (:light . "light")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 (:demi-light . "demilight")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 (:medium . "medium")
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
78 (:normal . "medium")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 (:demi-bold . "demibold")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 (:bold . "bold")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 (:extra-bold . "extrabold"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 "An assoc list mapping keywords to actual NeXTstep specific
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 information to use")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 (defconst x-font-weight-mappings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 '((:extra-light . "extralight")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 (:light . "light")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 (:demi-light . "demilight")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 (:demi . "demi")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 (:book . "book")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 (:medium . "medium")
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
92 (:normal . "medium")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 (:demi-bold . "demibold")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 (:bold . "bold")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 (:extra-bold . "extrabold"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 "An assoc list mapping keywords to actual Xwindow specific strings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 for use in the 'weight' field of an X font string.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 (defconst font-possible-weights
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 (mapcar 'car x-font-weight-mappings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 (defvar font-rgb-file nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 "Where the RGB file was found.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 (defvar font-maximum-slippage "1pt"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 "How much a font is allowed to vary from the desired size.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 (defvar font-family-mappings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 '(
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
110 ("serif" . ("new century schoolbook"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
111 "utopia"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
112 "charter"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
113 "times"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
114 "lucidabright"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
115 "garamond"
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 "palatino"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 "times new roman"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 "baskerville"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 "bookman"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 "bodoni"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 "computer modern"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 "rockwell"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 ("sans-serif" . ("lucida"
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
125 "helvetica"
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 "gills-sans"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 "avant-garde"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 "univers"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 "optima"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 ("elfin" . ("tymes"))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
131 ("monospace" . ("courier"
120
cca96a509cfe Import from CVS: tag r20-1b12
cvs
parents: 118
diff changeset
132 "courier new"
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
133 "fixed"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
134 "lucidatypewriter"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
135 "clean"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
136 "terminal"))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
137 ("cursive" . ("sirene"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
138 "zapf chancery"))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 "A list of font family mappings.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
142 (define-font-keywords :family :style :size :registry :encoding)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 2
diff changeset
143
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
144 (define-font-keywords
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
145 :weight :extra-light :light :demi-light :medium :normal :demi-bold
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
146 :bold :extra-bold)
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 2
diff changeset
147
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
148 (defvar font-style-keywords nil)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
149
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
150 (defsubst set-font-family (fontobj family)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
151 (aset fontobj 1 family))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
152
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
153 (defsubst set-font-weight (fontobj weight)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
154 (aset fontobj 3 weight))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
155
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
156 (defsubst set-font-style (fontobj style)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
157 (aset fontobj 5 style))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
158
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
159 (defsubst set-font-size (fontobj size)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
160 (aset fontobj 7 size))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
161
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
162 (defsubst set-font-registry (fontobj reg)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
163 (aset fontobj 9 reg))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
164
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
165 (defsubst set-font-encoding (fontobj enc)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
166 (aset fontobj 11 enc))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
167
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
168 (defsubst font-family (fontobj)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
169 (aref fontobj 1))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
170
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
171 (defsubst font-weight (fontobj)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
172 (aref fontobj 3))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
173
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
174 (defsubst font-style (fontobj)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
175 (aref fontobj 5))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
176
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
177 (defsubst font-size (fontobj)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
178 (aref fontobj 7))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
179
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
180 (defsubst font-registry (fontobj)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
181 (aref fontobj 9))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
182
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
183 (defsubst font-encoding (fontobj)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
184 (aref fontobj 11))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
185
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 (eval-when-compile
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 (defmacro define-new-mask (attr mask)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 (`
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 (progn
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
190 (setq font-style-keywords
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
191 (cons (cons (quote (, attr))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
192 (cons
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
193 (quote (, (intern (format "set-font-%s-p" attr))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
194 (quote (, (intern (format "font-%s-p" attr))))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
195 font-style-keywords))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 (defconst (, (intern (format "font-%s-mask" attr))) (<< 1 (, mask))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 (, (format
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 "Bitmask for whether a font is to be rendered in %s or not."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 attr)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 (defun (, (intern (format "font-%s-p" attr))) (fontobj)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 (, (format "Whether FONTOBJ will be renderd in `%s' or not." attr))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 (if (/= 0 (& (font-style fontobj)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 (, (intern (format "font-%s-mask" attr)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 nil))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
206 (defun (, (intern (format "set-font-%s-p" attr))) (fontobj val)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 (, (format "Set whether FONTOBJ will be renderd in `%s' or not."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 attr))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
209 (cond
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
210 (val
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
211 (set-font-style fontobj (| (font-style fontobj)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
212 (, (intern
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
213 (format "font-%s-mask" attr))))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
214 (((, (intern (format "font-%s-p" attr))) fontobj)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
215 (set-font-style fontobj (- (font-style fontobj)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
216 (, (intern
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
217 (format "font-%s-mask" attr))))))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 (let ((mask 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 (define-new-mask bold (setq mask (1+ mask)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 (define-new-mask italic (setq mask (1+ mask)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 (define-new-mask oblique (setq mask (1+ mask)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 (define-new-mask dim (setq mask (1+ mask)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 (define-new-mask underline (setq mask (1+ mask)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 (define-new-mask overline (setq mask (1+ mask)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 (define-new-mask linethrough (setq mask (1+ mask)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 (define-new-mask strikethru (setq mask (1+ mask)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 (define-new-mask reverse (setq mask (1+ mask)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 (define-new-mask blink (setq mask (1+ mask)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 (define-new-mask smallcaps (setq mask (1+ mask)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 (define-new-mask bigcaps (setq mask (1+ mask)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 (define-new-mask dropcaps (setq mask (1+ mask))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 (defvar font-caps-display-table
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 (let ((table (make-display-table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 (i 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 ;; Standard ASCII characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 (while (< i 26)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 (aset table (+ i ?a) (+ i ?A))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 (setq i (1+ i)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 ;; Now ISO translations
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 (setq i 224)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 (while (< i 247) ;; Agrave - Ouml
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 (aset table i (- i 32))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 (setq i (1+ i)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 (setq i 248)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 (while (< i 255) ;; Oslash - Thorn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 (aset table i (- i 32))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 (setq i (1+ i)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 ;;; Utility functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
256 (defsubst set-font-style-by-keywords (fontobj styles)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
257 (make-local-variable 'font-func)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
258 (declare (special font-func))
88
821dec489c24 Import from CVS: tag r20-0
cvs
parents: 82
diff changeset
259 (if (listp styles)
821dec489c24 Import from CVS: tag r20-0
cvs
parents: 82
diff changeset
260 (while styles
821dec489c24 Import from CVS: tag r20-0
cvs
parents: 82
diff changeset
261 (setq font-func (car-safe (cdr-safe (assq (car styles) font-style-keywords)))
821dec489c24 Import from CVS: tag r20-0
cvs
parents: 82
diff changeset
262 styles (cdr styles))
821dec489c24 Import from CVS: tag r20-0
cvs
parents: 82
diff changeset
263 (and (fboundp font-func) (funcall font-func fontobj t)))
821dec489c24 Import from CVS: tag r20-0
cvs
parents: 82
diff changeset
264 (setq font-func (car-safe (cdr-safe (assq styles font-style-keywords))))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
265 (and (fboundp font-func) (funcall font-func fontobj t))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
266
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
267 (defsubst font-properties-from-style (fontobj)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
268 (let ((style (font-style fontobj))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
269 (todo font-style-keywords)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
270 type func retval)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
271 (while todo
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
272 (setq func (cdr (cdr (car todo)))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
273 type (car (pop todo)))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
274 (if (funcall func fontobj)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
275 (setq retval (cons type retval))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
276 retval))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
277
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 (defun unique (list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 (let ((retval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 (cur))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 (while list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 (setq cur (car list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 list (cdr list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 (if (member cur retval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 (setq retval (cons cur retval))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 (nreverse retval)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 (defun font-higher-weight (w1 w2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 (let ((index1 (length (memq w1 font-possible-weights)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 (index2 (length (memq w2 font-possible-weights))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 ((<= index1 index2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 (or w1 w2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 ((not w2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 w1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 w2))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 (defun font-spatial-to-canonical (spec &optional device)
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
301 "Convert SPEC (in inches, millimeters, points, or picas) into points"
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
302 ;; 1 in = 6 pa = 25.4 mm = 72 pt
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
303 (cond
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
304 ((numberp spec)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
305 spec)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
306 ((null spec)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
307 nil)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
308 (t
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 (let ((num nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 (type nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 ;; If for any reason we get null for any of this, default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 ;; to 1024x768 resolution on a 17" screen
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 (pix-width (float (or (device-pixel-width device) 1024)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 (mm-width (float (or (device-mm-width device) 293)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 (retval nil))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
316 (cond
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
317 ((string-match "^ *\\([-+*/]\\) *" spec) ; math! whee!
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
318 (let ((math-func (intern (match-string 1 spec)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
319 (other (font-spatial-to-canonical
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
320 (substring spec (match-end 0) nil)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
321 (default (font-spatial-to-canonical
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
322 (font-default-size-for-device device))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
323 (if (fboundp math-func)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
324 (setq type "px"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
325 spec (int-to-string (funcall math-func default other)))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
326 (setq type "px"
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
327 spec (int-to-string other)))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
328 ((string-match "[^0-9.]+$" spec)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
329 (setq type (substring spec (match-beginning 0))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
330 spec (substring spec 0 (match-beginning 0))))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
331 (t
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 (setq type "px"
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
333 spec spec)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 (setq num (string-to-number spec))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 ((member type '("pixel" "px" "pix"))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
337 (setq retval (* num (/ pix-width mm-width) (/ 25.4 72.0))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 ((member type '("point" "pt"))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
339 (setq retval num))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 ((member type '("pica" "pa"))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
341 (setq retval (* num 12.0)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 ((member type '("inch" "in"))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
343 (setq retval (* num 72.0)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 ((string= type "mm")
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
345 (setq retval (* num (/ 72.0 25.4))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 ((string= type "cm")
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
347 (setq retval (* num 10 (/ 72.0 25.4))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
348 (t
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
349 (setq retval num))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 )
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
351 retval))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 ;;; The main interface routines - constructors and accessor functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 (defun make-font (&rest args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 (vector :family
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
359 (if (stringp (plist-get args :family))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
360 (list (plist-get args :family))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
361 (plist-get args :family))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 :weight
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
363 (plist-get args :weight)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364 :style
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
365 (if (numberp (plist-get args :style))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
366 (plist-get args :style)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 :size
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
369 (plist-get args :size)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 :registry
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
371 (plist-get args :registry)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 :encoding
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
373 (plist-get args :encoding)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 (defun font-create-name (fontobj &optional device)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 (let* ((type (device-type device))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 (func (car (cdr-safe (assq type font-window-system-mappings)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378 (and func (fboundp func) (funcall func fontobj device))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
380 ;;;###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 (defun font-create-object (fontname &optional device)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 (let* ((type (device-type device))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 (func (car (cdr (cdr-safe (assq type font-window-system-mappings))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 (and func (fboundp func) (funcall func fontname device))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 (defun font-combine-fonts-internal (fontobj-1 fontobj-2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 (let ((retval (make-font))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 (size-1 (and (font-size fontobj-1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 (font-spatial-to-canonical (font-size fontobj-1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 (size-2 (and (font-size fontobj-2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 (font-spatial-to-canonical (font-size fontobj-2)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 (set-font-weight retval (font-higher-weight (font-weight fontobj-1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 (font-weight fontobj-2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 (set-font-family retval (unique (append (font-family fontobj-1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 (font-family fontobj-2))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 (set-font-style retval (| (font-style fontobj-1) (font-style fontobj-2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 (set-font-registry retval (or (font-registry fontobj-1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 (font-registry fontobj-2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 (set-font-encoding retval (or (font-encoding fontobj-1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 (font-encoding fontobj-2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 (set-font-size retval (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 ((and size-1 size-2 (>= size-2 size-1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 (font-size fontobj-2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 ((and size-1 size-2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 (font-size fontobj-1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 (size-1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 (font-size fontobj-1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 (size-2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 (font-size fontobj-2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 (t nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 retval))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 (defun font-combine-fonts (&rest args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 ((null args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 (error "Wrong number of arguments to font-combine-fonts"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 ((= (length args) 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 (car args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 (let ((retval (font-combine-fonts-internal (nth 0 args) (nth 1 args))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 (setq args (cdr (cdr args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 (while args
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 (setq retval (font-combine-fonts-internal retval (car args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 args (cdr args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 retval))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 ;;; The window-system dependent code (TTY-style)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 (defun tty-font-create-object (fontname &optional device)
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
433 (make-font :size "12pt"))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 (defun tty-font-create-plist (fontobj &optional device)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 (let ((styles (font-style fontobj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 (weight (font-weight fontobj)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 (list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 (cons 'underline (font-underline-p fontobj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 (cons 'highlight (if (or (font-bold-p fontobj)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 (memq weight '(:bold :demi-bold))) t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 (cons 'dim (font-dim-p fontobj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 (cons 'blinking (font-blink-p fontobj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 (cons 'reverse (font-reverse-p fontobj)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 ;;; The window-system dependent code (X-style)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 (defvar font-x-font-regexp (or (and font-running-xemacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 (boundp 'x-font-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 x-font-regexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 (let
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 ((- "[-?]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 (foundry "[^-]*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 (family "[^-]*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 (weight "\\(bold\\|demibold\\|medium\\|black\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 (weight\? "\\([^-]*\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 (slant "\\([ior]\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 (slant\? "\\([^-]?\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 (swidth "\\([^-]*\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 (adstyle "\\([^-]*\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 (pixelsize "\\(\\*\\|[0-9]+\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 (pointsize "\\(\\*\\|0\\|[0-9][0-9]+\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 (resx "\\([*0]\\|[0-9][0-9]+\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 (resy "\\([*0]\\|[0-9][0-9]+\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 (spacing "[cmp?*]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 (avgwidth "\\(\\*\\|[0-9]+\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 (registry "[^-]*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 (encoding "[^-]+")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 (concat "\\`\\*?[-?*]"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 foundry - family - weight\? - slant\? - swidth - adstyle -
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 pixelsize - pointsize - resx - resy - spacing - avgwidth -
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 registry - encoding "\\'"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
478 (defvar font-x-registry-and-encoding-regexp
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
479 (or (and font-running-xemacs
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
480 (boundp 'x-font-regexp-registry-and-encoding)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
481 (symbol-value 'x-font-regexp-registry-and-encoding))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
482 (let ((- "[-?]")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
483 (registry "[^-]*")
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
484 (encoding "[^-]+"))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
485 (concat - "\\(" registry "\\)" - "\\(" encoding "\\)\\'"))))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
486
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 (defun x-font-create-object (fontname &optional device)
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
488 (let ((case-fold-search t))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
489 (if (or (not (stringp fontname))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
490 (not (string-match font-x-font-regexp fontname)))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
491 (make-font)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
492 (let ((family nil)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
493 (style nil)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
494 (size nil)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
495 (weight (match-string 1 fontname))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
496 (slant (match-string 2 fontname))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
497 (swidth (match-string 3 fontname))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
498 (adstyle (match-string 4 fontname))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
499 (pxsize (match-string 5 fontname))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
500 (ptsize (match-string 6 fontname))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
501 (retval nil)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
502 (case-fold-search t)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
503 )
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
504 (if (not (string-match x-font-regexp-foundry-and-family fontname))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
505 nil
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
506 (setq family (list (downcase (match-string 1 fontname)))))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
507 (if (string= "*" weight) (setq weight nil))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
508 (if (string= "*" slant) (setq slant nil))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
509 (if (string= "*" swidth) (setq swidth nil))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
510 (if (string= "*" adstyle) (setq adstyle nil))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
511 (if (string= "*" pxsize) (setq pxsize nil))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
512 (if (string= "*" ptsize) (setq ptsize nil))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
513 (if ptsize (setq size (/ (string-to-int ptsize) 10)))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
514 (if (and (not size) pxsize) (setq size (concat pxsize "px")))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
515 (if weight (setq weight (intern-soft (concat ":" (downcase weight)))))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
516 (if (and adstyle (not (equal adstyle "")))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
517 (setq family (append family (list (downcase adstyle)))))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
518 (setq retval (make-font :family family
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
519 :weight weight
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
520 :size size))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
521 (set-font-bold-p retval (eq :bold weight))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
522 (cond
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
523 ((null slant) nil)
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
524 ((member slant '("i" "I"))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
525 (set-font-italic-p retval t))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
526 ((member slant '("o" "O"))
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
527 (set-font-oblique-p retval t)))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
528 (if (string-match font-x-registry-and-encoding-regexp fontname)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
529 (progn
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
530 (set-font-registry retval (match-string 1 fontname))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
531 (set-font-encoding retval (match-string 2 fontname))))
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
532 retval))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 (defun x-font-families-for-device (&optional device no-resetp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 (require 'x-font-menu)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 (error nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 (or device (setq device (selected-device)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 (if (boundp 'device-fonts-cache)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 (let ((menu (or (cdr-safe (assq device device-fonts-cache)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 (if (and (not menu) (not no-resetp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 (reset-device-font-menus device)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 (x-font-families-for-device device t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 (let ((scaled (mapcar (function (lambda (x) (if x (aref x 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 (aref menu 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 (normal (mapcar (function (lambda (x) (if x (aref x 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 (aref menu 1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 (sort (unique (nconc scaled normal)) 'string-lessp))))
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
550 (cons "monospace" (mapcar 'car font-family-mappings))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 (defvar font-default-cache nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
554 ;;;###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 (defun font-default-font-for-device (&optional device)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 (or device (setq device (selected-device)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 (if font-running-xemacs
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
558 (font-truename
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
559 (make-font-specifier
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
560 (face-font-name 'default device)))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
561 (let ((font (cdr-safe (assq 'font (frame-parameters device)))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
562 (if (and (fboundp 'fontsetp) (fontsetp font))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
563 (aref (get-font-info (aref (cdr (get-fontset-info font)) 0)) 2)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
564 font))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
565
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
566 ;;;###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 (defun font-default-object-for-device (&optional device)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 (let ((font (font-default-font-for-device device)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 (or (cdr-safe
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 (assoc font font-default-cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 (setq font-default-cache (cons (cons font
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 (font-create-object font))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 font-default-cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 (cdr-safe (assoc font font-default-cache))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
577 ;;;###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 (defun font-default-family-for-device (&optional device)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 (or device (setq device (selected-device)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 (font-family (font-default-object-for-device device)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
582 ;;;###autoload
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
583 (defun font-default-registry-for-device (&optional device)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
584 (or device (setq device (selected-device)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
585 (font-registry (font-default-object-for-device device)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
586
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
587 ;;;###autoload
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
588 (defun font-default-encoding-for-device (&optional device)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
589 (or device (setq device (selected-device)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
590 (font-encoding (font-default-object-for-device device)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
591
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
592 ;;;###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 (defun font-default-size-for-device (&optional device)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594 (or device (setq device (selected-device)))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
595 ;; face-height isn't the right thing (always 1 pixel too high?)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
596 ;; (if font-running-xemacs
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
597 ;; (format "%dpx" (face-height 'default device))
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
598 (font-size (font-default-object-for-device device)))
114
8619ce7e4c50 Import from CVS: tag r20-1b9
cvs
parents: 110
diff changeset
599
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 (defun x-font-create-name (fontobj &optional device)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 (if (and (not (or (font-family fontobj)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 (font-weight fontobj)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 (font-size fontobj)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 (font-registry fontobj)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 (font-encoding fontobj)))
98
0d2f883870bc Import from CVS: tag r20-1b1
cvs
parents: 88
diff changeset
606 (= (font-style fontobj) 0))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 (face-font 'default)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 (or device (setq device (selected-device)))
118
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
609 (let* ((default (font-default-object-for-device device))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
610 (family (or (font-family fontobj)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
611 (font-family default)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
612 (x-font-families-for-device device)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
613 (weight (or (font-weight fontobj) :medium))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
614 (style (font-style fontobj))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
615 (size (or (if font-running-xemacs
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
616 (font-size fontobj))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
617 (font-size default)))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
618 (registry (or (font-registry fontobj)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
619 (font-registry default)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
620 "*"))
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
621 (encoding (or (font-encoding fontobj)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
622 (font-encoding default)
7d55a9ba150c Import from CVS: tag r20-1b11
cvs
parents: 116
diff changeset
623 "*")))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 (if (stringp family)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 (setq family (list family)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 (setq weight (font-higher-weight weight
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 (and (font-bold-p fontobj) :bold)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 (if (stringp size)
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
629 (setq size (truncate (font-spatial-to-canonical size device))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 (setq weight (or (cdr-safe (assq weight x-font-weight-mappings)) "*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 (let ((done nil) ; Did we find a good font yet?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 (font-name nil) ; font name we are currently checking
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 (cur-family nil) ; current family we are checking
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635 (while (and family (not done))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 (setq cur-family (car family)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 family (cdr family))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638 (if (assoc cur-family font-family-mappings)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 ;; If the family name is an alias as defined by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 ;; font-family-mappings, then append those families
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 ;; to the front of 'family' and continue in the loop.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 (setq family (append
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 (cdr-safe (assoc cur-family
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 font-family-mappings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 family))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 ;; Not an alias for a list of fonts, so we just check it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 ;; First, convert all '-' to spaces so that we don't screw up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 ;; the oh-so wonderful X font model. Wheee.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 (let ((x (length cur-family)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 (while (> x 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 (if (= ?- (aref cur-family (1- x)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 (aset cur-family (1- x) ? ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 (setq x (1- x))))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
654 ;; We treat oblique and italic as equivalent. Don't ask.
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
655 (let ((slants '("o" "i")))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
656 (while (and slants (not done))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
657 (setq font-name (format "-*-%s-%s-%s-*-*-*-%s-*-*-*-*-%s-%s"
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
658 cur-family weight
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
659 (if (or (font-italic-p fontobj)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
660 (font-oblique-p fontobj))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
661 (car slants)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
662 "r")
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
663 (if size
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
664 (int-to-string (* 10 size)) "*")
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
665 registry
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
666 encoding
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
667 )
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
668 slants (cdr slants)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
669 done (try-font-name font-name device))))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 (if done font-name)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 ;;; The window-system dependent code (NS-style)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 (defun ns-font-families-for-device (&optional device no-resetp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 ;; For right now, assume we are going to have the same storage for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 ;; device fonts for NS as we do for X. Is this a valid assumption?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 (or device (setq device (selected-device)))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
680 (if (boundp 'device-fonts-cache)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
681 (let ((menu (or (cdr-safe (assq device device-fonts-cache)))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
682 (if (and (not menu) (not no-resetp))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
683 (progn
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
684 (reset-device-font-menus device)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
685 (ns-font-families-for-device device t))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
686 (let ((scaled (mapcar (function (lambda (x) (if x (aref x 0))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
687 (aref menu 0)))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
688 (normal (mapcar (function (lambda (x) (if x (aref x 0))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
689 (aref menu 1))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
690 (sort (unique (nconc scaled normal)) 'string-lessp))))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 (defun ns-font-create-name (fontobj &optional device)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 (let ((family (or (font-family fontobj)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 (ns-font-families-for-device device)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 (weight (or (font-weight fontobj) :medium))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 (style (or (font-style fontobj) (list :normal)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 (size (font-size fontobj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 (registry (or (font-registry fontobj) "*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 (encoding (or (font-encoding fontobj) "*")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 ;; Create a font, wow!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 (if (stringp family)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 (setq family (list family)))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
703 (if (or (symbolp style) (numberp style))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 (setq style (list style)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 (setq weight (font-higher-weight weight (car-safe (memq :bold style))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 (if (stringp size)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 (setq size (font-spatial-to-canonical size device)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 (setq weight (or (cdr-safe (assq weight ns-font-weight-mappings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 "medium"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 (let ((done nil) ; Did we find a good font yet?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 (font-name nil) ; font name we are currently checking
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 (cur-family nil) ; current family we are checking
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 (while (and family (not done))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 (setq cur-family (car family)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 family (cdr family))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717 (if (assoc cur-family font-family-mappings)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 ;; If the family name is an alias as defined by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 ;; font-family-mappings, then append those families
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 ;; to the front of 'family' and continue in the loop.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 (setq family (append
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 (cdr-safe (assoc cur-family
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723 font-family-mappings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 family))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 ;; CARL: Need help here - I am not familiar with the NS font
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 ;; model
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 (setq font-name "UNKNOWN FORMULA GOES HERE"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728 done (try-font-name font-name device))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 (if done font-name))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
732 ;;; Cache building code
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
733 ;;;###autoload
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
734 (defun x-font-build-cache (&optional device)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
735 (let ((hashtable (make-hash-table :test 'equal :size 15))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
736 (fonts (mapcar 'x-font-create-object
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
737 (x-list-fonts "-*-*-*-*-*-*-*-*-*-*-*-*-*-*")))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
738 (plist nil)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
739 (cur nil))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
740 (while fonts
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
741 (setq cur (car fonts)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
742 fonts (cdr fonts)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
743 plist (cl-gethash (car (font-family cur)) hashtable))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
744 (if (not (memq (font-weight cur) (plist-get plist 'weights)))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
745 (setq plist (plist-put plist 'weights (cons (font-weight cur)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
746 (plist-get plist 'weights)))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
747 (if (not (member (font-size cur) (plist-get plist 'sizes)))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
748 (setq plist (plist-put plist 'sizes (cons (font-size cur)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
749 (plist-get plist 'sizes)))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
750 (if (and (font-oblique-p cur)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
751 (not (memq 'oblique (plist-get plist 'styles))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
752 (setq plist (plist-put plist 'styles (cons 'oblique (plist-get plist 'styles)))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
753 (if (and (font-italic-p cur)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
754 (not (memq 'italic (plist-get plist 'styles))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
755 (setq plist (plist-put plist 'styles (cons 'italic (plist-get plist 'styles)))))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
756 (cl-puthash (car (font-family cur)) plist hashtable))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
757 hashtable))
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
758
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
759
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 ;;; Now overwrite the original copy of set-face-font with our own copy that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 ;;; can deal with either syntax.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
764 ;;; ###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 (defun font-set-face-font (&optional face font &rest args)
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
766 (cond
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
767 ((and (vectorp font) (= (length font) 12))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
768 (let ((font-name (font-create-name font)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
769 (set-face-property face 'font-specification font)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
770 (cond
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
771 ((null font-name) ; No matching font!
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
772 nil)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
773 ((listp font-name) ; For TTYs
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
774 (let (cur)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
775 (while font-name
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
776 (setq cur (car font-name)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
777 font-name (cdr font-name))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
778 (apply 'set-face-property face (car cur) (cdr cur) args))))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
779 (font-running-xemacs
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
780 (apply 'set-face-font face font-name args)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
781 (apply 'set-face-underline-p face (font-underline-p font) args)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
782 (if (and (or (font-smallcaps-p font) (font-bigcaps-p font))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
783 (fboundp 'set-face-display-table))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
784 (apply 'set-face-display-table
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
785 face font-caps-display-table args))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
786 (apply 'set-face-property face 'strikethru (or
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
787 (font-linethrough-p font)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
788 (font-strikethru-p font))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
789 args))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
790 (t
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
791 (condition-case nil
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
792 (apply 'set-face-font face font-name args)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
793 (error
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
794 (let ((args (car-safe args)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
795 (and (or (font-bold-p font)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
796 (memq (font-weight font) '(:bold :demi-bold)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
797 (make-face-bold face args t))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
798 (and (font-italic-p font) (make-face-italic face args t)))))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
799 (apply 'set-face-underline-p face (font-underline-p font) args)))))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
800 (t
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
801 ;; Let the original set-face-font signal any errors
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
802 (set-face-property face 'font-specification nil)
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
803 (apply 'set-face-font face font args))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807 ;;; Now for emacsen specific stuff
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 (defun font-update-device-fonts (device)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 ;; Update all faces that were created with the 'font' package
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 ;; to appear correctly on the new device. This should be in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 ;; create-device-hook. This is XEmacs 19.12+ specific
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 (let ((faces (face-list 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 (cur nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 (font nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816 (font-spec nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 (while faces
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 (setq cur (car faces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 faces (cdr faces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 font-spec (face-property cur 'font-specification))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821 (if font-spec
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 (set-face-font cur font-spec device)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 (defun font-update-one-face (face &optional device-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 ;; Update FACE on all devices in DEVICE-LIST
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 ;; DEVICE_LIST defaults to a list of all active devices
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 (setq device-list (or device-list (device-list)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 (if (devicep device-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 (setq device-list (list device-list)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 (let* ((cur-device nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 (font-spec (face-property face 'font-specification))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 (font nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 (if (not font-spec)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 ;; Hey! Don't mess with fonts we didn't create in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 ;; first place.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 (while device-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 (setq cur-device (car device-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 device-list (cdr device-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 (if (not (device-live-p cur-device))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 ;; Whoah!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 (if font-spec
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 (set-face-font face font-spec cur-device)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 ;;; Various color related things
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 ((fboundp 'display-warning)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 (fset 'font-warn 'display-warning))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 ((fboundp 'w3-warn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853 (fset 'font-warn 'w3-warn))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 ((fboundp 'url-warn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 (fset 'font-warn 'url-warn))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 ((fboundp 'warn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 (defun font-warn (class message &optional level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 (warn "(%s/%s) %s" class (or level 'warning) message)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 (defun font-warn (class message &optional level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 (set-buffer (get-buffer-create "*W3-WARNINGS*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 (insert (format "(%s/%s) %s\n" class (or level 'warning) message)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866 (display-buffer (current-buffer))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 (defun font-lookup-rgb-components (color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 "Lookup COLOR (a color name) in rgb.txt and return a list of RGB values.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 The list (R G B) is returned, or an error is signaled if the lookup fails."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 (let ((lib-list (if (boundp 'x-library-search-path)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 x-library-search-path
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 ;; This default is from XEmacs 19.13 - hope it covers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 ;; everyone.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 (list "/usr/X11R6/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 "/usr/X11R5/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 "/usr/lib/X11R6/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 "/usr/lib/X11R5/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 "/usr/local/X11R6/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 "/usr/local/X11R5/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 "/usr/local/lib/X11R6/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 "/usr/local/lib/X11R5/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 "/usr/X11/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 "/usr/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 "/usr/local/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 "/usr/X386/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 "/usr/x386/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 "/usr/XFree86/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 "/usr/unsupported/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 "/usr/athena/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 "/usr/local/x11r5/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892 "/usr/lpp/Xamples/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 "/usr/openwin/lib/X11/"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 "/usr/openwin/share/lib/X11/")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 (file font-rgb-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 r g b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897 (if (not file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 (while lib-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 (setq file (expand-file-name "rgb.txt" (car lib-list)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 (if (file-readable-p file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 (setq lib-list nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 font-rgb-file file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903 (setq lib-list (cdr lib-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 file nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 (if (null file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 (list 0 0 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 (set-buffer (find-file-noselect file))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 (if (not (= (aref (buffer-name) 0) ? ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 (rename-buffer (generate-new-buffer-name " *rgb-tmp-buffer*")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 (widen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 (if (re-search-forward (format "\t%s$" (regexp-quote color)) nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 (setq r (* (read (current-buffer)) 256)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 g (* (read (current-buffer)) 256)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 b (* (read (current-buffer)) 256)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 (font-warn 'color (format "No such color: %s" color))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 (setq r 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 g 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 b 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 (list r g b) ))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 (defun font-hex-string-to-number (string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 "Convert STRING to an integer by parsing it as a hexadecimal number."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 (let ((conv-list '((?0 . 0) (?a . 10) (?A . 10)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 (?1 . 1) (?b . 11) (?B . 11)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 (?2 . 2) (?c . 12) (?C . 12)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 (?3 . 3) (?d . 13) (?D . 13)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 (?4 . 4) (?e . 14) (?E . 14)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 (?5 . 5) (?f . 15) (?F . 15)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 (?6 . 6)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 (?7 . 7)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 (?8 . 8)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 (?9 . 9)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 (n 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 (i 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 (lim (length string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 (while (< i lim)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 (setq n (+ (* n 16) (or (cdr (assq (aref string i) conv-list)) 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 i (1+ i)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 n ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 (defun font-parse-rgb-components (color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 "Parse RGB color specification and return a list of integers (R G B).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949 #FEFEFE and rgb:fe/fe/fe style specifications are parsed."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 (let ((case-fold-search t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 r g b str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 (cond ((string-match "^#[0-9a-f]+$" color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 ((= (length color) 4)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 (setq r (font-hex-string-to-number (substring color 1 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 g (font-hex-string-to-number (substring color 2 3))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 b (font-hex-string-to-number (substring color 3 4))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 r (* r 4096)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 g (* g 4096)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 b (* b 4096)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 ((= (length color) 7)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 (setq r (font-hex-string-to-number (substring color 1 3))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 g (font-hex-string-to-number (substring color 3 5))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 b (font-hex-string-to-number (substring color 5 7))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 r (* r 256)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 g (* g 256)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 b (* b 256)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 ((= (length color) 10)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 (setq r (font-hex-string-to-number (substring color 1 4))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 g (font-hex-string-to-number (substring color 4 7))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 b (font-hex-string-to-number (substring color 7 10))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 r (* r 16)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 g (* g 16)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974 b (* b 16)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 ((= (length color) 13)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 (setq r (font-hex-string-to-number (substring color 1 5))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 g (font-hex-string-to-number (substring color 5 9))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 b (font-hex-string-to-number (substring color 9 13))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 (font-warn 'color (format "Invalid RGB color specification: %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 color))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 (setq r 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 g 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 b 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 ((string-match "rgb:\\([0-9a-f]+\\)/\\([0-9a-f]+\\)/\\([0-9a-f]+\\)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 (if (or (> (- (match-end 1) (match-beginning 1)) 4)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 (> (- (match-end 2) (match-beginning 2)) 4)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 (> (- (match-end 3) (match-beginning 3)) 4))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 (error "Invalid RGB color specification: %s" color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 (setq str (match-string 1 color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 r (* (font-hex-string-to-number str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 (expt 16 (- 4 (length str))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 str (match-string 2 color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 g (* (font-hex-string-to-number str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 (expt 16 (- 4 (length str))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 str (match-string 3 color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 b (* (font-hex-string-to-number str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 (expt 16 (- 4 (length str)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 (font-warn 'html (format "Invalid RGB color specification: %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002 color))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 (setq r 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 g 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 b 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006 (list r g b) ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 (defsubst font-rgb-color-p (obj)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
1009 (or (and (vectorp obj)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
1010 (= (length obj) 4)
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 114
diff changeset
1011 (eq (aref obj 0) 'rgb))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 (defsubst font-rgb-color-red (obj) (aref obj 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 (defsubst font-rgb-color-green (obj) (aref obj 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 (defsubst font-rgb-color-blue (obj) (aref obj 3))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 (defun font-color-rgb-components (color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 "Return the RGB components of COLOR as a list of integers (R G B).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 16-bit values are always returned.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 #FEFEFE and rgb:fe/fe/fe style color specifications are parsed directly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 into their components.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 RGB values for color names are looked up in the rgb.txt file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 The variable x-library-search-path is use to locate the rgb.txt file."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 (let ((case-fold-search t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025 (cond
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
1026 ((and (font-rgb-color-p color) (floatp (aref color 1)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 (list (* 65535 (aref color 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 (* 65535 (aref color 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 (* 65535 (aref color 2))))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
1030 ((font-rgb-color-p color)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
1031 (list (font-rgb-color-red color)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
1032 (font-rgb-color-green color)
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
1033 (font-rgb-color-blue color)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 ((and (vectorp color) (= 3 (length color)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 (list (aref color 0) (aref color 1) (aref color 2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036 ((and (listp color) (= 3 (length color)) (floatp (car color)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 (mapcar (function (lambda (x) (* x 65535))) color))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 ((and (listp color) (= 3 (length color)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039 color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 ((or (string-match "^#" color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041 (string-match "^rgb:" color))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 (font-parse-rgb-components color))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 ((string-match "\\([0-9.]+\\)[ \t]\\([0-9.]+\\)[ \t]\\([0-9.]+\\)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 color)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 (let ((r (string-to-number (match-string 1 color)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 (g (string-to-number (match-string 2 color)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 (b (string-to-number (match-string 3 color))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048 (if (floatp r)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 (setq r (round (* 255 r))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 g (round (* 255 g))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 b (round (* 255 b))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 (font-parse-rgb-components (format "#%02x%02x%02x" r g b))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 (font-lookup-rgb-components color)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 (defsubst font-tty-compute-color-delta (col1 col2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 (+
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 (* (- (aref col1 0) (aref col2 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059 (- (aref col1 0) (aref col2 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 (* (- (aref col1 1) (aref col2 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 (- (aref col1 1) (aref col2 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 (* (- (aref col1 2) (aref col2 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 (- (aref col1 2) (aref col2 2)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 (defun font-tty-find-closest-color (r g b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066 ;; This is basically just a lisp copy of allocate_nearest_color
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067 ;; from objects-x.c from Emacs 19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068 ;; We really should just check tty-color-list, but unfortunately
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 ;; that does not include any RGB information at all.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 ;; So for now we just hardwire in the default list and call it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071 ;; good for now.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072 (setq r (/ r 65535.0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 g (/ g 65535.0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 b (/ b 65535.0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 (let* ((color_def (vector r g b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 (colors [([1.0 1.0 1.0] . "white")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077 ([0.0 1.0 1.0] . "cyan")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 ([1.0 0.0 1.0] . "magenta")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 ([0.0 0.0 1.0] . "blue")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080 ([1.0 1.0 0.0] . "yellow")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 ([0.0 1.0 0.0] . "green")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 ([1.0 0.0 0.0] . "red")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083 ([0.0 0.0 0.0] . "black")])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 (no_cells (length colors))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 (x 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 (nearest 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 (nearest_delta 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 (trial_delta 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 (setq nearest_delta (font-tty-compute-color-delta (car (aref colors 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 color_def))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091 (while (/= no_cells x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 (setq trial_delta (font-tty-compute-color-delta (car (aref colors x))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 color_def))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 (if (< trial_delta nearest_delta)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 (setq nearest x
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 nearest_delta trial_delta))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 (setq x (1+ x)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 (cdr-safe (aref colors nearest))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 (defun font-normalize-color (color &optional device)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 "Return an RGB tuple, given any form of input. If an error occurs, black
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 is returned."
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
1103 (case (device-type device)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
1104 ((x pm)
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
1105 (apply 'format "#%02x%02x%02x" (font-color-rgb-components color)))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
1106 (win32
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
1107 (let* ((rgb (font-color-rgb-components color))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
1108 (color (apply 'format "#%02x%02x%02x" rgb)))
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
1109 (win32-define-rgb-color (nth 0 rgb) (nth 1 rgb) (nth 2 rgb) color)
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
1110 color))
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
1111 (tty
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 (apply 'font-tty-find-closest-color (font-color-rgb-components color)))
82
6a378aca36af Import from CVS: tag r20-0b91
cvs
parents: 80
diff changeset
1113 (ns
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 (let ((vals (mapcar (function (lambda (x) (>> x 8)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115 (font-color-rgb-components color))))
80
1ce6082ce73f Import from CVS: tag r20-0b90
cvs
parents: 70
diff changeset
1116 (apply 'format "RGB%02x%02x%02xff" vals)))
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
1117 (otherwise
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
1118 color)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 (defun font-set-face-background (&optional face color &rest args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 (interactive)
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1122 (condition-case nil
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1123 (cond
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 114
diff changeset
1124 ((or (font-rgb-color-p color)
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 114
diff changeset
1125 (string-match "^#[0-9a-fA-F]+$" color))
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1126 (apply 'set-face-background face
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1127 (font-normalize-color color) args))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1128 (t
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1129 (apply 'set-face-background face color args)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1130 (error nil)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 (defun font-set-face-foreground (&optional face color &rest args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 (interactive)
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1134 (condition-case nil
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1135 (cond
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 114
diff changeset
1136 ((or (font-rgb-color-p color)
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 114
diff changeset
1137 (string-match "^#[0-9a-fA-F]+$" color))
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1138 (apply 'set-face-foreground face (font-normalize-color color) args))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1139 (t
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1140 (apply 'set-face-foreground face color args)))
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 98
diff changeset
1141 (error nil)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 (provide 'font)