1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 40cjk_eastasian.dpatch by Yi-Hsuan Hsin <mhsin@mhsin.org>
4
## DP: Fix display of characters with ambiguous width depending on the
5
## DP: user's display locale. See upstream #16666.
8
--- screen-4.0.3.orig/ansi.c 2 May 2006 12:58:25 -0000 1.38
9
+++ screen-4.0.3/ansi.c 19 May 2006 21:21:52 -0000
11
curr->w_rend.font = 0;
14
- if (curr->w_encoding == UTF8 && c >= 0x1100 && utf8_isdouble(c))
15
+ if (curr->w_encoding == UTF8 && utf8_isdouble(c))
18
if (curr->w_encoding == UTF8 && c >= 0x0300 && utf8_iscomb(c))
19
--- screen-4.0.3.orig/comm.c 2 May 2006 12:58:25 -0000 1.22
20
+++ screen-4.0.3/comm.c 19 May 2006 21:21:53 -0000
23
{ "charset", NEED_FORE|ARGS_1 },
26
+ { "cjkwidth", ARGS_01 },
28
{ "clear", NEED_FORE|ARGS_0 },
29
{ "colon", NEED_LAYER|ARGS_01 },
30
{ "command", NEED_DISPLAY|ARGS_02 },
31
--- screen-4.0.3.orig/encoding.c 2 May 2006 12:58:25 -0000 1.7
32
+++ screen-4.0.3/encoding.c 19 May 2006 21:21:53 -0000
35
extern char *screenencodings;
41
static int encmatch __P((char *, char *));
43
static int recode_char __P((int, int, int));
44
@@ -845,22 +849,107 @@
53
+/* auxiliary function for binary search in interval table */
54
+static int bisearch(int ucs, const struct interval *table, int max) {
58
+ if (ucs < table[0].first || ucs > table[max].last)
60
+ while (max >= min) {
61
+ mid = (min + max) / 2;
62
+ if (ucs > table[mid].last)
64
+ else if (ucs < table[mid].first)
79
- (c <= 0x115f || /* Hangul Jamo init. consonants */
80
- (c >= 0x2e80 && c <= 0xa4cf && (c & ~0x0011) != 0x300a &&
81
- c != 0x303f) || /* CJK ... Yi */
82
- (c >= 0xac00 && c <= 0xd7a3) || /* Hangul Syllables */
83
- (c >= 0xdf00 && c <= 0xdfff) || /* dw combining sequence */
84
- (c >= 0xf900 && c <= 0xfaff) || /* CJK Compatibility Ideographs */
85
- (c >= 0xfe30 && c <= 0xfe6f) || /* CJK Compatibility Forms */
86
- (c >= 0xff00 && c <= 0xff5f) || /* Fullwidth Forms */
87
- (c >= 0xffe0 && c <= 0xffe6) ||
88
- (c >= 0x20000 && c <= 0x2ffff)));
89
+ /* sorted list of non-overlapping intervals of East Asian Ambiguous
90
+ * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */
91
+ static const struct interval ambiguous[] = {
92
+ { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 },
93
+ { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 },
94
+ { 0x00B6, 0x00BA }, { 0x00BC, 0x00BF }, { 0x00C6, 0x00C6 },
95
+ { 0x00D0, 0x00D0 }, { 0x00D7, 0x00D8 }, { 0x00DE, 0x00E1 },
96
+ { 0x00E6, 0x00E6 }, { 0x00E8, 0x00EA }, { 0x00EC, 0x00ED },
97
+ { 0x00F0, 0x00F0 }, { 0x00F2, 0x00F3 }, { 0x00F7, 0x00FA },
98
+ { 0x00FC, 0x00FC }, { 0x00FE, 0x00FE }, { 0x0101, 0x0101 },
99
+ { 0x0111, 0x0111 }, { 0x0113, 0x0113 }, { 0x011B, 0x011B },
100
+ { 0x0126, 0x0127 }, { 0x012B, 0x012B }, { 0x0131, 0x0133 },
101
+ { 0x0138, 0x0138 }, { 0x013F, 0x0142 }, { 0x0144, 0x0144 },
102
+ { 0x0148, 0x014B }, { 0x014D, 0x014D }, { 0x0152, 0x0153 },
103
+ { 0x0166, 0x0167 }, { 0x016B, 0x016B }, { 0x01CE, 0x01CE },
104
+ { 0x01D0, 0x01D0 }, { 0x01D2, 0x01D2 }, { 0x01D4, 0x01D4 },
105
+ { 0x01D6, 0x01D6 }, { 0x01D8, 0x01D8 }, { 0x01DA, 0x01DA },
106
+ { 0x01DC, 0x01DC }, { 0x0251, 0x0251 }, { 0x0261, 0x0261 },
107
+ { 0x02C4, 0x02C4 }, { 0x02C7, 0x02C7 }, { 0x02C9, 0x02CB },
108
+ { 0x02CD, 0x02CD }, { 0x02D0, 0x02D0 }, { 0x02D8, 0x02DB },
109
+ { 0x02DD, 0x02DD }, { 0x02DF, 0x02DF }, { 0x0391, 0x03A1 },
110
+ { 0x03A3, 0x03A9 }, { 0x03B1, 0x03C1 }, { 0x03C3, 0x03C9 },
111
+ { 0x0401, 0x0401 }, { 0x0410, 0x044F }, { 0x0451, 0x0451 },
112
+ { 0x2010, 0x2010 }, { 0x2013, 0x2016 }, { 0x2018, 0x2019 },
113
+ { 0x201C, 0x201D }, { 0x2020, 0x2022 }, { 0x2024, 0x2027 },
114
+ { 0x2030, 0x2030 }, { 0x2032, 0x2033 }, { 0x2035, 0x2035 },
115
+ { 0x203B, 0x203B }, { 0x203E, 0x203E }, { 0x2074, 0x2074 },
116
+ { 0x207F, 0x207F }, { 0x2081, 0x2084 }, { 0x20AC, 0x20AC },
117
+ { 0x2103, 0x2103 }, { 0x2105, 0x2105 }, { 0x2109, 0x2109 },
118
+ { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 },
119
+ { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 },
120
+ { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 },
121
+ { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 },
122
+ { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 },
123
+ { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B },
124
+ { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 },
125
+ { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 },
126
+ { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E },
127
+ { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 },
128
+ { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 },
129
+ { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F },
130
+ { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 },
131
+ { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF },
132
+ { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B },
133
+ { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 },
134
+ { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 },
135
+ { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 },
136
+ { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 },
137
+ { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 },
138
+ { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 },
139
+ { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 },
140
+ { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 },
141
+ { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F },
142
+ { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF },
143
+ { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD }
146
+ return ((c >= 0x1100 &&
147
+ (c <= 0x115f || /* Hangul Jamo init. consonants */
148
+ c == 0x2329 || c == 0x232a ||
149
+ (c >= 0x2e80 && c <= 0xa4cf &&
150
+ c != 0x303f) || /* CJK ... Yi */
151
+ (c >= 0xac00 && c <= 0xd7a3) || /* Hangul Syllables */
152
+ (c >= 0xf900 && c <= 0xfaff) || /* CJK Compatibility Ideographs */
153
+ (c >= 0xfe30 && c <= 0xfe6f) || /* CJK Compatibility Forms */
154
+ (c >= 0xff00 && c <= 0xff60) || /* Fullwidth Forms */
155
+ (c >= 0xffe0 && c <= 0xffe6) ||
156
+ (c >= 0x20000 && c <= 0x2fffd) ||
157
+ (c >= 0x30000 && c <= 0x3fffd))) ||
159
+ bisearch(c, ambiguous,
160
+ sizeof(ambiguous) / sizeof(struct interval) - 1)));
164
--- screen-4.0.3.orig/process.c 2 May 2006 12:58:25 -0000 1.23
165
+++ screen-4.0.3/process.c 19 May 2006 21:21:54 -0000
168
extern char *screenencodings;
171
+extern int cjkwidth;
174
static int CheckArgNum __P((int, char **));
175
static void ClearAction __P((struct action *));
176
@@ -3870,6 +3873,15 @@
182
+ if(ParseSwitch(act, &cjkwidth) == 0)
185
+ Msg(0, "Treat ambiguous width characters as %s width", cjkwidth ? "full" : "half");
191
/* key == -2: input from braille keybord, msgok always 0 */
192
--- screen-4.0.3.orig/screen.c 2 May 2006 12:58:25 -0000 1.39
193
+++ screen-4.0.3/screen.c 19 May 2006 21:21:55 -0000
195
char *screenencodings;
207
screenencodings = SaveStr(SCREENENCODINGS);
213
nwin_options = nwin_undef;
214
strcpy(screenterm, "screen");
216
debug1("environment says encoding=%d\n", nwin_options.encoding);
222
+ if((s = getenv("LC_ALL")) || (s = getenv("LC_CTYPE")) ||
223
+ (s = getenv("LANG")))
225
+ if(!strncmp(s, "zh_", 3) || !strncmp(s, "ja_", 3) || !strncmp(s, "ko_", 3))
233
if (SockMatch && strlen(SockMatch) >= MAXSTR)
234
Panic(0, "Ridiculously long socketname - try again.");