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.29 by pcg, Wed Mar 3 20:15:18 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-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, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
66 { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 66 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
67 { 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" },
68#endif 71#endif
69 72
70#if ENCODING_CN || ENCODING_CN_EXT 73#if ENCODING_CN || ENCODING_CN_EXT
71# if XFT 74# if XFT
72 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 75 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
… …
89#endif 92#endif
90 93
91#if XFT 94#if XFT
92 { CS_UNICODE, "xft:Andale Mono" }, 95 { CS_UNICODE, "xft:Andale Mono" },
93 { CS_UNICODE, "xft:Arial Unicode MS" }, 96 { CS_UNICODE, "xft:Arial Unicode MS" },
97 { CS_UNICODE, "xft:FreeMono" },
94#endif 98#endif
95 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
96 { CS_UNICODE, "xft:FreeMono" },
97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 100 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 101 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 102 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
100 103
104#if UNICODE_3 && XFT
105 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
106#endif
107
101 { CS_UNKNOWN, 0 } 108 { CS_UNKNOWN, 0 }
102}; 109};
103 110
104///////////////////////////////////////////////////////////////////////////// 111/////////////////////////////////////////////////////////////////////////////
105 112
… …
129{ 136{
130 if (len > enc_len) 137 if (len > enc_len)
131 { 138 {
132 free (enc_buf); 139 free (enc_buf);
133 enc_buf = malloc (len); 140 enc_buf = malloc (len);
141 enc_len = len;
134 } 142 }
135 143
136 return enc_buf; 144 return enc_buf;
137} 145}
138 146
… …
190 else if (color >= 0) 198 else if (color >= 0)
191 { 199 {
192#if XFT 200#if XFT
193 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 201 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
194#else 202#else
195 XSetForeground (d.display->display, GC, r->PixColors[color]); 203 XSetForeground (d.display->display, TGC, r->PixColors[color]);
196 XFillRectangle (d.display->display, d, GC, x, y, w, h); 204 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
197#endif 205#endif
198 } 206 }
199} 207}
200 208
201static const char *linedraw_cmds[128] = { 209#include "table/linedraw.h"
202 "1hH", "2hH", "1vV", "2vV",
203 0, 0, 0, 0,
204 0, 0, 0, 0,
205 "1HV", "2H1V", "1H2V", "2HV",
206
207 // 2510
208 "1hV", "2h1V", "1h2V", "2hV",
209 "1Hv", "2H1v", "1H2v", "2Hv",
210 "1hv", "2h1v", "1h2v", "2hv",
211 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
212
213 // 2520
214 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
215 "1hvV", "2h1vV", "1hV2v", "1hv2V",
216 "1h2vV", "2hv1V", "1v2hV", "2hvV",
217 "1hHV", "2h1HV", "2H1hV", "2hH1V",
218
219 // 2530
220 "1hH2V", "2hV1H", "1h2HV", "2hHV",
221 "1hHv", "1vH2h", "1hv2H", "1v2hH",
222 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
223 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
224
225 // 2540
226 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
227 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
228 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
229 0, 0, 0, 0,
230
231 // 2550
232 0, 0, 0, 0,
233 0, 0, 0, 0,
234 0, 0, 0, 0,
235 0, 0, 0, 0,
236
237 // 2560
238 0, 0, 0, 0,
239 0, 0, 0, 0,
240 0, 0, 0, 0,
241 0, 0, 0, 0,
242
243 // 2570
244 0, "1a", "1b", "1ab",
245 "1h", "1v", "1H", "1V",
246 "2h", "2v", "2H", "2V",
247 "1h2H", "1v2V", "1H2h", "1V2v"
248
249 // to be done
250};
251 210
252struct rxvt_font_default : rxvt_font { 211struct rxvt_font_default : rxvt_font {
212
253 rxvt_fontprop properties () 213 rxvt_fontprop properties ()
254 { 214 {
255 rxvt_fontprop p; 215 rxvt_fontprop p;
256 216
257 p.width = p.height = 1; 217 p.width = p.height = 1;
… …
264 bool load (const rxvt_fontprop &prop) 224 bool load (const rxvt_fontprop &prop)
265 { 225 {
266 width = 1; height = 1; 226 width = 1; height = 1;
267 ascent = 1; descent = 0; 227 ascent = 1; descent = 0;
268 228
229 set_name (strdup ("built-in pseudofont"));
230
269 return true; 231 return true;
270 } 232 }
271 233
272 bool has_codepoint (uint32_t unicode) 234 bool has_codepoint (unicode_t unicode)
273 { 235 {
274 if (unicode <= 0x001f) 236 if (unicode <= 0x001f)
275 return true; 237 return true;
276 if (unicode >= 0x0080 && unicode <= 0x009f) 238
239 if (unicode <= 0x007f)
240 return false;
241
242 if (unicode <= 0x009f)
277 return true; 243 return true;
278 244
279 if (unicode >= 0x2500 && unicode <= 0x257f 245 if (unicode >= 0x2500 && unicode <= 0x259f)
280 && linedraw_cmds[unicode - 0x2500]) 246 return true;
247
248 if (IS_COMPOSE (unicode))
281 return true; 249 return true;
282 250
283 switch (unicode) 251 switch (unicode)
284 { 252 {
285 case ZERO_WIDTH_CHAR: 253 case ZERO_WIDTH_CHAR:
… …
299 const text_t *text, int len, 267 const text_t *text, int len,
300 int fg, int bg) 268 int fg, int bg)
301{ 269{
302 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 270 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
303 271
304 XSetForeground (d.display->display, GC, r->PixColors[fg]); 272 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
305 273
306 while (len--) 274 while (len--)
307 { 275 {
276#if ENABLE_COMBINING
277 compose_char *cc;
278#endif
308 text_t t = *text++; 279 text_t t = *text++;
309 280
310 // is it in our linedrawing table? 281 if (0x2500 <= t && t <= 0x259f)
311 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 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++)
312 { 294 {
313 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 }
314 298
315 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1; 299 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
316 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1; 300 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
317 301
318 XGCValues gcv; 302 XGCValues gcv;
319 303
304 gcv.cap_style = CapButt;
305 gcv.line_width = 0;
306 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
307
320 while (*p) 308 while (a < b)
321 { 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
322 switch (*p++) 320 switch (op)
323 { 321 {
324 case '1': 322 case 0: // line
325 gcv.line_width = 0; 323 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
326 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
327 break; 324 break;
328 325
329 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);
330 gcv.line_width = 2; 346 gcv.stipple = 0;
347 gcv.fill_style = FillSolid;
331 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 348 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
349 }
332 break; 350 break;
333 351 case 2: // arc
334 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 352 XDrawArc (d.display->display, d, TGC,
335 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 353 x1 - W/2, y1 - H/2, W-1, H-1,
336 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 354 (a - 1) * 90*64, (b - 1) * 90*64);
337 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 355 break;
338 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
339 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
340 } 356 }
341 } 357 }
342 358 }
343 gcv.line_width = 0; 359#if ENABLE_COMBINING
344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 360 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
345 } 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
346 else 375 else
347 switch (t) 376 switch (t)
348 { 377 {
349 case ZERO_WIDTH_CHAR: 378 case ZERO_WIDTH_CHAR:
350 break; 379 break;
380
351 default: 381 default:
352 int w = 0; 382 int w = 0;
353 while (len > 0 && *text == NOCHAR) 383 while (len > 0 && *text == NOCHAR)
354 { 384 {
355 ++text; 385 ++text;
356 --len; 386 --len;
357 w += r->TermWin.fwidth; 387 w += r->TermWin.fwidth;
358 } 388 }
359 389
360 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 390 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
361 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 391 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
362 x += w; 392 x += w;
363 } 393 }
364 394
365 x += r->TermWin.fwidth; 395 x += r->TermWin.fwidth;
366 } 396 }
… …
375 405
376 rxvt_fontprop properties (); 406 rxvt_fontprop properties ();
377 407
378 bool load (const rxvt_fontprop &prop); 408 bool load (const rxvt_fontprop &prop);
379 409
380 bool has_codepoint (uint32_t unicode); 410 bool has_codepoint (unicode_t unicode);
381 411
382 void draw (rxvt_drawable &d, int x, int y, 412 void draw (rxvt_drawable &d, int x, int y,
383 const text_t *text, int len, 413 const text_t *text, int len,
384 int fg, int bg); 414 int fg, int bg);
385 415
386 XFontStruct *f; 416 XFontStruct *f;
387 codeset cs; 417 codeset cs;
388 bool enc2b, encm; 418 bool enc2b, encm;
389 419
390 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;
391 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);
392 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 422 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
393 bool set_properties (rxvt_fontprop &p, const char *name); 423 bool set_properties (rxvt_fontprop &p, const char *name);
394}; 424};
395 425
396const char * 426char *
397rxvt_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
398{ 428{
399 unsigned long value; 429 unsigned long value;
400 430
401 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 431 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
402 return XGetAtomName (DISPLAY, value); 432 return XGetAtomName (DISPLAY, value);
403 else 433 else
404 return repl; 434 return rxvt_strdup (repl);
405} 435}
406 436
407rxvt_fontprop 437rxvt_fontprop
408rxvt_font_x11::properties () 438rxvt_font_x11::properties ()
409{ 439{
… …
424} 454}
425 455
426bool 456bool
427rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 457rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
428{ 458{
429 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
430 const char *slant = get_property (f, "SLANT", "r");
431
432 unsigned long height; 459 unsigned long height;
433 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
434 return false; 461 return false;
435 462
436 unsigned long avgwidth; 463 unsigned long avgwidth;
437 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 464 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
438 avgwidth = 0; 465 avgwidth = 0;
439 466
467 char *weight = get_property (f, "WEIGHT_NAME", "medium");
468 char *slant = get_property (f, "SLANT", "r");
469
440 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;
441} 476}
442 477
443bool 478bool
444rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 479rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
445{ 480{
… …
549 f = XLoadQueryFont (DISPLAY, name); 584 f = XLoadQueryFont (DISPLAY, name);
550 585
551 if (!f) 586 if (!f)
552 return false; 587 return false;
553 588
554 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 589 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
555 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 590 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
556 591
557 if (registry && encoding) 592 if (registry && encoding)
558 { 593 {
559 char charset[64]; 594 char charset[64];
560 snprintf (charset, 64, "%s-%s", registry, encoding); 595 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
573 if (*charset++ == '-' && !--count) 608 if (*charset++ == '-' && !--count)
574 break; 609 break;
575 610
576 cs = codeset_from_name (charset); 611 cs = codeset_from_name (charset);
577 } 612 }
613
614 free (registry);
615 free (encoding);
578 616
579 if (cs == CS_UNICODE) 617 if (cs == CS_UNICODE)
580 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
581 619
582 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 620 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
632 f = 0; 670 f = 0;
633 } 671 }
634} 672}
635 673
636bool 674bool
637rxvt_font_x11::has_codepoint (uint32_t unicode) 675rxvt_font_x11::has_codepoint (unicode_t unicode)
638{ 676{
639 uint32_t ch = FROM_UNICODE (cs, unicode); 677 uint32_t ch = FROM_UNICODE (cs, unicode);
640 678
641 if (ch == NOCHAR) 679 if (ch == NOCHAR)
642 return false; 680 return false;
… …
695 733
696 int base = r->TermWin.fbase; 734 int base = r->TermWin.fbase;
697 735
698 XGCValues v; 736 XGCValues v;
699 v.foreground = r->PixColors[fg]; 737 v.foreground = r->PixColors[fg];
700 v.background = r->PixColors[bg];
701 v.font = f->fid; 738 v.font = f->fid;
702 739
703 if (enc2b) 740 if (enc2b)
704 { 741 {
705 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 742 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
706 743
707 if (bg == Color_bg && !slow) 744 if (bg == Color_bg && !slow)
708 { 745 {
746 v.background = r->PixColors[bg];
709 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 747 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
710 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 748 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
711 } 749 }
712 else 750 else
713 { 751 {
714 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 752 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
715 753
716 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 754 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
717 755
718 if (slow) 756 if (slow)
719 { 757 {
720 do 758 do
721 { 759 {
722 if (xc->byte1 || xc->byte2) 760 if (xc->byte1 || xc->byte2)
723 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 761 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
724 762
725 x += r->TermWin.fwidth; 763 x += r->TermWin.fwidth;
726 xc++; len--; 764 xc++; len--;
727 } 765 }
728 while (len); 766 while (len);
729 } 767 }
730 else 768 else
731 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 769 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
732 } 770 }
733 } 771 }
734 else 772 else
735 { 773 {
736 const char *xc = enc_char (text, len, cs, slow); 774 const char *xc = enc_char (text, len, cs, slow);
737 775
738 if (bg == Color_bg && !slow) 776 if (bg == Color_bg && !slow)
739 { 777 {
778 v.background = r->PixColors[bg];
740 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 779 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
741 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 780 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
742 } 781 }
743 else 782 else
744 { 783 {
745 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 784 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
746 785
747 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 786 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
748 787
749 if (slow) 788 if (slow)
750 { 789 {
751 do 790 do
752 { 791 {
753 if (*xc) 792 if (*xc)
754 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 793 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
755 794
756 x += r->TermWin.fwidth; 795 x += r->TermWin.fwidth;
757 xc++; len--; 796 xc++; len--;
758 } 797 }
759 while (len); 798 while (len);
760 } 799 }
761 else 800 else
762 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 801 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
763 } 802 }
764 } 803 }
765} 804}
766 805
767///////////////////////////////////////////////////////////////////////////// 806/////////////////////////////////////////////////////////////////////////////
… …
784 823
785 void draw (rxvt_drawable &d, int x, int y, 824 void draw (rxvt_drawable &d, int x, int y,
786 const text_t *text, int len, 825 const text_t *text, int len,
787 int fg, int bg); 826 int fg, int bg);
788 827
789 bool has_codepoint (uint32_t unicode); 828 bool has_codepoint (unicode_t unicode);
790 829
791protected: 830protected:
792 XftFont *f; 831 XftFont *f;
793}; 832};
794 833
… …
907 946
908 return true; 947 return true;
909} 948}
910 949
911bool 950bool
912rxvt_font_xft::has_codepoint (uint32_t unicode) 951rxvt_font_xft::has_codepoint (unicode_t unicode)
913{ 952{
914 return XftCharExists (DISPLAY, f, unicode); 953 return XftCharExists (DISPLAY, f, unicode);
915} 954}
916 955
917void 956void
… …
963#endif 1002#endif
964 1003
965///////////////////////////////////////////////////////////////////////////// 1004/////////////////////////////////////////////////////////////////////////////
966 1005
967rxvt_fontset::rxvt_fontset (rxvt_t r) 1006rxvt_fontset::rxvt_fontset (rxvt_t r)
968: r (r) 1007: r (r), fontdesc (0)
969{ 1008{
970 clear (); 1009 clear ();
971} 1010}
972 1011
973rxvt_fontset::~rxvt_fontset () 1012rxvt_fontset::~rxvt_fontset ()
… …
978void 1017void
979rxvt_fontset::clear () 1018rxvt_fontset::clear ()
980{ 1019{
981 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1020 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
982 FONT_UNREF (*i); 1021 FONT_UNREF (*i);
1022
1023 free (fontdesc); fontdesc = 0;
983 1024
984 fonts.clear (); 1025 fonts.clear ();
985 base_id = 0; 1026 base_id = 0;
986 base_prop.height = 0x7fffffff; 1027 base_prop.height = 0x7fffffff;
987 base_prop.weight = rxvt_fontprop::medium; 1028 base_prop.weight = rxvt_fontprop::medium;
… …
1013 f = new rxvt_font_x11; 1054 f = new rxvt_font_x11;
1014 } 1055 }
1015 else 1056 else
1016 f = new rxvt_font_x11; 1057 f = new rxvt_font_x11;
1017 1058
1059 f->fs = this;
1018 f->set_term (r); 1060 f->set_term (r);
1019 f->set_name (strdup (name)); 1061 f->set_name (strdup (name));
1020 1062
1021 f->cs = cs; 1063 f->cs = cs;
1022 f->loaded = false; 1064 f->loaded = false;
… …
1094bool 1136bool
1095rxvt_fontset::populate (const char *desc) 1137rxvt_fontset::populate (const char *desc)
1096{ 1138{
1097 clear (); 1139 clear ();
1098 1140
1141 fontdesc = strdup (desc);
1142
1099 fonts.push_back (new_font (0, CS_UNICODE)); 1143 fonts.push_back (new_font (0, CS_UNICODE));
1100 realize_font (0); 1144 realize_font (0);
1101 1145
1102 add_fonts (desc); 1146 add_fonts (desc);
1103 1147
… …
1119 1163
1120 return true; 1164 return true;
1121} 1165}
1122 1166
1123int 1167int
1124rxvt_fontset::find_font (uint32_t unicode) 1168rxvt_fontset::find_font (unicode_t unicode, bool bold)
1125{ 1169{
1126 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++)
1127 { 1173 {
1128 rxvt_font *f = fonts[i]; 1174 rxvt_font *f = fonts[i];
1129 1175
1130 if (!f->loaded) 1176 if (!f->loaded)
1131 { 1177 {
… …
1134 1180
1135 if (!realize_font (i)) 1181 if (!realize_font (i))
1136 goto next_font; 1182 goto next_font;
1137 } 1183 }
1138 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
1139 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1191 if (f->has_codepoint (unicode))
1140 return i; 1192 return i;
1141 1193
1142 next_font: 1194 next_font:
1143 if (i == fonts.size () - 1 && fallback->name) 1195 if (i == fonts.size () - 1 && fallback->name)
1144 { 1196 {
… …
1146 fallback++; 1198 fallback++;
1147 i = 0; 1199 i = 0;
1148 } 1200 }
1149 } 1201 }
1150 1202
1203 // if no bold font found, use a regular one
1204 if (bold)
1205 return find_font (unicode);
1206
1151 return 0; /* we must return SOME font */ 1207 return 0; /* we must return SOME font */
1152} 1208}
1153 1209
1154 1210
1155 1211

Diff Legend

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