annotate lisp/w3/font.el @ 118:7d55a9ba150c r20-1b11

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