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.26 by pcg, Fri Feb 27 02:52:51 2004 UTC vs.
Revision 1.52 by pcg, Thu Apr 8 20:31:45 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[] = {
… …
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#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" },
… …
93 { CS_UNICODE, "xft:FreeMono" }, 96 { 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
… …
187 else if (color >= 0) 194 else if (color >= 0)
188 { 195 {
189#if XFT 196#if XFT
190 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
191#else 198#else
192 XSetForeground (d.display->display, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
193 XFillRectangle (d.display->display, d, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
194#endif 201#endif
195 } 202 }
196} 203}
197 204
198static const char *linedraw_cmds[128] = { 205#include "table/linedraw.h"
199 "1hH", "2hH", "1vV", "2vV",
200 0, 0, 0, 0,
201 0, 0, 0, 0,
202 "1HV", "2H1V", "1H2V", "2HV",
203
204 // 2510
205 "1hV", "2h1V", "1h2V", "2hV",
206 "1Hv", "2H1v", "1H2v", "2Hv",
207 "1hv", "2h1v", "1h2v", "2hv",
208 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
209
210 // 2520
211 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
212 "1hvV", "2h1vV", "1hV2v", "1hv2V",
213 "1h2vV", "2hv1V", "1v2hV", "2hvV",
214 "1hHV", "2h1HV", "2H1hV", "2hH1V",
215
216 // 2530
217 "1hH2V", "2hV1H", "1h2HV", "2hHV",
218 "1hHv", "1vH2h", "1hv2H", "1v2hH",
219 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
220 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
221
222 // 2540
223 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
224 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
225 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
226 0, 0, 0, 0,
227
228 // 2550
229 0, 0, 0, 0,
230 0, 0, 0, 0,
231 0, 0, 0, 0,
232 0, 0, 0, 0,
233
234 // 2560
235 0, 0, 0, 0,
236 0, 0, 0, 0,
237 0, 0, 0, 0,
238 0, 0, 0, 0,
239
240 // 2570
241 0, "1a", "1b", "1ab",
242 "1h", "1v", "1H", "1V",
243 "2h", "2v", "2H", "2V",
244 "1h2H", "1v2V", "1H2h", "1V2v"
245
246 // to be done
247};
248 206
249struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
250 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
251 { 210 {
252 rxvt_fontprop p; 211 rxvt_fontprop p;
253 212
254 p.width = p.height = 1; 213 p.width = p.height = 1;
… …
261 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
262 { 221 {
263 width = 1; height = 1; 222 width = 1; height = 1;
264 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
265 224
225 set_name (strdup ("built-in pseudofont"));
226
266 return true; 227 return true;
267 } 228 }
268 229
269 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
270 { 231 {
271 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
272 return true; 233 return true;
273 if (unicode >= 0x0080 && unicode <= 0x009f) 234
235 if (unicode <= 0x007f)
236 return false;
237
238 if (unicode <= 0x009f)
274 return true; 239 return true;
275 240
276 if (unicode >= 0x2500 && unicode <= 0x257f 241 if (unicode >= 0x2500 && unicode <= 0x259f)
277 && linedraw_cmds[unicode - 0x2500]) 242 return true;
243
244 if (IS_COMPOSE (unicode))
278 return true; 245 return true;
279 246
280 switch (unicode) 247 switch (unicode)
281 { 248 {
282 case ZERO_WIDTH_CHAR: 249 case ZERO_WIDTH_CHAR:
… …
296 const text_t *text, int len, 263 const text_t *text, int len,
297 int fg, int bg) 264 int fg, int bg)
298{ 265{
299 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);
300 267
301 XSetForeground (d.display->display, GC, r->PixColors[fg]); 268 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
302 269
303 while (len--) 270 while (len--)
304 { 271 {
272#if ENABLE_COMBINING
273 compose_char *cc;
274#endif
305 text_t t = *text++; 275 text_t t = *text++;
306 276
307 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++)
308 { 290 {
309 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 }
310 294
311 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;
312 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;
313 297
314 XGCValues gcv; 298 XGCValues gcv;
315 299
300 gcv.cap_style = CapButt;
301 gcv.line_width = 0;
302 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
303
316 while (*p) 304 while (a < b)
317 { 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
318 switch (*p++) 316 switch (op)
319 { 317 {
320 case '1': 318 case 0: // line
321 gcv.line_width = 0; 319 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
322 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
323 break; 320 break;
324 321
325 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);
326 gcv.line_width = 2; 342 gcv.stipple = 0;
343 gcv.fill_style = FillSolid;
327 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 344 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
345 }
328 break; 346 break;
329 347 case 2: // arc
330 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 348 XDrawArc (d.display->display, d, TGC,
331 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 349 x1 - W/2, y1 - H/2, W-1, H-1,
332 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 350 (a - 1) * 90*64, (b - 1) * 90*64);
333 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 351 break;
334 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
335 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
336 } 352 }
337 } 353 }
338 354 }
339 gcv.line_width = 0; 355#if ENABLE_COMBINING
340 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 356 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
341 } 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
342 else 371 else
343 switch (*text++) 372 switch (t)
344 { 373 {
345 case NOCHAR:
346 case ZERO_WIDTH_CHAR: 374 case ZERO_WIDTH_CHAR:
347 break; 375 break;
376
348 default: 377 default:
349 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;
350 } 389 }
351 390
352 x += r->TermWin.fwidth; 391 x += r->TermWin.fwidth;
353 } 392 }
354} 393}
… …
362 401
363 rxvt_fontprop properties (); 402 rxvt_fontprop properties ();
364 403
365 bool load (const rxvt_fontprop &prop); 404 bool load (const rxvt_fontprop &prop);
366 405
367 bool has_codepoint (uint32_t unicode); 406 bool has_codepoint (unicode_t unicode);
368 407
369 void draw (rxvt_drawable &d, int x, int y, 408 void draw (rxvt_drawable &d, int x, int y,
370 const text_t *text, int len, 409 const text_t *text, int len,
371 int fg, int bg); 410 int fg, int bg);
372 411
373 XFontStruct *f; 412 XFontStruct *f;
374 codeset cs; 413 codeset cs;
375 bool enc2b, encm; 414 bool enc2b, encm;
376 415
377 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;
378 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);
379 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 418 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
380 bool set_properties (rxvt_fontprop &p, const char *name); 419 bool set_properties (rxvt_fontprop &p, const char *name);
381}; 420};
382 421
383const char * 422char *
384rxvt_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
385{ 424{
386 unsigned long value; 425 unsigned long value;
387 426
388 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 427 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))
389 return XGetAtomName (DISPLAY, value); 428 return XGetAtomName (DISPLAY, value);
390 else 429 else
391 return repl; 430 return rxvt_strdup (repl);
392} 431}
393 432
394rxvt_fontprop 433rxvt_fontprop
395rxvt_font_x11::properties () 434rxvt_font_x11::properties ()
396{ 435{
… …
411} 450}
412 451
413bool 452bool
414rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 453rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
415{ 454{
416 const char *weight = get_property (f, "WEIGHT_NAME", "medium");
417 const char *slant = get_property (f, "SLANT", "r");
418
419 unsigned long height; 455 unsigned long height;
420 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 456 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
421 return false; 457 return false;
422 458
423 unsigned long avgwidth; 459 unsigned long avgwidth;
424 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 460 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
425 avgwidth = 0; 461 avgwidth = 0;
426 462
463 char *weight = get_property (f, "WEIGHT_NAME", "medium");
464 char *slant = get_property (f, "SLANT", "r");
465
427 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;
428} 472}
429 473
430bool 474bool
431rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 475rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
432{ 476{
433 int slashes = 0; 477 int slashes = 0;
434 const char *comp[12]; 478 const char *comp[13];
435 479
436 for (const char *c = name; *c; c++) 480 for (const char *c = name; *c; c++)
437 if (*c == '-') 481 if (*c == '-')
438 { 482 {
439 comp[slashes++] = c + 1; 483 comp[slashes++] = c + 1;
… …
536 f = XLoadQueryFont (DISPLAY, name); 580 f = XLoadQueryFont (DISPLAY, name);
537 581
538 if (!f) 582 if (!f)
539 return false; 583 return false;
540 584
541 const char *registry = get_property (f, "CHARSET_REGISTRY", 0); 585 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
542 const char *encoding = get_property (f, "CHARSET_ENCODING", 0); 586 char *encoding = get_property (f, "CHARSET_ENCODING", 0);
543 587
544 if (registry && encoding) 588 if (registry && encoding)
545 { 589 {
546 char charset[64]; 590 char charset[64];
547 snprintf (charset, 64, "%s-%s", registry, encoding); 591 snprintf (charset, 64, "%s-%s", registry, encoding);
… …
560 if (*charset++ == '-' && !--count) 604 if (*charset++ == '-' && !--count)
561 break; 605 break;
562 606
563 cs = codeset_from_name (charset); 607 cs = codeset_from_name (charset);
564 } 608 }
609
610 free (registry);
611 free (encoding);
565 612
566 if (cs == CS_UNICODE) 613 if (cs == CS_UNICODE)
567 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
568 615
569 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 616 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
619 f = 0; 666 f = 0;
620 } 667 }
621} 668}
622 669
623bool 670bool
624rxvt_font_x11::has_codepoint (uint32_t unicode) 671rxvt_font_x11::has_codepoint (unicode_t unicode)
625{ 672{
626 uint32_t ch = FROM_UNICODE (cs, unicode); 673 uint32_t ch = FROM_UNICODE (cs, unicode);
627 674
628 if (ch == NOCHAR) 675 if (ch == NOCHAR)
629 return false; 676 return false;
… …
682 729
683 int base = r->TermWin.fbase; 730 int base = r->TermWin.fbase;
684 731
685 XGCValues v; 732 XGCValues v;
686 v.foreground = r->PixColors[fg]; 733 v.foreground = r->PixColors[fg];
687 v.background = r->PixColors[bg];
688 v.font = f->fid; 734 v.font = f->fid;
689 735
690 if (enc2b) 736 if (enc2b)
691 { 737 {
692 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 738 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
693 739
694 if (bg == Color_bg && !slow) 740 if (bg == Color_bg && !slow)
695 { 741 {
742 v.background = r->PixColors[bg];
696 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 743 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
697 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 744 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
698 } 745 }
699 else 746 else
700 { 747 {
701 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);
702 749
703 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 750 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
704 751
705 if (slow) 752 if (slow)
706 { 753 {
707 do 754 do
708 { 755 {
709 if (xc->byte1 || xc->byte2) 756 if (xc->byte1 || xc->byte2)
710 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 757 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
711 758
712 x += r->TermWin.fwidth; 759 x += r->TermWin.fwidth;
713 xc++; len--; 760 xc++; len--;
714 } 761 }
715 while (len); 762 while (len);
716 } 763 }
717 else 764 else
718 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 765 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
719 } 766 }
720 } 767 }
721 else 768 else
722 { 769 {
723 const char *xc = enc_char (text, len, cs, slow); 770 const char *xc = enc_char (text, len, cs, slow);
724 771
725 if (bg == Color_bg && !slow) 772 if (bg == Color_bg && !slow)
726 { 773 {
774 v.background = r->PixColors[bg];
727 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 775 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
728 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 776 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
729 } 777 }
730 else 778 else
731 { 779 {
732 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);
733 781
734 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 782 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
735 783
736 if (slow) 784 if (slow)
737 { 785 {
738 do 786 do
739 { 787 {
740 if (*xc) 788 if (*xc)
741 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 789 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
742 790
743 x += r->TermWin.fwidth; 791 x += r->TermWin.fwidth;
744 xc++; len--; 792 xc++; len--;
745 } 793 }
746 while (len); 794 while (len);
747 } 795 }
748 else 796 else
749 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 797 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
750 } 798 }
751 } 799 }
752} 800}
753 801
754///////////////////////////////////////////////////////////////////////////// 802/////////////////////////////////////////////////////////////////////////////
… …
771 819
772 void draw (rxvt_drawable &d, int x, int y, 820 void draw (rxvt_drawable &d, int x, int y,
773 const text_t *text, int len, 821 const text_t *text, int len,
774 int fg, int bg); 822 int fg, int bg);
775 823
776 bool has_codepoint (uint32_t unicode); 824 bool has_codepoint (unicode_t unicode);
777 825
778protected: 826protected:
779 XftFont *f; 827 XftFont *f;
780}; 828};
781 829
… …
894 942
895 return true; 943 return true;
896} 944}
897 945
898bool 946bool
899rxvt_font_xft::has_codepoint (uint32_t unicode) 947rxvt_font_xft::has_codepoint (unicode_t unicode)
900{ 948{
901 return XftCharExists (DISPLAY, f, unicode); 949 return XftCharExists (DISPLAY, f, unicode);
902} 950}
903 951
904void 952void
… …
950#endif 998#endif
951 999
952///////////////////////////////////////////////////////////////////////////// 1000/////////////////////////////////////////////////////////////////////////////
953 1001
954rxvt_fontset::rxvt_fontset (rxvt_t r) 1002rxvt_fontset::rxvt_fontset (rxvt_t r)
955: r (r) 1003: r (r), fontdesc (0)
956{ 1004{
957 clear (); 1005 clear ();
958} 1006}
959 1007
960rxvt_fontset::~rxvt_fontset () 1008rxvt_fontset::~rxvt_fontset ()
… …
965void 1013void
966rxvt_fontset::clear () 1014rxvt_fontset::clear ()
967{ 1015{
968 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1016 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
969 FONT_UNREF (*i); 1017 FONT_UNREF (*i);
1018
1019 free (fontdesc); fontdesc = 0;
970 1020
971 fonts.clear (); 1021 fonts.clear ();
972 base_id = 0; 1022 base_id = 0;
973 base_prop.height = 0x7fffffff; 1023 base_prop.height = 0x7fffffff;
974 base_prop.weight = rxvt_fontprop::medium; 1024 base_prop.weight = rxvt_fontprop::medium;
… …
1000 f = new rxvt_font_x11; 1050 f = new rxvt_font_x11;
1001 } 1051 }
1002 else 1052 else
1003 f = new rxvt_font_x11; 1053 f = new rxvt_font_x11;
1004 1054
1055 f->fs = this;
1005 f->set_term (r); 1056 f->set_term (r);
1006 f->set_name (strdup (name)); 1057 f->set_name (strdup (name));
1007 1058
1008 f->cs = cs; 1059 f->cs = cs;
1009 f->loaded = false; 1060 f->loaded = false;
… …
1081bool 1132bool
1082rxvt_fontset::populate (const char *desc) 1133rxvt_fontset::populate (const char *desc)
1083{ 1134{
1084 clear (); 1135 clear ();
1085 1136
1137 fontdesc = strdup (desc);
1138
1086 fonts.push_back (new_font (0, CS_UNICODE)); 1139 fonts.push_back (new_font (0, CS_UNICODE));
1087 realize_font (0); 1140 realize_font (0);
1088 1141
1089 add_fonts (desc); 1142 add_fonts (desc);
1090 1143
… …
1106 1159
1107 return true; 1160 return true;
1108} 1161}
1109 1162
1110int 1163int
1111rxvt_fontset::find_font (uint32_t unicode) 1164rxvt_fontset::find_font (unicode_t unicode)
1112{ 1165{
1113 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++)
1114 { 1169 {
1115 rxvt_font *f = fonts[i]; 1170 rxvt_font *f = fonts[i];
1116 1171
1117 if (!f->loaded) 1172 if (!f->loaded)
1118 { 1173 {

Diff Legend

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