ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/defaultfont.C
(Generate patch)

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.18 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.56 by root, Mon Aug 2 04:42:11 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: defaultfont.C 2 * File: defaultfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003 Marc Lehmann rxvt@plan9.de> 4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
24#include "defaultfont.h" 24#include "defaultfont.h"
25 25
26#include <cstdlib> 26#include <cstdlib>
27 27
28#define DISPLAY r->display->display 28#define DISPLAY r->display->display
29#define DRAWABLE r->TermWin.vt
30#define GC r->TermWin.gc 29#define TGC r->TermWin.gc
31 30
32const struct rxvt_fallback_font { 31const struct rxvt_fallback_font {
33 codeset cs; 32 codeset cs;
34 const char *name; 33 const char *name;
35} fallback_fonts[] = { 34} fallback_fonts[] = {
36 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
38 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
39 38
40#if ENCODING_EU 39#if ENCODING_EU
41 // cyrillic 40 // cyrillic
42 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
43 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
44 43
45 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
46 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
47 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
48 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
49 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
50 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, 49 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" },
51 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, 50 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" },
52 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, 51 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" },
53 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, 52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },
54 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, 53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },
55 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
56 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
57 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
58#endif 57#endif
59 58
60 // japanese 59 // japanese
61#if ENCODING_JP || ENCODING_JP_EXT 60#if ENCODING_JP || ENCODING_JP_EXT
62# if XFT 61# if XFT
63 // prefer xft for complex scripts 62 // prefer xft for complex scripts
64 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, 63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
65# endif 64# endif
66 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
67 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
68 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
69 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
70 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
69#endif 71#endif
70 72
71#if ENCODING_CN || ENCODING_CN_EXT 73#if ENCODING_CN || ENCODING_CN_EXT
72# if XFT 74# if XFT
73 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 75 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
74 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 76 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
75 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 77 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
76 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 78 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
77# endif 79# endif
80 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
81 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
82 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 83 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
79 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 84 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
80 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 85 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
81 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 86 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
82 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 87 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
83 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, 88 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
84 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, 89 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
85 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, 90 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
86 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, 91 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
87#endif 92#endif
88 93
89#if XFT 94#if XFT
90 { CS_UNICODE, "xft:Andale Mono" }, 95 { CS_UNICODE, "xft:Andale Mono" },
91 { CS_UNICODE, "xft:Arial Unicode MS" }, 96 { CS_UNICODE, "xft:Arial Unicode MS" },
97 { CS_UNICODE, "xft:FreeMono" },
92#endif 98#endif
93 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
94 { CS_UNICODE, "xft:FreeMono" },
95 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 100 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 101 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
97 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 102 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
98 103
104#if UNICODE_3 && XFT
105 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
106#endif
107
99 { CS_UNKNOWN, 0 } 108 { CS_UNKNOWN, 0 }
100}; 109};
101 110
102///////////////////////////////////////////////////////////////////////////// 111/////////////////////////////////////////////////////////////////////////////
103 112
113#if XFT
114rxvt_drawable::~rxvt_drawable ()
115{
116 if (xftdrawable)
117 XftDrawDestroy (xftdrawable);
118}
119
120rxvt_drawable::operator XftDraw *()
121{
122 if (!xftdrawable)
123 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
124
125 return xftdrawable;
126}
127#endif
128
129/////////////////////////////////////////////////////////////////////////////
130
104static void *enc_buf; 131static void *enc_buf;
105static uint32_t enc_len; 132static uint32_t enc_len;
106 133
107static inline void * 134static inline void *
108get_enc_buf (uint32_t len) 135get_enc_buf (uint32_t len)
109{ 136{
110 if (len > enc_len) 137 if (len > enc_len)
111 { 138 {
112 free (enc_buf); 139 free (enc_buf);
113 enc_buf = malloc (len); 140 enc_buf = malloc (len);
141 enc_len = len;
114 } 142 }
115 143
116 return enc_buf; 144 return enc_buf;
117} 145}
118 146
… …
161} 189}
162 190
163///////////////////////////////////////////////////////////////////////////// 191/////////////////////////////////////////////////////////////////////////////
164 192
165void 193void
166rxvt_font::clear_rect (int x, int y, int w, int h, int color) 194rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
167{ 195{
168 if (color == Color_bg) 196 if (color == Color_bg)
169 XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); 197 XClearArea (d.display->display, d, x, y, w, h, FALSE);
170 else if (color >= 0) 198 else if (color >= 0)
171 { 199 {
200#if XFT
201 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
202#else
172 XSetForeground (DISPLAY, GC, r->PixColors[color]); 203 XSetForeground (d.display->display, TGC, r->PixColors[color]);
173 XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); 204 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
205#endif
174 } 206 }
175} 207}
176 208
177static const char *linedraw_cmds[128] = { 209#include "table/linedraw.h"
178 "1hH", "2hH", "1vV", "2vV",
179 0, 0, 0, 0,
180 0, 0, 0, 0,
181 "1HV", "2H1V", "1H2V", "2HV",
182
183 // 2510
184 "1hV", "2h1V", "1h2V", "2hV",
185 "1Hv", "2H1v", "1H2v", "2Hv",
186 "1hv", "2h1v", "1h2v", "2hv",
187 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
188
189 // 2520
190 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
191 "1hvV", "2h1vV", "1hV2v", "1hv2V",
192 "1h2vV", "2hv1V", "1v2hV", "2hvV",
193 "1hHV", "2h1HV", "2H1hV", "2hH1V",
194
195 // 2530
196 "1hH2V", "2hV1H", "1h2HV", "2hHV",
197 "1hHv", "1vH2h", "1hv2H", "1v2hH",
198 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
199 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
200
201 // 2540
202 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
203 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
204 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
205 0, 0, 0, 0,
206
207 // 2550
208 0, 0, 0, 0,
209 0, 0, 0, 0,
210 0, 0, 0, 0,
211 0, 0, 0, 0,
212
213 // 2560
214 0, 0, 0, 0,
215 0, 0, 0, 0,
216 0, 0, 0, 0,
217 0, 0, 0, 0,
218
219 // 2570
220 0, "1a", "1b", "1ab",
221 "1h", "1v", "1H", "1V",
222 "2h", "2v", "2H", "2V",
223 "1h2H", "1v2V", "1H2h", "1V2v"
224
225 // to be done
226};
227 210
228struct rxvt_font_default : rxvt_font { 211struct rxvt_font_default : rxvt_font {
212
229 rxvt_fontprop properties () 213 rxvt_fontprop properties ()
230 { 214 {
231 rxvt_fontprop p; 215 rxvt_fontprop p;
232 216
233 p.width = p.height = 1; 217 p.width = p.height = 1;
… …
240 bool load (const rxvt_fontprop &prop) 224 bool load (const rxvt_fontprop &prop)
241 { 225 {
242 width = 1; height = 1; 226 width = 1; height = 1;
243 ascent = 1; descent = 0; 227 ascent = 1; descent = 0;
244 228
229 set_name (strdup ("built-in pseudofont"));
230
245 return true; 231 return true;
246 } 232 }
247 233
248 bool has_codepoint (uint32_t unicode) 234 bool has_codepoint (unicode_t unicode)
249 { 235 {
250 if (unicode <= 0x001f) 236 if (unicode <= 0x001f)
251 return true; 237 return true;
252 if (unicode >= 0x0080 && unicode <= 0x009f) 238
239 if (unicode <= 0x007f)
240 return false;
241
242 if (unicode <= 0x009f)
253 return true; 243 return true;
254 244
255 if (unicode >= 0x2500 && unicode <= 0x257f 245 if (unicode >= 0x2500 && unicode <= 0x259f)
256 && linedraw_cmds[unicode - 0x2500]) 246 return true;
247
248 if (IS_COMPOSE (unicode))
257 return true; 249 return true;
258 250
259 switch (unicode) 251 switch (unicode)
260 { 252 {
261 case ZERO_WIDTH_CHAR: 253 case ZERO_WIDTH_CHAR:
… …
263 } 255 }
264 256
265 return false; 257 return false;
266 } 258 }
267 259
268 void draw (int x, int y, 260 void draw (rxvt_drawable &d, int x, int y,
269 const text_t *text, int len, 261 const text_t *text, int len,
270 int fg, int bg); 262 int fg, int bg);
271}; 263};
272 264
273void 265void
274rxvt_font_default::draw (int x, int y, 266rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
275 const text_t *text, int len, 267 const text_t *text, int len,
276 int fg, int bg) 268 int fg, int bg)
277{ 269{
278 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 270 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
279 271
280 XSetForeground (DISPLAY, GC, r->PixColors[fg]); 272 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
281 273
282 while (len--) 274 while (len--)
283 { 275 {
276#if ENABLE_COMBINING
277 compose_char *cc;
278#endif
284 text_t t = *text++; 279 text_t t = *text++;
285 280
286 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 281 if (0x2500 <= t && t <= 0x259f)
282 {
283 uint16_t offs = linedraw_offs[t - 0x2500];
284 uint32_t *a = linedraw_command + (offs >> 4);
285 uint32_t *b = a + (offs & 15);
286
287 int W = r->TermWin.fwidth;
288 int H = r->TermWin.fheight;
289
290 int x_[16];
291 int y_[16];
292
293 for (int i = 0; i <= 8; i++)
287 { 294 {
288 const char *p = linedraw_cmds[t - 0x2500]; 295 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
296 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
297 }
289 298
290 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; 299 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
291 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 300 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
292 301
293 XGCValues gcv; 302 XGCValues gcv;
294 303
304 gcv.cap_style = CapButt;
305 gcv.line_width = 0;
306 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
307
295 while (*p) 308 while (a < b)
296 { 309 {
310 uint32_t command = *a++;
311
312 int op = (command >> 24) & 255;
313 int a = (command >> 20) & 15;
314 int b = (command >> 16) & 15;
315 int x1 = x_[(command >> 12) & 15];
316 int y1 = y_[(command >> 8) & 15];
317 int x2 = x_[(command >> 4) & 15];
318 int y2 = y_[(command >> 0) & 15];
319
297 switch (*p++) 320 switch (op)
298 { 321 {
299 case '1': 322 case 0: // line
300 gcv.line_width = 0; 323 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
301 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
302 break; 324 break;
303 325
304 case '2': 326 case 1: // rectangle, possibly stippled
327 if (a)
328 {
329 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
330
331 gcv.fill_style = FillStippled;
332 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
333 gcv.ts_x_origin = x;
334 gcv.ts_y_origin = y;
335
336 XChangeGC (d.display->display, TGC,
337 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
338 &gcv);
339 }
340
341 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
342
343 if (a)
344 {
345 XFreePixmap (d.display->display, gcv.stipple);
305 gcv.line_width = 2; 346 gcv.stipple = 0;
306 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 347 gcv.fill_style = FillSolid;
348 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
349 }
307 break; 350 break;
308 351 case 2: // arc
309 case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; 352 XDrawArc (d.display->display, d, TGC,
310 case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; 353 x1 - W/2, y1 - H/2, W-1, H-1,
311 case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; 354 (a - 1) * 90*64, (b - 1) * 90*64);
312 case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; 355 break;
313 case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;
314 case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;
315 } 356 }
316 } 357 }
317 358 }
318 gcv.line_width = 0; 359#if ENABLE_COMBINING
319 XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); 360 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
320 } 361 {
362 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
363 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
364 if (cc->c2 != NOCHAR)
365 {
366 // prefer font of first character, for no good reasons
367 rxvt_font *f2 = f1->has_codepoint (cc->c2)
368 ? f1
369 : (*fs)[fs->find_font (cc->c2)];
370
371 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
372 }
373 }
374#endif
321 else 375 else
322 switch (*text++) 376 switch (t)
323 { 377 {
324 case NOCHAR:
325 case ZERO_WIDTH_CHAR: 378 case ZERO_WIDTH_CHAR:
326 break; 379 break;
380
327 default: 381 default:
328 XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 382 int w = 0;
383 while (len > 0 && *text == NOCHAR)
384 {
385 ++text;
386 --len;
387 w += r->TermWin.fwidth;
388 }
389
390 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
391 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
392 x += w;
329 } 393 }
330 394
331 x += r->TermWin.fwidth; 395 x += r->TermWin.fwidth;
332 } 396 }
333} 397}
… …
341 405
342 rxvt_fontprop properties (); 406 rxvt_fontprop properties ();
343 407
344 bool load (const rxvt_fontprop &prop); 408 bool load (const rxvt_fontprop &prop);
345 409
346 bool has_codepoint (uint32_t unicode); 410 bool has_codepoint (unicode_t unicode);
347 411
348 void draw (int x, int y, 412 void draw (rxvt_drawable &d, int x, int y,
349 const text_t *text, int len, 413 const text_t *text, int len,
350 int fg, int bg); 414 int fg, int bg);
351 415
352 XFontStruct *f; 416 XFontStruct *f;
353 codeset cs; 417 codeset cs;
354 bool enc2b, encm; 418 bool enc2b, encm;
355 419
356 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 420 char *get_property (XFontStruct *f, const char *property, const char *repl) const;
357 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 421 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
358 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 422 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
359 bool set_properties (rxvt_fontprop &p, const char *name); 423 bool set_properties (rxvt_fontprop &p, const char *name);
360}; 424};
361 425
362const char * 426char *
363rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 427rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
364{ 428{
365 unsigned long value; 429 unsigned long value;
366 430
367 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 431 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
368 return XGetAtomName (DISPLAY, value); 432 return XGetAtomName (DISPLAY, value);
369 else 433 else
370 return repl; 434 return rxvt_strdup (repl);
371} 435}
372 436
373rxvt_fontprop 437rxvt_fontprop
374rxvt_font_x11::properties () 438rxvt_font_x11::properties ()
375{ 439{
… …
390} 454}
391 455
392bool 456bool
393rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 457rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
394{ 458{
395 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
396 const char *slant = get_property (f, "SLANT", "r");
397
398 unsigned long height; 459 unsigned long height;
399 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
400 return false; 461 return false;
401 462
402 unsigned long avgwidth; 463 unsigned long avgwidth;
403 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 464 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
404 avgwidth = 0; 465 avgwidth = 0;
405 466
467 char *weight = get_property (f, "WEIGHT_NAME", "medium");
468 char *slant = get_property (f, "SLANT", "r");
469
406 return set_properties (p, height, weight, slant, avgwidth); 470 set_properties (p, height, weight, slant, avgwidth);
471
472 free (weight);
473 free (slant);
474
475 return true;
407} 476}
408 477
409bool 478bool
410rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 479rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
411{ 480{
412 int slashes = 0; 481 int slashes = 0;
413 const char *comp[12]; 482 const char *comp[13];
414 483
415 for (const char *c = name; *c; c++) 484 for (const char *c = name; *c; c++)
416 if (*c == '-') 485 if (*c == '-')
417 { 486 {
418 comp[slashes++] = c + 1; 487 comp[slashes++] = c + 1;
… …
428 497
429 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 498 XFontStruct *f = XLoadQueryFont (DISPLAY, name);
430 499
431 if (f) 500 if (f)
432 { 501 {
433 // the font should really exists now. if not, we have a problem 502 // the font should really exist now. if not, we have a problem
434 // (e.g. if the user did xset fp rehash just when we were searching fonts). 503 // (e.g. if the user did xset fp rehash just when we were searching fonts).
435 // in that case, just return garbage. 504 // in that case, just return garbage.
436 bool ret = set_properties (p, f); 505 bool ret = set_properties (p, f);
437 XFreeFont (DISPLAY, f); 506 XFreeFont (DISPLAY, f);
438 return ret; 507 return ret;
… …
515 f = XLoadQueryFont (DISPLAY, name); 584 f = XLoadQueryFont (DISPLAY, name);
516 585
517 if (!f) 586 if (!f)
518 return false; 587 return false;
519 588
520 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 589 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
521 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 590 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
522 591
523 if (registry && encoding) 592 if (registry && encoding)
524 { 593 {
525 char charset[64]; 594 char charset[64];
526 snprintf (charset, 64, "%s-%s", registry, encoding); 595 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
539 if (*charset++ == '-' && !--count) 608 if (*charset++ == '-' && !--count)
540 break; 609 break;
541 610
542 cs = codeset_from_name (charset); 611 cs = codeset_from_name (charset);
543 } 612 }
613
614 free (registry);
615 free (encoding);
544 616
545 if (cs == CS_UNICODE) 617 if (cs == CS_UNICODE)
546 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 618 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
547 619
548 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 620 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
598 f = 0; 670 f = 0;
599 } 671 }
600} 672}
601 673
602bool 674bool
603rxvt_font_x11::has_codepoint (uint32_t unicode) 675rxvt_font_x11::has_codepoint (unicode_t unicode)
604{ 676{
605 uint32_t ch = FROM_UNICODE (cs, unicode); 677 uint32_t ch = FROM_UNICODE (cs, unicode);
606 678
607 if (ch == NOCHAR) 679 if (ch == NOCHAR)
608 return false; 680 return false;
… …
644 716
645 return true; 717 return true;
646} 718}
647 719
648void 720void
649rxvt_font_x11::draw (int x, int y, 721rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
650 const text_t *text, int len, 722 const text_t *text, int len,
651 int fg, int bg) 723 int fg, int bg)
652{ 724{
653 // this looks like a mess /. 725 // this looks like a mess /.
654 // and it is a mess /. 726 // and it is a mess /.
… …
661 733
662 int base = r->TermWin.fbase; 734 int base = r->TermWin.fbase;
663 735
664 XGCValues v; 736 XGCValues v;
665 v.foreground = r->PixColors[fg]; 737 v.foreground = r->PixColors[fg];
666 v.background = r->PixColors[bg];
667 v.font = f->fid; 738 v.font = f->fid;
668 739
669 if (enc2b) 740 if (enc2b)
670 { 741 {
671 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 742 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
672 743
673 if (bg == Color_bg && !slow) 744 if (bg == Color_bg && !slow)
674 { 745 {
746 v.background = r->PixColors[bg];
675 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 747 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
676 XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 748 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
677 } 749 }
678 else 750 else
679 { 751 {
680 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 752 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
681 753
682 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 754 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
683 755
684 if (slow) 756 if (slow)
685 { 757 {
686 do 758 do
687 { 759 {
688 if (xc->byte1 || xc->byte2) 760 if (xc->byte1 || xc->byte2)
689 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 761 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
690 762
691 x += r->TermWin.fwidth; 763 x += r->TermWin.fwidth;
692 xc++; len--; 764 xc++; len--;
693 } 765 }
694 while (len); 766 while (len);
695 } 767 }
696 else 768 else
697 XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 769 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
698 } 770 }
699 } 771 }
700 else 772 else
701 { 773 {
702 const char *xc = enc_char (text, len, cs, slow); 774 const char *xc = enc_char (text, len, cs, slow);
703 775
704 if (bg == Color_bg && !slow) 776 if (bg == Color_bg && !slow)
705 { 777 {
778 v.background = r->PixColors[bg];
706 XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); 779 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
707 XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 780 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
708 } 781 }
709 else 782 else
710 { 783 {
711 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 784 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
712 785
713 XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); 786 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
714 787
715 if (slow) 788 if (slow)
716 { 789 {
717 do 790 do
718 { 791 {
719 if (*xc) 792 if (*xc)
720 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); 793 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
721 794
722 x += r->TermWin.fwidth; 795 x += r->TermWin.fwidth;
723 xc++; len--; 796 xc++; len--;
724 } 797 }
725 while (len); 798 while (len);
726 } 799 }
727 else 800 else
728 XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); 801 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
729 } 802 }
730 } 803 }
731} 804}
732 805
733///////////////////////////////////////////////////////////////////////////// 806/////////////////////////////////////////////////////////////////////////////
… …
738//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables 811//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
739#define SWATHBITS 8 812#define SWATHBITS 8
740#endif 813#endif
741 814
742struct rxvt_font_xft : rxvt_font { 815struct rxvt_font_xft : rxvt_font {
743 rxvt_font_xft () { f = 0; d = 0; } 816 rxvt_font_xft () { f = 0; }
744 817
745 void clear (); 818 void clear ();
746 819
747 rxvt_fontprop properties (); 820 rxvt_fontprop properties ();
748 821
749 bool load (const rxvt_fontprop &prop); 822 bool load (const rxvt_fontprop &prop);
750 823
751 void draw (int x, int y, 824 void draw (rxvt_drawable &d, int x, int y,
752 const text_t *text, int len, 825 const text_t *text, int len,
753 int fg, int bg); 826 int fg, int bg);
754 827
755 bool has_codepoint (uint32_t unicode); 828 bool has_codepoint (unicode_t unicode);
756 829
757protected: 830protected:
758 XftFont *f; 831 XftFont *f;
759 XftDraw *d;
760}; 832};
761 833
762void 834void
763rxvt_font_xft::clear () 835rxvt_font_xft::clear ()
764{ 836{
765 if (f) 837 if (f)
766 { 838 {
767 XftFontClose (DISPLAY, f); 839 XftFontClose (DISPLAY, f);
768 f = 0; 840 f = 0;
769 }
770
771 if (d)
772 {
773 XftDrawDestroy (d);
774 d = 0;
775 } 841 }
776} 842}
777 843
778rxvt_fontprop 844rxvt_fontprop
779rxvt_font_xft::properties () 845rxvt_font_xft::properties ()
… …
880 946
881 return true; 947 return true;
882} 948}
883 949
884bool 950bool
885rxvt_font_xft::has_codepoint (uint32_t unicode) 951rxvt_font_xft::has_codepoint (unicode_t unicode)
886{ 952{
887 return XftCharExists (DISPLAY, f, unicode); 953 return XftCharExists (DISPLAY, f, unicode);
888} 954}
889 955
890void 956void
891rxvt_font_xft::draw (int x, int y, 957rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
892 const text_t *text, int len, 958 const text_t *text, int len,
893 int fg, int bg) 959 int fg, int bg)
894{ 960{
895 if (!d)
896 d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap);
897
898 if (bg >= 0 && bg != Color_bg)
899 XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
900 else
901 clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 961 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
902 962
903 if (!slow && width == r->TermWin.fwidth && 0) 963 if (!slow && width == r->TermWin.fwidth && 0)
904 { 964 {
905 if (sizeof (text_t) == sizeof (FcChar16)) 965 if (sizeof (text_t) == sizeof (FcChar16))
906 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); 966 XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
… …
918 fwidth *= 2; 978 fwidth *= 2;
919 979
920 XGlyphInfo extents; 980 XGlyphInfo extents;
921 if (sizeof (text_t) == sizeof (FcChar16)) 981 if (sizeof (text_t) == sizeof (FcChar16))
922 { 982 {
923 XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); 983 XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
924 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 984 XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
925 y + r->TermWin.fbase, (const FcChar16 *)text, 1); 985 y + r->TermWin.fbase, (const FcChar16 *)text, 1);
926 } 986 }
927 else 987 else
928 { 988 {
929 XGlyphInfo extents; 989 XGlyphInfo extents;
930 XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); 990 XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
931 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, 991 XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
932 y + r->TermWin.fbase, (const FcChar32 *)text, 1); 992 y + r->TermWin.fbase, (const FcChar32 *)text, 1);
933 } 993 }
934 } 994 }
935 995
… …
942#endif 1002#endif
943 1003
944///////////////////////////////////////////////////////////////////////////// 1004/////////////////////////////////////////////////////////////////////////////
945 1005
946rxvt_fontset::rxvt_fontset (rxvt_t r) 1006rxvt_fontset::rxvt_fontset (rxvt_t r)
947: r (r) 1007: r (r), fontdesc (0)
948{ 1008{
949 clear (); 1009 clear ();
950} 1010}
951 1011
952rxvt_fontset::~rxvt_fontset () 1012rxvt_fontset::~rxvt_fontset ()
… …
957void 1017void
958rxvt_fontset::clear () 1018rxvt_fontset::clear ()
959{ 1019{
960 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1020 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
961 FONT_UNREF (*i); 1021 FONT_UNREF (*i);
1022
1023 free (fontdesc); fontdesc = 0;
962 1024
963 fonts.clear (); 1025 fonts.clear ();
964 base_id = 0; 1026 base_id = 0;
965 base_prop.height = 0x7fffffff; 1027 base_prop.height = 0x7fffffff;
966 base_prop.weight = rxvt_fontprop::medium; 1028 base_prop.weight = rxvt_fontprop::medium;
… …
992 f = new rxvt_font_x11; 1054 f = new rxvt_font_x11;
993 } 1055 }
994 else 1056 else
995 f = new rxvt_font_x11; 1057 f = new rxvt_font_x11;
996 1058
1059 f->fs = this;
997 f->set_term (r); 1060 f->set_term (r);
998 f->set_name (strdup (name)); 1061 f->set_name (strdup (name));
999 1062
1000 f->cs = cs; 1063 f->cs = cs;
1001 f->loaded = false; 1064 f->loaded = false;
… …
1068 } 1131 }
1069 1132
1070 return true; 1133 return true;
1071} 1134}
1072 1135
1073void 1136bool
1074rxvt_fontset::populate (const char *desc) 1137rxvt_fontset::populate (const char *desc)
1075{ 1138{
1076 clear (); 1139 clear ();
1140
1141 fontdesc = strdup (desc);
1077 1142
1078 fonts.push_back (new_font (0, CS_UNICODE)); 1143 fonts.push_back (new_font (0, CS_UNICODE));
1079 realize_font (0); 1144 realize_font (0);
1080 1145
1081 add_fonts (desc); 1146 add_fonts (desc);
… …
1090 add_fonts ("fixed"); 1155 add_fonts ("fixed");
1091 base_id = fonts.size () - 1; 1156 base_id = fonts.size () - 1;
1092 } 1157 }
1093 1158
1094 if ((int)fonts.size () <= base_id || !realize_font (base_id)) 1159 if ((int)fonts.size () <= base_id || !realize_font (base_id))
1095 { 1160 return false;
1096 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1097 exit (1);
1098 }
1099 1161
1100 base_prop = fonts[base_id]->properties (); 1162 base_prop = fonts[base_id]->properties ();
1163
1164 return true;
1101} 1165}
1102 1166
1103int 1167int
1104rxvt_fontset::find_font (uint32_t unicode) 1168rxvt_fontset::find_font (unicode_t unicode, bool bold)
1105{ 1169{
1106 for (unsigned int i = 0; i < fonts.size (); i++) 1170 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1171 i < fonts.size ();
1172 i++)
1107 { 1173 {
1108 rxvt_font *f = fonts[i]; 1174 rxvt_font *f = fonts[i];
1109 1175
1110 if (!f->loaded) 1176 if (!f->loaded)
1111 { 1177 {
… …
1114 1180
1115 if (!realize_font (i)) 1181 if (!realize_font (i))
1116 goto next_font; 1182 goto next_font;
1117 } 1183 }
1118 1184
1185 if (f->cs == CS_UNKNOWN)
1186 goto next_font;
1187
1188 if (bold && f->properties ().weight < rxvt_fontprop::bold)
1189 goto next_font;
1190
1119 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1191 if (f->has_codepoint (unicode))
1120 return i; 1192 return i;
1121 1193
1122 next_font: 1194 next_font:
1123 if (i == fonts.size () - 1 && fallback->name) 1195 if (i == fonts.size () - 1 && fallback->name)
1124 { 1196 {
… …
1126 fallback++; 1198 fallback++;
1127 i = 0; 1199 i = 0;
1128 } 1200 }
1129 } 1201 }
1130 1202
1203 // if no bold font found, use a regular one
1204 if (bold)
1205 return find_font (unicode);
1206
1131 return 0; /* we must return SOME font */ 1207 return 0; /* we must return SOME font */
1132} 1208}
1133 1209
1134 1210
1135 1211

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines