| … | |
… | |
| 124 | v.push_back (compose_char (c1, c2)); |
124 | v.push_back (compose_char (c1, c2)); |
| 125 | |
125 | |
| 126 | return v.size () - 1 + COMPOSE_LO; |
126 | return v.size () - 1 + COMPOSE_LO; |
| 127 | } |
127 | } |
| 128 | |
128 | |
|
|
129 | template<typename T> |
| 129 | int rxvt_composite_vec::expand (unicode_t c, wchar_t *r) |
130 | int rxvt_composite_vec::expand (unicode_t c, T *r) |
| 130 | { |
131 | { |
| 131 | compose_char *cc = (*this)[c]; |
132 | compose_char *cc = (*this)[c]; |
| 132 | |
133 | |
| 133 | if (!cc) |
134 | if (!cc) |
| 134 | { |
135 | { |
| … | |
… | |
| 145 | len++; |
146 | len++; |
| 146 | if (r) *r++ = cc->c2; |
147 | if (r) *r++ = cc->c2; |
| 147 | } |
148 | } |
| 148 | |
149 | |
| 149 | return len; |
150 | return len; |
| 150 | |
|
|
| 151 | } |
151 | } |
|
|
152 | |
|
|
153 | template int rxvt_composite_vec::expand<text_t> (unicode_t c, text_t *); |
|
|
154 | template int rxvt_composite_vec::expand<wchar_t> (unicode_t c, wchar_t *); |
| 152 | #endif |
155 | #endif |
| 153 | |
156 | |
| 154 | rxvt_term::rxvt_term () |
157 | rxvt_term::rxvt_term () |
| 155 | { |
158 | { |
| 156 | #ifdef CURSOR_BLINK |
159 | #ifdef CURSOR_BLINK |
