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.37 by pcg, Fri Mar 5 05:52:02 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
101#if UNICODE_3 && XFT 104#if UNICODE_3 && XFT
… …
133{ 136{
134 if (len > enc_len) 137 if (len > enc_len)
135 { 138 {
136 free (enc_buf); 139 free (enc_buf);
137 enc_buf = malloc (len); 140 enc_buf = malloc (len);
141 enc_len = len;
138 } 142 }
139 143
140 return enc_buf; 144 return enc_buf;
141} 145}
142 146
… …
194 else if (color >= 0) 198 else if (color >= 0)
195 { 199 {
196#if XFT 200#if XFT
197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 201 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198#else 202#else
199 XSetForeground (d.display->display, GC, r->PixColors[color]); 203 XSetForeground (d.display->display, TGC, r->PixColors[color]);
200 XFillRectangle (d.display->display, d, GC, x, y, w, h); 204 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201#endif 205#endif
202 } 206 }
203} 207}
204 208
205static const char *linedraw_cmds[128] = { 209#include "table/linedraw.h"
206 "1hH", "2hH", "1vV", "2vV",
207 0, 0, 0, 0,
208 0, 0, 0, 0,
209 "1HV", "2H1V", "1H2V", "2HV",
210
211 // 2510
212 "1hV", "2h1V", "1h2V", "2hV",
213 "1Hv", "2H1v", "1H2v", "2Hv",
214 "1hv", "2h1v", "1h2v", "2hv",
215 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
216
217 // 2520
218 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
219 "1hvV", "2h1vV", "1hV2v", "1hv2V",
220 "1h2vV", "2hv1V", "1v2hV", "2hvV",
221 "1hHV", "2h1HV", "2H1hV", "2hH1V",
222
223 // 2530
224 "1hH2V", "2hV1H", "1h2HV", "2hHV",
225 "1hHv", "1vH2h", "1hv2H", "1v2hH",
226 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
227 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
228
229 // 2540
230 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
231 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
232 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
233 0, 0, 0, 0,
234
235 // 2550
236 0, 0, 0, 0,
237 0, 0, 0, 0,
238 0, 0, 0, 0,
239 0, 0, 0, 0,
240
241 // 2560
242 0, 0, 0, 0,
243 0, 0, 0, 0,
244 0, 0, 0, 0,
245 0, 0, 0, 0,
246
247 // 2570
248 0, "1a", "1b", "1ab",
249 "1h", "1v", "1H", "1V",
250 "2h", "2v", "2H", "2V",
251 "1h2H", "1v2V", "1H2h", "1V2v"
252
253 // to be done
254};
255 210
256struct rxvt_font_default : rxvt_font { 211struct rxvt_font_default : rxvt_font {
212
257 rxvt_fontprop properties () 213 rxvt_fontprop properties ()
258 { 214 {
259 rxvt_fontprop p; 215 rxvt_fontprop p;
260 216
261 p.width = p.height = 1; 217 p.width = p.height = 1;
… …
268 bool load (const rxvt_fontprop &prop) 224 bool load (const rxvt_fontprop &prop)
269 { 225 {
270 width = 1; height = 1; 226 width = 1; height = 1;
271 ascent = 1; descent = 0; 227 ascent = 1; descent = 0;
272 228
229 set_name (strdup ("built-in pseudofont"));
230
273 return true; 231 return true;
274 } 232 }
275 233
276 bool has_codepoint (uint32_t unicode) 234 bool has_codepoint (unicode_t unicode)
277 { 235 {
278 if (unicode <= 0x001f) 236 if (unicode <= 0x001f)
279 return true; 237 return true;
280 238
281 if (unicode >= 0x0080 && unicode <= 0x009f) 239 if (unicode <= 0x007f)
240 return false;
241
242 if (unicode <= 0x009f)
282 return true; 243 return true;
283 244
284 if (unicode >= 0x2500 && unicode <= 0x257f 245 if (unicode >= 0x2500 && unicode <= 0x259f)
285 && linedraw_cmds[unicode - 0x2500])
286 return true; 246 return true;
287 247
288 if (IS_COMPOSE (unicode)) 248 if (IS_COMPOSE (unicode))
289 return true; 249 return true;
290 250
… …
307 const text_t *text, int len, 267 const text_t *text, int len,
308 int fg, int bg) 268 int fg, int bg)
309{ 269{
310 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);
311 271
312 XSetForeground (d.display->display, GC, r->PixColors[fg]); 272 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
313 273
314 while (len--) 274 while (len--)
315 { 275 {
276#if ENABLE_COMBINING
316 compose_char *cc; 277 compose_char *cc;
278#endif
317 text_t t = *text++; 279 text_t t = *text++;
318 280
319 // is it in our linedrawing table? 281 if (0x2500 <= t && t <= 0x259f)
320 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++)
321 { 294 {
322 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 }
323 298
324 int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; 299 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
325 int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; 300 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
326 301
327 XGCValues gcv; 302 XGCValues gcv;
328 303
304 gcv.cap_style = CapButt;
305 gcv.line_width = 0;
306 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
307
329 while (*p) 308 while (a < b)
330 { 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
331 switch (*p++) 320 switch (op)
332 { 321 {
333 case '1': 322 case 0: // line
334 gcv.line_width = 0; 323 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
335 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
336 break; 324 break;
337 325
338 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);
339 gcv.line_width = 2; 346 gcv.stipple = 0;
347 gcv.fill_style = FillSolid;
340 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 348 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
349 }
341 break; 350 break;
342 351 case 2: // arc
343 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 352 XDrawArc (d.display->display, d, TGC,
344 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 353 x1 - W/2, y1 - H/2, W-1, H-1,
345 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 354 (a - 1) * 90*64, (b - 1) * 90*64);
346 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 355 break;
347 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
348 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
349 } 356 }
350 } 357 }
351
352 gcv.line_width = 0;
353 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
354 } 358 }
359#if ENABLE_COMBINING
355 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 360 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
356 { 361 {
357 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 362 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
358 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); 363 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
359 if (cc->c2 != NOCHAR) 364 if (cc->c2 != NOCHAR)
… …
364 : (*fs)[fs->find_font (cc->c2)]; 369 : (*fs)[fs->find_font (cc->c2)];
365 370
366 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); 371 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
367 } 372 }
368 } 373 }
374#endif
369 else 375 else
370 switch (t) 376 switch (t)
371 { 377 {
372 case ZERO_WIDTH_CHAR: 378 case ZERO_WIDTH_CHAR:
373 break; 379 break;
380
374 default: 381 default:
375 int w = 0; 382 int w = 0;
376 while (len > 0 && *text == NOCHAR) 383 while (len > 0 && *text == NOCHAR)
377 { 384 {
378 ++text; 385 ++text;
379 --len; 386 --len;
380 w += r->TermWin.fwidth; 387 w += r->TermWin.fwidth;
381 } 388 }
382 389
383 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 390 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
384 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 391 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
385 x += w; 392 x += w;
386 } 393 }
387 394
388 x += r->TermWin.fwidth; 395 x += r->TermWin.fwidth;
389 } 396 }
… …
398 405
399 rxvt_fontprop properties (); 406 rxvt_fontprop properties ();
400 407
401 bool load (const rxvt_fontprop &prop); 408 bool load (const rxvt_fontprop &prop);
402 409
403 bool has_codepoint (uint32_t unicode); 410 bool has_codepoint (unicode_t unicode);
404 411
405 void draw (rxvt_drawable &d, int x, int y, 412 void draw (rxvt_drawable &d, int x, int y,
406 const text_t *text, int len, 413 const text_t *text, int len,
407 int fg, int bg); 414 int fg, int bg);
408 415
409 XFontStruct *f; 416 XFontStruct *f;
410 codeset cs; 417 codeset cs;
411 bool enc2b, encm; 418 bool enc2b, encm;
412 419
413 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;
414 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);
415 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 422 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
416 bool set_properties (rxvt_fontprop &p, const char *name); 423 bool set_properties (rxvt_fontprop &p, const char *name);
417}; 424};
418 425
419const char * 426char *
420rxvt_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
421{ 428{
422 unsigned long value; 429 unsigned long value;
423 430
424 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 431 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
425 return XGetAtomName (DISPLAY, value); 432 return XGetAtomName (DISPLAY, value);
426 else 433 else
427 return repl; 434 return rxvt_strdup (repl);
428} 435}
429 436
430rxvt_fontprop 437rxvt_fontprop
431rxvt_font_x11::properties () 438rxvt_font_x11::properties ()
432{ 439{
… …
447} 454}
448 455
449bool 456bool
450rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 457rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
451{ 458{
452 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
453 const char *slant = get_property (f, "SLANT", "r");
454
455 unsigned long height; 459 unsigned long height;
456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
457 return false; 461 return false;
458 462
459 unsigned long avgwidth; 463 unsigned long avgwidth;
460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 464 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
461 avgwidth = 0; 465 avgwidth = 0;
462 466
467 char *weight = get_property (f, "WEIGHT_NAME", "medium");
468 char *slant = get_property (f, "SLANT", "r");
469
463 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;
464} 476}
465 477
466bool 478bool
467rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 479rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
468{ 480{
… …
572 f = XLoadQueryFont (DISPLAY, name); 584 f = XLoadQueryFont (DISPLAY, name);
573 585
574 if (!f) 586 if (!f)
575 return false; 587 return false;
576 588
577 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 589 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
578 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 590 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
579 591
580 if (registry && encoding) 592 if (registry && encoding)
581 { 593 {
582 char charset[64]; 594 char charset[64];
583 snprintf (charset, 64, "%s-%s", registry, encoding); 595 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
596 if (*charset++ == '-' && !--count) 608 if (*charset++ == '-' && !--count)
597 break; 609 break;
598 610
599 cs = codeset_from_name (charset); 611 cs = codeset_from_name (charset);
600 } 612 }
613
614 free (registry);
615 free (encoding);
601 616
602 if (cs == CS_UNICODE) 617 if (cs == CS_UNICODE)
603 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
604 619
605 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 620 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
655 f = 0; 670 f = 0;
656 } 671 }
657} 672}
658 673
659bool 674bool
660rxvt_font_x11::has_codepoint (uint32_t unicode) 675rxvt_font_x11::has_codepoint (unicode_t unicode)
661{ 676{
662 uint32_t ch = FROM_UNICODE (cs, unicode); 677 uint32_t ch = FROM_UNICODE (cs, unicode);
663 678
664 if (ch == NOCHAR) 679 if (ch == NOCHAR)
665 return false; 680 return false;
… …
718 733
719 int base = r->TermWin.fbase; 734 int base = r->TermWin.fbase;
720 735
721 XGCValues v; 736 XGCValues v;
722 v.foreground = r->PixColors[fg]; 737 v.foreground = r->PixColors[fg];
723 v.background = r->PixColors[bg];
724 v.font = f->fid; 738 v.font = f->fid;
725 739
726 if (enc2b) 740 if (enc2b)
727 { 741 {
728 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 742 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
729 743
730 if (bg == Color_bg && !slow) 744 if (bg == Color_bg && !slow)
731 { 745 {
746 v.background = r->PixColors[bg];
732 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 747 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
733 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 748 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
734 } 749 }
735 else 750 else
736 { 751 {
737 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);
738 753
739 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 754 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
740 755
741 if (slow) 756 if (slow)
742 { 757 {
743 do 758 do
744 { 759 {
745 if (xc->byte1 || xc->byte2) 760 if (xc->byte1 || xc->byte2)
746 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 761 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
747 762
748 x += r->TermWin.fwidth; 763 x += r->TermWin.fwidth;
749 xc++; len--; 764 xc++; len--;
750 } 765 }
751 while (len); 766 while (len);
752 } 767 }
753 else 768 else
754 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 769 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
755 } 770 }
756 } 771 }
757 else 772 else
758 { 773 {
759 const char *xc = enc_char (text, len, cs, slow); 774 const char *xc = enc_char (text, len, cs, slow);
760 775
761 if (bg == Color_bg && !slow) 776 if (bg == Color_bg && !slow)
762 { 777 {
778 v.background = r->PixColors[bg];
763 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 779 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
764 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 780 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
765 } 781 }
766 else 782 else
767 { 783 {
768 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);
769 785
770 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 786 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
771 787
772 if (slow) 788 if (slow)
773 { 789 {
774 do 790 do
775 { 791 {
776 if (*xc) 792 if (*xc)
777 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 793 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
778 794
779 x += r->TermWin.fwidth; 795 x += r->TermWin.fwidth;
780 xc++; len--; 796 xc++; len--;
781 } 797 }
782 while (len); 798 while (len);
783 } 799 }
784 else 800 else
785 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 801 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
786 } 802 }
787 } 803 }
788} 804}
789 805
790///////////////////////////////////////////////////////////////////////////// 806/////////////////////////////////////////////////////////////////////////////
… …
807 823
808 void draw (rxvt_drawable &d, int x, int y, 824 void draw (rxvt_drawable &d, int x, int y,
809 const text_t *text, int len, 825 const text_t *text, int len,
810 int fg, int bg); 826 int fg, int bg);
811 827
812 bool has_codepoint (uint32_t unicode); 828 bool has_codepoint (unicode_t unicode);
813 829
814protected: 830protected:
815 XftFont *f; 831 XftFont *f;
816}; 832};
817 833
… …
930 946
931 return true; 947 return true;
932} 948}
933 949
934bool 950bool
935rxvt_font_xft::has_codepoint (uint32_t unicode) 951rxvt_font_xft::has_codepoint (unicode_t unicode)
936{ 952{
937 return XftCharExists (DISPLAY, f, unicode); 953 return XftCharExists (DISPLAY, f, unicode);
938} 954}
939 955
940void 956void
… …
986#endif 1002#endif
987 1003
988///////////////////////////////////////////////////////////////////////////// 1004/////////////////////////////////////////////////////////////////////////////
989 1005
990rxvt_fontset::rxvt_fontset (rxvt_t r) 1006rxvt_fontset::rxvt_fontset (rxvt_t r)
991: r (r) 1007: r (r), fontdesc (0)
992{ 1008{
993 clear (); 1009 clear ();
994} 1010}
995 1011
996rxvt_fontset::~rxvt_fontset () 1012rxvt_fontset::~rxvt_fontset ()
… …
1001void 1017void
1002rxvt_fontset::clear () 1018rxvt_fontset::clear ()
1003{ 1019{
1004 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1020 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1005 FONT_UNREF (*i); 1021 FONT_UNREF (*i);
1022
1023 free (fontdesc); fontdesc = 0;
1006 1024
1007 fonts.clear (); 1025 fonts.clear ();
1008 base_id = 0; 1026 base_id = 0;
1009 base_prop.height = 0x7fffffff; 1027 base_prop.height = 0x7fffffff;
1010 base_prop.weight = rxvt_fontprop::medium; 1028 base_prop.weight = rxvt_fontprop::medium;
… …
1118bool 1136bool
1119rxvt_fontset::populate (const char *desc) 1137rxvt_fontset::populate (const char *desc)
1120{ 1138{
1121 clear (); 1139 clear ();
1122 1140
1141 fontdesc = strdup (desc);
1142
1123 fonts.push_back (new_font (0, CS_UNICODE)); 1143 fonts.push_back (new_font (0, CS_UNICODE));
1124 realize_font (0); 1144 realize_font (0);
1125 1145
1126 add_fonts (desc); 1146 add_fonts (desc);
1127 1147
… …
1143 1163
1144 return true; 1164 return true;
1145} 1165}
1146 1166
1147int 1167int
1148rxvt_fontset::find_font (uint32_t unicode) 1168rxvt_fontset::find_font (unicode_t unicode, bool bold)
1149{ 1169{
1150 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++)
1151 { 1173 {
1152 rxvt_font *f = fonts[i]; 1174 rxvt_font *f = fonts[i];
1153 1175
1154 if (!f->loaded) 1176 if (!f->loaded)
1155 { 1177 {
… …
1158 1180
1159 if (!realize_font (i)) 1181 if (!realize_font (i))
1160 goto next_font; 1182 goto next_font;
1161 } 1183 }
1162 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
1163 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1191 if (f->has_codepoint (unicode))
1164 return i; 1192 return i;
1165 1193
1166 next_font: 1194 next_font:
1167 if (i == fonts.size () - 1 && fallback->name) 1195 if (i == fonts.size () - 1 && fallback->name)
1168 { 1196 {
… …
1170 fallback++; 1198 fallback++;
1171 i = 0; 1199 i = 0;
1172 } 1200 }
1173 } 1201 }
1174 1202
1203 // if no bold font found, use a regular one
1204 if (bold)
1205 return find_font (unicode);
1206
1175 return 0; /* we must return SOME font */ 1207 return 0; /* we must return SOME font */
1176} 1208}
1177 1209
1178 1210
1179 1211

Diff Legend

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