wsfont.c revision 1.44.40.1 1 1.44.40.1 mjf /* $NetBSD: wsfont.c,v 1.44.40.1 2008/06/02 13:23:58 mjf Exp $ */
2 1.1 ad
3 1.7 ad /*-
4 1.24 ad * Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
5 1.1 ad * All rights reserved.
6 1.1 ad *
7 1.7 ad * This code is derived from software contributed to The NetBSD Foundation
8 1.13 ad * by Andrew Doran.
9 1.7 ad *
10 1.1 ad * Redistribution and use in source and binary forms, with or without
11 1.1 ad * modification, are permitted provided that the following conditions
12 1.1 ad * are met:
13 1.1 ad * 1. Redistributions of source code must retain the above copyright
14 1.1 ad * notice, this list of conditions and the following disclaimer.
15 1.1 ad * 2. Redistributions in binary form must reproduce the above copyright
16 1.1 ad * notice, this list of conditions and the following disclaimer in the
17 1.1 ad * documentation and/or other materials provided with the distribution.
18 1.1 ad *
19 1.7 ad * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
20 1.7 ad * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 1.7 ad * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 1.7 ad * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 1.7 ad * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 1.7 ad * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 1.7 ad * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 1.7 ad * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 1.7 ad * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 1.7 ad * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 1.7 ad * POSSIBILITY OF SUCH DAMAGE.
30 1.1 ad */
31 1.2 ad
32 1.1 ad #include <sys/cdefs.h>
33 1.44.40.1 mjf __KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.44.40.1 2008/06/02 13:23:58 mjf Exp $");
34 1.1 ad
35 1.1 ad #include "opt_wsfont.h"
36 1.1 ad
37 1.1 ad #include <sys/param.h>
38 1.1 ad #include <sys/systm.h>
39 1.1 ad #include <sys/time.h>
40 1.1 ad #include <sys/malloc.h>
41 1.26 uch #include <sys/queue.h>
42 1.1 ad
43 1.1 ad #include <dev/wscons/wsdisplayvar.h>
44 1.1 ad #include <dev/wscons/wsconsio.h>
45 1.1 ad #include <dev/wsfont/wsfont.h>
46 1.1 ad
47 1.44 ober #include "wsfont_glue.h" /* NRASOPS_ROTATION */
48 1.44 ober
49 1.1 ad #undef HAVE_FONT
50 1.1 ad
51 1.4 ad #ifdef FONT_QVSS8x15
52 1.1 ad #define HAVE_FONT 1
53 1.4 ad #include <dev/wsfont/qvss8x15.h>
54 1.1 ad #endif
55 1.1 ad
56 1.1 ad #ifdef FONT_GALLANT12x22
57 1.1 ad #define HAVE_FONT 1
58 1.1 ad #include <dev/wsfont/gallant12x22.h>
59 1.1 ad #endif
60 1.1 ad
61 1.1 ad #ifdef FONT_LUCIDA16x29
62 1.1 ad #define HAVE_FONT 1
63 1.1 ad #include <dev/wsfont/lucida16x29.h>
64 1.1 ad #endif
65 1.1 ad
66 1.8 takemura #ifdef FONT_VT220L8x8
67 1.8 takemura #define HAVE_FONT 1
68 1.8 takemura #include <dev/wsfont/vt220l8x8.h>
69 1.8 takemura #endif
70 1.8 takemura
71 1.8 takemura #ifdef FONT_VT220L8x10
72 1.8 takemura #define HAVE_FONT 1
73 1.8 takemura #include <dev/wsfont/vt220l8x10.h>
74 1.8 takemura #endif
75 1.8 takemura
76 1.30 tsutsui #ifdef FONT_VT220L8x16
77 1.30 tsutsui #define HAVE_FONT 1
78 1.30 tsutsui #include <dev/wsfont/vt220l8x16.h>
79 1.30 tsutsui #endif
80 1.30 tsutsui
81 1.30 tsutsui #ifdef FONT_VT220ISO8x16
82 1.30 tsutsui #define HAVE_FONT 1
83 1.30 tsutsui #include <dev/wsfont/vt220iso8x16.h>
84 1.30 tsutsui #endif
85 1.30 tsutsui
86 1.34 uwe #ifdef FONT_VT220KOI8x10_KOI8_R
87 1.34 uwe #define HAVE_FONT 1
88 1.34 uwe #include <dev/wsfont/vt220koi8x10.h>
89 1.34 uwe #endif
90 1.34 uwe
91 1.34 uwe #ifdef FONT_VT220KOI8x10_KOI8_U
92 1.34 uwe #define HAVE_FONT 1
93 1.34 uwe #define KOI8_U
94 1.34 uwe #include <dev/wsfont/vt220koi8x10.h>
95 1.34 uwe #undef KOI8_U
96 1.34 uwe #endif
97 1.34 uwe
98 1.14 tsutsui #ifdef FONT_SONY8x16
99 1.14 tsutsui #define HAVE_FONT 1
100 1.14 tsutsui #include <dev/wsfont/sony8x16.h>
101 1.14 tsutsui #endif
102 1.14 tsutsui
103 1.14 tsutsui #ifdef FONT_SONY12x24
104 1.14 tsutsui #define HAVE_FONT 1
105 1.14 tsutsui #include <dev/wsfont/sony12x24.h>
106 1.14 tsutsui #endif
107 1.14 tsutsui
108 1.15 tsutsui #ifdef FONT_OMRON12x20
109 1.15 tsutsui #define HAVE_FONT 1
110 1.15 tsutsui #include <dev/wsfont/omron12x20.h>
111 1.15 tsutsui #endif
112 1.15 tsutsui
113 1.4 ad /* Make sure we always have at least one font. */
114 1.1 ad #ifndef HAVE_FONT
115 1.1 ad #define HAVE_FONT 1
116 1.4 ad #define FONT_BOLD8x16 1
117 1.1 ad #endif
118 1.1 ad
119 1.4 ad #ifdef FONT_BOLD8x16
120 1.4 ad #include <dev/wsfont/bold8x16.h>
121 1.1 ad #endif
122 1.1 ad
123 1.25 ad #define WSFONT_IDENT_MASK 0xffffff00
124 1.25 ad #define WSFONT_IDENT_SHIFT 8
125 1.25 ad #define WSFONT_BITO_MASK 0x000000f0
126 1.25 ad #define WSFONT_BITO_SHIFT 4
127 1.25 ad #define WSFONT_BYTEO_MASK 0x0000000f
128 1.25 ad #define WSFONT_BYTEO_SHIFT 0
129 1.25 ad
130 1.25 ad #define WSFONT_BUILTIN 0x01 /* In wsfont.c */
131 1.25 ad #define WSFONT_STATIC 0x02 /* Font structures not malloc()ed */
132 1.25 ad #define WSFONT_COPY 0x04 /* Copy of existing font in table */
133 1.25 ad
134 1.1 ad /* Placeholder struct used for linked list */
135 1.1 ad struct font {
136 1.25 ad TAILQ_ENTRY(font) chain;
137 1.1 ad struct wsdisplay_font *font;
138 1.25 ad u_int lockcount;
139 1.25 ad u_int cookie;
140 1.25 ad u_int flags;
141 1.25 ad };
142 1.1 ad
143 1.1 ad /* Our list of built-in fonts */
144 1.25 ad static struct font builtin_fonts[] = {
145 1.1 ad #ifdef FONT_BOLD8x16
146 1.43 christos { { NULL, NULL }, &bold8x16, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
147 1.1 ad #endif
148 1.1 ad #ifdef FONT_ISO8x16
149 1.43 christos { { NULL, NULL }, &iso8x16, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
150 1.1 ad #endif
151 1.1 ad #ifdef FONT_COURIER11x18
152 1.43 christos { { NULL, NULL }, &courier11x18, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
153 1.1 ad #endif
154 1.1 ad #ifdef FONT_GALLANT12x22
155 1.43 christos { { NULL, NULL }, &gallant12x22, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
156 1.1 ad #endif
157 1.1 ad #ifdef FONT_LUCIDA16x29
158 1.43 christos { { NULL, NULL }, &lucida16x29, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
159 1.1 ad #endif
160 1.1 ad #ifdef FONT_QVSS8x15
161 1.43 christos { { NULL, NULL }, &qvss8x15, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
162 1.8 takemura #endif
163 1.8 takemura #ifdef FONT_VT220L8x8
164 1.43 christos { { NULL, NULL }, &vt220l8x8, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
165 1.8 takemura #endif
166 1.8 takemura #ifdef FONT_VT220L8x10
167 1.43 christos { { NULL, NULL }, &vt220l8x10, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
168 1.30 tsutsui #endif
169 1.30 tsutsui #ifdef FONT_VT220L8x16
170 1.43 christos { { NULL, NULL }, &vt220l8x16, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
171 1.30 tsutsui #endif
172 1.30 tsutsui #ifdef FONT_VT220ISO8x16
173 1.43 christos { { NULL, NULL }, &vt220iso8x16, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
174 1.34 uwe #endif
175 1.34 uwe #ifdef FONT_VT220KOI8x10_KOI8_R
176 1.43 christos { { NULL, NULL }, &vt220kr8x10, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
177 1.34 uwe #endif
178 1.34 uwe #ifdef FONT_VT220KOI8x10_KOI8_U
179 1.43 christos { { NULL, NULL }, &vt220ku8x10, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
180 1.14 tsutsui #endif
181 1.14 tsutsui #ifdef FONT_SONY8x16
182 1.43 christos { { NULL, NULL }, &sony8x16, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
183 1.14 tsutsui #endif
184 1.14 tsutsui #ifdef FONT_SONY12x24
185 1.43 christos { { NULL, NULL }, &sony12x24, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
186 1.15 tsutsui #endif
187 1.15 tsutsui #ifdef FONT_OMRON12x20
188 1.43 christos { { NULL, NULL }, &omron12x20, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
189 1.1 ad #endif
190 1.43 christos { { NULL, NULL }, NULL, 0, 0, 0 },
191 1.1 ad };
192 1.1 ad
193 1.25 ad static TAILQ_HEAD(,font) list;
194 1.25 ad static int ident;
195 1.25 ad
196 1.1 ad /* Reverse the bit order in a byte */
197 1.1 ad static const u_char reverse[256] = {
198 1.37 perry 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
199 1.37 perry 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
200 1.37 perry 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
201 1.37 perry 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
202 1.37 perry 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
203 1.37 perry 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
204 1.37 perry 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
205 1.37 perry 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
206 1.37 perry 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
207 1.37 perry 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
208 1.37 perry 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
209 1.37 perry 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
210 1.37 perry 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
211 1.37 perry 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
212 1.37 perry 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
213 1.37 perry 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
214 1.37 perry 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
215 1.37 perry 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
216 1.37 perry 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
217 1.37 perry 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
218 1.37 perry 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
219 1.37 perry 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
220 1.37 perry 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
221 1.37 perry 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
222 1.37 perry 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
223 1.37 perry 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
224 1.37 perry 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
225 1.37 perry 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
226 1.37 perry 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
227 1.37 perry 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
228 1.37 perry 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
229 1.37 perry 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
230 1.1 ad };
231 1.1 ad
232 1.25 ad static struct font *wsfont_find0(int, int);
233 1.25 ad static struct font *wsfont_add0(struct wsdisplay_font *, int);
234 1.22 augustss static void wsfont_revbit(struct wsdisplay_font *);
235 1.22 augustss static void wsfont_revbyte(struct wsdisplay_font *);
236 1.42 rillig static inline int wsfont_make_cookie(int, int, int);
237 1.25 ad
238 1.42 rillig static inline int
239 1.38 christos wsfont_make_cookie(int cident, int bito, int byteo)
240 1.25 ad {
241 1.25 ad
242 1.38 christos return ((cident & WSFONT_IDENT_MASK) |
243 1.25 ad (bito << WSFONT_BITO_SHIFT) |
244 1.25 ad (byteo << WSFONT_BYTEO_SHIFT));
245 1.25 ad }
246 1.1 ad
247 1.1 ad static void
248 1.22 augustss wsfont_revbit(struct wsdisplay_font *font)
249 1.1 ad {
250 1.1 ad u_char *p, *m;
251 1.24 ad
252 1.1 ad p = (u_char *)font->data;
253 1.1 ad m = p + font->stride * font->numchars * font->fontheight;
254 1.18 cgd
255 1.37 perry for (; p < m; p++)
256 1.18 cgd *p = reverse[*p];
257 1.1 ad }
258 1.1 ad
259 1.1 ad static void
260 1.22 augustss wsfont_revbyte(struct wsdisplay_font *font)
261 1.1 ad {
262 1.1 ad int x, l, r, nr;
263 1.1 ad u_char *rp;
264 1.24 ad
265 1.1 ad if (font->stride == 1)
266 1.1 ad return;
267 1.1 ad
268 1.1 ad rp = (u_char *)font->data;
269 1.1 ad nr = font->numchars * font->fontheight;
270 1.24 ad
271 1.1 ad while (nr--) {
272 1.1 ad l = 0;
273 1.1 ad r = font->stride - 1;
274 1.24 ad
275 1.1 ad while (l < r) {
276 1.1 ad x = rp[l];
277 1.1 ad rp[l] = rp[r];
278 1.1 ad rp[r] = x;
279 1.1 ad l++, r--;
280 1.1 ad }
281 1.24 ad
282 1.1 ad rp += font->stride;
283 1.1 ad }
284 1.1 ad }
285 1.1 ad
286 1.1 ad void
287 1.31 jdolecek wsfont_enum(void (*cb)(const char *, int, int, int))
288 1.1 ad {
289 1.9 ad struct wsdisplay_font *f;
290 1.1 ad struct font *ent;
291 1.24 ad
292 1.25 ad TAILQ_FOREACH(ent, &list, chain) {
293 1.37 perry f = ent->font;
294 1.9 ad cb(f->name, f->fontwidth, f->fontheight, f->stride);
295 1.1 ad }
296 1.1 ad }
297 1.1 ad
298 1.44 ober #if NRASOPS_ROTATION > 0
299 1.44 ober
300 1.44 ober struct wsdisplay_font *wsfont_rotate_internal(struct wsdisplay_font *);
301 1.44 ober
302 1.44 ober struct wsdisplay_font *
303 1.44 ober wsfont_rotate_internal(struct wsdisplay_font *font)
304 1.44 ober {
305 1.44 ober int b, n, r, newstride;
306 1.44 ober struct wsdisplay_font *newfont;
307 1.44 ober char *newbits;
308 1.44 ober
309 1.44 ober /* Duplicate the existing font... */
310 1.44 ober newfont = malloc(sizeof(*font), M_DEVBUF, M_WAITOK);
311 1.44 ober if (newfont == NULL)
312 1.44 ober return (NULL);
313 1.44 ober
314 1.44 ober *newfont = *font;
315 1.44 ober
316 1.44 ober /* Allocate a buffer big enough for the rotated font. */
317 1.44 ober newstride = (font->fontheight + 7) / 8;
318 1.44 ober newbits = malloc(newstride * font->fontwidth * font->numchars,
319 1.44 ober M_DEVBUF, M_WAITOK|M_ZERO);
320 1.44 ober if (newbits == NULL) {
321 1.44 ober free(newfont, M_DEVBUF);
322 1.44 ober return (NULL);
323 1.44 ober }
324 1.44 ober
325 1.44 ober
326 1.44 ober
327 1.44 ober /* Rotate the font a bit at a time. */
328 1.44 ober for (n = 0; n < font->numchars; n++) {
329 1.44 ober unsigned char *ch = (unsigned char *)font->data +
330 1.44 ober (n * font->stride * font->fontheight);
331 1.44 ober
332 1.44 ober for (r = 0; r < font->fontheight; r++) {
333 1.44 ober for (b = 0; b < font->fontwidth; b++) {
334 1.44 ober unsigned char *rb;
335 1.44 ober
336 1.44 ober rb = ch + (font->stride * r) + (b / 8);
337 1.44 ober if (*rb & (0x80 >> (b % 8))) {
338 1.44 ober unsigned char *rrb;
339 1.44 ober
340 1.44 ober rrb = newbits + newstride - 1 - (r / 8)
341 1.44 ober + (n * newstride * font->fontwidth)
342 1.44 ober + (newstride * b);
343 1.44 ober *rrb |= (1 << (r % 8));
344 1.44 ober }
345 1.44 ober }
346 1.44 ober }
347 1.44 ober }
348 1.44 ober
349 1.44 ober newfont->data = newbits;
350 1.44 ober
351 1.44 ober /* Update font sizes. */
352 1.44 ober newfont->stride = newstride;
353 1.44 ober newfont->fontwidth = font->fontheight;
354 1.44 ober newfont->fontheight = font->fontwidth;
355 1.44 ober
356 1.44 ober if (wsfont_add(newfont, 0) != 0) {
357 1.44 ober /*
358 1.44 ober * If we seem to have rotated this font already, drop the
359 1.44 ober * new one...
360 1.44 ober */
361 1.44 ober free(newbits, M_DEVBUF);
362 1.44 ober free(newfont, M_DEVBUF);
363 1.44 ober newfont = NULL;
364 1.44 ober }
365 1.44 ober
366 1.44 ober return (newfont);
367 1.44 ober }
368 1.44 ober
369 1.44 ober int
370 1.44 ober wsfont_rotate(int cookie)
371 1.44 ober {
372 1.44 ober int s, ncookie;
373 1.44 ober struct wsdisplay_font *font;
374 1.44 ober struct font *origfont;
375 1.44 ober
376 1.44 ober s = splhigh();
377 1.44 ober origfont = wsfont_find0(cookie, 0xffffffff);
378 1.44 ober splx(s);
379 1.44 ober
380 1.44 ober font = wsfont_rotate_internal(origfont->font);
381 1.44 ober if (font == NULL)
382 1.44 ober return (-1);
383 1.44 ober
384 1.44 ober ncookie = wsfont_find(font->name, font->fontwidth, font->fontheight,
385 1.44 ober font->stride, 0, 0);
386 1.44 ober
387 1.44 ober return (ncookie);
388 1.44 ober }
389 1.44 ober
390 1.44 ober #endif /* NRASOPS_ROTATION */
391 1.44 ober
392 1.1 ad void
393 1.1 ad wsfont_init(void)
394 1.1 ad {
395 1.25 ad struct font *ent;
396 1.1 ad static int again;
397 1.1 ad int i;
398 1.25 ad
399 1.9 ad if (again != 0)
400 1.1 ad return;
401 1.1 ad again = 1;
402 1.25 ad
403 1.25 ad TAILQ_INIT(&list);
404 1.25 ad ent = builtin_fonts;
405 1.25 ad
406 1.25 ad for (i = 0; builtin_fonts[i].font != NULL; i++, ent++) {
407 1.25 ad ident += (1 << WSFONT_IDENT_SHIFT);
408 1.25 ad ent->cookie = wsfont_make_cookie(ident,
409 1.25 ad ent->font->bitorder, ent->font->byteorder);
410 1.25 ad TAILQ_INSERT_TAIL(&list, ent, chain);
411 1.1 ad }
412 1.1 ad }
413 1.1 ad
414 1.1 ad static struct font *
415 1.25 ad wsfont_find0(int cookie, int mask)
416 1.1 ad {
417 1.1 ad struct font *ent;
418 1.24 ad
419 1.25 ad TAILQ_FOREACH(ent, &list, chain) {
420 1.25 ad if ((ent->cookie & mask) == (cookie & mask))
421 1.1 ad return (ent);
422 1.25 ad }
423 1.24 ad
424 1.1 ad return (NULL);
425 1.1 ad }
426 1.1 ad
427 1.21 drochner int
428 1.31 jdolecek wsfont_matches(struct wsdisplay_font *font, const char *name,
429 1.22 augustss int width, int height, int stride)
430 1.21 drochner {
431 1.21 drochner
432 1.21 drochner if (height != 0 && font->fontheight != height)
433 1.21 drochner return (0);
434 1.21 drochner
435 1.21 drochner if (width != 0 && font->fontwidth != width)
436 1.21 drochner return (0);
437 1.21 drochner
438 1.21 drochner if (stride != 0 && font->stride != stride)
439 1.21 drochner return (0);
440 1.24 ad
441 1.21 drochner if (name != NULL && strcmp(font->name, name) != 0)
442 1.21 drochner return (0);
443 1.21 drochner
444 1.21 drochner return (1);
445 1.21 drochner }
446 1.21 drochner
447 1.1 ad int
448 1.31 jdolecek wsfont_find(const char *name, int width, int height, int stride, int bito, int byteo)
449 1.1 ad {
450 1.1 ad struct font *ent;
451 1.24 ad
452 1.25 ad TAILQ_FOREACH(ent, &list, chain) {
453 1.25 ad if (wsfont_matches(ent->font, name, width, height, stride))
454 1.25 ad return (wsfont_make_cookie(ent->cookie, bito, byteo));
455 1.1 ad }
456 1.1 ad
457 1.1 ad return (-1);
458 1.1 ad }
459 1.1 ad
460 1.25 ad static struct font *
461 1.25 ad wsfont_add0(struct wsdisplay_font *font, int copy)
462 1.1 ad {
463 1.1 ad struct font *ent;
464 1.9 ad size_t size;
465 1.24 ad
466 1.28 enami ent = malloc(sizeof(struct font), M_DEVBUF, M_WAITOK | M_ZERO);
467 1.24 ad
468 1.1 ad /* Is this font statically allocated? */
469 1.1 ad if (!copy) {
470 1.1 ad ent->font = font;
471 1.25 ad ent->flags = WSFONT_STATIC;
472 1.1 ad } else {
473 1.31 jdolecek void *data;
474 1.31 jdolecek char *name;
475 1.31 jdolecek
476 1.25 ad ent->font = malloc(sizeof(struct wsdisplay_font), M_DEVBUF,
477 1.28 enami M_WAITOK);
478 1.27 ad memcpy(ent->font, font, sizeof(*ent->font));
479 1.25 ad
480 1.1 ad size = font->fontheight * font->numchars * font->stride;
481 1.31 jdolecek data = malloc(size, M_DEVBUF, M_WAITOK);
482 1.31 jdolecek memcpy(data, font->data, size);
483 1.31 jdolecek ent->font->data = data;
484 1.31 jdolecek
485 1.31 jdolecek name = malloc(strlen(font->name) + 1, M_DEVBUF, M_WAITOK);
486 1.36 itojun strlcpy(name, font->name, strlen(font->name) + 1);
487 1.31 jdolecek ent->font->name = name;
488 1.1 ad }
489 1.24 ad
490 1.25 ad TAILQ_INSERT_TAIL(&list, ent, chain);
491 1.25 ad return (ent);
492 1.25 ad }
493 1.25 ad
494 1.25 ad int
495 1.25 ad wsfont_add(struct wsdisplay_font *font, int copy)
496 1.25 ad {
497 1.25 ad struct font *ent;
498 1.25 ad
499 1.25 ad /* Don't allow exact duplicates */
500 1.25 ad if (wsfont_find(font->name, font->fontwidth, font->fontheight,
501 1.25 ad font->stride, 0, 0) >= 0)
502 1.25 ad return (EEXIST);
503 1.25 ad
504 1.25 ad ent = wsfont_add0(font, copy);
505 1.25 ad
506 1.25 ad ident += (1 << WSFONT_IDENT_SHIFT);
507 1.25 ad ent->cookie = wsfont_make_cookie(ident, font->bitorder,
508 1.25 ad font->byteorder);
509 1.25 ad
510 1.1 ad return (0);
511 1.1 ad }
512 1.24 ad
513 1.1 ad int
514 1.22 augustss wsfont_remove(int cookie)
515 1.1 ad {
516 1.1 ad struct font *ent;
517 1.1 ad
518 1.25 ad if ((ent = wsfont_find0(cookie, 0xffffffff)) == NULL)
519 1.21 drochner return (ENOENT);
520 1.24 ad
521 1.25 ad if ((ent->flags & WSFONT_BUILTIN) != 0 || ent->lockcount != 0)
522 1.21 drochner return (EBUSY);
523 1.24 ad
524 1.25 ad if ((ent->flags & WSFONT_STATIC) == 0) {
525 1.38 christos free(ent->font->data, M_DEVBUF);
526 1.38 christos free(__UNCONST(ent->font->name), M_DEVBUF); /*XXXUNCONST*/
527 1.25 ad free(ent->font, M_DEVBUF);
528 1.1 ad }
529 1.24 ad
530 1.25 ad TAILQ_REMOVE(&list, ent, chain);
531 1.25 ad free(ent, M_DEVBUF);
532 1.24 ad
533 1.9 ad return (0);
534 1.1 ad }
535 1.1 ad
536 1.1 ad int
537 1.25 ad wsfont_lock(int cookie, struct wsdisplay_font **ptr)
538 1.1 ad {
539 1.25 ad struct font *ent, *neu;
540 1.25 ad int bito, byteo;
541 1.25 ad
542 1.25 ad if ((ent = wsfont_find0(cookie, 0xffffffff)) == NULL) {
543 1.25 ad if ((ent = wsfont_find0(cookie, WSFONT_IDENT_MASK)) == NULL)
544 1.25 ad return (ENOENT);
545 1.25 ad
546 1.32 jdolecek bito = (cookie & WSFONT_BITO_MASK) >> WSFONT_BITO_SHIFT;
547 1.32 jdolecek byteo = (cookie & WSFONT_BYTEO_MASK) >> WSFONT_BYTEO_SHIFT;
548 1.32 jdolecek
549 1.33 jdolecek if (ent->lockcount != 0) {
550 1.25 ad neu = wsfont_add0(ent->font, 1);
551 1.25 ad neu->flags |= WSFONT_COPY;
552 1.32 jdolecek
553 1.35 tsutsui aprint_debug("wsfont: font '%s' bito %d byteo %d "
554 1.35 tsutsui "copied to bito %d byteo %d\n",
555 1.35 tsutsui ent->font->name,
556 1.35 tsutsui ent->font->bitorder, ent->font->byteorder,
557 1.35 tsutsui bito, byteo);
558 1.32 jdolecek
559 1.25 ad ent = neu;
560 1.25 ad }
561 1.24 ad
562 1.25 ad if (bito && bito != ent->font->bitorder) {
563 1.1 ad wsfont_revbit(ent->font);
564 1.25 ad ent->font->bitorder = bito;
565 1.1 ad }
566 1.1 ad
567 1.25 ad if (byteo && byteo != ent->font->byteorder) {
568 1.1 ad wsfont_revbyte(ent->font);
569 1.25 ad ent->font->byteorder = byteo;
570 1.1 ad }
571 1.24 ad
572 1.25 ad ent->cookie = cookie;
573 1.1 ad }
574 1.24 ad
575 1.25 ad ent->lockcount++;
576 1.25 ad *ptr = ent->font;
577 1.25 ad return (0);
578 1.1 ad }
579 1.1 ad
580 1.1 ad int
581 1.22 augustss wsfont_unlock(int cookie)
582 1.1 ad {
583 1.1 ad struct font *ent;
584 1.24 ad
585 1.25 ad if ((ent = wsfont_find0(cookie, 0xffffffff)) == NULL)
586 1.25 ad return (ENOENT);
587 1.25 ad
588 1.25 ad if (ent->lockcount == 0)
589 1.29 provos panic("wsfont_unlock: font not locked");
590 1.24 ad
591 1.25 ad if (--ent->lockcount == 0 && (ent->flags & WSFONT_COPY) != 0)
592 1.25 ad wsfont_remove(cookie);
593 1.24 ad
594 1.25 ad return (0);
595 1.16 marcus }
596 1.16 marcus
597 1.16 marcus /*
598 1.16 marcus * Unicode to font encoding mappings
599 1.16 marcus */
600 1.16 marcus
601 1.16 marcus /*
602 1.24 ad * To save memory, font encoding tables use a two level lookup. First the
603 1.24 ad * high byte of the Unicode is used to lookup the level 2 table, then the
604 1.24 ad * low byte indexes that table. Level 2 tables that are not needed are
605 1.24 ad * omitted (NULL), and both level 1 and level 2 tables have base and size
606 1.24 ad * attributes to keep their size down.
607 1.16 marcus */
608 1.16 marcus
609 1.16 marcus struct wsfont_level1_glyphmap {
610 1.24 ad const struct wsfont_level2_glyphmap **level2;
611 1.24 ad int base; /* High byte for first level2 entry */
612 1.24 ad int size; /* Number of level2 entries */
613 1.16 marcus };
614 1.16 marcus
615 1.16 marcus struct wsfont_level2_glyphmap {
616 1.24 ad int base; /* Low byte for first character */
617 1.24 ad int size; /* Number of characters */
618 1.24 ad const void *chars; /* Pointer to character number entries */
619 1.24 ad int width; /* Size of each entry in bytes (1,2,4) */
620 1.16 marcus };
621 1.16 marcus
622 1.16 marcus #define null16 \
623 1.16 marcus NULL, NULL, NULL, NULL, \
624 1.16 marcus NULL, NULL, NULL, NULL, \
625 1.16 marcus NULL, NULL, NULL, NULL, \
626 1.16 marcus NULL, NULL, NULL, NULL
627 1.16 marcus
628 1.16 marcus /*
629 1.16 marcus * IBM 437 maps
630 1.16 marcus */
631 1.16 marcus
632 1.24 ad static const u_int8_t ibm437_chars_0[] = {
633 1.16 marcus 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
634 1.16 marcus 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
635 1.16 marcus 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
636 1.16 marcus 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
637 1.16 marcus 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
638 1.16 marcus 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
639 1.16 marcus 96, 97, 98, 99, 100,101,102,103,104,105,106,107,108,109,110,111,
640 1.16 marcus 112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
641 1.16 marcus 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
642 1.16 marcus 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
643 1.16 marcus 255,173,155,156, 0, 157, 0, 0, 0, 0, 166,174,170, 0, 0, 0,
644 1.16 marcus 0, 241,253, 0, 0, 0, 0, 249, 0, 0, 167,175,172,171, 0, 168,
645 1.16 marcus 0, 0, 0, 0, 142,143,146,128, 0, 144, 0, 0, 0, 0, 0, 0,
646 1.16 marcus 0, 165, 0, 0, 0, 0, 153, 0, 0, 0, 0, 0, 154, 0, 0, 0,
647 1.16 marcus 133,160,131, 0, 132,134,145,135,138,130,136,137,141,161,140,139,
648 1.16 marcus 0, 164,149,162,147, 0, 148,246, 0, 151,163,150,129, 0, 0, 152
649 1.24 ad };
650 1.24 ad
651 1.24 ad static const u_int8_t ibm437_chars_1[] = {
652 1.16 marcus 159
653 1.24 ad };
654 1.24 ad
655 1.24 ad static const u_int8_t ibm437_chars_3[] = {
656 1.16 marcus 226, 0, 0, 0, 0, 233, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
657 1.16 marcus 228, 0, 0, 232, 0, 0, 234, 0, 0, 0, 0, 0, 0, 0, 224,225,
658 1.16 marcus 0, 235,238, 0, 0, 0, 0, 0, 0, 230, 0, 0, 0, 227, 0, 0,
659 1.16 marcus 229,231
660 1.24 ad };
661 1.24 ad
662 1.24 ad static const u_int8_t ibm437_chars_32[] = {
663 1.16 marcus 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
664 1.16 marcus 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
665 1.16 marcus 0, 0, 0, 0, 0, 0, 0, 0, 158
666 1.24 ad };
667 1.24 ad
668 1.24 ad static const u_int8_t ibm437_chars_34[] = {
669 1.16 marcus 237, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
670 1.16 marcus 0, 0, 0, 248,250,251, 0, 0, 0, 236, 0, 0, 0, 0, 0, 0,
671 1.16 marcus 0, 0, 0, 0, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
672 1.16 marcus 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
673 1.16 marcus 0, 0, 0, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
674 1.16 marcus 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,240, 0, 0,243,
675 1.16 marcus 242
676 1.24 ad };
677 1.24 ad
678 1.24 ad static const u_int8_t ibm437_chars_35[] = {
679 1.16 marcus 169, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
680 1.16 marcus 244,245
681 1.24 ad };
682 1.24 ad
683 1.24 ad static const u_int8_t ibm437_chars_37[] = {
684 1.16 marcus 196,205,179,186, 0, 0, 0, 0, 0, 0, 0, 0, 218,213,214,201,
685 1.16 marcus 191,184,183,187,192,212,211,200,217,190,189,188,195,198, 0, 0,
686 1.16 marcus 199, 0, 0, 204,180,181, 0, 0, 182, 0, 0, 185,194, 0, 0, 209,
687 1.16 marcus 210, 0, 0, 203,193, 0, 0, 207,208, 0, 0, 202,197, 0, 0, 216,
688 1.16 marcus 0, 0, 215, 0, 0, 0, 0, 0, 0, 0, 0, 206, 0, 0, 0, 0,
689 1.16 marcus 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
690 1.16 marcus 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
691 1.16 marcus 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
692 1.16 marcus 223, 0, 0, 0, 220, 0, 0, 0, 219, 0, 0, 0, 221, 0, 0, 0,
693 1.16 marcus 222,176,177,178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
694 1.16 marcus 254
695 1.16 marcus };
696 1.16 marcus
697 1.24 ad static const struct wsfont_level2_glyphmap ibm437_level2_0 =
698 1.24 ad { 0, 256, ibm437_chars_0, 1 };
699 1.24 ad
700 1.24 ad static const struct wsfont_level2_glyphmap ibm437_level2_1 =
701 1.24 ad { 146, 1, ibm437_chars_1, 1 };
702 1.24 ad
703 1.24 ad static const struct wsfont_level2_glyphmap ibm437_level2_3 =
704 1.24 ad { 147, 50, ibm437_chars_3, 1 };
705 1.24 ad
706 1.24 ad static const struct wsfont_level2_glyphmap ibm437_level2_32 =
707 1.24 ad { 127, 41, ibm437_chars_32, 1 };
708 1.24 ad
709 1.24 ad static const struct wsfont_level2_glyphmap ibm437_level2_34 =
710 1.24 ad { 5, 97, ibm437_chars_34, 1 };
711 1.24 ad
712 1.24 ad static const struct wsfont_level2_glyphmap ibm437_level2_35 =
713 1.24 ad { 16, 18, ibm437_chars_35, 1 };
714 1.16 marcus
715 1.24 ad static const struct wsfont_level2_glyphmap ibm437_level2_37 =
716 1.24 ad { 0, 161, ibm437_chars_37, 1 };
717 1.24 ad
718 1.24 ad static const struct wsfont_level2_glyphmap *ibm437_level1[] = {
719 1.16 marcus &ibm437_level2_0, &ibm437_level2_1, NULL, &ibm437_level2_3,
720 1.16 marcus NULL, NULL, NULL, NULL,
721 1.16 marcus NULL, NULL, NULL, NULL,
722 1.16 marcus NULL, NULL, NULL, NULL,
723 1.16 marcus NULL, NULL, NULL, NULL,
724 1.16 marcus NULL, NULL, NULL, NULL,
725 1.16 marcus NULL, NULL, NULL, NULL,
726 1.16 marcus NULL, NULL, NULL, NULL,
727 1.16 marcus &ibm437_level2_32, NULL, &ibm437_level2_34, &ibm437_level2_35,
728 1.16 marcus NULL, &ibm437_level2_37
729 1.16 marcus };
730 1.16 marcus
731 1.16 marcus /*
732 1.16 marcus * ISO-8859-7 maps
733 1.16 marcus */
734 1.24 ad static const u_int8_t iso7_chars_0[] = {
735 1.16 marcus 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
736 1.16 marcus 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
737 1.16 marcus 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
738 1.16 marcus 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
739 1.16 marcus 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
740 1.16 marcus 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
741 1.16 marcus 96, 97, 98, 99, 100,101,102,103,104,105,106,107,108,109,110,111,
742 1.16 marcus 112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
743 1.16 marcus 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
744 1.16 marcus 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
745 1.16 marcus 160, 0, 0, 163, 0, 0, 166,167,168,169, 0, 171,172,173, 0, 0,
746 1.16 marcus 176,177,178,179,180, 0, 0, 183, 0, 0, 0, 187, 0, 189
747 1.24 ad };
748 1.24 ad
749 1.24 ad static const u_int8_t iso7_chars_3[] = {
750 1.16 marcus 182, 0, 184,185,186, 0, 188, 0, 190,191,192,193,194,195,196,197,
751 1.16 marcus 198,199,200,201,202,203,204,205,206,207,208,209, 0, 211,212,213,
752 1.16 marcus 214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,
753 1.16 marcus 230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,
754 1.16 marcus 246,247,248,249,250,251,252,253,254, 0, 0, 0, 0, 0, 0, 0,
755 1.16 marcus 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
756 1.16 marcus 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 181
757 1.24 ad };
758 1.24 ad
759 1.24 ad static const u_int8_t iso7_chars_32[] = {
760 1.16 marcus 175, 0, 0, 0, 0, 162, 0, 161
761 1.16 marcus };
762 1.16 marcus
763 1.24 ad static const struct wsfont_level2_glyphmap iso7_level2_0 =
764 1.24 ad { 0, 190, iso7_chars_0, 1 };
765 1.24 ad
766 1.24 ad static const struct wsfont_level2_glyphmap iso7_level2_3 =
767 1.24 ad { 134, 111, iso7_chars_3, 1 };
768 1.16 marcus
769 1.24 ad static const struct wsfont_level2_glyphmap iso7_level2_32 =
770 1.24 ad { 20, 8, iso7_chars_32, 1 };
771 1.24 ad
772 1.24 ad static const struct wsfont_level2_glyphmap *iso7_level1[] = {
773 1.16 marcus &iso7_level2_0, NULL, NULL, &iso7_level2_3,
774 1.16 marcus NULL, NULL, NULL, NULL,
775 1.16 marcus NULL, NULL, NULL, NULL,
776 1.16 marcus NULL, NULL, NULL, NULL,
777 1.16 marcus NULL, NULL, NULL, NULL,
778 1.16 marcus NULL, NULL, NULL, NULL,
779 1.16 marcus NULL, NULL, NULL, NULL,
780 1.16 marcus NULL, NULL, NULL, NULL,
781 1.16 marcus &iso7_level2_32
782 1.16 marcus };
783 1.16 marcus
784 1.24 ad static const struct wsfont_level1_glyphmap encodings[] = {
785 1.16 marcus { NULL, 0, 0 }, /* WSDISPLAY_FONTENC_ISO */
786 1.16 marcus { ibm437_level1, 0, 38 }, /* WSDISPLAY_FONTENC_IBM */
787 1.16 marcus { NULL, 0, 0 }, /* WSDISPLAY_FONTENC_PCVT */
788 1.16 marcus { iso7_level1, 0, 33 }, /* WSDISPLAY_FONTENC_ISO7 */
789 1.16 marcus };
790 1.16 marcus
791 1.19 enami #define MAX_ENCODING (sizeof(encodings) / sizeof(encodings[0]))
792 1.16 marcus
793 1.16 marcus /*
794 1.16 marcus * Remap Unicode character to glyph
795 1.16 marcus */
796 1.16 marcus int
797 1.22 augustss wsfont_map_unichar(struct wsdisplay_font *font, int c)
798 1.16 marcus {
799 1.24 ad const struct wsfont_level1_glyphmap *map1;
800 1.24 ad const struct wsfont_level2_glyphmap *map2;
801 1.24 ad int hi, lo;
802 1.16 marcus
803 1.24 ad if (font->encoding == WSDISPLAY_FONTENC_ISO)
804 1.24 ad return (c);
805 1.16 marcus
806 1.41 chris if (font->encoding < 0 || font->encoding >= MAX_ENCODING)
807 1.24 ad return (-1);
808 1.16 marcus
809 1.24 ad hi = (c >> 8);
810 1.24 ad lo = c & 255;
811 1.24 ad map1 = &encodings[font->encoding];
812 1.24 ad
813 1.24 ad if (hi < map1->base || hi >= map1->base + map1->size)
814 1.16 marcus return (-1);
815 1.16 marcus
816 1.24 ad map2 = map1->level2[hi - map1->base];
817 1.16 marcus
818 1.24 ad if (map2 == NULL || lo < map2->base || lo >= map2->base + map2->size)
819 1.24 ad return (-1);
820 1.16 marcus
821 1.24 ad lo -= map2->base;
822 1.16 marcus
823 1.24 ad switch(map2->width) {
824 1.24 ad case 1:
825 1.24 ad c = (((const u_int8_t *)map2->chars)[lo]);
826 1.24 ad break;
827 1.24 ad case 2:
828 1.24 ad c = (((const u_int16_t *)map2->chars)[lo]);
829 1.24 ad break;
830 1.24 ad case 4:
831 1.24 ad c = (((const u_int32_t *)map2->chars)[lo]);
832 1.24 ad break;
833 1.24 ad }
834 1.16 marcus
835 1.24 ad if (c == 0 && lo != 0)
836 1.24 ad return (-1);
837 1.16 marcus
838 1.24 ad return (c);
839 1.1 ad }
840