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.27 by pcg, Wed Mar 3 00:20:33 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_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5*-0" }, 77 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
78 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
79 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
78 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 80 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
79 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 81 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
80 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 82 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
81 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 83 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
82 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 84 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
… …
94 { CS_UNICODE, "xft:FreeMono" }, 96 { CS_UNICODE, "xft:FreeMono" },
95 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 97 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
96 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 98 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
97 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 99 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
98 100
101#if UNICODE_3 && XFT
102 { CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
103#endif
104
99 { CS_UNKNOWN, 0 } 105 { CS_UNKNOWN, 0 }
100}; 106};
101 107
102///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
103 109
… …
188 else if (color >= 0) 194 else if (color >= 0)
189 { 195 {
190#if XFT 196#if XFT
191 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); 197 XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
192#else 198#else
193 XSetForeground (d.display->display, GC, r->PixColors[color]); 199 XSetForeground (d.display->display, TGC, r->PixColors[color]);
194 XFillRectangle (d.display->display, d, GC, x, y, w, h); 200 XFillRectangle (d.display->display, d, TGC, x, y, w, h);
195#endif 201#endif
196 } 202 }
197} 203}
198 204
199static const char *linedraw_cmds[128] = { 205#include "table/linedraw.h"
200 "1hH", "2hH", "1vV", "2vV",
201 0, 0, 0, 0,
202 0, 0, 0, 0,
203 "1HV", "2H1V", "1H2V", "2HV",
204
205 // 2510
206 "1hV", "2h1V", "1h2V", "2hV",
207 "1Hv", "2H1v", "1H2v", "2Hv",
208 "1hv", "2h1v", "1h2v", "2hv",
209 "1HvV", "2H1vV", "1HV2v", "1Hv2V",
210
211 // 2520
212 "1H2vV", "2Hv1V", "2HV1v", "2HvV",
213 "1hvV", "2h1vV", "1hV2v", "1hv2V",
214 "1h2vV", "2hv1V", "1v2hV", "2hvV",
215 "1hHV", "2h1HV", "2H1hV", "2hH1V",
216
217 // 2530
218 "1hH2V", "2hV1H", "1h2HV", "2hHV",
219 "1hHv", "1vH2h", "1hv2H", "1v2hH",
220 "1hH2v", "1H2hv", "1h2Hv", "2hHv",
221 "1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
222
223 // 2540
224 "1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
225 "1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
226 "1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
227 0, 0, 0, 0,
228
229 // 2550
230 0, 0, 0, 0,
231 0, 0, 0, 0,
232 0, 0, 0, 0,
233 0, 0, 0, 0,
234
235 // 2560
236 0, 0, 0, 0,
237 0, 0, 0, 0,
238 0, 0, 0, 0,
239 0, 0, 0, 0,
240
241 // 2570
242 0, "1a", "1b", "1ab",
243 "1h", "1v", "1H", "1V",
244 "2h", "2v", "2H", "2V",
245 "1h2H", "1v2V", "1H2h", "1V2v"
246
247 // to be done
248};
249 206
250struct rxvt_font_default : rxvt_font { 207struct rxvt_font_default : rxvt_font {
208
251 rxvt_fontprop properties () 209 rxvt_fontprop properties ()
252 { 210 {
253 rxvt_fontprop p; 211 rxvt_fontprop p;
254 212
255 p.width = p.height = 1; 213 p.width = p.height = 1;
… …
262 bool load (const rxvt_fontprop &prop) 220 bool load (const rxvt_fontprop &prop)
263 { 221 {
264 width = 1; height = 1; 222 width = 1; height = 1;
265 ascent = 1; descent = 0; 223 ascent = 1; descent = 0;
266 224
225 set_name (strdup ("built-in pseudofont"));
226
267 return true; 227 return true;
268 } 228 }
269 229
270 bool has_codepoint (uint32_t unicode) 230 bool has_codepoint (unicode_t unicode)
271 { 231 {
272 if (unicode <= 0x001f) 232 if (unicode <= 0x001f)
273 return true; 233 return true;
234
274 if (unicode >= 0x0080 && unicode <= 0x009f) 235 if (unicode >= 0x0080 && unicode <= 0x009f)
275 return true; 236 return true;
276 237
277 if (unicode >= 0x2500 && unicode <= 0x257f 238 if (unicode >= 0x2500 && unicode <= 0x259f
278 && linedraw_cmds[unicode - 0x2500]) 239 && linedraw_offs[unicode - 0x2500] & 15)
240 return true;
241
242 if (IS_COMPOSE (unicode))
279 return true; 243 return true;
280 244
281 switch (unicode) 245 switch (unicode)
282 { 246 {
283 case ZERO_WIDTH_CHAR: 247 case ZERO_WIDTH_CHAR:
… …
297 const text_t *text, int len, 261 const text_t *text, int len,
298 int fg, int bg) 262 int fg, int bg)
299{ 263{
300 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);
301 265
302 XSetForeground (d.display->display, GC, r->PixColors[fg]); 266 XSetForeground (d.display->display, TGC, r->PixColors[fg]);
303 267
304 while (len--) 268 while (len--)
305 { 269 {
270#if ENABLE_COMBINING
271 compose_char *cc;
272#endif
306 text_t t = *text++; 273 text_t t = *text++;
307 274
308 // is it in our linedrawing table? 275 int W = r->TermWin.fwidth , w = (W - 1) / 2;
309 if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) 276 int H = r->TermWin.fheight, h = (H - 1) / 2;
277 int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
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++)
310 { 291 {
311 const char *p = linedraw_cmds[t - 0x2500]; 292 x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
293 y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
294 }
312 295
313 int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1; 296 x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
314 int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1; 297 y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
315 298
316 XGCValues gcv; 299 XGCValues gcv;
317 300
301 gcv.cap_style = CapButt;
302 gcv.line_width = 0;
303 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv);
304
318 while (*p) 305 while (a < b)
319 { 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
320 switch (*p++) 317 switch (op)
321 { 318 {
322 case '1': 319 case 0: // line
323 gcv.line_width = 0; 320 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
324 XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
325 break; 321 break;
326 322
327 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);
328 gcv.line_width = 2; 344 gcv.stipple = 0;
345 gcv.fill_style = FillSolid;
329 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 346 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
347 }
348
330 break; 349 break;
331 350 case 2: // arc
332 case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; 351 XDrawArc (d.display->display, d, TGC,
333 case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; 352 x1 - W/2, y1 - H/2, W-1, H-1,
334 case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; 353 (a - 1) * 90*64, (b - 1) * 90*64);
335 case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; 354 break;
336 case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
337 case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
338 } 355 }
339 } 356 }
340 357 }
341 gcv.line_width = 0; 358#if ENABLE_COMBINING
342 XChangeGC (d.display->display, GC, GCLineWidth, &gcv); 359 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
343 } 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
344 else 374 else
345 switch (t) 375 switch (t)
346 { 376 {
347 case ZERO_WIDTH_CHAR: 377 case ZERO_WIDTH_CHAR:
348 break; 378 break;
379
349 default: 380 default:
350 int w = 0; 381 int w = 0;
351 while (len > 0 && *text == NOCHAR) 382 while (len > 0 && *text == NOCHAR)
352 { 383 {
353 ++text; 384 ++text;
354 --len; 385 --len;
355 w += r->TermWin.fwidth; 386 w += r->TermWin.fwidth;
356 } 387 }
357 388
358 XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, 389 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
359 w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); 390 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
360 x += w; 391 x += w;
361 } 392 }
362 393
363 x += r->TermWin.fwidth; 394 x += r->TermWin.fwidth;
364 } 395 }
… …
373 404
374 rxvt_fontprop properties (); 405 rxvt_fontprop properties ();
375 406
376 bool load (const rxvt_fontprop &prop); 407 bool load (const rxvt_fontprop &prop);
377 408
378 bool has_codepoint (uint32_t unicode); 409 bool has_codepoint (unicode_t unicode);
379 410
380 void draw (rxvt_drawable &d, int x, int y, 411 void draw (rxvt_drawable &d, int x, int y,
381 const text_t *text, int len, 412 const text_t *text, int len,
382 int fg, int bg); 413 int fg, int bg);
383 414
… …
440 471
441bool 472bool
442rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 473rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
443{ 474{
444 int slashes = 0; 475 int slashes = 0;
445 const char *comp[12]; 476 const char *comp[13];
446 477
447 for (const char *c = name; *c; c++) 478 for (const char *c = name; *c; c++)
448 if (*c == '-') 479 if (*c == '-')
449 { 480 {
450 comp[slashes++] = c + 1; 481 comp[slashes++] = c + 1;
… …
630 f = 0; 661 f = 0;
631 } 662 }
632} 663}
633 664
634bool 665bool
635rxvt_font_x11::has_codepoint (uint32_t unicode) 666rxvt_font_x11::has_codepoint (unicode_t unicode)
636{ 667{
637 uint32_t ch = FROM_UNICODE (cs, unicode); 668 uint32_t ch = FROM_UNICODE (cs, unicode);
638 669
639 if (ch == NOCHAR) 670 if (ch == NOCHAR)
640 return false; 671 return false;
… …
702 { 733 {
703 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 734 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
704 735
705 if (bg == Color_bg && !slow) 736 if (bg == Color_bg && !slow)
706 { 737 {
707 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 738 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
708 XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); 739 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
709 } 740 }
710 else 741 else
711 { 742 {
712 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);
713 744
714 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 745 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
715 746
716 if (slow) 747 if (slow)
717 { 748 {
718 do 749 do
719 { 750 {
720 if (xc->byte1 || xc->byte2) 751 if (xc->byte1 || xc->byte2)
721 XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); 752 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
722 753
723 x += r->TermWin.fwidth; 754 x += r->TermWin.fwidth;
724 xc++; len--; 755 xc++; len--;
725 } 756 }
726 while (len); 757 while (len);
727 } 758 }
728 else 759 else
729 XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); 760 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
730 } 761 }
731 } 762 }
732 else 763 else
733 { 764 {
734 const char *xc = enc_char (text, len, cs, slow); 765 const char *xc = enc_char (text, len, cs, slow);
735 766
736 if (bg == Color_bg && !slow) 767 if (bg == Color_bg && !slow)
737 { 768 {
738 XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); 769 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
739 XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); 770 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
740 } 771 }
741 else 772 else
742 { 773 {
743 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);
744 775
745 XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); 776 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v);
746 777
747 if (slow) 778 if (slow)
748 { 779 {
749 do 780 do
750 { 781 {
751 if (*xc) 782 if (*xc)
752 XDrawString (d.display->display, d, GC, x, y + base, xc, 1); 783 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
753 784
754 x += r->TermWin.fwidth; 785 x += r->TermWin.fwidth;
755 xc++; len--; 786 xc++; len--;
756 } 787 }
757 while (len); 788 while (len);
758 } 789 }
759 else 790 else
760 XDrawString (d.display->display, d, GC, x, y + base, xc, len); 791 XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
761 } 792 }
762 } 793 }
763} 794}
764 795
765///////////////////////////////////////////////////////////////////////////// 796/////////////////////////////////////////////////////////////////////////////
… …
782 813
783 void draw (rxvt_drawable &d, int x, int y, 814 void draw (rxvt_drawable &d, int x, int y,
784 const text_t *text, int len, 815 const text_t *text, int len,
785 int fg, int bg); 816 int fg, int bg);
786 817
787 bool has_codepoint (uint32_t unicode); 818 bool has_codepoint (unicode_t unicode);
788 819
789protected: 820protected:
790 XftFont *f; 821 XftFont *f;
791}; 822};
792 823
… …
905 936
906 return true; 937 return true;
907} 938}
908 939
909bool 940bool
910rxvt_font_xft::has_codepoint (uint32_t unicode) 941rxvt_font_xft::has_codepoint (unicode_t unicode)
911{ 942{
912 return XftCharExists (DISPLAY, f, unicode); 943 return XftCharExists (DISPLAY, f, unicode);
913} 944}
914 945
915void 946void
… …
1011 f = new rxvt_font_x11; 1042 f = new rxvt_font_x11;
1012 } 1043 }
1013 else 1044 else
1014 f = new rxvt_font_x11; 1045 f = new rxvt_font_x11;
1015 1046
1047 f->fs = this;
1016 f->set_term (r); 1048 f->set_term (r);
1017 f->set_name (strdup (name)); 1049 f->set_name (strdup (name));
1018 1050
1019 f->cs = cs; 1051 f->cs = cs;
1020 f->loaded = false; 1052 f->loaded = false;
… …
1117 1149
1118 return true; 1150 return true;
1119} 1151}
1120 1152
1121int 1153int
1122rxvt_fontset::find_font (uint32_t unicode) 1154rxvt_fontset::find_font (unicode_t unicode)
1123{ 1155{
1124 for (unsigned int i = 0; i < fonts.size (); i++) 1156 for (unsigned int i = 0; i < fonts.size (); i++)
1125 { 1157 {
1126 rxvt_font *f = fonts[i]; 1158 rxvt_font *f = fonts[i];
1127 1159

Diff Legend

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