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