… | |
… | |
352 | gcv.line_width = 0; |
352 | gcv.line_width = 0; |
353 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
353 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
354 | } |
354 | } |
355 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
355 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
356 | { |
356 | { |
|
|
357 | 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); |
358 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
358 | if (cc->c2 != NOCHAR) |
359 | if (cc->c2 != NOCHAR) |
|
|
360 | { |
|
|
361 | // prefer font of first character, for no good reasons |
|
|
362 | rxvt_font *f2 = f1->has_codepoint (cc->c2) |
|
|
363 | ? f1 |
|
|
364 | : (*fs)[fs->find_font (cc->c2)]; |
|
|
365 | |
359 | (*fs)[fs->find_font (cc->c2)]->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
366 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
|
|
367 | } |
360 | } |
368 | } |
361 | else |
369 | else |
362 | switch (t) |
370 | switch (t) |
363 | { |
371 | { |
364 | case ZERO_WIDTH_CHAR: |
372 | case ZERO_WIDTH_CHAR: |