| … | |
… | |
| 59 | } |
59 | } |
| 60 | |
60 | |
| 61 | #if ENABLE_COMBINING |
61 | #if ENABLE_COMBINING |
| 62 | class rxvt_composite_vec rxvt_composite; |
62 | class rxvt_composite_vec rxvt_composite; |
| 63 | |
63 | |
| 64 | text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2) |
64 | text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) |
| 65 | { |
65 | { |
| 66 | compose_char *cc; |
66 | compose_char *cc; |
| 67 | |
67 | |
| 68 | // break compose chains, as stupid readline really likes to duplicate |
68 | // break compose chains, as stupid readline really likes to duplicate |
| 69 | // composing characters for some reason near the end of a line. |
69 | // composing characters for some reason near the end of a line. |
| … | |
… | |
| 95 | v.push_back (compose_char (c1, c2)); |
95 | v.push_back (compose_char (c1, c2)); |
| 96 | |
96 | |
| 97 | return v.size () - 1 + COMPOSE_LO; |
97 | return v.size () - 1 + COMPOSE_LO; |
| 98 | } |
98 | } |
| 99 | |
99 | |
| 100 | int rxvt_composite_vec::expand (uint32_t c, wchar_t *r) |
100 | int rxvt_composite_vec::expand (unicode_t c, wchar_t *r) |
| 101 | { |
101 | { |
| 102 | compose_char *cc = (*this)[c]; |
102 | compose_char *cc = (*this)[c]; |
| 103 | |
103 | |
| 104 | if (!cc) |
104 | if (!cc) |
| 105 | { |
105 | { |
