mirror of
https://github.com/tmux/tmux.git
synced 2024-12-12 17:38:48 +00:00
Merge branch 'obsd-master'
Conflicts: utf8.c
This commit is contained in:
Thomas Adam
commit
35fd6d134a
@ -108,7 +108,7 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag,
|
||||
TAILQ_FOREACH(c_loop, &clients, entry) {
|
||||
if (c_loop->session != s || c == c_loop)
|
||||
continue;
|
||||
proc_send_s(c->peer, MSG_DETACH, s->name);
|
||||
proc_send_s(c_loop->peer, MSG_DETACH, s->name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -77,11 +77,16 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
|
||||
else
|
||||
cwd = ".";
|
||||
|
||||
xasprintf(&file, "%s/%s", cwd, path);
|
||||
if (realpath(file, resolved) == NULL)
|
||||
f = NULL;
|
||||
if (*path == '/')
|
||||
file = xstrdup(path);
|
||||
else
|
||||
f = fopen(resolved, "rb");
|
||||
xasprintf(&file, "%s/%s", cwd, path);
|
||||
if (realpath(file, resolved) == NULL &&
|
||||
strlcpy(resolved, file, sizeof resolved) >= sizeof resolved) {
|
||||
cmdq_error(cmdq, "%s: %s", file, strerror(ENAMETOOLONG));
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
f = fopen(resolved, "rb");
|
||||
free(file);
|
||||
if (f == NULL) {
|
||||
cmdq_error(cmdq, "%s: %s", resolved, strerror(errno));
|
||||
|
||||
@ -102,11 +102,16 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
|
||||
if (args_has(self->args, 'a'))
|
||||
flags = "ab";
|
||||
|
||||
xasprintf(&file, "%s/%s", cwd, path);
|
||||
if (realpath(file, resolved) == NULL)
|
||||
f = NULL;
|
||||
if (*path == '/')
|
||||
file = xstrdup(path);
|
||||
else
|
||||
f = fopen(resolved, flags);
|
||||
xasprintf(&file, "%s/%s", cwd, path);
|
||||
if (realpath(file, resolved) == NULL &&
|
||||
strlcpy(resolved, file, sizeof resolved) >= sizeof resolved) {
|
||||
cmdq_error(cmdq, "%s: %s", file, strerror(ENAMETOOLONG));
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
f = fopen(resolved, flags);
|
||||
free(file);
|
||||
if (f == NULL) {
|
||||
cmdq_error(cmdq, "%s: %s", resolved, strerror(errno));
|
||||
|
||||
457
utf8.c
457
utf8.c
@ -33,166 +33,315 @@ struct utf8_width_entry {
|
||||
struct utf8_width_entry *right;
|
||||
};
|
||||
|
||||
/* Random order. Not optimal but it'll do for now... */
|
||||
/* Sorted, then repeatedly split in the middle to balance the tree. */
|
||||
struct utf8_width_entry utf8_width_table[] = {
|
||||
{ 0x00951, 0x00954, 0, NULL, NULL },
|
||||
{ 0x00ccc, 0x00ccd, 0, NULL, NULL },
|
||||
{ 0x0fff9, 0x0fffb, 0, NULL, NULL },
|
||||
{ 0x20000, 0x2fffd, 2, NULL, NULL },
|
||||
{ 0x00ebb, 0x00ebc, 0, NULL, NULL },
|
||||
{ 0x01932, 0x01932, 0, NULL, NULL },
|
||||
{ 0x0070f, 0x0070f, 0, NULL, NULL },
|
||||
{ 0x00a70, 0x00a71, 0, NULL, NULL },
|
||||
{ 0x02329, 0x02329, 2, NULL, NULL },
|
||||
{ 0x00acd, 0x00acd, 0, NULL, NULL },
|
||||
{ 0x00ac7, 0x00ac8, 0, NULL, NULL },
|
||||
{ 0x00a3c, 0x00a3c, 0, NULL, NULL },
|
||||
{ 0x009cd, 0x009cd, 0, NULL, NULL },
|
||||
{ 0x00591, 0x005bd, 0, NULL, NULL },
|
||||
{ 0x01058, 0x01059, 0, NULL, NULL },
|
||||
{ 0x0ffe0, 0x0ffe6, 2, NULL, NULL },
|
||||
{ 0x01100, 0x0115f, 2, NULL, NULL },
|
||||
{ 0x0fe20, 0x0fe23, 0, NULL, NULL },
|
||||
{ 0x0302a, 0x0302f, 0, NULL, NULL },
|
||||
{ 0x01772, 0x01773, 0, NULL, NULL },
|
||||
{ 0x005bf, 0x005bf, 0, NULL, NULL },
|
||||
{ 0x006ea, 0x006ed, 0, NULL, NULL },
|
||||
{ 0x00bc0, 0x00bc0, 0, NULL, NULL },
|
||||
{ 0x00962, 0x00963, 0, NULL, NULL },
|
||||
{ 0x01732, 0x01734, 0, NULL, NULL },
|
||||
{ 0x00d41, 0x00d43, 0, NULL, NULL },
|
||||
{ 0x01b42, 0x01b42, 0, NULL, NULL },
|
||||
{ 0x00a41, 0x00a42, 0, NULL, NULL },
|
||||
{ 0x00eb4, 0x00eb9, 0, NULL, NULL },
|
||||
{ 0x00b01, 0x00b01, 0, NULL, NULL },
|
||||
{ 0x00e34, 0x00e3a, 0, NULL, NULL },
|
||||
{ 0x03040, 0x03098, 2, NULL, NULL },
|
||||
{ 0x0093c, 0x0093c, 0, NULL, NULL },
|
||||
{ 0x00c4a, 0x00c4d, 0, NULL, NULL },
|
||||
{ 0x01032, 0x01032, 0, NULL, NULL },
|
||||
{ 0x00f37, 0x00f37, 0, NULL, NULL },
|
||||
{ 0x00901, 0x00902, 0, NULL, NULL },
|
||||
{ 0x00cbf, 0x00cbf, 0, NULL, NULL },
|
||||
{ 0x0a806, 0x0a806, 0, NULL, NULL },
|
||||
{ 0x00dd2, 0x00dd4, 0, NULL, NULL },
|
||||
{ 0x00f71, 0x00f7e, 0, NULL, NULL },
|
||||
{ 0x01752, 0x01753, 0, NULL, NULL },
|
||||
{ 0x1d242, 0x1d244, 0, NULL, NULL },
|
||||
{ 0x005c1, 0x005c2, 0, NULL, NULL },
|
||||
{ 0x0309b, 0x0a4cf, 2, NULL, NULL },
|
||||
{ 0xe0100, 0xe01ef, 0, NULL, NULL },
|
||||
{ 0x017dd, 0x017dd, 0, NULL, NULL },
|
||||
{ 0x00600, 0x00603, 0, NULL, NULL },
|
||||
{ 0x009e2, 0x009e3, 0, NULL, NULL },
|
||||
{ 0x00cc6, 0x00cc6, 0, NULL, NULL },
|
||||
{ 0x0a80b, 0x0a80b, 0, NULL, NULL },
|
||||
{ 0x01712, 0x01714, 0, NULL, NULL },
|
||||
{ 0x00b3c, 0x00b3c, 0, NULL, NULL },
|
||||
{ 0x01b00, 0x01b03, 0, NULL, NULL },
|
||||
{ 0x007eb, 0x007f3, 0, NULL, NULL },
|
||||
{ 0xe0001, 0xe0001, 0, NULL, NULL },
|
||||
{ 0x1d185, 0x1d18b, 0, NULL, NULL },
|
||||
{ 0x0feff, 0x0feff, 0, NULL, NULL },
|
||||
{ 0x01b36, 0x01b3a, 0, NULL, NULL },
|
||||
{ 0x01920, 0x01922, 0, NULL, NULL },
|
||||
{ 0x00670, 0x00670, 0, NULL, NULL },
|
||||
{ 0x00f90, 0x00f97, 0, NULL, NULL },
|
||||
{ 0x01927, 0x01928, 0, NULL, NULL },
|
||||
{ 0x0200b, 0x0200f, 0, NULL, NULL },
|
||||
{ 0x0ff00, 0x0ff60, 2, NULL, NULL },
|
||||
{ 0x0f900, 0x0faff, 2, NULL, NULL },
|
||||
{ 0x0fb1e, 0x0fb1e, 0, NULL, NULL },
|
||||
{ 0x00cbc, 0x00cbc, 0, NULL, NULL },
|
||||
{ 0x00eb1, 0x00eb1, 0, NULL, NULL },
|
||||
{ 0x10a38, 0x10a3a, 0, NULL, NULL },
|
||||
{ 0x007a6, 0x007b0, 0, NULL, NULL },
|
||||
{ 0x00f80, 0x00f84, 0, NULL, NULL },
|
||||
{ 0x00b41, 0x00b44, 0, NULL, NULL },
|
||||
{ 0x008e4, 0x00902, 0, NULL, NULL },
|
||||
{ 0x006d6, 0x006dd, 0, NULL, NULL },
|
||||
{ 0x005c4, 0x005c5, 0, NULL, NULL },
|
||||
{ 0x0ac00, 0x0d7a3, 2, NULL, NULL },
|
||||
{ 0x017c9, 0x017d3, 0, NULL, NULL },
|
||||
{ 0x00d4d, 0x00d4d, 0, NULL, NULL },
|
||||
{ 0x1d167, 0x1d169, 0, NULL, NULL },
|
||||
{ 0x01036, 0x01037, 0, NULL, NULL },
|
||||
{ 0xe0020, 0xe007f, 0, NULL, NULL },
|
||||
{ 0x00f35, 0x00f35, 0, NULL, NULL },
|
||||
{ 0x017b4, 0x017b5, 0, NULL, NULL },
|
||||
{ 0x0206a, 0x0206f, 0, NULL, NULL },
|
||||
{ 0x00c46, 0x00c48, 0, NULL, NULL },
|
||||
{ 0x01939, 0x0193b, 0, NULL, NULL },
|
||||
{ 0x01dc0, 0x01dca, 0, NULL, NULL },
|
||||
{ 0x10a0c, 0x10a0f, 0, NULL, NULL },
|
||||
{ 0x0102d, 0x01030, 0, NULL, NULL },
|
||||
{ 0x017c6, 0x017c6, 0, NULL, NULL },
|
||||
{ 0x00ec8, 0x00ecd, 0, NULL, NULL },
|
||||
{ 0x00b41, 0x00b43, 0, NULL, NULL },
|
||||
{ 0x017b7, 0x017bd, 0, NULL, NULL },
|
||||
{ 0x1d173, 0x1d182, 0, NULL, NULL },
|
||||
{ 0x00a47, 0x00a48, 0, NULL, NULL },
|
||||
{ 0x0232a, 0x0232a, 2, NULL, NULL },
|
||||
{ 0x01b3c, 0x01b3c, 0, NULL, NULL },
|
||||
{ 0x10a01, 0x10a03, 0, NULL, NULL },
|
||||
{ 0x00ae2, 0x00ae3, 0, NULL, NULL },
|
||||
{ 0x00483, 0x00486, 0, NULL, NULL },
|
||||
{ 0x0135f, 0x0135f, 0, NULL, NULL },
|
||||
{ 0x01a17, 0x01a18, 0, NULL, NULL },
|
||||
{ 0x006e7, 0x006e8, 0, NULL, NULL },
|
||||
#ifndef __APPLE__
|
||||
{ 0x03099, 0x0309a, 0, NULL, NULL },
|
||||
#endif
|
||||
{ 0x00b4d, 0x00b4d, 0, NULL, NULL },
|
||||
{ 0x00ce2, 0x00ce3, 0, NULL, NULL },
|
||||
{ 0x00bcd, 0x00bcd, 0, NULL, NULL },
|
||||
{ 0x00610, 0x00615, 0, NULL, NULL },
|
||||
{ 0x00f99, 0x00fbc, 0, NULL, NULL },
|
||||
{ 0x009c1, 0x009c4, 0, NULL, NULL },
|
||||
{ 0x00730, 0x0074a, 0, NULL, NULL },
|
||||
{ 0x00591, 0x005bd, 0, NULL, NULL },
|
||||
{ 0x00300, 0x0036f, 0, NULL, NULL },
|
||||
{ 0x03030, 0x0303e, 2, NULL, NULL },
|
||||
{ 0x01b34, 0x01b34, 0, NULL, NULL },
|
||||
{ 0x1d1aa, 0x1d1ad, 0, NULL, NULL },
|
||||
{ 0x00dca, 0x00dca, 0, NULL, NULL },
|
||||
{ 0x006d6, 0x006e4, 0, NULL, NULL },
|
||||
{ 0x00f86, 0x00f87, 0, NULL, NULL },
|
||||
{ 0x00b3f, 0x00b3f, 0, NULL, NULL },
|
||||
{ 0x0fe30, 0x0fe6f, 2, NULL, NULL },
|
||||
{ 0x01039, 0x01039, 0, NULL, NULL },
|
||||
{ 0x0094d, 0x0094d, 0, NULL, NULL },
|
||||
{ 0x00c55, 0x00c56, 0, NULL, NULL },
|
||||
{ 0x00488, 0x00489, 0, NULL, NULL },
|
||||
{ 0x00e47, 0x00e4e, 0, NULL, NULL },
|
||||
{ 0x00a81, 0x00a82, 0, NULL, NULL },
|
||||
{ 0x00ac1, 0x00ac5, 0, NULL, NULL },
|
||||
{ 0x0202a, 0x0202e, 0, NULL, NULL },
|
||||
{ 0x00dd6, 0x00dd6, 0, NULL, NULL },
|
||||
{ 0x018a9, 0x018a9, 0, NULL, NULL },
|
||||
{ 0x0064b, 0x0065e, 0, NULL, NULL },
|
||||
{ 0x00abc, 0x00abc, 0, NULL, NULL },
|
||||
{ 0x00b82, 0x00b82, 0, NULL, NULL },
|
||||
{ 0x00f39, 0x00f39, 0, NULL, NULL },
|
||||
{ 0x020d0, 0x020ef, 0, NULL, NULL },
|
||||
{ 0x01dfe, 0x01dff, 0, NULL, NULL },
|
||||
{ 0x30000, 0x3fffd, 2, NULL, NULL },
|
||||
{ 0x00711, 0x00711, 0, NULL, NULL },
|
||||
{ 0x0fe00, 0x0fe0f, 0, NULL, NULL },
|
||||
{ 0x0180b, 0x0180d, 0, NULL, NULL },
|
||||
{ 0x10a3f, 0x10a3f, 0, NULL, NULL },
|
||||
{ 0x00981, 0x00981, 0, NULL, NULL },
|
||||
{ 0x0a825, 0x0a826, 0, NULL, NULL },
|
||||
{ 0x00941, 0x00948, 0, NULL, NULL },
|
||||
{ 0x01b6b, 0x01b73, 0, NULL, NULL },
|
||||
{ 0x00e31, 0x00e31, 0, NULL, NULL },
|
||||
{ 0x0fe10, 0x0fe19, 2, NULL, NULL },
|
||||
{ 0x00a01, 0x00a02, 0, NULL, NULL },
|
||||
{ 0x00a4b, 0x00a4d, 0, NULL, NULL },
|
||||
{ 0x00f18, 0x00f19, 0, NULL, NULL },
|
||||
{ 0x00fc6, 0x00fc6, 0, NULL, NULL },
|
||||
{ 0x02e80, 0x03029, 2, NULL, NULL },
|
||||
{ 0x00b56, 0x00b56, 0, NULL, NULL },
|
||||
{ 0x009bc, 0x009bc, 0, NULL, NULL },
|
||||
{ 0x00483, 0x00489, 0, NULL, NULL },
|
||||
{ 0x005bf, 0x005bf, 0, NULL, NULL },
|
||||
{ 0x005c1, 0x005c2, 0, NULL, NULL },
|
||||
{ 0x00610, 0x0061a, 0, NULL, NULL },
|
||||
{ 0x00600, 0x00605, 0, NULL, NULL },
|
||||
{ 0x005c7, 0x005c7, 0, NULL, NULL },
|
||||
{ 0x02060, 0x02063, 0, NULL, NULL },
|
||||
{ 0x0064b, 0x0065f, 0, NULL, NULL },
|
||||
{ 0x0061c, 0x0061c, 0, NULL, NULL },
|
||||
{ 0x00670, 0x00670, 0, NULL, NULL },
|
||||
{ 0x007a6, 0x007b0, 0, NULL, NULL },
|
||||
{ 0x006ea, 0x006ed, 0, NULL, NULL },
|
||||
{ 0x006df, 0x006e4, 0, NULL, NULL },
|
||||
{ 0x006e7, 0x006e8, 0, NULL, NULL },
|
||||
{ 0x00711, 0x00711, 0, NULL, NULL },
|
||||
{ 0x0070f, 0x0070f, 0, NULL, NULL },
|
||||
{ 0x00730, 0x0074a, 0, NULL, NULL },
|
||||
{ 0x0081b, 0x00823, 0, NULL, NULL },
|
||||
{ 0x007eb, 0x007f3, 0, NULL, NULL },
|
||||
{ 0x00816, 0x00819, 0, NULL, NULL },
|
||||
{ 0x00829, 0x0082d, 0, NULL, NULL },
|
||||
{ 0x00825, 0x00827, 0, NULL, NULL },
|
||||
{ 0x00859, 0x0085b, 0, NULL, NULL },
|
||||
{ 0x00a41, 0x00a42, 0, NULL, NULL },
|
||||
{ 0x00981, 0x00981, 0, NULL, NULL },
|
||||
{ 0x00941, 0x00948, 0, NULL, NULL },
|
||||
{ 0x0093a, 0x0093a, 0, NULL, NULL },
|
||||
{ 0x0093c, 0x0093c, 0, NULL, NULL },
|
||||
{ 0x00951, 0x00957, 0, NULL, NULL },
|
||||
{ 0x0094d, 0x0094d, 0, NULL, NULL },
|
||||
{ 0x00962, 0x00963, 0, NULL, NULL },
|
||||
{ 0x009e2, 0x009e3, 0, NULL, NULL },
|
||||
{ 0x009c1, 0x009c4, 0, NULL, NULL },
|
||||
{ 0x009bc, 0x009bc, 0, NULL, NULL },
|
||||
{ 0x009cd, 0x009cd, 0, NULL, NULL },
|
||||
{ 0x00a01, 0x00a02, 0, NULL, NULL },
|
||||
{ 0x00a3c, 0x00a3c, 0, NULL, NULL },
|
||||
{ 0x00ac1, 0x00ac5, 0, NULL, NULL },
|
||||
{ 0x00a70, 0x00a71, 0, NULL, NULL },
|
||||
{ 0x00a4b, 0x00a4d, 0, NULL, NULL },
|
||||
{ 0x00a47, 0x00a48, 0, NULL, NULL },
|
||||
{ 0x00a51, 0x00a51, 0, NULL, NULL },
|
||||
{ 0x00a81, 0x00a82, 0, NULL, NULL },
|
||||
{ 0x00a75, 0x00a75, 0, NULL, NULL },
|
||||
{ 0x00abc, 0x00abc, 0, NULL, NULL },
|
||||
{ 0x00ae2, 0x00ae3, 0, NULL, NULL },
|
||||
{ 0x00ac7, 0x00ac8, 0, NULL, NULL },
|
||||
{ 0x00acd, 0x00acd, 0, NULL, NULL },
|
||||
{ 0x00b3c, 0x00b3c, 0, NULL, NULL },
|
||||
{ 0x00b01, 0x00b01, 0, NULL, NULL },
|
||||
{ 0x00b3f, 0x00b3f, 0, NULL, NULL },
|
||||
{ 0x03190, 0x031ba, 2, NULL, NULL },
|
||||
{ 0x017c9, 0x017d3, 0, NULL, NULL },
|
||||
{ 0x00ec8, 0x00ecd, 0, NULL, NULL },
|
||||
{ 0x00cc6, 0x00cc6, 0, NULL, NULL },
|
||||
{ 0x00c3e, 0x00c40, 0, NULL, NULL },
|
||||
{ 0x00b82, 0x00b82, 0, NULL, NULL },
|
||||
{ 0x00b56, 0x00b56, 0, NULL, NULL },
|
||||
{ 0x00b4d, 0x00b4d, 0, NULL, NULL },
|
||||
{ 0x00b62, 0x00b63, 0, NULL, NULL },
|
||||
{ 0x00bcd, 0x00bcd, 0, NULL, NULL },
|
||||
{ 0x00bc0, 0x00bc0, 0, NULL, NULL },
|
||||
{ 0x00c00, 0x00c00, 0, NULL, NULL },
|
||||
{ 0x00c62, 0x00c63, 0, NULL, NULL },
|
||||
{ 0x00c4a, 0x00c4d, 0, NULL, NULL },
|
||||
{ 0x00c46, 0x00c48, 0, NULL, NULL },
|
||||
{ 0x00c55, 0x00c56, 0, NULL, NULL },
|
||||
{ 0x00cbc, 0x00cbc, 0, NULL, NULL },
|
||||
{ 0x00c81, 0x00c81, 0, NULL, NULL },
|
||||
{ 0x00cbf, 0x00cbf, 0, NULL, NULL },
|
||||
{ 0x00dd2, 0x00dd4, 0, NULL, NULL },
|
||||
{ 0x00d41, 0x00d44, 0, NULL, NULL },
|
||||
{ 0x00ce2, 0x00ce3, 0, NULL, NULL },
|
||||
{ 0x00ccc, 0x00ccd, 0, NULL, NULL },
|
||||
{ 0x00d01, 0x00d01, 0, NULL, NULL },
|
||||
{ 0x00d62, 0x00d63, 0, NULL, NULL },
|
||||
{ 0x00d4d, 0x00d4d, 0, NULL, NULL },
|
||||
{ 0x00dca, 0x00dca, 0, NULL, NULL },
|
||||
{ 0x00e47, 0x00e4e, 0, NULL, NULL },
|
||||
{ 0x00e31, 0x00e31, 0, NULL, NULL },
|
||||
{ 0x00dd6, 0x00dd6, 0, NULL, NULL },
|
||||
{ 0x00e34, 0x00e3a, 0, NULL, NULL },
|
||||
{ 0x00eb4, 0x00eb9, 0, NULL, NULL },
|
||||
{ 0x00eb1, 0x00eb1, 0, NULL, NULL },
|
||||
{ 0x00ebb, 0x00ebc, 0, NULL, NULL },
|
||||
{ 0x0105e, 0x01060, 0, NULL, NULL },
|
||||
{ 0x00f8d, 0x00f97, 0, NULL, NULL },
|
||||
{ 0x00f39, 0x00f39, 0, NULL, NULL },
|
||||
{ 0x00f35, 0x00f35, 0, NULL, NULL },
|
||||
{ 0x00f18, 0x00f19, 0, NULL, NULL },
|
||||
{ 0x00f37, 0x00f37, 0, NULL, NULL },
|
||||
{ 0x00f80, 0x00f84, 0, NULL, NULL },
|
||||
{ 0x00f71, 0x00f7e, 0, NULL, NULL },
|
||||
{ 0x00f86, 0x00f87, 0, NULL, NULL },
|
||||
{ 0x01032, 0x01037, 0, NULL, NULL },
|
||||
{ 0x00fc6, 0x00fc6, 0, NULL, NULL },
|
||||
{ 0x00f99, 0x00fbc, 0, NULL, NULL },
|
||||
{ 0x0102d, 0x01030, 0, NULL, NULL },
|
||||
{ 0x0103d, 0x0103e, 0, NULL, NULL },
|
||||
{ 0x01039, 0x0103a, 0, NULL, NULL },
|
||||
{ 0x01058, 0x01059, 0, NULL, NULL },
|
||||
{ 0x0135d, 0x0135f, 0, NULL, NULL },
|
||||
{ 0x01085, 0x01086, 0, NULL, NULL },
|
||||
{ 0x01071, 0x01074, 0, NULL, NULL },
|
||||
{ 0x01082, 0x01082, 0, NULL, NULL },
|
||||
{ 0x0109d, 0x0109d, 0, NULL, NULL },
|
||||
{ 0x0108d, 0x0108d, 0, NULL, NULL },
|
||||
{ 0x01100, 0x011ff, 2, NULL, NULL },
|
||||
{ 0x01772, 0x01773, 0, NULL, NULL },
|
||||
{ 0x01732, 0x01734, 0, NULL, NULL },
|
||||
{ 0x01712, 0x01714, 0, NULL, NULL },
|
||||
{ 0x01752, 0x01753, 0, NULL, NULL },
|
||||
{ 0x017b7, 0x017bd, 0, NULL, NULL },
|
||||
{ 0x017b4, 0x017b5, 0, NULL, NULL },
|
||||
{ 0x017c6, 0x017c6, 0, NULL, NULL },
|
||||
{ 0x01c2c, 0x01c33, 0, NULL, NULL },
|
||||
{ 0x01a7f, 0x01a7f, 0, NULL, NULL },
|
||||
{ 0x01a17, 0x01a18, 0, NULL, NULL },
|
||||
{ 0x01920, 0x01922, 0, NULL, NULL },
|
||||
{ 0x0180b, 0x0180e, 0, NULL, NULL },
|
||||
{ 0x017dd, 0x017dd, 0, NULL, NULL },
|
||||
{ 0x018a9, 0x018a9, 0, NULL, NULL },
|
||||
{ 0x01932, 0x01932, 0, NULL, NULL },
|
||||
{ 0x01927, 0x01928, 0, NULL, NULL },
|
||||
{ 0x01939, 0x0193b, 0, NULL, NULL },
|
||||
{ 0x01a60, 0x01a60, 0, NULL, NULL },
|
||||
{ 0x01a56, 0x01a56, 0, NULL, NULL },
|
||||
{ 0x01a1b, 0x01a1b, 0, NULL, NULL },
|
||||
{ 0x01a58, 0x01a5e, 0, NULL, NULL },
|
||||
{ 0x01a65, 0x01a6c, 0, NULL, NULL },
|
||||
{ 0x01a62, 0x01a62, 0, NULL, NULL },
|
||||
{ 0x01a73, 0x01a7c, 0, NULL, NULL },
|
||||
{ 0x01b80, 0x01b81, 0, NULL, NULL },
|
||||
{ 0x01b36, 0x01b3a, 0, NULL, NULL },
|
||||
{ 0x01b00, 0x01b03, 0, NULL, NULL },
|
||||
{ 0x01ab0, 0x01abe, 0, NULL, NULL },
|
||||
{ 0x01b34, 0x01b34, 0, NULL, NULL },
|
||||
{ 0x01b42, 0x01b42, 0, NULL, NULL },
|
||||
{ 0x01b3c, 0x01b3c, 0, NULL, NULL },
|
||||
{ 0x01b6b, 0x01b73, 0, NULL, NULL },
|
||||
{ 0x01be6, 0x01be6, 0, NULL, NULL },
|
||||
{ 0x01ba8, 0x01ba9, 0, NULL, NULL },
|
||||
{ 0x01ba2, 0x01ba5, 0, NULL, NULL },
|
||||
{ 0x01bab, 0x01bad, 0, NULL, NULL },
|
||||
{ 0x01bed, 0x01bed, 0, NULL, NULL },
|
||||
{ 0x01be8, 0x01be9, 0, NULL, NULL },
|
||||
{ 0x01bef, 0x01bf1, 0, NULL, NULL },
|
||||
{ 0x02329, 0x0232a, 2, NULL, NULL },
|
||||
{ 0x01dc0, 0x01df5, 0, NULL, NULL },
|
||||
{ 0x01ce2, 0x01ce8, 0, NULL, NULL },
|
||||
{ 0x01cd0, 0x01cd2, 0, NULL, NULL },
|
||||
{ 0x01c36, 0x01c37, 0, NULL, NULL },
|
||||
{ 0x01cd4, 0x01ce0, 0, NULL, NULL },
|
||||
{ 0x01cf4, 0x01cf4, 0, NULL, NULL },
|
||||
{ 0x01ced, 0x01ced, 0, NULL, NULL },
|
||||
{ 0x01cf8, 0x01cf9, 0, NULL, NULL },
|
||||
{ 0x02060, 0x02064, 0, NULL, NULL },
|
||||
{ 0x0200b, 0x0200f, 0, NULL, NULL },
|
||||
{ 0x01dfc, 0x01dff, 0, NULL, NULL },
|
||||
{ 0x0202a, 0x0202e, 0, NULL, NULL },
|
||||
{ 0x02066, 0x0206f, 0, NULL, NULL },
|
||||
{ 0x020d0, 0x020f0, 0, NULL, NULL },
|
||||
{ 0x03001, 0x03029, 2, NULL, NULL },
|
||||
{ 0x02e80, 0x02e99, 2, NULL, NULL },
|
||||
{ 0x02d7f, 0x02d7f, 0, NULL, NULL },
|
||||
{ 0x02cef, 0x02cf1, 0, NULL, NULL },
|
||||
{ 0x02de0, 0x02dff, 0, NULL, NULL },
|
||||
{ 0x02f00, 0x02fd5, 2, NULL, NULL },
|
||||
{ 0x02e9b, 0x02ef3, 2, NULL, NULL },
|
||||
{ 0x02ff0, 0x02ffb, 2, NULL, NULL },
|
||||
{ 0x03099, 0x0309a, 0, NULL, NULL },
|
||||
{ 0x0302e, 0x0303e, 2, NULL, NULL },
|
||||
{ 0x0302a, 0x0302d, 0, NULL, NULL },
|
||||
{ 0x03041, 0x03096, 2, NULL, NULL },
|
||||
{ 0x03105, 0x0312d, 2, NULL, NULL },
|
||||
{ 0x0309b, 0x030ff, 2, NULL, NULL },
|
||||
{ 0x03131, 0x0318e, 2, NULL, NULL },
|
||||
{ 0x10a3f, 0x10a3f, 0, NULL, NULL },
|
||||
{ 0x0aa4c, 0x0aa4c, 0, NULL, NULL },
|
||||
{ 0x0a825, 0x0a826, 0, NULL, NULL },
|
||||
{ 0x0a490, 0x0a4c6, 2, NULL, NULL },
|
||||
{ 0x03250, 0x032fe, 2, NULL, NULL },
|
||||
{ 0x031f0, 0x0321e, 2, NULL, NULL },
|
||||
{ 0x031c0, 0x031e3, 2, NULL, NULL },
|
||||
{ 0x03220, 0x03247, 2, NULL, NULL },
|
||||
{ 0x04e00, 0x09fcc, 2, NULL, NULL },
|
||||
{ 0x03300, 0x04db5, 2, NULL, NULL },
|
||||
{ 0x0a000, 0x0a48c, 2, NULL, NULL },
|
||||
{ 0x0a6f0, 0x0a6f1, 0, NULL, NULL },
|
||||
{ 0x0a674, 0x0a67d, 0, NULL, NULL },
|
||||
{ 0x0a66f, 0x0a672, 0, NULL, NULL },
|
||||
{ 0x0a69f, 0x0a69f, 0, NULL, NULL },
|
||||
{ 0x0a806, 0x0a806, 0, NULL, NULL },
|
||||
{ 0x0a802, 0x0a802, 0, NULL, NULL },
|
||||
{ 0x0a80b, 0x0a80b, 0, NULL, NULL },
|
||||
{ 0x0a9b6, 0x0a9b9, 0, NULL, NULL },
|
||||
{ 0x0a947, 0x0a951, 0, NULL, NULL },
|
||||
{ 0x0a8e0, 0x0a8f1, 0, NULL, NULL },
|
||||
{ 0x0a8c4, 0x0a8c4, 0, NULL, NULL },
|
||||
{ 0x0a926, 0x0a92d, 0, NULL, NULL },
|
||||
{ 0x0a980, 0x0a982, 0, NULL, NULL },
|
||||
{ 0x0a960, 0x0a97c, 2, NULL, NULL },
|
||||
{ 0x0a9b3, 0x0a9b3, 0, NULL, NULL },
|
||||
{ 0x0aa29, 0x0aa2e, 0, NULL, NULL },
|
||||
{ 0x0a9bc, 0x0a9bc, 0, NULL, NULL },
|
||||
{ 0x0a9e5, 0x0a9e5, 0, NULL, NULL },
|
||||
{ 0x0aa35, 0x0aa36, 0, NULL, NULL },
|
||||
{ 0x0aa31, 0x0aa32, 0, NULL, NULL },
|
||||
{ 0x0aa43, 0x0aa43, 0, NULL, NULL },
|
||||
{ 0x0fb1e, 0x0fb1e, 0, NULL, NULL },
|
||||
{ 0x0aaf6, 0x0aaf6, 0, NULL, NULL },
|
||||
{ 0x0aab7, 0x0aab8, 0, NULL, NULL },
|
||||
{ 0x0aab0, 0x0aab0, 0, NULL, NULL },
|
||||
{ 0x0aa7c, 0x0aa7c, 0, NULL, NULL },
|
||||
{ 0x0aab2, 0x0aab4, 0, NULL, NULL },
|
||||
{ 0x0aac1, 0x0aac1, 0, NULL, NULL },
|
||||
{ 0x0aabe, 0x0aabf, 0, NULL, NULL },
|
||||
{ 0x0aaec, 0x0aaed, 0, NULL, NULL },
|
||||
{ 0x0ac00, 0x0d7a3, 2, NULL, NULL },
|
||||
{ 0x0abe8, 0x0abe8, 0, NULL, NULL },
|
||||
{ 0x0abe5, 0x0abe5, 0, NULL, NULL },
|
||||
{ 0x0abed, 0x0abed, 0, NULL, NULL },
|
||||
{ 0x0f900, 0x0fa6d, 2, NULL, NULL },
|
||||
{ 0x0d800, 0x0f8ff, 0, NULL, NULL },
|
||||
{ 0x0fa70, 0x0fad9, 2, NULL, NULL },
|
||||
{ 0x0fff9, 0x0fffb, 0, NULL, NULL },
|
||||
{ 0x0fe30, 0x0fe52, 2, NULL, NULL },
|
||||
{ 0x0fe10, 0x0fe19, 2, NULL, NULL },
|
||||
{ 0x0fe00, 0x0fe0f, 0, NULL, NULL },
|
||||
{ 0x0fe20, 0x0fe2d, 0, NULL, NULL },
|
||||
{ 0x0fe68, 0x0fe6b, 2, NULL, NULL },
|
||||
{ 0x0fe54, 0x0fe66, 2, NULL, NULL },
|
||||
{ 0x0feff, 0x0feff, 0, NULL, NULL },
|
||||
{ 0x10a01, 0x10a03, 0, NULL, NULL },
|
||||
{ 0x102e0, 0x102e0, 0, NULL, NULL },
|
||||
{ 0x101fd, 0x101fd, 0, NULL, NULL },
|
||||
{ 0x10376, 0x1037a, 0, NULL, NULL },
|
||||
{ 0x10a0c, 0x10a0f, 0, NULL, NULL },
|
||||
{ 0x10a05, 0x10a06, 0, NULL, NULL },
|
||||
{ 0x10a38, 0x10a3a, 0, NULL, NULL },
|
||||
{ 0x11633, 0x1163a, 0, NULL, NULL },
|
||||
{ 0x11236, 0x11237, 0, NULL, NULL },
|
||||
{ 0x11100, 0x11102, 0, NULL, NULL },
|
||||
{ 0x1107f, 0x11081, 0, NULL, NULL },
|
||||
{ 0x11001, 0x11001, 0, NULL, NULL },
|
||||
{ 0x10ae5, 0x10ae6, 0, NULL, NULL },
|
||||
{ 0x11038, 0x11046, 0, NULL, NULL },
|
||||
{ 0x110b9, 0x110ba, 0, NULL, NULL },
|
||||
{ 0x110b3, 0x110b6, 0, NULL, NULL },
|
||||
{ 0x110bd, 0x110bd, 0, NULL, NULL },
|
||||
{ 0x11180, 0x11181, 0, NULL, NULL },
|
||||
{ 0x1112d, 0x11134, 0, NULL, NULL },
|
||||
{ 0x11127, 0x1112b, 0, NULL, NULL },
|
||||
{ 0x11173, 0x11173, 0, NULL, NULL },
|
||||
{ 0x1122f, 0x11231, 0, NULL, NULL },
|
||||
{ 0x111b6, 0x111be, 0, NULL, NULL },
|
||||
{ 0x11234, 0x11234, 0, NULL, NULL },
|
||||
{ 0x11370, 0x11374, 0, NULL, NULL },
|
||||
{ 0x11301, 0x11301, 0, NULL, NULL },
|
||||
{ 0x112df, 0x112df, 0, NULL, NULL },
|
||||
{ 0x112e3, 0x112ea, 0, NULL, NULL },
|
||||
{ 0x11340, 0x11340, 0, NULL, NULL },
|
||||
{ 0x1133c, 0x1133c, 0, NULL, NULL },
|
||||
{ 0x11366, 0x1136c, 0, NULL, NULL },
|
||||
{ 0x114c2, 0x114c3, 0, NULL, NULL },
|
||||
{ 0x114ba, 0x114ba, 0, NULL, NULL },
|
||||
{ 0x114b3, 0x114b8, 0, NULL, NULL },
|
||||
{ 0x114bf, 0x114c0, 0, NULL, NULL },
|
||||
{ 0x115bc, 0x115bd, 0, NULL, NULL },
|
||||
{ 0x115b2, 0x115b5, 0, NULL, NULL },
|
||||
{ 0x115bf, 0x115c0, 0, NULL, NULL },
|
||||
{ 0x1d1aa, 0x1d1ad, 0, NULL, NULL },
|
||||
{ 0x16b30, 0x16b36, 0, NULL, NULL },
|
||||
{ 0x116ad, 0x116ad, 0, NULL, NULL },
|
||||
{ 0x1163f, 0x11640, 0, NULL, NULL },
|
||||
{ 0x1163d, 0x1163d, 0, NULL, NULL },
|
||||
{ 0x116ab, 0x116ab, 0, NULL, NULL },
|
||||
{ 0x116b7, 0x116b7, 0, NULL, NULL },
|
||||
{ 0x116b0, 0x116b5, 0, NULL, NULL },
|
||||
{ 0x16af0, 0x16af4, 0, NULL, NULL },
|
||||
{ 0x1bca0, 0x1bca3, 0, NULL, NULL },
|
||||
{ 0x1b000, 0x1b001, 2, NULL, NULL },
|
||||
{ 0x16f8f, 0x16f92, 0, NULL, NULL },
|
||||
{ 0x1bc9d, 0x1bc9e, 0, NULL, NULL },
|
||||
{ 0x1d173, 0x1d182, 0, NULL, NULL },
|
||||
{ 0x1d167, 0x1d169, 0, NULL, NULL },
|
||||
{ 0x1d185, 0x1d18b, 0, NULL, NULL },
|
||||
{ 0x2a700, 0x2b734, 2, NULL, NULL },
|
||||
{ 0x1f210, 0x1f23a, 2, NULL, NULL },
|
||||
{ 0x1e8d0, 0x1e8d6, 0, NULL, NULL },
|
||||
{ 0x1d242, 0x1d244, 0, NULL, NULL },
|
||||
{ 0x1f200, 0x1f202, 2, NULL, NULL },
|
||||
{ 0x1f250, 0x1f251, 2, NULL, NULL },
|
||||
{ 0x1f240, 0x1f248, 2, NULL, NULL },
|
||||
{ 0x20000, 0x2a6d6, 2, NULL, NULL },
|
||||
{ 0xe0020, 0xe007f, 0, NULL, NULL },
|
||||
{ 0x2f800, 0x2fa1d, 2, NULL, NULL },
|
||||
{ 0x2b740, 0x2b81d, 2, NULL, NULL },
|
||||
{ 0xe0001, 0xe0001, 0, NULL, NULL },
|
||||
{ 0xf0000, 0xffffd, 0, NULL, NULL },
|
||||
{ 0xe0100, 0xe01ef, 0, NULL, NULL },
|
||||
{ 0x100000, 0x10fffd, 0, NULL, NULL },
|
||||
};
|
||||
|
||||
struct utf8_width_entry *utf8_width_root = NULL;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user