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.24 by pcg, Tue Feb 24 00:44:23 2004 UTC vs.
Revision 1.46 by pcg, Tue Mar 16 05:55:51 2004 UTC

… …
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
110#if XFT
103rxvt_drawable::~rxvt_drawable () 111rxvt_drawable::~rxvt_drawable ()
104{ 112{
105 if (xftdrawable) 113 if (xftdrawable)
106 XftDrawDestroy (xftdrawable); 114 XftDrawDestroy (xftdrawable);
107} 115}
… …
111 if (!xftdrawable) 119 if (!xftdrawable)
112 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); 120 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
113 121
114 return xftdrawable; 122 return xftdrawable;
115} 123}
124#endif
116 125
117///////////////////////////////////////////////////////////////////////////// 126/////////////////////////////////////////////////////////////////////////////
118 127
119static void *enc_buf; 128static void *enc_buf;
120static uint32_t enc_len; 129static uint32_t enc_len;
… …
185 else if (color >= 0) 194 else if (color >= 0)
186 { 195 {
187#if XFT 196#if XFT
188 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
189#else 198#else
190 XSetForeground (d.display->display, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
191 XFillRectangle (d.display->display, d, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
192#endif 201#endif
193 } 202 }
194} 203}
195 204
196static const char *linedraw_cmds[128] = { 205#include "table/linedraw.h"
197 "1hH", "2hH", "1vV", "2vV",
198 0, 0, 0, 0,
199 0, 0, 0, 0,
200 "1HV", "2H1V", "1H2V", "2HV",
201
202 // 2510
203 "1hV", "2h1V", "1h2V", "2hV",
204 "1Hv", "2H1v", "1H2v", "2Hv",
205 "1hv", "2h1v", "1h2v", "2hv",
206 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
207
208 // 2520
209 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
210 "1hvV", "2h1vV", "1hV2v", "1hv2V",
211 "1h2vV", "2hv1V", "1v2hV", "2hvV",
212 "1hHV", "2h1HV", "2H1hV", "2hH1V",
213
214 // 2530
215 "1hH2V", "2hV1H", "1h2HV", "2hHV",
216 "1hHv", "1vH2h", "1hv2H", "1v2hH",
217 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
218 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
219
220 // 2540
221 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
222 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
223 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
224 0, 0, 0, 0,
225
226 // 2550
227 0, 0, 0, 0,
228 0, 0, 0, 0,
229 0, 0, 0, 0,
230 0, 0, 0, 0,
231
232 // 2560
233 0, 0, 0, 0,
234 0, 0, 0, 0,
235 0, 0, 0, 0,
236 0, 0, 0, 0,
237
238 // 2570
239 0, "1a", "1b", "1ab",
240 "1h", "1v", "1H", "1V",
241 "2h", "2v", "2H", "2V",
242 "1h2H", "1v2V", "1H2h", "1V2v"
243
244 // to be done
245};
246 206
247struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
248 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
249 { 210 {
250 rxvt_fontprop p; 211 rxvt_fontprop p;
251 212
252 p.width = p.height = 1; 213 p.width = p.height = 1;
… …
259 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
260 { 221 {
261 width = 1; height = 1; 222 width = 1; height = 1;
262 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
263 224
225 set_name (strdup ("built-in pseudofont"));
226
264 return true; 227 return true;
265 } 228 }
266 229
267 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
268 { 231 {
269 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
270 return true; 233 return true;
234
271 if (unicode >= 0x0080 && unicode <= 0x009f) 235 if (unicode >= 0x0080 && unicode <= 0x009f)
272 return true; 236 return true;
273 237
274 if (unicode >= 0x2500 && unicode <= 0x257f 238 if (unicode >= 0x2500 && unicode <= 0x259f
275 && linedraw_cmds[unicode - 0x2500]) 239 && linedraw_offs[unicode - 0x2500] & 15)
240 return true;
241
242 if (IS_COMPOSE (unicode))
276 return true; 243 return true;
277 244
278 switch (unicode) 245 switch (unicode)
279 { 246 {
280 case ZERO_WIDTH_CHAR: 247 case ZERO_WIDTH_CHAR:
… …
294 const text_t *text, int len, 261 const text_t *text, int len,
295 int fg, int bg) 262 int fg, int bg)
296{ 263{
297 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 264 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
298 265
299 XSetForeground (d.display->display, GC, r->PixColors[fg]); 266 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
300 267
301 while (len--) 268 while (len--)
302 { 269 {
270#if ENABLE_COMBINING
271 compose_char *cc;
272#endif
303 text_t t = *text++; 273 text_t t = *text++;
304 274
305 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 275 int W = r->TermWin.fwidth , w = (W - 1) / 2;
306 { 276 int H = r->TermWin.fheight, h = (H - 1) / 2;
307 const char *p = linedraw_cmds[t - 0x2500]; 277 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
308
309 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;
310 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; 278 int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
279
280 if (0x2500 <= t && t <= 0x259f
281 && linedraw_offs[t - 0x2500] & 15)
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 x_[16];
288 int y_[16];
289
290 for (int i = 0; i <= 8; i++)
291 {
292 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
293 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
294 }
295
296 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
297 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
311 298
312 XGCValues gcv; 299 XGCValues gcv;
313 300
301 gcv.cap_style = CapButt;
302 gcv.line_width = 0;
303 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
304
314 while (*p) 305 while (a < b)
315 { 306 {
307 uint32_t command = *a++;
308
309 int op = (command >> 24) & 255;
310 int a = (command >> 20) & 15;
311 int b = (command >> 16) & 15;
312 int x1 = x_[(command >> 12) & 15];
313 int y1 = y_[(command >> 8) & 15];
314 int x2 = x_[(command >> 4) & 15];
315 int y2 = y_[(command >> 0) & 15];
316
316 switch (*p++) 317 switch (op)
317 { 318 {
318 case '1': 319 case 0: // line
319 gcv.line_width = 0; 320 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
320 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
321 break; 321 break;
322 322
323 case '2': 323 case 1: // rectangle, possibly stippled
324 if (a)
325 {
326 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
327
328 gcv.fill_style = FillStippled;
329 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
330 gcv.ts_x_origin = x;
331 gcv.ts_y_origin = y;
332
333 XChangeGC (d.display->display, TGC,
334 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
335 &gcv);
336 }
337
338
339 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
340
341 if (a)
342 {
343 XFreePixmap (d.display->display, gcv.stipple);
324 gcv.line_width = 2; 344 gcv.stipple = 0;
345 gcv.fill_style = FillSolid;
325 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 346 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
347 }
348
326 break; 349 break;
327 350 case 2: // arc
328 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 351 XDrawArc (d.display->display, d, TGC,
329 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 352 x1 - W/2, y1 - H/2, W-1, H-1,
330 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 353 (a - 1) * 90*64, (b - 1) * 90*64);
331 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 354 break;
332 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
333 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
334 } 355 }
335 } 356 }
336 357 }
337 gcv.line_width = 0; 358#if ENABLE_COMBINING
338 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 359 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
339 } 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
340 else 374 else
341 switch (*text++) 375 switch (t)
342 { 376 {
343 case NOCHAR:
344 case ZERO_WIDTH_CHAR: 377 case ZERO_WIDTH_CHAR:
345 break; 378 break;
379
346 default: 380 default:
347 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 381 int w = 0;
382 while (len > 0 && *text == NOCHAR)
383 {
384 ++text;
385 --len;
386 w += r->TermWin.fwidth;
387 }
388
389 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
390 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
391 x += w;
348 } 392 }
349 393
350 x += r->TermWin.fwidth; 394 x += r->TermWin.fwidth;
351 } 395 }
352} 396}
… …
360 404
361 rxvt_fontprop properties (); 405 rxvt_fontprop properties ();
362 406
363 bool load (const rxvt_fontprop &prop); 407 bool load (const rxvt_fontprop &prop);
364 408
365 bool has_codepoint (uint32_t unicode); 409 bool has_codepoint (unicode_t unicode);
366 410
367 void draw (rxvt_drawable &d, int x, int y, 411 void draw (rxvt_drawable &d, int x, int y,
368 const text_t *text, int len, 412 const text_t *text, int len,
369 int fg, int bg); 413 int fg, int bg);
370 414
… …
427 471
428bool 472bool
429rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 473rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
430{ 474{
431 int slashes = 0; 475 int slashes = 0;
432 const char *comp[12]; 476 const char *comp[13];
433 477
434 for (const char *c = name; *c; c++) 478 for (const char *c = name; *c; c++)
435 if (*c == '-') 479 if (*c == '-')
436 { 480 {
437 comp[slashes++] = c + 1; 481 comp[slashes++] = c + 1;
… …
617 f = 0; 661 f = 0;
618 } 662 }
619} 663}
620 664
621bool 665bool
622rxvt_font_x11::has_codepoint (uint32_t unicode) 666rxvt_font_x11::has_codepoint (unicode_t unicode)
623{ 667{
624 uint32_t ch = FROM_UNICODE (cs, unicode); 668 uint32_t ch = FROM_UNICODE (cs, unicode);
625 669
626 if (ch == NOCHAR) 670 if (ch == NOCHAR)
627 return false; 671 return false;
… …
689 { 733 {
690 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 734 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
691 735
692 if (bg == Color_bg && !slow) 736 if (bg == Color_bg && !slow)
693 { 737 {
694 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 738 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
695 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 739 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
696 } 740 }
697 else 741 else
698 { 742 {
699 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 743 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
700 744
701 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 745 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
702 746
703 if (slow) 747 if (slow)
704 { 748 {
705 do 749 do
706 { 750 {
707 if (xc->byte1 || xc->byte2) 751 if (xc->byte1 || xc->byte2)
708 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 752 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
709 753
710 x += r->TermWin.fwidth; 754 x += r->TermWin.fwidth;
711 xc++; len--; 755 xc++; len--;
712 } 756 }
713 while (len); 757 while (len);
714 } 758 }
715 else 759 else
716 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 760 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
717 } 761 }
718 } 762 }
719 else 763 else
720 { 764 {
721 const char *xc = enc_char (text, len, cs, slow); 765 const char *xc = enc_char (text, len, cs, slow);
722 766
723 if (bg == Color_bg && !slow) 767 if (bg == Color_bg && !slow)
724 { 768 {
725 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 769 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
726 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 770 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
727 } 771 }
728 else 772 else
729 { 773 {
730 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 774 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
731 775
732 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 776 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
733 777
734 if (slow) 778 if (slow)
735 { 779 {
736 do 780 do
737 { 781 {
738 if (*xc) 782 if (*xc)
739 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 783 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
740 784
741 x += r->TermWin.fwidth; 785 x += r->TermWin.fwidth;
742 xc++; len--; 786 xc++; len--;
743 } 787 }
744 while (len); 788 while (len);
745 } 789 }
746 else 790 else
747 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 791 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
748 } 792 }
749 } 793 }
750} 794}
751 795
752///////////////////////////////////////////////////////////////////////////// 796/////////////////////////////////////////////////////////////////////////////
… …
769 813
770 void draw (rxvt_drawable &d, int x, int y, 814 void draw (rxvt_drawable &d, int x, int y,
771 const text_t *text, int len, 815 const text_t *text, int len,
772 int fg, int bg); 816 int fg, int bg);
773 817
774 bool has_codepoint (uint32_t unicode); 818 bool has_codepoint (unicode_t unicode);
775 819
776protected: 820protected:
777 XftFont *f; 821 XftFont *f;
778}; 822};
779 823
… …
892 936
893 return true; 937 return true;
894} 938}
895 939
896bool 940bool
897rxvt_font_xft::has_codepoint (uint32_t unicode) 941rxvt_font_xft::has_codepoint (unicode_t unicode)
898{ 942{
899 return XftCharExists (DISPLAY, f, unicode); 943 return XftCharExists (DISPLAY, f, unicode);
900} 944}
901 945
902void 946void
… …
998 f = new rxvt_font_x11; 1042 f = new rxvt_font_x11;
999 } 1043 }
1000 else 1044 else
1001 f = new rxvt_font_x11; 1045 f = new rxvt_font_x11;
1002 1046
1047 f->fs = this;
1003 f->set_term (r); 1048 f->set_term (r);
1004 f->set_name (strdup (name)); 1049 f->set_name (strdup (name));
1005 1050
1006 f->cs = cs; 1051 f->cs = cs;
1007 f->loaded = false; 1052 f->loaded = false;
… …
1104 1149
1105 return true; 1150 return true;
1106} 1151}
1107 1152
1108int 1153int
1109rxvt_fontset::find_font (uint32_t unicode) 1154rxvt_fontset::find_font (unicode_t unicode)
1110{ 1155{
1111 for (unsigned int i = 0; i < fonts.size (); i++) 1156 for (unsigned int i = 0; i < fonts.size (); i++)
1112 { 1157 {
1113 rxvt_font *f = fonts[i]; 1158 rxvt_font *f = fonts[i];
1114 1159

Diff Legend

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