… | |
… | |
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 | |
31 | const struct rxvt_fallback_font { |
31 | const 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 |
… | |
… | |
194 | else if (color >= 0) |
194 | else if (color >= 0) |
195 | { |
195 | { |
196 | #if XFT |
196 | #if XFT |
197 | XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); |
197 | XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); |
198 | #else |
198 | #else |
199 | XSetForeground (d.display->display, GC, r->PixColors[color]); |
199 | XSetForeground (d.display->display, TGC, r->PixColors[color]); |
200 | XFillRectangle (d.display->display, d, GC, x, y, w, h); |
200 | XFillRectangle (d.display->display, d, TGC, x, y, w, h); |
201 | #endif |
201 | #endif |
202 | } |
202 | } |
203 | } |
203 | } |
204 | |
204 | |
205 | static const char *linedraw_cmds[128] = { |
205 | #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 | |
206 | |
256 | struct rxvt_font_default : rxvt_font { |
207 | struct rxvt_font_default : rxvt_font { |
|
|
208 | |
257 | rxvt_fontprop properties () |
209 | rxvt_fontprop properties () |
258 | { |
210 | { |
259 | rxvt_fontprop p; |
211 | rxvt_fontprop p; |
260 | |
212 | |
261 | p.width = p.height = 1; |
213 | p.width = p.height = 1; |
… | |
… | |
268 | bool load (const rxvt_fontprop &prop) |
220 | bool load (const rxvt_fontprop &prop) |
269 | { |
221 | { |
270 | width = 1; height = 1; |
222 | width = 1; height = 1; |
271 | ascent = 1; descent = 0; |
223 | ascent = 1; descent = 0; |
272 | |
224 | |
|
|
225 | set_name (strdup ("built-in pseudofont")); |
|
|
226 | |
273 | return true; |
227 | return true; |
274 | } |
228 | } |
275 | |
229 | |
276 | bool has_codepoint (uint32_t unicode) |
230 | bool has_codepoint (unicode_t unicode) |
277 | { |
231 | { |
278 | if (unicode <= 0x001f) |
232 | if (unicode <= 0x001f) |
279 | return true; |
233 | return true; |
|
|
234 | |
280 | if (unicode >= 0x0080 && unicode <= 0x009f) |
235 | if (unicode >= 0x0080 && unicode <= 0x009f) |
281 | return true; |
236 | return true; |
282 | |
237 | |
283 | if (unicode >= 0x2500 && unicode <= 0x257f |
238 | if (unicode >= 0x2500 && unicode <= 0x259f |
284 | && linedraw_cmds[unicode - 0x2500]) |
239 | && linedraw_offs[unicode - 0x2500] & 15) |
|
|
240 | return true; |
|
|
241 | |
|
|
242 | if (IS_COMPOSE (unicode)) |
285 | return true; |
243 | return true; |
286 | |
244 | |
287 | switch (unicode) |
245 | switch (unicode) |
288 | { |
246 | { |
289 | case ZERO_WIDTH_CHAR: |
247 | case ZERO_WIDTH_CHAR: |
… | |
… | |
301 | void |
259 | void |
302 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
260 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
303 | const text_t *text, int len, |
261 | const text_t *text, int len, |
304 | int fg, int bg) |
262 | int fg, int bg) |
305 | { |
263 | { |
|
|
264 | return; |
306 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
265 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
307 | |
266 | |
308 | XSetForeground (d.display->display, GC, r->PixColors[fg]); |
267 | XSetForeground (d.display->display, TGC, r->PixColors[fg]); |
309 | |
268 | |
310 | while (len--) |
269 | while (len--) |
311 | { |
270 | { |
|
|
271 | #if ENABLE_COMBINING |
|
|
272 | compose_char *cc; |
|
|
273 | #endif |
312 | text_t t = *text++; |
274 | text_t t = *text++; |
313 | |
275 | |
314 | // is it in our linedrawing table? |
276 | int W = r->TermWin.fwidth , w = (W - 1) / 2; |
315 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
277 | int H = r->TermWin.fheight, h = (H - 1) / 2; |
|
|
278 | int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ; |
|
|
279 | int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight; |
|
|
280 | |
|
|
281 | if (0x2500 <= t && t <= 0x259f |
|
|
282 | && linedraw_offs[t - 0x2500] & 15) |
|
|
283 | { |
|
|
284 | uint16_t offs = linedraw_offs[t - 0x2500]; |
|
|
285 | uint32_t *a = linedraw_command + (offs >> 4); |
|
|
286 | uint32_t *b = a + (offs & 15); |
|
|
287 | |
|
|
288 | int x_[16]; |
|
|
289 | int y_[16]; |
|
|
290 | |
|
|
291 | for (int i = 0; i <= 8; i++) |
316 | { |
292 | { |
317 | const char *p = linedraw_cmds[t - 0x2500]; |
293 | x_[i] = x + ((W-1) * i + (i*7/8)) / 8; |
|
|
294 | y_[i] = y + ((H-1) * i + (i*7/8)) / 8; |
|
|
295 | } |
318 | |
296 | |
319 | int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; |
297 | x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1; |
320 | int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; |
298 | y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1; |
321 | |
299 | |
322 | XGCValues gcv; |
300 | XGCValues gcv; |
323 | |
301 | |
|
|
302 | gcv.cap_style = CapButt; |
|
|
303 | gcv.line_width = 0; |
|
|
304 | XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); |
|
|
305 | |
324 | while (*p) |
306 | while (a < b) |
325 | { |
307 | { |
|
|
308 | uint32_t command = *a++; |
|
|
309 | |
|
|
310 | int op = (command >> 24) & 255; |
|
|
311 | int a = (command >> 20) & 15; |
|
|
312 | int b = (command >> 16) & 15; |
|
|
313 | int x1 = x_[(command >> 12) & 15]; |
|
|
314 | int y1 = y_[(command >> 8) & 15]; |
|
|
315 | int x2 = x_[(command >> 4) & 15]; |
|
|
316 | int y2 = y_[(command >> 0) & 15]; |
|
|
317 | |
326 | switch (*p++) |
318 | switch (op) |
327 | { |
319 | { |
328 | case '1': |
320 | case 0: // line |
329 | gcv.line_width = 0; |
321 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
330 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
|
|
331 | break; |
322 | break; |
332 | |
323 | |
333 | case '2': |
324 | case 1: // rectangle, possibly stippled |
|
|
325 | if (a) |
|
|
326 | { |
|
|
327 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
|
|
328 | |
|
|
329 | gcv.fill_style = FillStippled; |
|
|
330 | gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); |
|
|
331 | gcv.ts_x_origin = x; |
|
|
332 | gcv.ts_y_origin = y; |
|
|
333 | |
|
|
334 | XChangeGC (d.display->display, TGC, |
|
|
335 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
|
|
336 | &gcv); |
|
|
337 | } |
|
|
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); |
334 | gcv.line_width = 2; |
345 | gcv.stipple = 0; |
|
|
346 | gcv.fill_style = FillSolid; |
335 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
347 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
|
|
348 | } |
|
|
349 | |
336 | break; |
350 | break; |
337 | |
351 | case 2: // arc |
338 | case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; |
352 | XDrawArc (d.display->display, d, TGC, |
339 | case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; |
353 | x1 - W/2, y1 - H/2, W-1, H-1, |
340 | case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; |
354 | (a - 1) * 90*64, (b - 1) * 90*64); |
341 | case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; |
355 | break; |
342 | case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break; |
|
|
343 | case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break; |
|
|
344 | } |
356 | } |
345 | } |
357 | } |
346 | |
358 | } |
347 | gcv.line_width = 0; |
359 | #if ENABLE_COMBINING |
348 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
360 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
349 | } |
361 | { |
|
|
362 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
|
|
363 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
|
|
364 | if (cc->c2 != NOCHAR) |
|
|
365 | { |
|
|
366 | // prefer font of first character, for no good reasons |
|
|
367 | rxvt_font *f2 = f1->has_codepoint (cc->c2) |
|
|
368 | ? f1 |
|
|
369 | : (*fs)[fs->find_font (cc->c2)]; |
|
|
370 | |
|
|
371 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
|
|
372 | } |
|
|
373 | } |
|
|
374 | #endif |
350 | else |
375 | else |
351 | switch (t) |
376 | switch (t) |
352 | { |
377 | { |
353 | case ZERO_WIDTH_CHAR: |
378 | case ZERO_WIDTH_CHAR: |
354 | break; |
379 | break; |
|
|
380 | |
355 | default: |
381 | default: |
356 | int w = 0; |
382 | int w = 0; |
357 | while (len > 0 && *text == NOCHAR) |
383 | while (len > 0 && *text == NOCHAR) |
358 | { |
384 | { |
359 | ++text; |
385 | ++text; |
360 | --len; |
386 | --len; |
361 | w += r->TermWin.fwidth; |
387 | w += r->TermWin.fwidth; |
362 | } |
388 | } |
363 | |
389 | |
364 | XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, |
390 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
365 | w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
391 | w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); |
366 | x += w; |
392 | x += w; |
367 | } |
393 | } |
368 | |
394 | |
369 | x += r->TermWin.fwidth; |
395 | x += r->TermWin.fwidth; |
370 | } |
396 | } |
… | |
… | |
379 | |
405 | |
380 | rxvt_fontprop properties (); |
406 | rxvt_fontprop properties (); |
381 | |
407 | |
382 | bool load (const rxvt_fontprop &prop); |
408 | bool load (const rxvt_fontprop &prop); |
383 | |
409 | |
384 | bool has_codepoint (uint32_t unicode); |
410 | bool has_codepoint (unicode_t unicode); |
385 | |
411 | |
386 | void draw (rxvt_drawable &d, int x, int y, |
412 | void draw (rxvt_drawable &d, int x, int y, |
387 | const text_t *text, int len, |
413 | const text_t *text, int len, |
388 | int fg, int bg); |
414 | int fg, int bg); |
389 | |
415 | |
… | |
… | |
636 | f = 0; |
662 | f = 0; |
637 | } |
663 | } |
638 | } |
664 | } |
639 | |
665 | |
640 | bool |
666 | bool |
641 | rxvt_font_x11::has_codepoint (uint32_t unicode) |
667 | rxvt_font_x11::has_codepoint (unicode_t unicode) |
642 | { |
668 | { |
643 | uint32_t ch = FROM_UNICODE (cs, unicode); |
669 | uint32_t ch = FROM_UNICODE (cs, unicode); |
644 | |
670 | |
645 | if (ch == NOCHAR) |
671 | if (ch == NOCHAR) |
646 | return false; |
672 | return false; |
… | |
… | |
708 | { |
734 | { |
709 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
735 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
710 | |
736 | |
711 | if (bg == Color_bg && !slow) |
737 | if (bg == Color_bg && !slow) |
712 | { |
738 | { |
713 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
739 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
714 | XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); |
740 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
715 | } |
741 | } |
716 | else |
742 | else |
717 | { |
743 | { |
718 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
744 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
719 | |
745 | |
720 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
746 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
721 | |
747 | |
722 | if (slow) |
748 | if (slow) |
723 | { |
749 | { |
724 | do |
750 | do |
725 | { |
751 | { |
726 | if (xc->byte1 || xc->byte2) |
752 | if (xc->byte1 || xc->byte2) |
727 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); |
753 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
728 | |
754 | |
729 | x += r->TermWin.fwidth; |
755 | x += r->TermWin.fwidth; |
730 | xc++; len--; |
756 | xc++; len--; |
731 | } |
757 | } |
732 | while (len); |
758 | while (len); |
733 | } |
759 | } |
734 | else |
760 | else |
735 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); |
761 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
736 | } |
762 | } |
737 | } |
763 | } |
738 | else |
764 | else |
739 | { |
765 | { |
740 | const char *xc = enc_char (text, len, cs, slow); |
766 | const char *xc = enc_char (text, len, cs, slow); |
741 | |
767 | |
742 | if (bg == Color_bg && !slow) |
768 | if (bg == Color_bg && !slow) |
743 | { |
769 | { |
744 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
770 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
745 | XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); |
771 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
746 | } |
772 | } |
747 | else |
773 | else |
748 | { |
774 | { |
749 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
775 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
750 | |
776 | |
751 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
777 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
752 | |
778 | |
753 | if (slow) |
779 | if (slow) |
754 | { |
780 | { |
755 | do |
781 | do |
756 | { |
782 | { |
757 | if (*xc) |
783 | if (*xc) |
758 | XDrawString (d.display->display, d, GC, x, y + base, xc, 1); |
784 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
759 | |
785 | |
760 | x += r->TermWin.fwidth; |
786 | x += r->TermWin.fwidth; |
761 | xc++; len--; |
787 | xc++; len--; |
762 | } |
788 | } |
763 | while (len); |
789 | while (len); |
764 | } |
790 | } |
765 | else |
791 | else |
766 | XDrawString (d.display->display, d, GC, x, y + base, xc, len); |
792 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
767 | } |
793 | } |
768 | } |
794 | } |
769 | } |
795 | } |
770 | |
796 | |
771 | ///////////////////////////////////////////////////////////////////////////// |
797 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
788 | |
814 | |
789 | void draw (rxvt_drawable &d, int x, int y, |
815 | void draw (rxvt_drawable &d, int x, int y, |
790 | const text_t *text, int len, |
816 | const text_t *text, int len, |
791 | int fg, int bg); |
817 | int fg, int bg); |
792 | |
818 | |
793 | bool has_codepoint (uint32_t unicode); |
819 | bool has_codepoint (unicode_t unicode); |
794 | |
820 | |
795 | protected: |
821 | protected: |
796 | XftFont *f; |
822 | XftFont *f; |
797 | }; |
823 | }; |
798 | |
824 | |
… | |
… | |
911 | |
937 | |
912 | return true; |
938 | return true; |
913 | } |
939 | } |
914 | |
940 | |
915 | bool |
941 | bool |
916 | rxvt_font_xft::has_codepoint (uint32_t unicode) |
942 | rxvt_font_xft::has_codepoint (unicode_t unicode) |
917 | { |
943 | { |
918 | return XftCharExists (DISPLAY, f, unicode); |
944 | return XftCharExists (DISPLAY, f, unicode); |
919 | } |
945 | } |
920 | |
946 | |
921 | void |
947 | void |
… | |
… | |
1017 | f = new rxvt_font_x11; |
1043 | f = new rxvt_font_x11; |
1018 | } |
1044 | } |
1019 | else |
1045 | else |
1020 | f = new rxvt_font_x11; |
1046 | f = new rxvt_font_x11; |
1021 | |
1047 | |
|
|
1048 | f->fs = this; |
1022 | f->set_term (r); |
1049 | f->set_term (r); |
1023 | f->set_name (strdup (name)); |
1050 | f->set_name (strdup (name)); |
1024 | |
1051 | |
1025 | f->cs = cs; |
1052 | f->cs = cs; |
1026 | f->loaded = false; |
1053 | f->loaded = false; |
… | |
… | |
1097 | |
1124 | |
1098 | bool |
1125 | bool |
1099 | rxvt_fontset::populate (const char *desc) |
1126 | rxvt_fontset::populate (const char *desc) |
1100 | { |
1127 | { |
1101 | clear (); |
1128 | clear (); |
1102 | printf ("P(%s)\n",desc); |
|
|
1103 | |
1129 | |
1104 | fonts.push_back (new_font (0, CS_UNICODE)); |
1130 | fonts.push_back (new_font (0, CS_UNICODE)); |
1105 | realize_font (0); |
1131 | realize_font (0); |
1106 | |
1132 | |
1107 | add_fonts (desc); |
1133 | add_fonts (desc); |
… | |
… | |
1124 | |
1150 | |
1125 | return true; |
1151 | return true; |
1126 | } |
1152 | } |
1127 | |
1153 | |
1128 | int |
1154 | int |
1129 | rxvt_fontset::find_font (uint32_t unicode) |
1155 | rxvt_fontset::find_font (unicode_t unicode) |
1130 | { |
1156 | { |
1131 | for (unsigned int i = 0; i < fonts.size (); i++) |
1157 | for (unsigned int i = 0; i < fonts.size (); i++) |
1132 | { |
1158 | { |
1133 | rxvt_font *f = fonts[i]; |
1159 | rxvt_font *f = fonts[i]; |
1134 | |
1160 | |