| … | |
… | |
| 23 | #include "../config.h" |
23 | #include "../config.h" |
| 24 | |
24 | |
| 25 | #include "encoding.h" |
25 | #include "encoding.h" |
| 26 | #include "rxvtutil.h" |
26 | #include "rxvtutil.h" |
| 27 | |
27 | |
| 28 | #include <cstdlib> |
28 | #include <stdlib.h> |
| 29 | #include <cstring> |
29 | #include <string.h> |
| 30 | |
30 | |
| 31 | static const struct n2cs { |
31 | static const struct n2cs { |
| 32 | const char *name; |
32 | const char *name; |
| 33 | codeset cs; |
33 | codeset cs; |
| 34 | } n2cs[] = { |
34 | } n2cs[] = { |
| … | |
… | |
| 286 | |
286 | |
| 287 | unicode_t |
287 | unicode_t |
| 288 | rxvt_compose (unicode_t c1, unicode_t c2) |
288 | rxvt_compose (unicode_t c1, unicode_t c2) |
| 289 | { |
289 | { |
| 290 | int l = 0; |
290 | int l = 0; |
| 291 | int r = ARRAY_LENGTH(rxvt_compose_table) - 1; |
291 | int r = ecb_array_length (rxvt_compose_table) - 1; |
| 292 | int m; |
292 | int m; |
| 293 | |
293 | |
| 294 | while (r >= l) |
294 | while (r >= l) |
| 295 | { |
295 | { |
| 296 | m = (l + r) / 2; |
296 | m = (l + r) / 2; |
