| … | |
… | |
| 268 | bool load (const rxvt_fontprop &prop) |
268 | bool load (const rxvt_fontprop &prop) |
| 269 | { |
269 | { |
| 270 | width = 1; height = 1; |
270 | width = 1; height = 1; |
| 271 | ascent = 1; descent = 0; |
271 | ascent = 1; descent = 0; |
| 272 | |
272 | |
|
|
273 | set_name ("built-in pseudofont"); |
|
|
274 | |
| 273 | return true; |
275 | return true; |
| 274 | } |
276 | } |
| 275 | |
277 | |
| 276 | bool has_codepoint (uint32_t unicode) |
278 | bool has_codepoint (uint32_t unicode) |
| 277 | { |
279 | { |
| … | |
… | |
| 352 | gcv.line_width = 0; |
354 | gcv.line_width = 0; |
| 353 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
355 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
| 354 | } |
356 | } |
| 355 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
357 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
| 356 | { |
358 | { |
|
|
359 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
| 357 | (*fs)[fs->find_font (cc->c1)]->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
360 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
| 358 | if (cc->c2 != NOCHAR) |
361 | if (cc->c2 != NOCHAR) |
|
|
362 | { |
|
|
363 | // prefer font of first character, for no good reasons |
|
|
364 | rxvt_font *f2 = f1->has_codepoint (cc->c2) |
|
|
365 | ? f1 |
|
|
366 | : (*fs)[fs->find_font (cc->c2)]; |
|
|
367 | |
| 359 | (*fs)[fs->find_font (cc->c2)]->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
368 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
|
|
369 | } |
| 360 | } |
370 | } |
| 361 | else |
371 | else |
| 362 | switch (t) |
372 | switch (t) |
| 363 | { |
373 | { |
| 364 | case ZERO_WIDTH_CHAR: |
374 | case ZERO_WIDTH_CHAR: |
