| … | |
… | |
| 313 | |
313 | |
| 314 | XSetForeground (d.display->display, GC, r->PixColors[fg]); |
314 | XSetForeground (d.display->display, GC, r->PixColors[fg]); |
| 315 | |
315 | |
| 316 | while (len--) |
316 | while (len--) |
| 317 | { |
317 | { |
|
|
318 | #if ENABLE_COMBINING |
| 318 | compose_char *cc; |
319 | compose_char *cc; |
|
|
320 | #endif |
| 319 | text_t t = *text++; |
321 | text_t t = *text++; |
| 320 | |
322 | |
| 321 | // is it in our linedrawing table? |
323 | // is it in our linedrawing table? |
| 322 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
324 | if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500]) |
| 323 | { |
325 | { |
| … | |
… | |
| 352 | } |
354 | } |
| 353 | |
355 | |
| 354 | gcv.line_width = 0; |
356 | gcv.line_width = 0; |
| 355 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
357 | XChangeGC (d.display->display, GC, GCLineWidth, &gcv); |
| 356 | } |
358 | } |
|
|
359 | #if ENABLE_COMBINING |
| 357 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
360 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
| 358 | { |
361 | { |
| 359 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
362 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
| 360 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
363 | f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg); |
| 361 | if (cc->c2 != NOCHAR) |
364 | if (cc->c2 != NOCHAR) |
| … | |
… | |
| 366 | : (*fs)[fs->find_font (cc->c2)]; |
369 | : (*fs)[fs->find_font (cc->c2)]; |
| 367 | |
370 | |
| 368 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
371 | f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1); |
| 369 | } |
372 | } |
| 370 | } |
373 | } |
|
|
374 | #endif |
| 371 | else |
375 | else |
| 372 | switch (t) |
376 | switch (t) |
| 373 | { |
377 | { |
| 374 | case ZERO_WIDTH_CHAR: |
378 | case ZERO_WIDTH_CHAR: |
| 375 | break; |
379 | break; |
