| … | |
… | |
| 729 | |
729 | |
| 730 | int base = r->TermWin.fbase; |
730 | int base = r->TermWin.fbase; |
| 731 | |
731 | |
| 732 | XGCValues v; |
732 | XGCValues v; |
| 733 | v.foreground = r->PixColors[fg]; |
733 | v.foreground = r->PixColors[fg]; |
| 734 | v.background = r->PixColors[bg]; |
|
|
| 735 | v.font = f->fid; |
734 | v.font = f->fid; |
| 736 | |
735 | |
| 737 | if (enc2b) |
736 | if (enc2b) |
| 738 | { |
737 | { |
| 739 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
738 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
| 740 | |
739 | |
| 741 | if (bg == Color_bg && !slow) |
740 | if (bg == Color_bg && !slow) |
| 742 | { |
741 | { |
|
|
742 | v.background = r->PixColors[bg]; |
| 743 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
743 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
| 744 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
744 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
| 745 | } |
745 | } |
| 746 | else |
746 | else |
| 747 | { |
747 | { |
| … | |
… | |
| 769 | { |
769 | { |
| 770 | const char *xc = enc_char (text, len, cs, slow); |
770 | const char *xc = enc_char (text, len, cs, slow); |
| 771 | |
771 | |
| 772 | if (bg == Color_bg && !slow) |
772 | if (bg == Color_bg && !slow) |
| 773 | { |
773 | { |
|
|
774 | v.background = r->PixColors[bg]; |
| 774 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
775 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
| 775 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
776 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
| 776 | } |
777 | } |
| 777 | else |
778 | else |
| 778 | { |
779 | { |
