-
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathtmux-3.5-fix.diff
1109 lines (1084 loc) · 40.8 KB
/
tmux-3.5-fix.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/image-sixel.c b/image-sixel.c
index e23d17f..111760d 100644
--- a/image-sixel.c
+++ b/image-sixel.c
@@ -105,6 +105,9 @@ sixel_parse_write(struct sixel_image *si, u_int ch)
{
struct sixel_line *sl;
u_int i;
+#ifndef NO_FIX_SIXEL
+ u_int dstdata, srcdata;
+#endif
if (sixel_parse_expand_lines(si, si->dy + 6) != 0)
return (1);
@@ -113,8 +116,32 @@ sixel_parse_write(struct sixel_image *si, u_int ch)
for (i = 0; i < 6; i++) {
if (sixel_parse_expand_line(si, sl, si->dx + 1) != 0)
return (1);
+#ifndef NO_FIX_SIXEL
+ if (ch & (1 << i)) {
+ if (sl->data[si->dx] == 0) {
+ /* The element of the array for storing pixels, sl->data[si->dx], stores
+ * si->dc, a value incremented by one from the palette number.
+ */
+
+ sl->data[si->dx] = si->dc;
+ } else {
+ /* This code is for the ORMODE of SIXEL Graphics.
+ * The value obtained by the logical OR of the decremented by 1 value
+ * from sl->data[si->dx] and si->dc, which are the elements of the array
+ * for storing pixel palette numbers, is incremented by 1, and stored
+ * in sl->data[si-dx].
+ */
+
+ dstdata = sl->data[si->dx] - 1;
+ srcdata = si->dc - 1;
+ dstdata = dstdata | srcdata;
+ sl->data[si->dx] = dstdata + 1;
+ }
+ }
+#else
if (ch & (1 << i))
sl->data[si->dx] = si->dc;
+#endif
sl++;
}
return (0);
@@ -433,7 +460,19 @@ sixel_scale(struct sixel_image *si, u_int xpixel, u_int ypixel, u_int ox,
}
if (colours) {
+#ifndef NO_FIX_SIXEL
+ /* Code to prevent the function xmalloc() from exiting abnormally if si->ncolors == 0 */
+ if (si->ncolours == 0) {
+ new->colours = xmalloc((size_t)1 * sizeof *new->colours);
+ new->colours[0] = 0;
+ log_debug("%s: WARNING; si->ncolours == 0, force %d ncolour.", __func__, 1);
+ } else {
+ new->colours = xmalloc(si->ncolours * sizeof *new->colours);
+ log_debug("%s: si->ncolours == %d.", __func__, si->ncolours);
+ }
+#else
new->colours = xmalloc(si->ncolours * sizeof *new->colours);
+#endif
for (i = 0; i < si->ncolours; i++)
new->colours[i] = si->colours[i];
new->ncolours = si->ncolours;
@@ -485,9 +524,15 @@ sixel_print(struct sixel_image *si, struct sixel_image *map, size_t *size)
if (map != NULL) {
colours = map->colours;
ncolours = map->ncolours;
+#ifndef NO_FIX_SIXEL
+ log_debug("%s: map->{colours,ncolours}; colours == %p, ncolours == %d", __func__, colours, ncolours);
+#endif
} else {
colours = si->colours;
ncolours = si->ncolours;
+#ifndef NO_FIX_SIXEL
+ log_debug("%s: si->{colours,ncolours}; colours == %p, ncolours == %d", __func__, colours, ncolours);
+#endif
}
if (ncolours == 0)
@@ -516,8 +561,23 @@ sixel_print(struct sixel_image *si, struct sixel_image *map, size_t *size)
if (y + i >= si->y)
break;
sl = &si->lines[y + i];
+#ifndef NO_FIX_SIXEL
+ if (x < sl->x) {
+ /* For sl->data[x], which is an element of an array for storing the palette number for each pixel,
+ * if the value of sl->data[x] is 0 except for the bottom pixel with y-coordinate,
+ * especially if ormode is used, the palette number of sl->data[x] is 1 and The palette number
+ * in sl->data[x] should be considered to be 1.
+ */
+
+ if (y < (si->y - 6) && sl->data[x] == 0)
+ sl->data[x] = 1;
+ if (sl->data[x] != 0)
+ contains[sl->data[x] - 1] = 1;
+ }
+#else
if (x < sl->x && sl->data[x] != 0)
contains[sl->data[x] - 1] = 1;
+#endif
}
}
diff --git a/options-table.c b/options-table.c
index 81e4049..d3b1a13 100644
--- a/options-table.c
+++ b/options-table.c
@@ -1298,6 +1298,38 @@ const struct options_table_entry options_table[] = {
"This option is no longer used."
},
+#ifndef NO_USE_UTF8CJK
+ /* UTF8 East asian Ambiguous Width charactor options. */
+ { .name = "utf8-cjk",
+ .type = OPTIONS_TABLE_FLAG,
+ .scope = OPTIONS_TABLE_SERVER,
+ .default_num = 1
+ },
+
+#ifndef NO_USE_UTF8CJK_EMOJI
+ /* UTF8 Emoji charactor options. */
+ { .name = "utf8-emoji",
+ .type = OPTIONS_TABLE_FLAG,
+ .scope = OPTIONS_TABLE_SERVER,
+ .default_num = 1
+ },
+#endif
+#endif
+
+#ifndef NO_USE_PANE_BORDER_ACS_ASCII
+ { .name = "pane-border-acs",
+ .type = OPTIONS_TABLE_FLAG,
+ .scope = OPTIONS_TABLE_SESSION,
+ .default_num = 0
+ },
+
+ { .name = "pane-border-ascii",
+ .type = OPTIONS_TABLE_FLAG,
+ .scope = OPTIONS_TABLE_SESSION,
+ .default_num = 0
+ },
+#endif
+
/* Hook options. */
OPTIONS_TABLE_HOOK("after-bind-key", ""),
OPTIONS_TABLE_HOOK("after-capture-pane", ""),
diff --git a/tmux.c b/tmux.c
index a9619ba..69ae7a8 100644
--- a/tmux.c
+++ b/tmux.c
@@ -351,20 +351,33 @@ main(int argc, char **argv)
{
char *path = NULL, *label = NULL;
char *cause, **var;
+#ifndef NO_USE_UTF8CJK
+ char *ctype;
+#endif
const char *s, *cwd;
int opt, keys, feat = 0, fflag = 0;
uint64_t flags = 0;
const struct options_table_entry *oe;
u_int i;
+#ifndef NO_USE_ENV_TMUX_CONF
+ struct environ_entry *tmux_conf_entry;
+ char *tmux_conf;
+#endif
+#ifdef NO_USE_UTF8CJK
if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL &&
setlocale(LC_CTYPE, "C.UTF-8") == NULL) {
if (setlocale(LC_CTYPE, "") == NULL)
+#else
+ if ((ctype = setlocale(LC_CTYPE, "")) == NULL)
+#endif
errx(1, "invalid LC_ALL, LC_CTYPE or LANG");
s = nl_langinfo(CODESET);
if (strcasecmp(s, "UTF-8") != 0 && strcasecmp(s, "UTF8") != 0)
errx(1, "need UTF-8 locale (LC_CTYPE) but have %s", s);
+#ifdef NO_USE_UTF8CJK
}
+#endif
setlocale(LC_TIME, "");
tzset();
@@ -377,7 +390,16 @@ main(int argc, char **argv)
environ_put(global_environ, *var, 0);
if ((cwd = find_cwd()) != NULL)
environ_set(global_environ, "PWD", 0, "%s", cwd);
+#ifdef NO_USE_ENV_TMUX_CONF
expand_paths(TMUX_CONF, &cfg_files, &cfg_nfiles, 1);
+#else
+ if ((tmux_conf_entry = environ_find(global_environ, "TMUX_CONF")) == NULL) {
+ expand_paths(TMUX_CONF, &cfg_files, &cfg_nfiles, 1);
+ } else {
+ tmux_conf = xstrdup(tmux_conf_entry->value);
+ expand_paths(tmux_conf, &cfg_files, &cfg_nfiles, 1);
+ }
+#endif
while ((opt = getopt(argc, argv, "2c:CDdf:lL:NqS:T:uUvV")) != -1) {
switch (opt) {
@@ -508,6 +530,19 @@ main(int argc, char **argv)
options_set_number(global_w_options, "mode-keys", keys);
}
+#ifndef NO_USE_UTF8CJK
+ if (!strncmp(ctype, "ja", 2) || !strncmp(ctype, "ko", 2) || !strncmp(ctype, "zh", 2)) {
+ options_set_number(global_options, "utf8-cjk", 1);
+#ifndef NO_USE_UTF8CJK_EMOJI
+ options_set_number(global_options, "utf8-emoji", 1);
+#endif
+ } else {
+ options_set_number(global_options, "utf8-cjk", 0);
+#ifndef NO_USE_UTF8CJK_EMOJI
+ options_set_number(global_options, "utf8-emoji", 0);
+#endif
+ }
+#endif
/*
* If socket is specified on the command-line with -S or -L, it is
* used. Otherwise, $TMUX is checked and if that fails "default" is
@@ -533,6 +568,13 @@ main(int argc, char **argv)
socket_path = path;
free(label);
+#ifndef NO_USE_FIX_NOEPOLL
+#ifdef __linux__
+ /* Set the environment variable EVENT_NOEPOLL to "1" certainly. */
+ environ_set(global_environ, "EVENT_NOEPOLL", 0, "%d", 1);
+#endif
+#endif
+
/* Pass control to the client. */
exit(client_main(osdep_event_init(), argc, argv, flags, feat));
}
diff --git a/tmux.h b/tmux.h
index 0b14ccd..504f23f 100644
--- a/tmux.h
+++ b/tmux.h
@@ -91,6 +91,17 @@ struct winlink;
#define TMUX_LOCK_CMD "lock -np"
#endif
+/* If "pane-border-ascii" is not used, "utf8-cjk" is not used too. */
+#ifdef NO_USE_PANE_BORDER_ASCII
+#ifndef NO_USE_UTF8CJK
+#define NO_USE_UTF8CJK
+#endif
+#endif
+
+#ifdef NO_USE_UTF8CJK
+#define NO_USE_UTF8CJK_EMOJI
+#endif
+
/* Minimum layout cell size, NOT including border lines. */
#define PANE_MINIMUM 1
diff --git a/tty-acs.c b/tty-acs.c
index 3dab31b..af80835 100644
--- a/tty-acs.c
+++ b/tty-acs.c
@@ -23,6 +23,223 @@
#include "tmux.h"
+#ifndef NO_USE_PANE_BORDER_ACS_ASCII
+#include <string.h>
+
+enum acs_type {
+ ACST_UTF8,
+ ACST_ACS,
+ ACST_ASCII,
+};
+
+static const char tty_acs_table[UCHAR_MAX][4] = {
+ ['+'] = "\342\206\222", /* arrow pointing right */
+ [','] = "\342\206\220", /* arrow pointing left */
+ ['-'] = "\342\206\221", /* arrow pointing up */
+ ['.'] = "\342\206\223", /* arrow pointing down */
+ ['0'] = "\342\226\256", /* solid square block */
+ ['`'] = "\342\227\206", /* diamond */
+ ['a'] = "\342\226\222", /* checker board (stipple) */
+ ['b'] = "\342\220\211",
+ ['c'] = "\342\220\214",
+ ['d'] = "\342\220\215",
+ ['e'] = "\342\220\212",
+ ['f'] = "\302\260", /* degree symbol */
+ ['g'] = "\302\261", /* plus/minus */
+ ['h'] = "\342\220\244",
+ ['i'] = "\342\220\213",
+ ['j'] = "\342\224\230", /* lower right corner */
+ ['k'] = "\342\224\220", /* upper right corner */
+ ['l'] = "\342\224\214", /* upper left corner */
+ ['m'] = "\342\224\224", /* lower left corner */
+ ['n'] = "\342\224\274", /* large plus or crossover */
+ ['o'] = "\342\216\272", /* scan line 1 */
+ ['p'] = "\342\216\273", /* scan line 3 */
+ ['q'] = "\342\224\200", /* horizontal line */
+ ['r'] = "\342\216\274", /* scan line 7 */
+ ['s'] = "\342\216\275", /* scan line 9 */
+ ['t'] = "\342\224\234", /* tee pointing right */
+ ['u'] = "\342\224\244", /* tee pointing left */
+ ['v'] = "\342\224\264", /* tee pointing up */
+ ['w'] = "\342\224\254", /* tee pointing down */
+ ['x'] = "\342\224\202", /* vertical line */
+ ['y'] = "\342\211\244", /* less-than-or-equal-to */
+ ['z'] = "\342\211\245", /* greater-than-or-equal-to */
+ ['{'] = "\317\200", /* greek pi */
+ ['|'] = "\342\211\240", /* not-equal */
+ ['}'] = "\302\243", /* UK pound sign */
+ ['~'] = "\302\267", /* bullet */
+};
+
+static char tty_acs_ascii_table[UCHAR_MAX][2] = {
+ ['}'] = "f", /* UK pound sign ACS_STERLING */
+ ['.'] = "v", /* arrow pointing down ACS_DARROW */
+ [','] = "<", /* arrow pointing left ACS_LARROW */
+ ['+'] = ">", /* arrow pointing right ACS_RARROW */
+ ['-'] = "^", /* arrow pointing up ACS_UARROW */
+ ['h'] = "#", /* board of squares ACS_BOARD */
+ ['~'] = "o", /* bullet ACS_BULLET */
+ ['a'] = ":", /* checker board (stipple) ACS_CKBOARD */
+ ['f'] = "\\", /* degree symbol ACS_DEGREE */
+ ['`'] = "+", /* diamond ACS_DIAMOND */
+ ['z'] = ">", /* greater-than-or-equal-to ACS_GEQUAL */
+ ['{'] = "*", /* greek pi ACS_PI */
+ ['q'] = "-", /* horizontal line ACS_HLINE */
+ ['i'] = "#", /* lantern symbol ACS_LANTERN */
+ ['n'] = "+", /* large plus or crossover ACS_PLUS */
+ ['y'] = "<", /* less-than-or-equal-to ACS_LEQUAL */
+ ['m'] = "+", /* lower left corner ACS_LLCORNER */
+ ['j'] = "+", /* lower right corner ACS_LRCORNER */
+ ['|'] = "!", /* not-equal ACS_NEQUAL */
+ ['g'] = "#", /* plus/minus ACS_PLMINUS */
+ ['o'] = "~", /* scan line 1 ACS_S1 */
+ ['p'] = "-", /* scan line 3 ACS_S3 */
+ ['r'] = "-", /* scan line 7 ACS_S7 */
+ ['s'] = "_", /* scan line 9 ACS_S9 */
+ ['0'] = "#", /* solid square block ACS_BLOCK */
+ ['w'] = "+", /* tee pointing down ACS_TTEE */
+ ['u'] = "+", /* tee pointing left ACS_RTEE */
+ ['t'] = "+", /* tee pointing right ACS_LTEE */
+ ['v'] = "+", /* tee pointing up ACS_BTEE */
+ ['l'] = "+", /* upper left corner ACS_ULCORNER */
+ ['k'] = "+", /* upper right corner ACS_URCORNER */
+ ['x'] = "|", /* vertical line ACS_VLINE */
+};
+
+static int tty_acs_reverse_table[USHRT_MAX][1] = {
+ [0xfb1d] = 0x7e, /* "\302\267" = '~' */
+ [0xcd2e] = 0x71, /* "\342\224\200" = 'q' */
+ [0xcd2f] = 0x71, /* "\342\224\201" = 'q' */
+ [0xcd30] = 0x78, /* "\342\224\202" = 'x' */
+ [0xcd31] = 0x78, /* "\342\224\203" = 'x' */
+ [0xcd3a] = 0x6c, /* "\342\224\214" = 'l' */
+ [0xcd3d] = 0x6b, /* "\342\224\217" = 'k' */
+ [0xcd3e] = 0x6b, /* "\342\224\220" = 'k' */
+ [0xcd41] = 0x6c, /* "\342\224\223" = 'l' */
+ [0xcd42] = 0x6d, /* "\342\224\224" = 'm' */
+ [0xcd45] = 0x6d, /* "\342\224\227" = 'm' */
+ [0xcd46] = 0x6a, /* "\342\224\230" = 'j' */
+ [0xcd49] = 0x6a, /* "\342\224\233" = 'j' */
+ [0xcd4a] = 0x74, /* "\342\224\234" = 't' */
+ [0xcd51] = 0x74, /* "\342\224\243" = 't' */
+ [0xcd52] = 0x75, /* "\342\224\244" = 'u' */
+ [0xcd59] = 0x75, /* "\342\224\253" = 'u' */
+ [0xcd61] = 0x77, /* "\342\224\263" = 'w' */
+ [0xcd62] = 0x76, /* "\342\224\264" = 'v' */
+ [0xcd69] = 0x76, /* "\342\224\273" = 'v' */
+ [0xcd6a] = 0x6e, /* "\342\224\274" = 'n' */
+ [0xcd4c] = 0x6e, /* "\342\225\213" = 'n' */
+ [0xcd51] = 0x71, /* "\342\225\220" = 'q' */
+ [0xcd52] = 0x78, /* "\342\225\221" = 'x' */
+ [0xcd55] = 0x6c, /* "\342\225\224" = 'l' */
+ [0xcd58] = 0x6b, /* "\342\225\227" = 'k' */
+ [0xcd5b] = 0x6d, /* "\342\225\232" = 'm' */
+ [0xcd5e] = 0x6a, /* "\342\225\235" = 'j' */
+ [0xcd61] = 0x74, /* "\342\225\240" = 't' */
+ [0xcd64] = 0x75, /* "\342\225\243" = 'u' */
+ [0xcd67] = 0x77, /* "\342\225\246" = 'w' */
+ [0xcd6a] = 0x76, /* "\342\225\251" = 'v' */
+ [0xcd6d] = 0x6e, /* "\342\225\254" = 'n' */
+};
+
+static int
+acs_reverse_hash(const char *str, size_t strlen)
+{
+ int result;
+
+ for (result = 0; (strlen > 0) || (*str != '\0'); str++, strlen--)
+ result = 19 * result + ((int)*str);
+
+ return (result & 0xffff);
+}
+
+/* UTF-8 double borders. */
+static const struct utf8_data tty_acs_double_borders_list[][2] = {
+ { { "", 0, 0, 0 }, { "", 0, 0, 0 } },
+ { { "\342\225\221", 0, 3, 1 }, { "|", 0, 1, 1 } }, /* U+2551 */
+ { { "\342\225\220", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+2550 */
+ { { "\342\225\224", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+2554 */
+ { { "\342\225\227", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+2557 */
+ { { "\342\225\232", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+255A */
+ { { "\342\225\235", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+255D */
+ { { "\342\225\246", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+2566 */
+ { { "\342\225\251", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+2569 */
+ { { "\342\225\240", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+2560 */
+ { { "\342\225\243", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+2563 */
+ { { "\342\225\254", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+256C */
+ { { "\302\267", 0, 2, 1 }, { "o", 0, 1, 1 } } /* U+00B7 */
+};
+
+/* UTF-8 heavy borders. */
+static const struct utf8_data tty_acs_heavy_borders_list[][2] = {
+ { { "", 0, 0, 0 }, { "", 0, 0, 0 } },
+ { { "\342\224\203", 0, 3, 1 }, { "|", 0, 1, 1 } }, /* U+2503 */
+ { { "\342\224\201", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+2501 */
+ { { "\342\224\217", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+250F */
+ { { "\342\224\223", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+2513 */
+ { { "\342\224\227", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+2517 */
+ { { "\342\224\233", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+251B */
+ { { "\342\224\263", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+2533 */
+ { { "\342\224\273", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+253B */
+ { { "\342\224\243", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+2523 */
+ { { "\342\224\253", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+252B */
+ { { "\342\225\213", 0, 3, 1 }, { "+", 0, 1, 1 } }, /* U+254B */
+ { { "\302\267", 0, 2, 1 }, { "o", 0, 1, 1 } } /* U+00B7 */
+};
+
+/* UTF-8 rounded borders. */
+static const struct utf8_data tty_acs_rounded_borders_list[][2] = {
+ { { "", 0, 0, 0 }, { "", 0, 0, 0 } },
+ { { "\342\224\202", 0, 3, 1 }, { "|", 0, 1, 1 } },/* U+2502 */
+ { { "\342\224\200", 0, 3, 1 }, { "+", 0, 1, 1 } },/* U+2500 */
+ { { "\342\225\255", 0, 3, 1 }, { "+", 0, 1, 1 } },/* U+256D */
+ { { "\342\225\256", 0, 3, 1 }, { "+", 0, 1, 1 } },/* U+256E */
+ { { "\342\225\260", 0, 3, 1 }, { "+", 0, 1, 1 } },/* U+2570 */
+ { { "\342\225\257", 0, 3, 1 }, { "+", 0, 1, 1 } },/* U+256F */
+ { { "\342\224\263", 0, 3, 1 }, { "+", 0, 1, 1 } },/* U+2533 */
+ { { "\342\224\273", 0, 3, 1 }, { "+", 0, 1, 1 } },/* U+253B */
+ { { "\342\224\243", 0, 3, 1 }, { "+", 0, 1, 1 } },/* U+2523 */
+ { { "\342\224\253", 0, 3, 1 }, { "+", 0, 1, 1 } },/* U+252B */
+ { { "\342\225\213", 0, 3, 1 }, { "+", 0, 1, 1 } },/* U+254B */
+ { { "\302\267", 0, 2, 1 }, { "o", 0, 1, 1 } } /* U+00B7 */
+};
+
+static int
+tty_acs_borders_list_index(void)
+{
+ static int index = -1;
+
+ if (index < 0) {
+ if (options_get_number(global_s_options, "pane-border-acs"))
+ index = 0;
+ else if (options_get_number(global_s_options, "pane-border-ascii"))
+ index = 1;
+ }
+
+ return index;
+}
+
+/* Get cell border character for double style. */
+const struct utf8_data *
+tty_acs_double_borders(int cell_type)
+{
+ return (&tty_acs_double_borders_list[cell_type][tty_acs_borders_list_index()]);
+}
+
+/* Get cell border character for heavy style. */
+const struct utf8_data *
+tty_acs_heavy_borders(int cell_type)
+{
+ return (&tty_acs_heavy_borders_list[cell_type][tty_acs_borders_list_index()]);
+}
+
+/* Get cell border character for rounded style. */
+const struct utf8_data *
+tty_acs_rounded_borders(int cell_type)
+{
+ return (&tty_acs_rounded_borders_list[cell_type][tty_acs_borders_list_index()]);
+}
+#else
/* Table mapping ACS entries to UTF-8. */
struct tty_acs_entry {
u_char key;
@@ -199,11 +416,85 @@ tty_acs_reverse_cmp(const void *key, const void *value)
return (strcmp(test, entry->string));
}
+#endif /* NO_USE_PANE_BORDER_ACS_ASCII */
+
+#ifndef NO_USE_PANE_BORDER_ACS_ASCII
+static int
+get_utf8_width(const char *s)
+{
+ const char *p = s;
+ struct utf8_data ud;
+ enum utf8_state more;
+
+ for (more = utf8_open(&ud, *p++); more == UTF8_MORE; more = utf8_append(&ud, *p++))
+ ;
+ if (more != UTF8_DONE)
+ fatalx("INTERNAL ERROR: In get_utf8_width, utf8_open or utf8_append return error %d", more);
+ log_debug("%s width is %d", s, ud.width);
+ return ud.width;
+}
+
+static enum acs_type
+tty_acs_type(struct tty *tty)
+{
+ if (tty == NULL)
+ return (ACST_ASCII);
+
+ /*
+ * If the U8 flag is present, it marks whether a terminal supports
+ * UTF-8 and ACS together.
+ *
+ * If it is present and zero, we force ACS - this gives users a way to
+ * turn off UTF-8 line drawing.
+ *
+ * If it is nonzero, we can fall through to the default and use UTF-8
+ * line drawing on UTF-8 terminals.
+ */
+
+ struct environ_entry *envent;
+ envent = environ_find(tty->client->environ, "TMUX_ACS");
+ if (envent != NULL) {
+ if (strcasestr(envent->value, "utf-8") != NULL ||
+ strcasestr(envent->value, "utf8") != NULL)
+ return (ACST_UTF8);
+ else if (strcasestr(envent->value, "acs") != NULL)
+ return (ACST_ACS);
+ else
+ return (ACST_ASCII);
+ }
+
+ if (options_get_number(global_s_options, "pane-border-acs"))
+ return (ACST_ACS);
+ if (options_get_number(global_s_options, "pane-border-ascii"))
+ return (ACST_ASCII);
+
+ if ((tty->client->flags & CLIENT_UTF8) &&
+ (!tty_term_has(tty->term, TTYC_U8) ||
+ tty_term_number(tty->term, TTYC_U8) != 0)) {
+ static int hline_width = 0;
+ const char *hline = "\342\224\200";
+ if (hline_width == 0) {
+ hline_width = get_utf8_width(hline);
+ log_debug("hline_width=%d", hline_width);
+ }
+ if (hline_width == 1)
+ return (ACST_UTF8);
+ }
+
+ if (tty_term_has(tty->term, TTYC_ACSC))
+ return (ACST_ACS);
+
+ return (ACST_ASCII);
+}
+#endif /* NO_USE_PANE_BORDER_ACS_ASCII */
/* Should this terminal use ACS instead of UTF-8 line drawing? */
int
tty_acs_needed(struct tty *tty)
{
+#ifndef NO_USE_PANE_BORDER_ACS_ASCII
+ return (tty_acs_type(tty) == ACST_ACS);
+#else
if (tty == NULL)
return (0);
@@ -224,12 +515,31 @@ tty_acs_needed(struct tty *tty)
if (tty->client->flags & CLIENT_UTF8)
return (0);
return (1);
+#endif /* NO_USE_PANE_BORDER_ACS_ASCII */
}
/* Retrieve ACS to output as UTF-8. */
const char *
tty_acs_get(struct tty *tty, u_char ch)
{
+#ifndef NO_USE_PANE_BORDER_ACS_ASCII
+ switch (tty_acs_type(tty)) {
+ case ACST_UTF8:
+ if (tty_acs_table[ch][0] != '\0')
+ return (&tty_acs_table[ch][0]);
+ break;
+ case ACST_ACS:
+ if (tty->term->acs[ch][0] != '\0')
+ return (&tty->term->acs[ch][0]);
+ break;
+ case ACST_ASCII:
+ break;
+ }
+
+ if (tty_acs_ascii_table[ch][0] != '\0')
+ return (&tty_acs_ascii_table[ch][0]);
+ return (NULL);
+#else
const struct tty_acs_entry *entry;
/* Use the ACS set instead of UTF-8 if needed. */
@@ -245,12 +555,23 @@ tty_acs_get(struct tty *tty, u_char ch)
if (entry == NULL)
return (NULL);
return (entry->string);
+#endif /* NO_USE_PANE_BORDER_ACS_ASCII */
}
/* Reverse UTF-8 into ACS. */
int
tty_acs_reverse_get(__unused struct tty *tty, const char *s, size_t slen)
{
+#ifndef NO_USE_PANE_BOARDER_ACS_ASCII
+ int ch;
+
+ if (tty_acs_type(tty) == ACST_UTF8) {
+ if ((ch = tty_acs_reverse_table[acs_reverse_hash(s, slen)][0]) != 0)
+ return ch;
+ }
+
+ return (-1);
+#else
const struct tty_acs_reverse_entry *table, *entry;
u_int items;
@@ -266,4 +587,5 @@ tty_acs_reverse_get(__unused struct tty *tty, const char *s, size_t slen)
if (entry == NULL)
return (-1);
return (entry->key);
+#endif
}
diff --git a/tty-term.c b/tty-term.c
index d422349..ac01f9e 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -510,6 +510,15 @@ tty_term_apply_overrides(struct tty_term *term)
term->flags &= ~TERM_NOAM;
log_debug("NOAM flag is %d", !!(term->flags & TERM_NOAM));
+#ifndef NO_USE_PANE_BORDER_ACS_ASCII
+ /* Generate ACS table. */
+ memset(term->acs, 0, sizeof term->acs);
+ if (tty_term_has(term, TTYC_ACSC)) {
+ acs = tty_term_string(term, TTYC_ACSC);
+ for (; acs[0] != '\0' && acs[1] != '\0'; acs += 2)
+ term->acs[(u_char) acs[0]][0] = acs[1];
+ }
+#else
/* Generate ACS table. If none is present, use nearest ASCII. */
memset(term->acs, 0, sizeof term->acs);
if (tty_term_has(term, TTYC_ACSC))
@@ -518,6 +527,7 @@ tty_term_apply_overrides(struct tty_term *term)
acs = "a#j+k+l+m+n+o-p-q-r-s-t+u+v+w+x|y<z>~.";
for (; acs[0] != '\0' && acs[1] != '\0'; acs += 2)
term->acs[(u_char) acs[0]][0] = acs[1];
+#endif
}
struct tty_term *
diff --git a/utf8.c b/utf8.c
index bc7c8fd..ca3d8ca 100644
--- a/utf8.c
+++ b/utf8.c
@@ -27,6 +27,407 @@
#include "compat.h"
#include "tmux.h"
+#ifndef NO_USE_UTF8CJK
+/*
+ * This is an implementation of wcwidth() and wcswidth() (defined in
+ * IEEE Std 1002.1-2001) for Unicode.
+ *
+ * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html
+ * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html
+ *
+ * In fixed-width output devices, Latin characters all occupy a single
+ * "cell" position of equal width, whereas ideographic CJK characters
+ * occupy two such cells. Interoperability between terminal-line
+ * applications and (teletype-style) character terminals using the
+ * UTF-8 encoding requires agreement on which character should advance
+ * the cursor by how many cell positions. No established formal
+ * standards exist at present on which Unicode character shall occupy
+ * how many cell positions on character terminals. These routines are
+ * a first attempt of defining such behavior based on simple rules
+ * applied to data provided by the Unicode Consortium.
+ *
+ * For some graphical characters, the Unicode standard explicitly
+ * defines a character-cell width via the definition of the East Asian
+ * FullWidth (F), Wide (W), Half-width (H), and Narrow (Na) classes.
+ * In all these cases, there is no ambiguity about which width a
+ * terminal shall use. For characters in the East Asian Ambiguous (A)
+ * class, the width choice depends purely on a preference of backward
+ * compatibility with either historic CJK or Western practice.
+ * Choosing single-width for these characters is easy to justify as
+ * the appropriate long-term solution, as the CJK practice of
+ * displaying these characters as double-width comes from historic
+ * implementation simplicity (8-bit encoded characters were displayed
+ * single-width and 16-bit ones double-width, even for Greek,
+ * Cyrillic, etc.) and not any typographic considerations.
+ *
+ * Much less clear is the choice of width for the Not East Asian
+ * (Neutral) class. Existing practice does not dictate a width for any
+ * of these characters. It would nevertheless make sense
+ * typographically to allocate two character cells to characters such
+ * as for instance EM SPACE or VOLUME INTEGRAL, which cannot be
+ * represented adequately with a single-width glyph. The following
+ * routines at present merely assign a single-cell width to all
+ * neutral characters, in the interest of simplicity. This is not
+ * entirely satisfactory and should be reconsidered before
+ * establishing a formal standard in this area. At the moment, the
+ * decision which Not East Asian (Neutral) characters should be
+ * represented by double-width glyphs cannot yet be answered by
+ * applying a simple rule from the Unicode database content. Setting
+ * up a proper standard for the behavior of UTF-8 character terminals
+ * will require a careful analysis not only of each Unicode character,
+ * but also of each presentation form, something the author of these
+ * routines has avoided to do so far.
+ *
+ * http://www.unicode.org/unicode/reports/tr11/
+ *
+ * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
+ *
+ * Permission to use, copy, modify, and distribute this software
+ * for any purpose and without fee is hereby granted. The author
+ * disclaims all warranties with regard to this software.
+ *
+ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
+ */
+
+// Delete duplicated '#include <wchar.h>' by Z.OOL. <zool@zool.jpn.org>
+//#include <wchar.h>
+
+struct interval {
+ int first;
+ int last;
+};
+
+/* auxiliary function for binary search in interval table */
+static int bisearch(wchar_t ucs, const struct interval *table, int max) {
+ int min = 0;
+ int mid;
+
+ if (ucs < table[0].first || ucs > table[max].last)
+ return 0;
+ while (max >= min) {
+ mid = (min + max) / 2;
+ if (ucs > table[mid].last)
+ min = mid + 1;
+ else if (ucs < table[mid].first)
+ max = mid - 1;
+ else
+ return 1;
+ }
+
+ return 0;
+}
+
+
+/* The following two functions define the column width of an ISO 10646
+ * character as follows:
+ *
+ * - The null character (U+0000) has a column width of 0.
+ *
+ * - Other C0/C1 control characters and DEL will lead to a return
+ * value of -1.
+ *
+ * - Non-spacing and enclosing combining characters (general
+ * category code Mn or Me in the Unicode database) have a
+ * column width of 0.
+ *
+ * - SOFT HYPHEN (U+00AD) has a column width of 1.
+ *
+ * - Other format characters (general category code Cf in the Unicode
+ * database) and ZERO WIDTH SPACE (U+200B) have a column width of 0.
+ *
+ * - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
+ * have a column width of 0.
+ *
+ * - Spacing characters in the East Asian Wide (W) or East Asian
+ * Full-width (F) category as defined in Unicode Technical
+ * Report #11 have a column width of 2.
+ *
+ * - All remaining characters (including all printable
+ * ISO 8859-1 and WGL4 characters, Unicode control characters,
+ * etc.) have a column width of 1.
+ *
+ * This implementation assumes that wchar_t characters are encoded
+ * in ISO 10646.
+ */
+
+int mk_wcwidth(wchar_t ucs)
+{
+ /* sorted list of non-overlapping intervals of non-spacing characters */
+ /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
+ static const struct interval combining[] = {
+ { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },
+ { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
+ { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },
+ { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },
+ { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
+ { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
+ { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },
+ { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },
+ { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },
+ { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },
+ { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },
+ { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },
+ { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },
+ { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },
+ { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },
+ { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },
+ { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
+ { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
+ { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },
+ { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
+ { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },
+ { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },
+ { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },
+ { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },
+ { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },
+ { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },
+ { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },
+ { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },
+ { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },
+ { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },
+ { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },
+ { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },
+ { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },
+ { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
+ { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
+ { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
+ { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
+ { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },
+ { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },
+ { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F },
+ { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B },
+ { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },
+ { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
+ { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },
+ { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 },
+ { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },
+ { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },
+ { 0xE0100, 0xE01EF }
+ };
+
+ /* test for 8-bit control characters */
+ if (ucs == 0)
+ return 0;
+ if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
+ return -1;
+
+ /* binary search in table of non-spacing characters */
+ if (bisearch(ucs, combining,
+ sizeof(combining) / sizeof(struct interval) - 1))
+ return 0;
+
+ /* if we arrive here, ucs is not a combining or C0/C1 control character */
+
+ return 1 +
+ (ucs >= 0x1100 &&
+ (ucs <= 0x115f || /* Hangul Jamo init. consonants */
+ ucs == 0x2329 || ucs == 0x232a ||
+ (ucs >= 0x2e80 && ucs <= 0xa4cf &&
+ ucs != 0x303f) || /* CJK ... Yi */
+ (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
+ (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
+ (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
+ (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
+ (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
+ (ucs >= 0xffe0 && ucs <= 0xffe6) ||
+ (ucs >= 0x20000 && ucs <= 0x2fffd) ||
+ (ucs >= 0x30000 && ucs <= 0x3fffd)));
+}
+
+
+int mk_wcswidth(const wchar_t *pwcs, size_t n)
+{
+ int w, width = 0;
+
+ for (;*pwcs && n-- > 0; pwcs++)
+ if ((w = mk_wcwidth(*pwcs)) < 0)
+ return -1;
+ else
+ width += w;
+
+ return width;
+}
+
+
+/*
+ * The following functions are the same as mk_wcwidth() and
+ * mk_wcswidth(), except that spacing characters in the East Asian
+ * Ambiguous (A) category as defined in Unicode Technical Report #11
+ * have a column width of 2. This variant might be useful for users of
+ * CJK legacy encodings who want to migrate to UCS without changing
+ * the traditional terminal character-width behaviour. It is not
+ * otherwise recommended for general use.
+ */
+int mk_wcwidth_cjk(wchar_t ucs)
+{
+ /* sorted list of non-overlapping intervals of East Asian Ambiguous
+ * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */
+ static const struct interval ambiguous[] = {
+ { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 },
+ { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 },
+ { 0x00B6, 0x00BA }, { 0x00BC, 0x00BF }, { 0x00C6, 0x00C6 },
+ { 0x00D0, 0x00D0 }, { 0x00D7, 0x00D8 }, { 0x00DE, 0x00E1 },
+ { 0x00E6, 0x00E6 }, { 0x00E8, 0x00EA }, { 0x00EC, 0x00ED },
+ { 0x00F0, 0x00F0 }, { 0x00F2, 0x00F3 }, { 0x00F7, 0x00FA },
+ { 0x00FC, 0x00FC }, { 0x00FE, 0x00FE }, { 0x0101, 0x0101 },
+ { 0x0111, 0x0111 }, { 0x0113, 0x0113 }, { 0x011B, 0x011B },
+ { 0x0126, 0x0127 }, { 0x012B, 0x012B }, { 0x0131, 0x0133 },
+ { 0x0138, 0x0138 }, { 0x013F, 0x0142 }, { 0x0144, 0x0144 },
+ { 0x0148, 0x014B }, { 0x014D, 0x014D }, { 0x0152, 0x0153 },
+ { 0x0166, 0x0167 }, { 0x016B, 0x016B }, { 0x01CE, 0x01CE },
+ { 0x01D0, 0x01D0 }, { 0x01D2, 0x01D2 }, { 0x01D4, 0x01D4 },
+ { 0x01D6, 0x01D6 }, { 0x01D8, 0x01D8 }, { 0x01DA, 0x01DA },
+ { 0x01DC, 0x01DC }, { 0x0251, 0x0251 }, { 0x0261, 0x0261 },
+ { 0x02C4, 0x02C4 }, { 0x02C7, 0x02C7 }, { 0x02C9, 0x02CB },
+ { 0x02CD, 0x02CD }, { 0x02D0, 0x02D0 }, { 0x02D8, 0x02DB },
+ { 0x02DD, 0x02DD }, { 0x02DF, 0x02DF }, { 0x0391, 0x03A1 },
+ { 0x03A3, 0x03A9 }, { 0x03B1, 0x03C1 }, { 0x03C3, 0x03C9 },
+ { 0x0401, 0x0401 }, { 0x0410, 0x044F }, { 0x0451, 0x0451 },
+ { 0x2010, 0x2010 }, { 0x2013, 0x2016 }, { 0x2018, 0x2019 },
+ { 0x201C, 0x201D }, { 0x2020, 0x2022 }, { 0x2024, 0x2027 },
+ { 0x2030, 0x2030 }, { 0x2032, 0x2033 }, { 0x2035, 0x2035 },
+ { 0x203B, 0x203B }, { 0x203E, 0x203E }, { 0x2074, 0x2074 },
+ { 0x207F, 0x207F }, { 0x2081, 0x2084 }, { 0x20AC, 0x20AC },
+ { 0x2103, 0x2103 }, { 0x2105, 0x2105 }, { 0x2109, 0x2109 },
+ { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 },
+ { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 },
+ { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 },
+ { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 },
+ { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 },
+ { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B },
+ { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 },
+ { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 },
+ { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E },
+ { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 },
+ { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 },
+ { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F },
+ { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 },
+ { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF },
+ { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B },
+ { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 },
+ { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 },
+ { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 },
+ { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 },
+ { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 },
+ { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 },
+ { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 },
+ { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 },
+ { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F },
+ { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF },
+ { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD }
+ };
+
+ /* binary search in table of non-spacing characters */
+ if (bisearch(ucs, ambiguous,
+ sizeof(ambiguous) / sizeof(struct interval) - 1))
+ return 2;
+
+ return mk_wcwidth(ucs);
+}
+
+
+int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n)
+{
+ int w, width = 0;
+
+ for (;*pwcs && n-- > 0; pwcs++)
+ if ((w = mk_wcwidth_cjk(*pwcs)) < 0)
+ return -1;
+ else
+ width += w;
+
+ return width;
+}
+
+#ifndef NO_USE_UTF8CJK_EMOJI
+/* The following function returns 1 if wide charactor code ucs is
+ * The following functions are the same as mk_wcwidth_cjk() and
+ * mk_wcswidth_cjk(), except that spacing characters in the "Emoji"
+ * characters as defined in Unicode have a column width of 2.
+ * This function is based on the following vim-jp issue,
+ * by Mr.mattn <https://github.com/mattn>.
+ *
+ * https://github.com/vim-jp/issues/issues/1086
+ */
+int mk_wcwidth_cjk_emoji(wchar_t ucs)
+{
+ /* Sorted list of non-overlapping intervals of all Emoji characters,
+ * based on http://unicode.org/emoji/charts/emoji-list.html */
+