… | |
… | |
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 DRAWABLE r->TermWin.vt |
|
|
30 | #define GC r->TermWin.gc |
29 | #define GC r->TermWin.gc |
31 | |
30 | |
32 | const struct rxvt_fallback_font { |
31 | const struct rxvt_fallback_font { |
33 | codeset cs; |
32 | codeset cs; |
34 | const char *name; |
33 | const char *name; |
… | |
… | |
73 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
72 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
74 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
73 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
75 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
74 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
76 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
75 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
77 | # endif |
76 | # endif |
|
|
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" }, |
83 | { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, |
85 | { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-5" }, |
84 | { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, |
86 | { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-6" }, |
85 | { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, |
87 | { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-7" }, |
86 | { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, |
88 | { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-f" }, |
87 | #endif |
89 | #endif |
88 | |
90 | |
89 | #if XFT |
91 | #if XFT |
90 | { CS_UNICODE, "xft:Andale Mono" }, |
92 | { CS_UNICODE, "xft:Andale Mono" }, |
91 | { CS_UNICODE, "xft:Arial Unicode MS" }, |
93 | { CS_UNICODE, "xft:Arial Unicode MS" }, |
… | |
… | |
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 | }; |
|
|
107 | |
|
|
108 | ///////////////////////////////////////////////////////////////////////////// |
|
|
109 | |
|
|
110 | #if XFT |
|
|
111 | rxvt_drawable::~rxvt_drawable () |
|
|
112 | { |
|
|
113 | if (xftdrawable) |
|
|
114 | XftDrawDestroy (xftdrawable); |
|
|
115 | } |
|
|
116 | |
|
|
117 | rxvt_drawable::operator XftDraw *() |
|
|
118 | { |
|
|
119 | if (!xftdrawable) |
|
|
120 | xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); |
|
|
121 | |
|
|
122 | return xftdrawable; |
|
|
123 | } |
|
|
124 | #endif |
101 | |
125 | |
102 | ///////////////////////////////////////////////////////////////////////////// |
126 | ///////////////////////////////////////////////////////////////////////////// |
103 | |
127 | |
104 | static void *enc_buf; |
128 | static void *enc_buf; |
105 | static uint32_t enc_len; |
129 | static uint32_t enc_len; |
… | |
… | |
161 | } |
185 | } |
162 | |
186 | |
163 | ///////////////////////////////////////////////////////////////////////////// |
187 | ///////////////////////////////////////////////////////////////////////////// |
164 | |
188 | |
165 | void |
189 | void |
166 | rxvt_font::clear_rect (int x, int y, int w, int h, int color) |
190 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) |
167 | { |
191 | { |
168 | if (color == Color_bg) |
192 | if (color == Color_bg) |
169 | XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE); |
193 | XClearArea (d.display->display, d, x, y, w, h, FALSE); |
170 | else if (color >= 0) |
194 | else if (color >= 0) |
171 | { |
195 | { |
|
|
196 | #if XFT |
|
|
197 | XftDrawRect (d, &r->PixColors[color].c, x, y, w, h); |
|
|
198 | #else |
172 | XSetForeground (DISPLAY, GC, r->PixColors[color]); |
199 | XSetForeground (d.display->display, GC, r->PixColors[color]); |
173 | XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h); |
200 | XFillRectangle (d.display->display, d, GC, x, y, w, h); |
|
|
201 | #endif |
174 | } |
202 | } |
175 | } |
203 | } |
176 | |
204 | |
177 | static const char *linedraw_cmds[128] = { |
205 | static const char *linedraw_cmds[128] = { |
178 | "1hH", "2hH", "1vV", "2vV", |
206 | "1hH", "2hH", "1vV", "2vV", |
… | |
… | |
263 | } |
291 | } |
264 | |
292 | |
265 | return false; |
293 | return false; |
266 | } |
294 | } |
267 | |
295 | |
268 | void draw (int x, int y, |
296 | void draw (rxvt_drawable &d, int x, int y, |
269 | const text_t *text, int len, |
297 | const text_t *text, int len, |
270 | int fg, int bg); |
298 | int fg, int bg); |
271 | }; |
299 | }; |
272 | |
300 | |
273 | void |
301 | void |
274 | rxvt_font_default::draw (int x, int y, |
302 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
275 | const text_t *text, int len, |
303 | const text_t *text, int len, |
276 | int fg, int bg) |
304 | int fg, int bg) |
277 | { |
305 | { |
278 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
306 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
279 | |
307 | |
280 | XSetForeground (DISPLAY, GC, r->PixColors[fg]); |
308 | XSetForeground (d.display->display, GC, r->PixColors[fg]); |
281 | |
309 | |
282 | while (len--) |
310 | while (len--) |
283 | { |
311 | { |
284 | text_t t = *text++; |
312 | text_t t = *text++; |
285 | |
313 | |
|
|
314 | // is it in our linedrawing table? |
286 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
315 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
287 | { |
316 | { |
288 | const char *p = linedraw_cmds[t - 0x2500]; |
317 | const char *p = linedraw_cmds[t - 0x2500]; |
289 | |
318 | |
290 | int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ; |
319 | int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; |
291 | int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight; |
320 | int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; |
292 | |
321 | |
293 | XGCValues gcv; |
322 | XGCValues gcv; |
294 | |
323 | |
295 | while (*p) |
324 | while (*p) |
296 | { |
325 | { |
297 | switch (*p++) |
326 | switch (*p++) |
298 | { |
327 | { |
299 | case '1': |
328 | case '1': |
300 | gcv.line_width = 0; |
329 | gcv.line_width = 0; |
301 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
330 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
302 | break; |
331 | break; |
303 | |
332 | |
304 | case '2': |
333 | case '2': |
305 | gcv.line_width = 2; |
334 | gcv.line_width = 2; |
306 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
335 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
307 | break; |
336 | break; |
308 | |
337 | |
309 | case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break; |
338 | case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; |
310 | case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break; |
339 | case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; |
311 | case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break; |
340 | case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; |
312 | case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break; |
341 | case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; |
313 | case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break; |
342 | case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break; |
314 | case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break; |
343 | case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break; |
315 | } |
344 | } |
316 | } |
345 | } |
317 | |
346 | |
318 | gcv.line_width = 0; |
347 | gcv.line_width = 0; |
319 | XChangeGC (DISPLAY, GC, GCLineWidth, &gcv); |
348 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
320 | } |
349 | } |
321 | else |
350 | else |
322 | switch (*text++) |
351 | switch (t) |
323 | { |
352 | { |
324 | case NOCHAR: |
|
|
325 | case ZERO_WIDTH_CHAR: |
353 | case ZERO_WIDTH_CHAR: |
326 | break; |
354 | break; |
327 | default: |
355 | default: |
328 | XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
356 | int w = 0; |
|
|
357 | while (len > 0 && *text == NOCHAR) |
|
|
358 | { |
|
|
359 | ++text; |
|
|
360 | --len; |
|
|
361 | w += r->TermWin.fwidth; |
|
|
362 | } |
|
|
363 | |
|
|
364 | XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, |
|
|
365 | w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
|
|
366 | x += w; |
329 | } |
367 | } |
330 | |
368 | |
331 | x += r->TermWin.fwidth; |
369 | x += r->TermWin.fwidth; |
332 | } |
370 | } |
333 | } |
371 | } |
… | |
… | |
343 | |
381 | |
344 | bool load (const rxvt_fontprop &prop); |
382 | bool load (const rxvt_fontprop &prop); |
345 | |
383 | |
346 | bool has_codepoint (uint32_t unicode); |
384 | bool has_codepoint (uint32_t unicode); |
347 | |
385 | |
348 | void draw (int x, int y, |
386 | void draw (rxvt_drawable &d, int x, int y, |
349 | const text_t *text, int len, |
387 | const text_t *text, int len, |
350 | int fg, int bg); |
388 | int fg, int bg); |
351 | |
389 | |
352 | XFontStruct *f; |
390 | XFontStruct *f; |
353 | codeset cs; |
391 | codeset cs; |
… | |
… | |
408 | |
446 | |
409 | bool |
447 | bool |
410 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
448 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
411 | { |
449 | { |
412 | int slashes = 0; |
450 | int slashes = 0; |
413 | const char *comp[12]; |
451 | const char *comp[13]; |
414 | |
452 | |
415 | for (const char *c = name; *c; c++) |
453 | for (const char *c = name; *c; c++) |
416 | if (*c == '-') |
454 | if (*c == '-') |
417 | { |
455 | { |
418 | comp[slashes++] = c + 1; |
456 | comp[slashes++] = c + 1; |
… | |
… | |
644 | |
682 | |
645 | return true; |
683 | return true; |
646 | } |
684 | } |
647 | |
685 | |
648 | void |
686 | void |
649 | rxvt_font_x11::draw (int x, int y, |
687 | rxvt_font_x11::draw (rxvt_drawable &d, int x, int y, |
650 | const text_t *text, int len, |
688 | const text_t *text, int len, |
651 | int fg, int bg) |
689 | int fg, int bg) |
652 | { |
690 | { |
653 | // this looks like a mess /. |
691 | // this looks like a mess /. |
654 | // and it is a mess /. |
692 | // and it is a mess /. |
… | |
… | |
670 | { |
708 | { |
671 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
709 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
672 | |
710 | |
673 | if (bg == Color_bg && !slow) |
711 | if (bg == Color_bg && !slow) |
674 | { |
712 | { |
675 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
713 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
676 | XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
714 | XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); |
677 | } |
715 | } |
678 | else |
716 | else |
679 | { |
717 | { |
680 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
718 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
681 | |
719 | |
682 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
720 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
683 | |
721 | |
684 | if (slow) |
722 | if (slow) |
685 | { |
723 | { |
686 | do |
724 | do |
687 | { |
725 | { |
688 | if (xc->byte1 || xc->byte2) |
726 | if (xc->byte1 || xc->byte2) |
689 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
727 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); |
690 | |
728 | |
691 | x += r->TermWin.fwidth; |
729 | x += r->TermWin.fwidth; |
692 | xc++; len--; |
730 | xc++; len--; |
693 | } |
731 | } |
694 | while (len); |
732 | while (len); |
695 | } |
733 | } |
696 | else |
734 | else |
697 | XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
735 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); |
698 | } |
736 | } |
699 | } |
737 | } |
700 | else |
738 | else |
701 | { |
739 | { |
702 | const char *xc = enc_char (text, len, cs, slow); |
740 | const char *xc = enc_char (text, len, cs, slow); |
703 | |
741 | |
704 | if (bg == Color_bg && !slow) |
742 | if (bg == Color_bg && !slow) |
705 | { |
743 | { |
706 | XChangeGC (DISPLAY, GC, GCForeground | GCBackground | GCFont, &v); |
744 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
707 | XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
745 | XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); |
708 | } |
746 | } |
709 | else |
747 | else |
710 | { |
748 | { |
711 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
749 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
712 | |
750 | |
713 | XChangeGC (DISPLAY, GC, GCForeground | GCFont, &v); |
751 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
714 | |
752 | |
715 | if (slow) |
753 | if (slow) |
716 | { |
754 | { |
717 | do |
755 | do |
718 | { |
756 | { |
719 | if (*xc) |
757 | if (*xc) |
720 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1); |
758 | XDrawString (d.display->display, d, GC, x, y + base, xc, 1); |
721 | |
759 | |
722 | x += r->TermWin.fwidth; |
760 | x += r->TermWin.fwidth; |
723 | xc++; len--; |
761 | xc++; len--; |
724 | } |
762 | } |
725 | while (len); |
763 | while (len); |
726 | } |
764 | } |
727 | else |
765 | else |
728 | XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len); |
766 | XDrawString (d.display->display, d, GC, x, y + base, xc, len); |
729 | } |
767 | } |
730 | } |
768 | } |
731 | } |
769 | } |
732 | |
770 | |
733 | ///////////////////////////////////////////////////////////////////////////// |
771 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
738 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
776 | //#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables |
739 | #define SWATHBITS 8 |
777 | #define SWATHBITS 8 |
740 | #endif |
778 | #endif |
741 | |
779 | |
742 | struct rxvt_font_xft : rxvt_font { |
780 | struct rxvt_font_xft : rxvt_font { |
743 | rxvt_font_xft () { f = 0; d = 0; } |
781 | rxvt_font_xft () { f = 0; } |
744 | |
782 | |
745 | void clear (); |
783 | void clear (); |
746 | |
784 | |
747 | rxvt_fontprop properties (); |
785 | rxvt_fontprop properties (); |
748 | |
786 | |
749 | bool load (const rxvt_fontprop &prop); |
787 | bool load (const rxvt_fontprop &prop); |
750 | |
788 | |
751 | void draw (int x, int y, |
789 | void draw (rxvt_drawable &d, int x, int y, |
752 | const text_t *text, int len, |
790 | const text_t *text, int len, |
753 | int fg, int bg); |
791 | int fg, int bg); |
754 | |
792 | |
755 | bool has_codepoint (uint32_t unicode); |
793 | bool has_codepoint (uint32_t unicode); |
756 | |
794 | |
757 | protected: |
795 | protected: |
758 | XftFont *f; |
796 | XftFont *f; |
759 | XftDraw *d; |
|
|
760 | }; |
797 | }; |
761 | |
798 | |
762 | void |
799 | void |
763 | rxvt_font_xft::clear () |
800 | rxvt_font_xft::clear () |
764 | { |
801 | { |
765 | if (d) |
|
|
766 | { |
|
|
767 | XftDrawDestroy (d); |
|
|
768 | d = 0; |
|
|
769 | } |
|
|
770 | |
|
|
771 | if (f) |
802 | if (f) |
772 | { |
803 | { |
773 | XftFontClose (DISPLAY, f); |
804 | XftFontClose (DISPLAY, f); |
774 | f = 0; |
805 | f = 0; |
775 | } |
806 | } |
… | |
… | |
886 | { |
917 | { |
887 | return XftCharExists (DISPLAY, f, unicode); |
918 | return XftCharExists (DISPLAY, f, unicode); |
888 | } |
919 | } |
889 | |
920 | |
890 | void |
921 | void |
891 | rxvt_font_xft::draw (int x, int y, |
922 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
892 | const text_t *text, int len, |
923 | const text_t *text, int len, |
893 | int fg, int bg) |
924 | int fg, int bg) |
894 | { |
925 | { |
895 | d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap); |
|
|
896 | |
|
|
897 | if (bg >= 0 && bg != Color_bg) |
|
|
898 | XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight); |
|
|
899 | else |
|
|
900 | clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
926 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
901 | |
927 | |
902 | if (!slow && width == r->TermWin.fwidth && 0) |
928 | if (!slow && width == r->TermWin.fwidth && 0) |
903 | { |
929 | { |
904 | if (sizeof (text_t) == sizeof (FcChar16)) |
930 | if (sizeof (text_t) == sizeof (FcChar16)) |
905 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
931 | XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len); |
… | |
… | |
917 | fwidth *= 2; |
943 | fwidth *= 2; |
918 | |
944 | |
919 | XGlyphInfo extents; |
945 | XGlyphInfo extents; |
920 | if (sizeof (text_t) == sizeof (FcChar16)) |
946 | if (sizeof (text_t) == sizeof (FcChar16)) |
921 | { |
947 | { |
922 | XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents); |
948 | XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents); |
923 | XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
949 | XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
924 | y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
950 | y + r->TermWin.fbase, (const FcChar16 *)text, 1); |
925 | } |
951 | } |
926 | else |
952 | else |
927 | { |
953 | { |
928 | XGlyphInfo extents; |
954 | XGlyphInfo extents; |
929 | XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents); |
955 | XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents); |
930 | XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
956 | XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2, |
931 | y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
957 | y + r->TermWin.fbase, (const FcChar32 *)text, 1); |
932 | } |
958 | } |
933 | } |
959 | } |
934 | |
960 | |