… | |
… | |
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 |
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 | |
199 | static 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 | |
250 | struct rxvt_font_default : rxvt_font { |
207 | struct 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 | return true; |
|
|
240 | |
|
|
241 | if (IS_COMPOSE (unicode)) |
279 | return true; |
242 | return true; |
280 | |
243 | |
281 | switch (unicode) |
244 | switch (unicode) |
282 | { |
245 | { |
283 | case ZERO_WIDTH_CHAR: |
246 | case ZERO_WIDTH_CHAR: |
… | |
… | |
297 | const text_t *text, int len, |
260 | const text_t *text, int len, |
298 | int fg, int bg) |
261 | int fg, int bg) |
299 | { |
262 | { |
300 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
263 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
301 | |
264 | |
302 | XSetForeground (d.display->display, GC, r->PixColors[fg]); |
265 | XSetForeground (d.display->display, TGC, r->PixColors[fg]); |
303 | |
266 | |
304 | while (len--) |
267 | while (len--) |
305 | { |
268 | { |
|
|
269 | #if ENABLE_COMBINING |
|
|
270 | compose_char *cc; |
|
|
271 | #endif |
306 | text_t t = *text++; |
272 | text_t t = *text++; |
307 | |
273 | |
308 | // is it in our linedrawing table? |
274 | if (0x2500 <= t && t <= 0x259f) |
309 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
275 | { |
|
|
276 | uint16_t offs = linedraw_offs[t - 0x2500]; |
|
|
277 | uint32_t *a = linedraw_command + (offs >> 4); |
|
|
278 | uint32_t *b = a + (offs & 15); |
|
|
279 | |
|
|
280 | int W = r->TermWin.fwidth; |
|
|
281 | int H = r->TermWin.fheight; |
|
|
282 | |
|
|
283 | int x_[16]; |
|
|
284 | int y_[16]; |
|
|
285 | |
|
|
286 | for (int i = 0; i <= 8; i++) |
310 | { |
287 | { |
311 | const char *p = linedraw_cmds[t - 0x2500]; |
288 | x_[i] = x + ((W-1) * i + (i*7/8)) / 8; |
|
|
289 | y_[i] = y + ((H-1) * i + (i*7/8)) / 8; |
|
|
290 | } |
312 | |
291 | |
313 | int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1; |
292 | 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; |
293 | y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1; |
315 | |
294 | |
316 | XGCValues gcv; |
295 | XGCValues gcv; |
317 | |
296 | |
|
|
297 | gcv.cap_style = CapButt; |
|
|
298 | gcv.line_width = 0; |
|
|
299 | XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); |
|
|
300 | |
318 | while (*p) |
301 | while (a < b) |
319 | { |
302 | { |
|
|
303 | uint32_t command = *a++; |
|
|
304 | |
|
|
305 | int op = (command >> 24) & 255; |
|
|
306 | int a = (command >> 20) & 15; |
|
|
307 | int b = (command >> 16) & 15; |
|
|
308 | int x1 = x_[(command >> 12) & 15]; |
|
|
309 | int y1 = y_[(command >> 8) & 15]; |
|
|
310 | int x2 = x_[(command >> 4) & 15]; |
|
|
311 | int y2 = y_[(command >> 0) & 15]; |
|
|
312 | |
320 | switch (*p++) |
313 | switch (op) |
321 | { |
314 | { |
322 | case '1': |
315 | case 0: // line |
323 | gcv.line_width = 0; |
316 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
324 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
|
|
325 | break; |
317 | break; |
326 | |
318 | |
327 | case '2': |
319 | case 1: // rectangle, possibly stippled |
|
|
320 | if (a) |
|
|
321 | { |
|
|
322 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
|
|
323 | |
|
|
324 | gcv.fill_style = FillStippled; |
|
|
325 | gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); |
|
|
326 | gcv.ts_x_origin = x; |
|
|
327 | gcv.ts_y_origin = y; |
|
|
328 | |
|
|
329 | XChangeGC (d.display->display, TGC, |
|
|
330 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
|
|
331 | &gcv); |
|
|
332 | } |
|
|
333 | |
|
|
334 | XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
|
|
335 | |
|
|
336 | if (a) |
|
|
337 | { |
|
|
338 | XFreePixmap (d.display->display, gcv.stipple); |
328 | gcv.line_width = 2; |
339 | gcv.stipple = 0; |
|
|
340 | gcv.fill_style = FillSolid; |
329 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
341 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
|
|
342 | } |
330 | break; |
343 | break; |
331 | |
344 | case 2: // arc |
332 | case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; |
345 | XDrawArc (d.display->display, d, TGC, |
333 | case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; |
346 | x1 - W/2, y1 - H/2, W-1, H-1, |
334 | case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; |
347 | (a - 1) * 90*64, (b - 1) * 90*64); |
335 | case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; |
348 | 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 | } |
349 | } |
339 | } |
350 | } |
340 | |
351 | } |
341 | gcv.line_width = 0; |
352 | #if ENABLE_COMBINING |
342 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
353 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
343 | } |
354 | { |
|
|
355 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
|
|
356 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
|
|
357 | if (cc->c2 != NOCHAR) |
|
|
358 | { |
|
|
359 | // prefer font of first character, for no good reasons |
|
|
360 | rxvt_font *f2 = f1->has_codepoint (cc->c2) |
|
|
361 | ? f1 |
|
|
362 | : (*fs)[fs->find_font (cc->c2)]; |
|
|
363 | |
|
|
364 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
|
|
365 | } |
|
|
366 | } |
|
|
367 | #endif |
344 | else |
368 | else |
345 | switch (t) |
369 | switch (t) |
346 | { |
370 | { |
347 | case ZERO_WIDTH_CHAR: |
371 | case ZERO_WIDTH_CHAR: |
348 | break; |
372 | break; |
|
|
373 | |
349 | default: |
374 | default: |
350 | int w = 0; |
375 | int w = 0; |
351 | while (len > 0 && *text == NOCHAR) |
376 | while (len > 0 && *text == NOCHAR) |
352 | { |
377 | { |
353 | ++text; |
378 | ++text; |
354 | --len; |
379 | --len; |
355 | w += r->TermWin.fwidth; |
380 | w += r->TermWin.fwidth; |
356 | } |
381 | } |
357 | |
382 | |
358 | XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, |
383 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
359 | w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
384 | w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); |
360 | x += w; |
385 | x += w; |
361 | } |
386 | } |
362 | |
387 | |
363 | x += r->TermWin.fwidth; |
388 | x += r->TermWin.fwidth; |
364 | } |
389 | } |
… | |
… | |
373 | |
398 | |
374 | rxvt_fontprop properties (); |
399 | rxvt_fontprop properties (); |
375 | |
400 | |
376 | bool load (const rxvt_fontprop &prop); |
401 | bool load (const rxvt_fontprop &prop); |
377 | |
402 | |
378 | bool has_codepoint (uint32_t unicode); |
403 | bool has_codepoint (unicode_t unicode); |
379 | |
404 | |
380 | void draw (rxvt_drawable &d, int x, int y, |
405 | void draw (rxvt_drawable &d, int x, int y, |
381 | const text_t *text, int len, |
406 | const text_t *text, int len, |
382 | int fg, int bg); |
407 | int fg, int bg); |
383 | |
408 | |
… | |
… | |
440 | |
465 | |
441 | bool |
466 | bool |
442 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
467 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
443 | { |
468 | { |
444 | int slashes = 0; |
469 | int slashes = 0; |
445 | const char *comp[12]; |
470 | const char *comp[13]; |
446 | |
471 | |
447 | for (const char *c = name; *c; c++) |
472 | for (const char *c = name; *c; c++) |
448 | if (*c == '-') |
473 | if (*c == '-') |
449 | { |
474 | { |
450 | comp[slashes++] = c + 1; |
475 | comp[slashes++] = c + 1; |
… | |
… | |
630 | f = 0; |
655 | f = 0; |
631 | } |
656 | } |
632 | } |
657 | } |
633 | |
658 | |
634 | bool |
659 | bool |
635 | rxvt_font_x11::has_codepoint (uint32_t unicode) |
660 | rxvt_font_x11::has_codepoint (unicode_t unicode) |
636 | { |
661 | { |
637 | uint32_t ch = FROM_UNICODE (cs, unicode); |
662 | uint32_t ch = FROM_UNICODE (cs, unicode); |
638 | |
663 | |
639 | if (ch == NOCHAR) |
664 | if (ch == NOCHAR) |
640 | return false; |
665 | return false; |
… | |
… | |
702 | { |
727 | { |
703 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
728 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
704 | |
729 | |
705 | if (bg == Color_bg && !slow) |
730 | if (bg == Color_bg && !slow) |
706 | { |
731 | { |
707 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
732 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
708 | XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); |
733 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
709 | } |
734 | } |
710 | else |
735 | else |
711 | { |
736 | { |
712 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
737 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
713 | |
738 | |
714 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
739 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
715 | |
740 | |
716 | if (slow) |
741 | if (slow) |
717 | { |
742 | { |
718 | do |
743 | do |
719 | { |
744 | { |
720 | if (xc->byte1 || xc->byte2) |
745 | if (xc->byte1 || xc->byte2) |
721 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); |
746 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
722 | |
747 | |
723 | x += r->TermWin.fwidth; |
748 | x += r->TermWin.fwidth; |
724 | xc++; len--; |
749 | xc++; len--; |
725 | } |
750 | } |
726 | while (len); |
751 | while (len); |
727 | } |
752 | } |
728 | else |
753 | else |
729 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); |
754 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
730 | } |
755 | } |
731 | } |
756 | } |
732 | else |
757 | else |
733 | { |
758 | { |
734 | const char *xc = enc_char (text, len, cs, slow); |
759 | const char *xc = enc_char (text, len, cs, slow); |
735 | |
760 | |
736 | if (bg == Color_bg && !slow) |
761 | if (bg == Color_bg && !slow) |
737 | { |
762 | { |
738 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
763 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
739 | XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); |
764 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
740 | } |
765 | } |
741 | else |
766 | else |
742 | { |
767 | { |
743 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
768 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
744 | |
769 | |
745 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
770 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
746 | |
771 | |
747 | if (slow) |
772 | if (slow) |
748 | { |
773 | { |
749 | do |
774 | do |
750 | { |
775 | { |
751 | if (*xc) |
776 | if (*xc) |
752 | XDrawString (d.display->display, d, GC, x, y + base, xc, 1); |
777 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
753 | |
778 | |
754 | x += r->TermWin.fwidth; |
779 | x += r->TermWin.fwidth; |
755 | xc++; len--; |
780 | xc++; len--; |
756 | } |
781 | } |
757 | while (len); |
782 | while (len); |
758 | } |
783 | } |
759 | else |
784 | else |
760 | XDrawString (d.display->display, d, GC, x, y + base, xc, len); |
785 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
761 | } |
786 | } |
762 | } |
787 | } |
763 | } |
788 | } |
764 | |
789 | |
765 | ///////////////////////////////////////////////////////////////////////////// |
790 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
782 | |
807 | |
783 | void draw (rxvt_drawable &d, int x, int y, |
808 | void draw (rxvt_drawable &d, int x, int y, |
784 | const text_t *text, int len, |
809 | const text_t *text, int len, |
785 | int fg, int bg); |
810 | int fg, int bg); |
786 | |
811 | |
787 | bool has_codepoint (uint32_t unicode); |
812 | bool has_codepoint (unicode_t unicode); |
788 | |
813 | |
789 | protected: |
814 | protected: |
790 | XftFont *f; |
815 | XftFont *f; |
791 | }; |
816 | }; |
792 | |
817 | |
… | |
… | |
905 | |
930 | |
906 | return true; |
931 | return true; |
907 | } |
932 | } |
908 | |
933 | |
909 | bool |
934 | bool |
910 | rxvt_font_xft::has_codepoint (uint32_t unicode) |
935 | rxvt_font_xft::has_codepoint (unicode_t unicode) |
911 | { |
936 | { |
912 | return XftCharExists (DISPLAY, f, unicode); |
937 | return XftCharExists (DISPLAY, f, unicode); |
913 | } |
938 | } |
914 | |
939 | |
915 | void |
940 | void |
… | |
… | |
1011 | f = new rxvt_font_x11; |
1036 | f = new rxvt_font_x11; |
1012 | } |
1037 | } |
1013 | else |
1038 | else |
1014 | f = new rxvt_font_x11; |
1039 | f = new rxvt_font_x11; |
1015 | |
1040 | |
|
|
1041 | f->fs = this; |
1016 | f->set_term (r); |
1042 | f->set_term (r); |
1017 | f->set_name (strdup (name)); |
1043 | f->set_name (strdup (name)); |
1018 | |
1044 | |
1019 | f->cs = cs; |
1045 | f->cs = cs; |
1020 | f->loaded = false; |
1046 | f->loaded = false; |
… | |
… | |
1117 | |
1143 | |
1118 | return true; |
1144 | return true; |
1119 | } |
1145 | } |
1120 | |
1146 | |
1121 | int |
1147 | int |
1122 | rxvt_fontset::find_font (uint32_t unicode) |
1148 | rxvt_fontset::find_font (unicode_t unicode) |
1123 | { |
1149 | { |
1124 | for (unsigned int i = 0; i < fonts.size (); i++) |
1150 | for (unsigned int i = 0; i < fonts.size (); i++) |
1125 | { |
1151 | { |
1126 | rxvt_font *f = fonts[i]; |
1152 | rxvt_font *f = fonts[i]; |
1127 | |
1153 | |