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.25 by pcg, Tue Feb 24 23:58:12 2004 UTC vs.
Revision 1.53 by root, Mon Jun 21 19:09:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
2 * File: defaultfont.C 2 * File: defaultfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
… …
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 GC r->TermWin.gc 29#define TGC r->TermWin.gc
30 30
31const struct rxvt_fallback_font { 31const struct rxvt_fallback_font {
32 codeset cs; 32 codeset cs;
33 const char *name; 33 const char *name;
34} fallback_fonts[] = { 34} fallback_fonts[] = {
35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 35 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 36 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 37 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
38 38
39#if ENCODING_EU 39#if ENCODING_EU
40 // cyrillic 40 // cyrillic
41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 41 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 42 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
43 43
44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 44 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 45 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 46 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 47 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 48 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
49 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" }, 49 { CS_ISO8859_7, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-7" },
50 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" }, 50 { CS_ISO8859_8, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-8" },
51 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" }, 51 { CS_ISO8859_9, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-9" },
52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" }, 52 { CS_ISO8859_10, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-10" },
53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" }, 53 { CS_ISO8859_11, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-11" },
54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 54 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 55 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 56 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
57#endif 57#endif
58 58
59 // japanese 59 // japanese
60#if ENCODING_JP || ENCODING_JP_EXT 60#if ENCODING_JP || ENCODING_JP_EXT
61# if XFT 61# if XFT
62 // prefer xft for complex scripts 62 // prefer xft for complex scripts
63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" }, 63 { CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
64# endif 64# endif
65 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 65 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
66 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 67 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
68#endif 68#endif
69 69
70#if ENCODING_CN || ENCODING_CN_EXT 70#if ENCODING_CN || ENCODING_CN_EXT
71# if XFT 71# if XFT
72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
73 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 73 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
74 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 74 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
75 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 75 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
76# endif 76# endif
77 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
78 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
79 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
77 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 80 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 81 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
79 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 82 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
80 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 83 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
81 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 84 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
82 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, 85 { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" },
83 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, 86 { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" },
84 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, 87 { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" },
85 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, 88 { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" },
86#endif 89#endif
87 90
88#if XFT 91#if XFT
89 { CS_UNICODE, "xft:Andale Mono" }, 92 { CS_UNICODE, "xft:Andale Mono" },
90 { CS_UNICODE, "xft:Arial Unicode MS" }, 93 { CS_UNICODE, "xft:Arial Unicode MS" },
94 { CS_UNICODE, "xft:FreeMono" },
91#endif 95#endif
92 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 96 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
93 { CS_UNICODE, "xft:FreeMono" },
94 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
95 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
97 100
101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
104
98 { CS_UNKNOWN, 0 } 105 { CS_UNKNOWN, 0 }
99}; 106};
100 107
101///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
102 109
110#if XFT
103rxvt_drawable::~rxvt_drawable () 111rxvt_drawable::~rxvt_drawable ()
104{ 112{
105 if (xftdrawable) 113 if (xftdrawable)
106 XftDrawDestroy (xftdrawable); 114 XftDrawDestroy (xftdrawable);
107} 115}
… …
111 if (!xftdrawable) 119 if (!xftdrawable)
112 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); 120 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
113 121
114 return xftdrawable; 122 return xftdrawable;
115} 123}
124#endif
116 125
117///////////////////////////////////////////////////////////////////////////// 126/////////////////////////////////////////////////////////////////////////////
118 127
119static void *enc_buf; 128static void *enc_buf;
120static uint32_t enc_len; 129static uint32_t enc_len;
… …
185 else if (color >= 0) 194 else if (color >= 0)
186 { 195 {
187#if XFT 196#if XFT
188 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
189#else 198#else
190 XSetForeground (d.display->display, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
191 XFillRectangle (d.display->display, d, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
192#endif 201#endif
193 } 202 }
194} 203}
195 204
196static const char *linedraw_cmds[128] = { 205#include "table/linedraw.h"
197 "1hH", "2hH", "1vV", "2vV",
198 0, 0, 0, 0,
199 0, 0, 0, 0,
200 "1HV", "2H1V", "1H2V", "2HV",
201
202 // 2510
203 "1hV", "2h1V", "1h2V", "2hV",
204 "1Hv", "2H1v", "1H2v", "2Hv",
205 "1hv", "2h1v", "1h2v", "2hv",
206 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
207
208 // 2520
209 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
210 "1hvV", "2h1vV", "1hV2v", "1hv2V",
211 "1h2vV", "2hv1V", "1v2hV", "2hvV",
212 "1hHV", "2h1HV", "2H1hV", "2hH1V",
213
214 // 2530
215 "1hH2V", "2hV1H", "1h2HV", "2hHV",
216 "1hHv", "1vH2h", "1hv2H", "1v2hH",
217 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
218 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
219
220 // 2540
221 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
222 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
223 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
224 0, 0, 0, 0,
225
226 // 2550
227 0, 0, 0, 0,
228 0, 0, 0, 0,
229 0, 0, 0, 0,
230 0, 0, 0, 0,
231
232 // 2560
233 0, 0, 0, 0,
234 0, 0, 0, 0,
235 0, 0, 0, 0,
236 0, 0, 0, 0,
237
238 // 2570
239 0, "1a", "1b", "1ab",
240 "1h", "1v", "1H", "1V",
241 "2h", "2v", "2H", "2V",
242 "1h2H", "1v2V", "1H2h", "1V2v"
243
244 // to be done
245};
246 206
247struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
248 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
249 { 210 {
250 rxvt_fontprop p; 211 rxvt_fontprop p;
251 212
252 p.width = p.height = 1; 213 p.width = p.height = 1;
… …
259 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
260 { 221 {
261 width = 1; height = 1; 222 width = 1; height = 1;
262 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
263 224
225 set_name (strdup ("built-in pseudofont"));
226
264 return true; 227 return true;
265 } 228 }
266 229
267 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
268 { 231 {
269 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
270 return true; 233 return true;
271 if (unicode >= 0x0080 && unicode <= 0x009f) 234
235 if (unicode <= 0x007f)
236 return false;
237
238 if (unicode <= 0x009f)
272 return true; 239 return true;
273 240
274 if (unicode >= 0x2500 && unicode <= 0x257f 241 if (unicode >= 0x2500 && unicode <= 0x259f)
275 && linedraw_cmds[unicode - 0x2500]) 242 return true;
243
244 if (IS_COMPOSE (unicode))
276 return true; 245 return true;
277 246
278 switch (unicode) 247 switch (unicode)
279 { 248 {
280 case ZERO_WIDTH_CHAR: 249 case ZERO_WIDTH_CHAR:
… …
294 const text_t *text, int len, 263 const text_t *text, int len,
295 int fg, int bg) 264 int fg, int bg)
296{ 265{
297 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 266 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
298 267
299 XSetForeground (d.display->display, GC, r->PixColors[fg]); 268 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
300 269
301 while (len--) 270 while (len--)
302 { 271 {
272#if ENABLE_COMBINING
273 compose_char *cc;
274#endif
303 text_t t = *text++; 275 text_t t = *text++;
304 276
305 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 277 if (0x2500 <= t && t <= 0x259f)
278 {
279 uint16_t offs = linedraw_offs[t - 0x2500];
280 uint32_t *a = linedraw_command + (offs >> 4);
281 uint32_t *b = a + (offs & 15);
282
283 int W = r->TermWin.fwidth;
284 int H = r->TermWin.fheight;
285
286 int x_[16];
287 int y_[16];
288
289 for (int i = 0; i <= 8; i++)
306 { 290 {
307 const char *p = linedraw_cmds[t - 0x2500]; 291 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
292 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
293 }
308 294
309 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1; 295 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
310 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1; 296 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
311 297
312 XGCValues gcv; 298 XGCValues gcv;
313 299
300 gcv.cap_style = CapButt;
301 gcv.line_width = 0;
302 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
303
314 while (*p) 304 while (a < b)
315 { 305 {
306 uint32_t command = *a++;
307
308 int op = (command >> 24) & 255;
309 int a = (command >> 20) & 15;
310 int b = (command >> 16) & 15;
311 int x1 = x_[(command >> 12) & 15];
312 int y1 = y_[(command >> 8) & 15];
313 int x2 = x_[(command >> 4) & 15];
314 int y2 = y_[(command >> 0) & 15];
315
316 switch (*p++) 316 switch (op)
317 { 317 {
318 case '1': 318 case 0: // line
319 gcv.line_width = 0; 319 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
320 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
321 break; 320 break;
322 321
323 case '2': 322 case 1: // rectangle, possibly stippled
323 if (a)
324 {
325 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
326
327 gcv.fill_style = FillStippled;
328 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
329 gcv.ts_x_origin = x;
330 gcv.ts_y_origin = y;
331
332 XChangeGC (d.display->display, TGC,
333 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
334 &gcv);
335 }
336
337 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
338
339 if (a)
340 {
341 XFreePixmap (d.display->display, gcv.stipple);
324 gcv.line_width = 2; 342 gcv.stipple = 0;
343 gcv.fill_style = FillSolid;
325 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 344 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
345 }
326 break; 346 break;
327 347 case 2: // arc
328 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 348 XDrawArc (d.display->display, d, TGC,
329 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 349 x1 - W/2, y1 - H/2, W-1, H-1,
330 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 350 (a - 1) * 90*64, (b - 1) * 90*64);
331 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 351 break;
332 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
333 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
334 } 352 }
335 } 353 }
336 354 }
337 gcv.line_width = 0; 355#if ENABLE_COMBINING
338 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 356 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
339 } 357 {
358 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
359 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
360 if (cc->c2 != NOCHAR)
361 {
362 // prefer font of first character, for no good reasons
363 rxvt_font *f2 = f1->has_codepoint (cc->c2)
364 ? f1
365 : (*fs)[fs->find_font (cc->c2)];
366
367 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
368 }
369 }
370#endif
340 else 371 else
341 switch (*text++) 372 switch (t)
342 { 373 {
343 case NOCHAR:
344 case ZERO_WIDTH_CHAR: 374 case ZERO_WIDTH_CHAR:
345 break; 375 break;
376
346 default: 377 default:
347 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 378 int w = 0;
379 while (len > 0 && *text == NOCHAR)
380 {
381 ++text;
382 --len;
383 w += r->TermWin.fwidth;
384 }
385
386 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
387 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
388 x += w;
348 } 389 }
349 390
350 x += r->TermWin.fwidth; 391 x += r->TermWin.fwidth;
351 } 392 }
352} 393}
… …
360 401
361 rxvt_fontprop properties (); 402 rxvt_fontprop properties ();
362 403
363 bool load (const rxvt_fontprop &prop); 404 bool load (const rxvt_fontprop &prop);
364 405
365 bool has_codepoint (uint32_t unicode); 406 bool has_codepoint (unicode_t unicode);
366 407
367 void draw (rxvt_drawable &d, int x, int y, 408 void draw (rxvt_drawable &d, int x, int y,
368 const text_t *text, int len, 409 const text_t *text, int len,
369 int fg, int bg); 410 int fg, int bg);
370 411
371 XFontStruct *f; 412 XFontStruct *f;
372 codeset cs; 413 codeset cs;
373 bool enc2b, encm; 414 bool enc2b, encm;
374 415
375 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 416 char *get_property (XFontStruct *f, const char *property, const char *repl) const;
376 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 417 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
377 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 418 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
378 bool set_properties (rxvt_fontprop &p, const char *name); 419 bool set_properties (rxvt_fontprop &p, const char *name);
379}; 420};
380 421
381const char * 422char *
382rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 423rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
383{ 424{
384 unsigned long value; 425 unsigned long value;
385 426
386 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
387 return XGetAtomName (DISPLAY, value); 428 return XGetAtomName (DISPLAY, value);
388 else 429 else
389 return repl; 430 return rxvt_strdup (repl);
390} 431}
391 432
392rxvt_fontprop 433rxvt_fontprop
393rxvt_font_x11::properties () 434rxvt_font_x11::properties ()
394{ 435{
… …
409} 450}
410 451
411bool 452bool
412rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
413{ 454{
414 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
415 const char *slant = get_property (f, "SLANT", "r");
416
417 unsigned long height; 455 unsigned long height;
418 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
419 return false; 457 return false;
420 458
421 unsigned long avgwidth; 459 unsigned long avgwidth;
422 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
423 avgwidth = 0; 461 avgwidth = 0;
424 462
463 char *weight = get_property (f, "WEIGHT_NAME", "medium");
464 char *slant = get_property (f, "SLANT", "r");
465
425 return set_properties (p, height, weight, slant, avgwidth); 466 set_properties (p, height, weight, slant, avgwidth);
467
468 free (weight);
469 free (slant);
470
471 return true;
426} 472}
427 473
428bool 474bool
429rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 475rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
430{ 476{
431 int slashes = 0; 477 int slashes = 0;
432 const char *comp[12]; 478 const char *comp[13];
433 479
434 for (const char *c = name; *c; c++) 480 for (const char *c = name; *c; c++)
435 if (*c == '-') 481 if (*c == '-')
436 { 482 {
437 comp[slashes++] = c + 1; 483 comp[slashes++] = c + 1;
… …
534 f = XLoadQueryFont (DISPLAY, name); 580 f = XLoadQueryFont (DISPLAY, name);
535 581
536 if (!f) 582 if (!f)
537 return false; 583 return false;
538 584
539 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 585 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
540 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 586 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
541 587
542 if (registry && encoding) 588 if (registry && encoding)
543 { 589 {
544 char charset[64]; 590 char charset[64];
545 snprintf (charset, 64, "%s-%s", registry, encoding); 591 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
558 if (*charset++ == '-' && !--count) 604 if (*charset++ == '-' && !--count)
559 break; 605 break;
560 606
561 cs = codeset_from_name (charset); 607 cs = codeset_from_name (charset);
562 } 608 }
609
610 free (registry);
611 free (encoding);
563 612
564 if (cs == CS_UNICODE) 613 if (cs == CS_UNICODE)
565 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 614 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
566 615
567 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 616 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
617 f = 0; 666 f = 0;
618 } 667 }
619} 668}
620 669
621bool 670bool
622rxvt_font_x11::has_codepoint (uint32_t unicode) 671rxvt_font_x11::has_codepoint (unicode_t unicode)
623{ 672{
624 uint32_t ch = FROM_UNICODE (cs, unicode); 673 uint32_t ch = FROM_UNICODE (cs, unicode);
625 674
626 if (ch == NOCHAR) 675 if (ch == NOCHAR)
627 return false; 676 return false;
… …
680 729
681 int base = r->TermWin.fbase; 730 int base = r->TermWin.fbase;
682 731
683 XGCValues v; 732 XGCValues v;
684 v.foreground = r->PixColors[fg]; 733 v.foreground = r->PixColors[fg];
685 v.background = r->PixColors[bg];
686 v.font = f->fid; 734 v.font = f->fid;
687 735
688 if (enc2b) 736 if (enc2b)
689 { 737 {
690 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 738 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
691 739
692 if (bg == Color_bg && !slow) 740 if (bg == Color_bg && !slow)
693 { 741 {
742 v.background = r->PixColors[bg];
694 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 743 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
695 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 744 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
696 } 745 }
697 else 746 else
698 { 747 {
699 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 748 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
700 749
701 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 750 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
702 751
703 if (slow) 752 if (slow)
704 { 753 {
705 do 754 do
706 { 755 {
707 if (xc->byte1 || xc->byte2) 756 if (xc->byte1 || xc->byte2)
708 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 757 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
709 758
710 x += r->TermWin.fwidth; 759 x += r->TermWin.fwidth;
711 xc++; len--; 760 xc++; len--;
712 } 761 }
713 while (len); 762 while (len);
714 } 763 }
715 else 764 else
716 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 765 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
717 } 766 }
718 } 767 }
719 else 768 else
720 { 769 {
721 const char *xc = enc_char (text, len, cs, slow); 770 const char *xc = enc_char (text, len, cs, slow);
722 771
723 if (bg == Color_bg && !slow) 772 if (bg == Color_bg && !slow)
724 { 773 {
774 v.background = r->PixColors[bg];
725 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 775 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
726 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 776 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
727 } 777 }
728 else 778 else
729 { 779 {
730 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 780 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
731 781
732 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 782 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
733 783
734 if (slow) 784 if (slow)
735 { 785 {
736 do 786 do
737 { 787 {
738 if (*xc) 788 if (*xc)
739 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 789 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
740 790
741 x += r->TermWin.fwidth; 791 x += r->TermWin.fwidth;
742 xc++; len--; 792 xc++; len--;
743 } 793 }
744 while (len); 794 while (len);
745 } 795 }
746 else 796 else
747 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 797 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
748 } 798 }
749 } 799 }
750} 800}
751 801
752///////////////////////////////////////////////////////////////////////////// 802/////////////////////////////////////////////////////////////////////////////
… …
769 819
770 void draw (rxvt_drawable &d, int x, int y, 820 void draw (rxvt_drawable &d, int x, int y,
771 const text_t *text, int len, 821 const text_t *text, int len,
772 int fg, int bg); 822 int fg, int bg);
773 823
774 bool has_codepoint (uint32_t unicode); 824 bool has_codepoint (unicode_t unicode);
775 825
776protected: 826protected:
777 XftFont *f; 827 XftFont *f;
778}; 828};
779 829
… …
892 942
893 return true; 943 return true;
894} 944}
895 945
896bool 946bool
897rxvt_font_xft::has_codepoint (uint32_t unicode) 947rxvt_font_xft::has_codepoint (unicode_t unicode)
898{ 948{
899 return XftCharExists (DISPLAY, f, unicode); 949 return XftCharExists (DISPLAY, f, unicode);
900} 950}
901 951
902void 952void
… …
948#endif 998#endif
949 999
950///////////////////////////////////////////////////////////////////////////// 1000/////////////////////////////////////////////////////////////////////////////
951 1001
952rxvt_fontset::rxvt_fontset (rxvt_t r) 1002rxvt_fontset::rxvt_fontset (rxvt_t r)
953: r (r) 1003: r (r), fontdesc (0)
954{ 1004{
955 clear (); 1005 clear ();
956} 1006}
957 1007
958rxvt_fontset::~rxvt_fontset () 1008rxvt_fontset::~rxvt_fontset ()
… …
963void 1013void
964rxvt_fontset::clear () 1014rxvt_fontset::clear ()
965{ 1015{
966 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1016 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
967 FONT_UNREF (*i); 1017 FONT_UNREF (*i);
1018
1019 free (fontdesc); fontdesc = 0;
968 1020
969 fonts.clear (); 1021 fonts.clear ();
970 base_id = 0; 1022 base_id = 0;
971 base_prop.height = 0x7fffffff; 1023 base_prop.height = 0x7fffffff;
972 base_prop.weight = rxvt_fontprop::medium; 1024 base_prop.weight = rxvt_fontprop::medium;
… …
998 f = new rxvt_font_x11; 1050 f = new rxvt_font_x11;
999 } 1051 }
1000 else 1052 else
1001 f = new rxvt_font_x11; 1053 f = new rxvt_font_x11;
1002 1054
1055 f->fs = this;
1003 f->set_term (r); 1056 f->set_term (r);
1004 f->set_name (strdup (name)); 1057 f->set_name (strdup (name));
1005 1058
1006 f->cs = cs; 1059 f->cs = cs;
1007 f->loaded = false; 1060 f->loaded = false;
… …
1079bool 1132bool
1080rxvt_fontset::populate (const char *desc) 1133rxvt_fontset::populate (const char *desc)
1081{ 1134{
1082 clear (); 1135 clear ();
1083 1136
1137 fontdesc = strdup (desc);
1138
1084 fonts.push_back (new_font (0, CS_UNICODE)); 1139 fonts.push_back (new_font (0, CS_UNICODE));
1085 realize_font (0); 1140 realize_font (0);
1086 1141
1087 add_fonts (desc); 1142 add_fonts (desc);
1088 1143
… …
1104 1159
1105 return true; 1160 return true;
1106} 1161}
1107 1162
1108int 1163int
1109rxvt_fontset::find_font (uint32_t unicode) 1164rxvt_fontset::find_font (unicode_t unicode)
1110{ 1165{
1111 for (unsigned int i = 0; i < fonts.size (); i++) 1166 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1167 i < fonts.size ();
1168 i++)
1112 { 1169 {
1113 rxvt_font *f = fonts[i]; 1170 rxvt_font *f = fonts[i];
1114 1171
1115 if (!f->loaded) 1172 if (!f->loaded)
1116 { 1173 {

Diff Legend

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