… | |
… | |
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; |
280 | |
234 | |
281 | if (unicode >= 0x0080 && unicode <= 0x009f) |
235 | if (unicode <= 0x007f) |
|
|
236 | return false; |
|
|
237 | |
|
|
238 | if (unicode <= 0x009f) |
282 | return true; |
239 | return true; |
283 | |
240 | |
284 | if (unicode >= 0x2500 && unicode <= 0x257f |
241 | if (unicode >= 0x2500 && unicode <= 0x259f) |
285 | && linedraw_cmds[unicode - 0x2500]) |
|
|
286 | return true; |
242 | return true; |
287 | |
243 | |
288 | if (IS_PSEUDO (unicode)) |
244 | if (IS_COMPOSE (unicode)) |
289 | return true; |
245 | return true; |
290 | |
246 | |
291 | switch (unicode) |
247 | switch (unicode) |
292 | { |
248 | { |
293 | case ZERO_WIDTH_CHAR: |
249 | case ZERO_WIDTH_CHAR: |
… | |
… | |
307 | const text_t *text, int len, |
263 | const text_t *text, int len, |
308 | int fg, int bg) |
264 | int fg, int bg) |
309 | { |
265 | { |
310 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
266 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
311 | |
267 | |
312 | XSetForeground (d.display->display, GC, r->PixColors[fg]); |
268 | XSetForeground (d.display->display, TGC, r->PixColors[fg]); |
313 | |
269 | |
314 | while (len--) |
270 | while (len--) |
315 | { |
271 | { |
|
|
272 | #if ENABLE_COMBINING |
|
|
273 | compose_char *cc; |
|
|
274 | #endif |
316 | text_t t = *text++; |
275 | text_t t = *text++; |
317 | |
276 | |
318 | // is it in our linedrawing table? |
277 | if (0x2500 <= t && t <= 0x259f) |
319 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
278 | { |
|
|
279 | uint16_t offs = linedraw_offs[t - 0x2500]; |
|
|
280 | uint32_t *a = linedraw_command + (offs >> 4); |
|
|
281 | uint32_t *b = a + (offs & 15); |
|
|
282 | |
|
|
283 | int W = r->TermWin.fwidth; |
|
|
284 | int H = r->TermWin.fheight; |
|
|
285 | |
|
|
286 | int x_[16]; |
|
|
287 | int y_[16]; |
|
|
288 | |
|
|
289 | for (int i = 0; i <= 8; i++) |
320 | { |
290 | { |
321 | const char *p = linedraw_cmds[t - 0x2500]; |
291 | x_[i] = x + ((W-1) * i + (i*7/8)) / 8; |
|
|
292 | y_[i] = y + ((H-1) * i + (i*7/8)) / 8; |
|
|
293 | } |
322 | |
294 | |
323 | int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1; |
295 | x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1; |
324 | int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1; |
296 | y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1; |
325 | |
297 | |
326 | XGCValues gcv; |
298 | XGCValues gcv; |
327 | |
299 | |
|
|
300 | gcv.cap_style = CapButt; |
|
|
301 | gcv.line_width = 0; |
|
|
302 | XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); |
|
|
303 | |
328 | while (*p) |
304 | while (a < b) |
329 | { |
305 | { |
|
|
306 | uint32_t command = *a++; |
|
|
307 | |
|
|
308 | int op = (command >> 24) & 255; |
|
|
309 | int a = (command >> 20) & 15; |
|
|
310 | int b = (command >> 16) & 15; |
|
|
311 | int x1 = x_[(command >> 12) & 15]; |
|
|
312 | int y1 = y_[(command >> 8) & 15]; |
|
|
313 | int x2 = x_[(command >> 4) & 15]; |
|
|
314 | int y2 = y_[(command >> 0) & 15]; |
|
|
315 | |
330 | switch (*p++) |
316 | switch (op) |
331 | { |
317 | { |
332 | case '1': |
318 | case 0: // line |
333 | gcv.line_width = 0; |
319 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
334 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
|
|
335 | break; |
320 | break; |
336 | |
321 | |
337 | case '2': |
322 | case 1: // rectangle, possibly stippled |
|
|
323 | if (a) |
|
|
324 | { |
|
|
325 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
|
|
326 | |
|
|
327 | gcv.fill_style = FillStippled; |
|
|
328 | gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); |
|
|
329 | gcv.ts_x_origin = x; |
|
|
330 | gcv.ts_y_origin = y; |
|
|
331 | |
|
|
332 | XChangeGC (d.display->display, TGC, |
|
|
333 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
|
|
334 | &gcv); |
|
|
335 | } |
|
|
336 | |
|
|
337 | XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
|
|
338 | |
|
|
339 | if (a) |
|
|
340 | { |
|
|
341 | XFreePixmap (d.display->display, gcv.stipple); |
338 | gcv.line_width = 2; |
342 | gcv.stipple = 0; |
|
|
343 | gcv.fill_style = FillSolid; |
339 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
344 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
|
|
345 | } |
340 | break; |
346 | break; |
341 | |
347 | case 2: // arc |
342 | case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break; |
348 | XDrawArc (d.display->display, d, TGC, |
343 | case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break; |
349 | x1 - W/2, y1 - H/2, W-1, H-1, |
344 | case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break; |
350 | (a - 1) * 90*64, (b - 1) * 90*64); |
345 | case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break; |
351 | break; |
346 | case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break; |
|
|
347 | case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break; |
|
|
348 | } |
352 | } |
349 | } |
353 | } |
350 | |
|
|
351 | gcv.line_width = 0; |
|
|
352 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
|
|
353 | } |
|
|
354 | else if (IS_PSEUDO (t)) |
|
|
355 | { |
354 | } |
356 | const compose_char &cc = r->composite (t); |
355 | #if ENABLE_COMBINING |
357 | (void)0; //D ADD pseudo handling here |
356 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
358 | } |
357 | { |
|
|
358 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
|
|
359 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
|
|
360 | if (cc->c2 != NOCHAR) |
|
|
361 | { |
|
|
362 | // prefer font of first character, for no good reasons |
|
|
363 | rxvt_font *f2 = f1->has_codepoint (cc->c2) |
|
|
364 | ? f1 |
|
|
365 | : (*fs)[fs->find_font (cc->c2)]; |
|
|
366 | |
|
|
367 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
|
|
368 | } |
|
|
369 | } |
|
|
370 | #endif |
359 | else |
371 | else |
360 | switch (t) |
372 | switch (t) |
361 | { |
373 | { |
362 | case ZERO_WIDTH_CHAR: |
374 | case ZERO_WIDTH_CHAR: |
363 | break; |
375 | break; |
|
|
376 | |
364 | default: |
377 | default: |
365 | int w = 0; |
378 | int w = 0; |
366 | while (len > 0 && *text == NOCHAR) |
379 | while (len > 0 && *text == NOCHAR) |
367 | { |
380 | { |
368 | ++text; |
381 | ++text; |
369 | --len; |
382 | --len; |
370 | w += r->TermWin.fwidth; |
383 | w += r->TermWin.fwidth; |
371 | } |
384 | } |
372 | |
385 | |
373 | XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, |
386 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
374 | w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5); |
387 | w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); |
375 | x += w; |
388 | x += w; |
376 | } |
389 | } |
377 | |
390 | |
378 | x += r->TermWin.fwidth; |
391 | x += r->TermWin.fwidth; |
379 | } |
392 | } |
… | |
… | |
388 | |
401 | |
389 | rxvt_fontprop properties (); |
402 | rxvt_fontprop properties (); |
390 | |
403 | |
391 | bool load (const rxvt_fontprop &prop); |
404 | bool load (const rxvt_fontprop &prop); |
392 | |
405 | |
393 | bool has_codepoint (uint32_t unicode); |
406 | bool has_codepoint (unicode_t unicode); |
394 | |
407 | |
395 | void draw (rxvt_drawable &d, int x, int y, |
408 | void draw (rxvt_drawable &d, int x, int y, |
396 | const text_t *text, int len, |
409 | const text_t *text, int len, |
397 | int fg, int bg); |
410 | int fg, int bg); |
398 | |
411 | |
399 | XFontStruct *f; |
412 | XFontStruct *f; |
400 | codeset cs; |
413 | codeset cs; |
401 | bool enc2b, encm; |
414 | bool enc2b, encm; |
402 | |
415 | |
403 | const char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
416 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
404 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
417 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
405 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
418 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
406 | bool set_properties (rxvt_fontprop &p, const char *name); |
419 | bool set_properties (rxvt_fontprop &p, const char *name); |
407 | }; |
420 | }; |
408 | |
421 | |
409 | const char * |
422 | char * |
410 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
423 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
411 | { |
424 | { |
412 | unsigned long value; |
425 | unsigned long value; |
413 | |
426 | |
414 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
427 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
415 | return XGetAtomName (DISPLAY, value); |
428 | return XGetAtomName (DISPLAY, value); |
416 | else |
429 | else |
417 | return repl; |
430 | return rxvt_strdup (repl); |
418 | } |
431 | } |
419 | |
432 | |
420 | rxvt_fontprop |
433 | rxvt_fontprop |
421 | rxvt_font_x11::properties () |
434 | rxvt_font_x11::properties () |
422 | { |
435 | { |
… | |
… | |
437 | } |
450 | } |
438 | |
451 | |
439 | bool |
452 | bool |
440 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
453 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
441 | { |
454 | { |
442 | const char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
|
|
443 | const char *slant = get_property (f, "SLANT", "r"); |
|
|
444 | |
|
|
445 | unsigned long height; |
455 | unsigned long height; |
446 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
456 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
447 | return false; |
457 | return false; |
448 | |
458 | |
449 | unsigned long avgwidth; |
459 | unsigned long avgwidth; |
450 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
460 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
451 | avgwidth = 0; |
461 | avgwidth = 0; |
452 | |
462 | |
|
|
463 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
|
|
464 | char *slant = get_property (f, "SLANT", "r"); |
|
|
465 | |
453 | return set_properties (p, height, weight, slant, avgwidth); |
466 | set_properties (p, height, weight, slant, avgwidth); |
|
|
467 | |
|
|
468 | free (weight); |
|
|
469 | free (slant); |
|
|
470 | |
|
|
471 | return true; |
454 | } |
472 | } |
455 | |
473 | |
456 | bool |
474 | bool |
457 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
475 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
458 | { |
476 | { |
… | |
… | |
562 | f = XLoadQueryFont (DISPLAY, name); |
580 | f = XLoadQueryFont (DISPLAY, name); |
563 | |
581 | |
564 | if (!f) |
582 | if (!f) |
565 | return false; |
583 | return false; |
566 | |
584 | |
567 | const char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
585 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
568 | const char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
586 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
569 | |
587 | |
570 | if (registry && encoding) |
588 | if (registry && encoding) |
571 | { |
589 | { |
572 | char charset[64]; |
590 | char charset[64]; |
573 | snprintf (charset, 64, "%s-%s", registry, encoding); |
591 | snprintf (charset, 64, "%s-%s", registry, encoding); |
… | |
… | |
586 | if (*charset++ == '-' && !--count) |
604 | if (*charset++ == '-' && !--count) |
587 | break; |
605 | break; |
588 | |
606 | |
589 | cs = codeset_from_name (charset); |
607 | cs = codeset_from_name (charset); |
590 | } |
608 | } |
|
|
609 | |
|
|
610 | free (registry); |
|
|
611 | free (encoding); |
591 | |
612 | |
592 | if (cs == CS_UNICODE) |
613 | if (cs == CS_UNICODE) |
593 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
614 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
594 | |
615 | |
595 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
616 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
… | |
… | |
645 | f = 0; |
666 | f = 0; |
646 | } |
667 | } |
647 | } |
668 | } |
648 | |
669 | |
649 | bool |
670 | bool |
650 | rxvt_font_x11::has_codepoint (uint32_t unicode) |
671 | rxvt_font_x11::has_codepoint (unicode_t unicode) |
651 | { |
672 | { |
652 | uint32_t ch = FROM_UNICODE (cs, unicode); |
673 | uint32_t ch = FROM_UNICODE (cs, unicode); |
653 | |
674 | |
654 | if (ch == NOCHAR) |
675 | if (ch == NOCHAR) |
655 | return false; |
676 | return false; |
… | |
… | |
717 | { |
738 | { |
718 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
739 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
719 | |
740 | |
720 | if (bg == Color_bg && !slow) |
741 | if (bg == Color_bg && !slow) |
721 | { |
742 | { |
722 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
743 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
723 | XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len); |
744 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
724 | } |
745 | } |
725 | else |
746 | else |
726 | { |
747 | { |
727 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
748 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
728 | |
749 | |
729 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
750 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
730 | |
751 | |
731 | if (slow) |
752 | if (slow) |
732 | { |
753 | { |
733 | do |
754 | do |
734 | { |
755 | { |
735 | if (xc->byte1 || xc->byte2) |
756 | if (xc->byte1 || xc->byte2) |
736 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1); |
757 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
737 | |
758 | |
738 | x += r->TermWin.fwidth; |
759 | x += r->TermWin.fwidth; |
739 | xc++; len--; |
760 | xc++; len--; |
740 | } |
761 | } |
741 | while (len); |
762 | while (len); |
742 | } |
763 | } |
743 | else |
764 | else |
744 | XDrawString16 (d.display->display, d, GC, x, y + base, xc, len); |
765 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
745 | } |
766 | } |
746 | } |
767 | } |
747 | else |
768 | else |
748 | { |
769 | { |
749 | const char *xc = enc_char (text, len, cs, slow); |
770 | const char *xc = enc_char (text, len, cs, slow); |
750 | |
771 | |
751 | if (bg == Color_bg && !slow) |
772 | if (bg == Color_bg && !slow) |
752 | { |
773 | { |
753 | XChangeGC (d.display->display, GC, GCForeground | GCBackground | GCFont, &v); |
774 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
754 | XDrawImageString (d.display->display, d, GC, x, y + base, xc, len); |
775 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
755 | } |
776 | } |
756 | else |
777 | else |
757 | { |
778 | { |
758 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
779 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
759 | |
780 | |
760 | XChangeGC (d.display->display, GC, GCForeground | GCFont, &v); |
781 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
761 | |
782 | |
762 | if (slow) |
783 | if (slow) |
763 | { |
784 | { |
764 | do |
785 | do |
765 | { |
786 | { |
766 | if (*xc) |
787 | if (*xc) |
767 | XDrawString (d.display->display, d, GC, x, y + base, xc, 1); |
788 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
768 | |
789 | |
769 | x += r->TermWin.fwidth; |
790 | x += r->TermWin.fwidth; |
770 | xc++; len--; |
791 | xc++; len--; |
771 | } |
792 | } |
772 | while (len); |
793 | while (len); |
773 | } |
794 | } |
774 | else |
795 | else |
775 | XDrawString (d.display->display, d, GC, x, y + base, xc, len); |
796 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
776 | } |
797 | } |
777 | } |
798 | } |
778 | } |
799 | } |
779 | |
800 | |
780 | ///////////////////////////////////////////////////////////////////////////// |
801 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
797 | |
818 | |
798 | void draw (rxvt_drawable &d, int x, int y, |
819 | void draw (rxvt_drawable &d, int x, int y, |
799 | const text_t *text, int len, |
820 | const text_t *text, int len, |
800 | int fg, int bg); |
821 | int fg, int bg); |
801 | |
822 | |
802 | bool has_codepoint (uint32_t unicode); |
823 | bool has_codepoint (unicode_t unicode); |
803 | |
824 | |
804 | protected: |
825 | protected: |
805 | XftFont *f; |
826 | XftFont *f; |
806 | }; |
827 | }; |
807 | |
828 | |
… | |
… | |
920 | |
941 | |
921 | return true; |
942 | return true; |
922 | } |
943 | } |
923 | |
944 | |
924 | bool |
945 | bool |
925 | rxvt_font_xft::has_codepoint (uint32_t unicode) |
946 | rxvt_font_xft::has_codepoint (unicode_t unicode) |
926 | { |
947 | { |
927 | return XftCharExists (DISPLAY, f, unicode); |
948 | return XftCharExists (DISPLAY, f, unicode); |
928 | } |
949 | } |
929 | |
950 | |
930 | void |
951 | void |
… | |
… | |
1026 | f = new rxvt_font_x11; |
1047 | f = new rxvt_font_x11; |
1027 | } |
1048 | } |
1028 | else |
1049 | else |
1029 | f = new rxvt_font_x11; |
1050 | f = new rxvt_font_x11; |
1030 | |
1051 | |
|
|
1052 | f->fs = this; |
1031 | f->set_term (r); |
1053 | f->set_term (r); |
1032 | f->set_name (strdup (name)); |
1054 | f->set_name (strdup (name)); |
1033 | |
1055 | |
1034 | f->cs = cs; |
1056 | f->cs = cs; |
1035 | f->loaded = false; |
1057 | f->loaded = false; |
… | |
… | |
1132 | |
1154 | |
1133 | return true; |
1155 | return true; |
1134 | } |
1156 | } |
1135 | |
1157 | |
1136 | int |
1158 | int |
1137 | rxvt_fontset::find_font (uint32_t unicode) |
1159 | rxvt_fontset::find_font (unicode_t unicode) |
1138 | { |
1160 | { |
1139 | for (unsigned int i = 0; i < fonts.size (); i++) |
1161 | for (unsigned int i = !!(0x20 <= unicode && unicode <= 0x7f); // skip pseudo-font for ascii |
|
|
1162 | i < fonts.size (); |
|
|
1163 | i++) |
1140 | { |
1164 | { |
1141 | rxvt_font *f = fonts[i]; |
1165 | rxvt_font *f = fonts[i]; |
1142 | |
1166 | |
1143 | if (!f->loaded) |
1167 | if (!f->loaded) |
1144 | { |
1168 | { |