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.55 by root, Mon Jul 26 14:57:12 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
… …
190 else if (color >= 0) 197 else if (color >= 0)
191 { 198 {
192#if XFT 199#if XFT
193 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 200 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
194#else 201#else
195 XSetForeground (d.display->display, GC, r->PixColors[color]); 202 XSetForeground (d.display->display, TGC, r->PixColors[color]);
196 XFillRectangle (d.display->display, d, GC, x, y, w, h); 203 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
197#endif 204#endif
198 } 205 }
199} 206}
200 207
201static const char *linedraw_cmds[128] = { 208#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 209
252struct rxvt_font_default : rxvt_font { 210struct rxvt_font_default : rxvt_font {
211
253 rxvt_fontprop properties () 212 rxvt_fontprop properties ()
254 { 213 {
255 rxvt_fontprop p; 214 rxvt_fontprop p;
256 215
257 p.width = p.height = 1; 216 p.width = p.height = 1;
… …
264 bool load (const rxvt_fontprop &prop) 223 bool load (const rxvt_fontprop &prop)
265 { 224 {
266 width = 1; height = 1; 225 width = 1; height = 1;
267 ascent = 1; descent = 0; 226 ascent = 1; descent = 0;
268 227
228 set_name (strdup ("built-in pseudofont"));
229
269 return true; 230 return true;
270 } 231 }
271 232
272 bool has_codepoint (uint32_t unicode) 233 bool has_codepoint (unicode_t unicode)
273 { 234 {
274 if (unicode <= 0x001f) 235 if (unicode <= 0x001f)
275 return true; 236 return true;
276 if (unicode >= 0x0080 && unicode <= 0x009f) 237
238 if (unicode <= 0x007f)
239 return false;
240
241 if (unicode <= 0x009f)
277 return true; 242 return true;
278 243
279 if (unicode >= 0x2500 && unicode <= 0x257f 244 if (unicode >= 0x2500 && unicode <= 0x259f)
280 && linedraw_cmds[unicode - 0x2500]) 245 return true;
246
247 if (IS_COMPOSE (unicode))
281 return true; 248 return true;
282 249
283 switch (unicode) 250 switch (unicode)
284 { 251 {
285 case ZERO_WIDTH_CHAR: 252 case ZERO_WIDTH_CHAR:
… …
299 const text_t *text, int len, 266 const text_t *text, int len,
300 int fg, int bg) 267 int fg, int bg)
301{ 268{
302 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 269 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
303 270
304 XSetForeground (d.display->display, GC, r->PixColors[fg]); 271 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
305 272
306 while (len--) 273 while (len--)
307 { 274 {
275#if ENABLE_COMBINING
276 compose_char *cc;
277#endif
308 text_t t = *text++; 278 text_t t = *text++;
309 279
310 // is it in our linedrawing table? 280 if (0x2500 <= t && t <= 0x259f)
311 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 281 {
282 uint16_t offs = linedraw_offs[t - 0x2500];
283 uint32_t *a = linedraw_command + (offs >> 4);
284 uint32_t *b = a + (offs & 15);
285
286 int W = r->TermWin.fwidth;
287 int H = r->TermWin.fheight;
288
289 int x_[16];
290 int y_[16];
291
292 for (int i = 0; i <= 8; i++)
312 { 293 {
313 const char *p = linedraw_cmds[t - 0x2500]; 294 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
295 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
296 }
314 297
315 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1; 298 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; 299 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
317 300
318 XGCValues gcv; 301 XGCValues gcv;
319 302
303 gcv.cap_style = CapButt;
304 gcv.line_width = 0;
305 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
306
320 while (*p) 307 while (a < b)
321 { 308 {
309 uint32_t command = *a++;
310
311 int op = (command >> 24) & 255;
312 int a = (command >> 20) & 15;
313 int b = (command >> 16) & 15;
314 int x1 = x_[(command >> 12) & 15];
315 int y1 = y_[(command >> 8) & 15];
316 int x2 = x_[(command >> 4) & 15];
317 int y2 = y_[(command >> 0) & 15];
318
322 switch (*p++) 319 switch (op)
323 { 320 {
324 case '1': 321 case 0: // line
325 gcv.line_width = 0; 322 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
326 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
327 break; 323 break;
328 324
329 case '2': 325 case 1: // rectangle, possibly stippled
326 if (a)
327 {
328 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
329
330 gcv.fill_style = FillStippled;
331 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
332 gcv.ts_x_origin = x;
333 gcv.ts_y_origin = y;
334
335 XChangeGC (d.display->display, TGC,
336 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
337 &gcv);
338 }
339
340 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
341
342 if (a)
343 {
344 XFreePixmap (d.display->display, gcv.stipple);
330 gcv.line_width = 2; 345 gcv.stipple = 0;
346 gcv.fill_style = FillSolid;
331 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 347 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
348 }
332 break; 349 break;
333 350 case 2: // arc
334 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 351 XDrawArc (d.display->display, d, TGC,
335 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 352 x1 - W/2, y1 - H/2, W-1, H-1,
336 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 353 (a - 1) * 90*64, (b - 1) * 90*64);
337 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 354 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 } 355 }
341 } 356 }
342 357 }
343 gcv.line_width = 0; 358#if ENABLE_COMBINING
344 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 359 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
345 } 360 {
361 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
362 f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
363 if (cc->c2 != NOCHAR)
364 {
365 // prefer font of first character, for no good reasons
366 rxvt_font *f2 = f1->has_codepoint (cc->c2)
367 ? f1
368 : (*fs)[fs->find_font (cc->c2)];
369
370 f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
371 }
372 }
373#endif
346 else 374 else
347 switch (t) 375 switch (t)
348 { 376 {
349 case ZERO_WIDTH_CHAR: 377 case ZERO_WIDTH_CHAR:
350 break; 378 break;
379
351 default: 380 default:
352 int w = 0; 381 int w = 0;
353 while (len > 0 && *text == NOCHAR) 382 while (len > 0 && *text == NOCHAR)
354 { 383 {
355 ++text; 384 ++text;
356 --len; 385 --len;
357 w += r->TermWin.fwidth; 386 w += r->TermWin.fwidth;
358 } 387 }
359 388
360 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 389 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
361 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 390 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
362 x += w; 391 x += w;
363 } 392 }
364 393
365 x += r->TermWin.fwidth; 394 x += r->TermWin.fwidth;
366 } 395 }
… …
375 404
376 rxvt_fontprop properties (); 405 rxvt_fontprop properties ();
377 406
378 bool load (const rxvt_fontprop &prop); 407 bool load (const rxvt_fontprop &prop);
379 408
380 bool has_codepoint (uint32_t unicode); 409 bool has_codepoint (unicode_t unicode);
381 410
382 void draw (rxvt_drawable &d, int x, int y, 411 void draw (rxvt_drawable &d, int x, int y,
383 const text_t *text, int len, 412 const text_t *text, int len,
384 int fg, int bg); 413 int fg, int bg);
385 414
386 XFontStruct *f; 415 XFontStruct *f;
387 codeset cs; 416 codeset cs;
388 bool enc2b, encm; 417 bool enc2b, encm;
389 418
390 const char *get_property (XFontStruct *f, const char *property, const char *repl) const; 419 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); 420 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); 421 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
393 bool set_properties (rxvt_fontprop &p, const char *name); 422 bool set_properties (rxvt_fontprop &p, const char *name);
394}; 423};
395 424
396const char * 425char *
397rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 426rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
398{ 427{
399 unsigned long value; 428 unsigned long value;
400 429
401 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 430 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
402 return XGetAtomName (DISPLAY, value); 431 return XGetAtomName (DISPLAY, value);
403 else 432 else
404 return repl; 433 return rxvt_strdup (repl);
405} 434}
406 435
407rxvt_fontprop 436rxvt_fontprop
408rxvt_font_x11::properties () 437rxvt_font_x11::properties ()
409{ 438{
… …
424} 453}
425 454
426bool 455bool
427rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 456rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
428{ 457{
429 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
430 const char *slant = get_property (f, "SLANT", "r");
431
432 unsigned long height; 458 unsigned long height;
433 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 459 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
434 return false; 460 return false;
435 461
436 unsigned long avgwidth; 462 unsigned long avgwidth;
437 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 463 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
438 avgwidth = 0; 464 avgwidth = 0;
439 465
466 char *weight = get_property (f, "WEIGHT_NAME", "medium");
467 char *slant = get_property (f, "SLANT", "r");
468
440 return set_properties (p, height, weight, slant, avgwidth); 469 set_properties (p, height, weight, slant, avgwidth);
470
471 free (weight);
472 free (slant);
473
474 return true;
441} 475}
442 476
443bool 477bool
444rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 478rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
445{ 479{
… …
549 f = XLoadQueryFont (DISPLAY, name); 583 f = XLoadQueryFont (DISPLAY, name);
550 584
551 if (!f) 585 if (!f)
552 return false; 586 return false;
553 587
554 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 588 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
555 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 589 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
556 590
557 if (registry && encoding) 591 if (registry && encoding)
558 { 592 {
559 char charset[64]; 593 char charset[64];
560 snprintf (charset, 64, "%s-%s", registry, encoding); 594 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
573 if (*charset++ == '-' && !--count) 607 if (*charset++ == '-' && !--count)
574 break; 608 break;
575 609
576 cs = codeset_from_name (charset); 610 cs = codeset_from_name (charset);
577 } 611 }
612
613 free (registry);
614 free (encoding);
578 615
579 if (cs == CS_UNICODE) 616 if (cs == CS_UNICODE)
580 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 617 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
581 618
582 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 619 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
632 f = 0; 669 f = 0;
633 } 670 }
634} 671}
635 672
636bool 673bool
637rxvt_font_x11::has_codepoint (uint32_t unicode) 674rxvt_font_x11::has_codepoint (unicode_t unicode)
638{ 675{
639 uint32_t ch = FROM_UNICODE (cs, unicode); 676 uint32_t ch = FROM_UNICODE (cs, unicode);
640 677
641 if (ch == NOCHAR) 678 if (ch == NOCHAR)
642 return false; 679 return false;
… …
695 732
696 int base = r->TermWin.fbase; 733 int base = r->TermWin.fbase;
697 734
698 XGCValues v; 735 XGCValues v;
699 v.foreground = r->PixColors[fg]; 736 v.foreground = r->PixColors[fg];
700 v.background = r->PixColors[bg];
701 v.font = f->fid; 737 v.font = f->fid;
702 738
703 if (enc2b) 739 if (enc2b)
704 { 740 {
705 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 741 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
706 742
707 if (bg == Color_bg && !slow) 743 if (bg == Color_bg && !slow)
708 { 744 {
745 v.background = r->PixColors[bg];
709 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 746 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
710 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 747 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
711 } 748 }
712 else 749 else
713 { 750 {
714 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 751 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
715 752
716 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 753 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
717 754
718 if (slow) 755 if (slow)
719 { 756 {
720 do 757 do
721 { 758 {
722 if (xc->byte1 || xc->byte2) 759 if (xc->byte1 || xc->byte2)
723 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 760 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
724 761
725 x += r->TermWin.fwidth; 762 x += r->TermWin.fwidth;
726 xc++; len--; 763 xc++; len--;
727 } 764 }
728 while (len); 765 while (len);
729 } 766 }
730 else 767 else
731 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 768 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
732 } 769 }
733 } 770 }
734 else 771 else
735 { 772 {
736 const char *xc = enc_char (text, len, cs, slow); 773 const char *xc = enc_char (text, len, cs, slow);
737 774
738 if (bg == Color_bg && !slow) 775 if (bg == Color_bg && !slow)
739 { 776 {
777 v.background = r->PixColors[bg];
740 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 778 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
741 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 779 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
742 } 780 }
743 else 781 else
744 { 782 {
745 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 783 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
746 784
747 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 785 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
748 786
749 if (slow) 787 if (slow)
750 { 788 {
751 do 789 do
752 { 790 {
753 if (*xc) 791 if (*xc)
754 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 792 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
755 793
756 x += r->TermWin.fwidth; 794 x += r->TermWin.fwidth;
757 xc++; len--; 795 xc++; len--;
758 } 796 }
759 while (len); 797 while (len);
760 } 798 }
761 else 799 else
762 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 800 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
763 } 801 }
764 } 802 }
765} 803}
766 804
767///////////////////////////////////////////////////////////////////////////// 805/////////////////////////////////////////////////////////////////////////////
… …
784 822
785 void draw (rxvt_drawable &d, int x, int y, 823 void draw (rxvt_drawable &d, int x, int y,
786 const text_t *text, int len, 824 const text_t *text, int len,
787 int fg, int bg); 825 int fg, int bg);
788 826
789 bool has_codepoint (uint32_t unicode); 827 bool has_codepoint (unicode_t unicode);
790 828
791protected: 829protected:
792 XftFont *f; 830 XftFont *f;
793}; 831};
794 832
… …
907 945
908 return true; 946 return true;
909} 947}
910 948
911bool 949bool
912rxvt_font_xft::has_codepoint (uint32_t unicode) 950rxvt_font_xft::has_codepoint (unicode_t unicode)
913{ 951{
914 return XftCharExists (DISPLAY, f, unicode); 952 return XftCharExists (DISPLAY, f, unicode);
915} 953}
916 954
917void 955void
… …
963#endif 1001#endif
964 1002
965///////////////////////////////////////////////////////////////////////////// 1003/////////////////////////////////////////////////////////////////////////////
966 1004
967rxvt_fontset::rxvt_fontset (rxvt_t r) 1005rxvt_fontset::rxvt_fontset (rxvt_t r)
968: r (r) 1006: r (r), fontdesc (0)
969{ 1007{
970 clear (); 1008 clear ();
971} 1009}
972 1010
973rxvt_fontset::~rxvt_fontset () 1011rxvt_fontset::~rxvt_fontset ()
… …
978void 1016void
979rxvt_fontset::clear () 1017rxvt_fontset::clear ()
980{ 1018{
981 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1019 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
982 FONT_UNREF (*i); 1020 FONT_UNREF (*i);
1021
1022 free (fontdesc); fontdesc = 0;
983 1023
984 fonts.clear (); 1024 fonts.clear ();
985 base_id = 0; 1025 base_id = 0;
986 base_prop.height = 0x7fffffff; 1026 base_prop.height = 0x7fffffff;
987 base_prop.weight = rxvt_fontprop::medium; 1027 base_prop.weight = rxvt_fontprop::medium;
… …
1013 f = new rxvt_font_x11; 1053 f = new rxvt_font_x11;
1014 } 1054 }
1015 else 1055 else
1016 f = new rxvt_font_x11; 1056 f = new rxvt_font_x11;
1017 1057
1058 f->fs = this;
1018 f->set_term (r); 1059 f->set_term (r);
1019 f->set_name (strdup (name)); 1060 f->set_name (strdup (name));
1020 1061
1021 f->cs = cs; 1062 f->cs = cs;
1022 f->loaded = false; 1063 f->loaded = false;
… …
1094bool 1135bool
1095rxvt_fontset::populate (const char *desc) 1136rxvt_fontset::populate (const char *desc)
1096{ 1137{
1097 clear (); 1138 clear ();
1098 1139
1140 fontdesc = strdup (desc);
1141
1099 fonts.push_back (new_font (0, CS_UNICODE)); 1142 fonts.push_back (new_font (0, CS_UNICODE));
1100 realize_font (0); 1143 realize_font (0);
1101 1144
1102 add_fonts (desc); 1145 add_fonts (desc);
1103 1146
… …
1119 1162
1120 return true; 1163 return true;
1121} 1164}
1122 1165
1123int 1166int
1124rxvt_fontset::find_font (uint32_t unicode) 1167rxvt_fontset::find_font (unicode_t unicode, bool bold)
1125{ 1168{
1126 for (unsigned int i = 0; i < fonts.size (); i++) 1169 for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii
1170 i < fonts.size ();
1171 i++)
1127 { 1172 {
1128 rxvt_font *f = fonts[i]; 1173 rxvt_font *f = fonts[i];
1129 1174
1130 if (!f->loaded) 1175 if (!f->loaded)
1131 { 1176 {
… …
1134 1179
1135 if (!realize_font (i)) 1180 if (!realize_font (i))
1136 goto next_font; 1181 goto next_font;
1137 } 1182 }
1138 1183
1184 if (f->cs == CS_UNKNOWN)
1185 goto next_font;
1186
1187 if (bold && f->properties ().weight < rxvt_fontprop::bold)
1188 goto next_font;
1189
1139 if (f->cs != CS_UNKNOWN && f->has_codepoint (unicode)) 1190 if (f->has_codepoint (unicode))
1140 return i; 1191 return i;
1141 1192
1142 next_font: 1193 next_font:
1143 if (i == fonts.size () - 1 && fallback->name) 1194 if (i == fonts.size () - 1 && fallback->name)
1144 { 1195 {
… …
1146 fallback++; 1197 fallback++;
1147 i = 0; 1198 i = 0;
1148 } 1199 }
1149 } 1200 }
1150 1201
1202 // if no bold font found, use a regular one
1203 if (bold)
1204 return find_font (unicode);
1205
1151 return 0; /* we must return SOME font */ 1206 return 0; /* we must return SOME font */
1152} 1207}
1153 1208
1154 1209
1155 1210

Diff Legend

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