annotate src/os_mac_conv.c @ 14698:d2cfca5b178e v8.1.0361

patch 8.1.0361: remote user not used for completion commit https://github.com/vim/vim/commit/6b0b83f768cf536b34ce4d3f2de6bf62324229aa Author: Bram Moolenaar <Bram@vim.org> Date: Mon Sep 10 19:03:05 2018 +0200 patch 8.1.0361: remote user not used for completion Problem: Remote user not used for completion. (Stucki) Solution: Use $USER too. (Dominique Pelle, closes https://github.com/vim/vim/issues/3407)
author Christian Brabandt <cb@256bit.org>
date Mon, 10 Sep 2018 19:15:05 +0200
parents ac42c4b11dbc
children ce04ebdf26b8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10042
4aead6a9b7a9 commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents: 10025
diff changeset
1 /* vi:set ts=8 sts=4 sw=4 noet:
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
2 *
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
3 * VIM - Vi IMproved by Bram Moolenaar
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
4 *
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
5 * Do ":help uganda" in Vim to read copying and usage conditions.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
6 * Do ":help credits" in Vim to see a list of people who contributed.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
7 * See README.txt for an overview of the Vim source code.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
8 */
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
9 /*
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
10 * os_mac_conv.c: Code specifically for Mac string conversions.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
11 *
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
12 * This code has been put in a separate file to avoid the conflicts that are
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
13 * caused by including both the X11 and Carbon header files.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
14 */
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
15
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
16 #define NO_X11_INCLUDES
2891
acda456c788a updated for version 7.3.219
Bram Moolenaar <bram@vim.org>
parents: 2309
diff changeset
17
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
18 #include "vim.h"
7811
7fda54504fee commit https://github.com/vim/vim/commit/3e96c3d241ab657cf4df0913ea8de50a6cb90730
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
19
7fda54504fee commit https://github.com/vim/vim/commit/3e96c3d241ab657cf4df0913ea8de50a6cb90730
Christian Brabandt <cb@256bit.org>
parents: 7805
diff changeset
20 #if !defined(FEAT_GUI_MAC) && !defined(PROTO)
2309
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents: 1621
diff changeset
21 # include <CoreServices/CoreServices.h>
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents: 1621
diff changeset
22 #endif
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents: 1621
diff changeset
23
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
24
766
f0d0d3d3a1e2 updated for version 7.0225
vimboss
parents: 501
diff changeset
25 #if defined(MACOS_CONVERT) || defined(PROTO)
2309
543ea69d037f Add clipboard support in Mac console. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents: 1621
diff changeset
26
766
f0d0d3d3a1e2 updated for version 7.0225
vimboss
parents: 501
diff changeset
27 # ifdef PROTO
f0d0d3d3a1e2 updated for version 7.0225
vimboss
parents: 501
diff changeset
28 /* A few dummy types to be able to generate function prototypes. */
f0d0d3d3a1e2 updated for version 7.0225
vimboss
parents: 501
diff changeset
29 typedef int UniChar;
f0d0d3d3a1e2 updated for version 7.0225
vimboss
parents: 501
diff changeset
30 typedef int *TECObjectRef;
f0d0d3d3a1e2 updated for version 7.0225
vimboss
parents: 501
diff changeset
31 typedef int CFStringRef;
f0d0d3d3a1e2 updated for version 7.0225
vimboss
parents: 501
diff changeset
32 # endif
f0d0d3d3a1e2 updated for version 7.0225
vimboss
parents: 501
diff changeset
33
7805
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 3143
diff changeset
34 static char_u *mac_utf16_to_utf8(UniChar *from, size_t fromLen, size_t *actualLen);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 3143
diff changeset
35 static UniChar *mac_utf8_to_utf16(char_u *from, size_t fromLen, size_t *actualLen);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
36
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
37 /* Converter for composing decomposed HFS+ file paths */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
38 static TECObjectRef gPathConverter;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
39 /* Converter used by mac_utf16_to_utf8 */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
40 static TECObjectRef gUTF16ToUTF8Converter;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
41
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
42 /*
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
43 * A Mac version of string_convert_ext() for special cases.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
44 */
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
45 char_u *
7833
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
46 mac_string_convert(
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
47 char_u *ptr,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
48 int len,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
49 int *lenp,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
50 int fail_on_error,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
51 int from_enc,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
52 int to_enc,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
53 int *unconvlenp)
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
54 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
55 char_u *retval, *d;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
56 CFStringRef cfstr;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
57 int buflen, in, out, l, i;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
58 CFStringEncoding from;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
59 CFStringEncoding to;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
60
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
61 switch (from_enc)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
62 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
63 case 'l': from = kCFStringEncodingISOLatin1; break;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
64 case 'm': from = kCFStringEncodingMacRoman; break;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
65 case 'u': from = kCFStringEncodingUTF8; break;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
66 default: return NULL;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
67 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
68 switch (to_enc)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
69 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
70 case 'l': to = kCFStringEncodingISOLatin1; break;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
71 case 'm': to = kCFStringEncodingMacRoman; break;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
72 case 'u': to = kCFStringEncodingUTF8; break;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
73 default: return NULL;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
74 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
75
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
76 if (unconvlenp != NULL)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
77 *unconvlenp = 0;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
78 cfstr = CFStringCreateWithBytes(NULL, ptr, len, from, 0);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
79
3143
314d9368069e updated for version 7.3.342
Bram Moolenaar <bram@vim.org>
parents: 2891
diff changeset
80 if (cfstr == NULL)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
81 fprintf(stderr, "Encoding failed\n");
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
82 /* When conversion failed, try excluding bytes from the end, helps when
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
83 * there is an incomplete byte sequence. Only do up to 6 bytes to avoid
1212
e085b0f7b036 updated for version 7.1b
vimboss
parents: 766
diff changeset
84 * looping a long time when there really is something unconvertible. */
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
85 while (cfstr == NULL && unconvlenp != NULL && len > 1 && *unconvlenp < 6)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
86 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
87 --len;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
88 ++*unconvlenp;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
89 cfstr = CFStringCreateWithBytes(NULL, ptr, len, from, 0);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
90 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
91 if (cfstr == NULL)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
92 return NULL;
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
93
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
94 if (to == kCFStringEncodingUTF8)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
95 buflen = len * 6 + 1;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
96 else
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
97 buflen = len + 1;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
98 retval = alloc(buflen);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
99 if (retval == NULL)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
100 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
101 CFRelease(cfstr);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
102 return NULL;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
103 }
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
104
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
105 #if 0
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
106 CFRange convertRange = CFRangeMake(0, CFStringGetLength(cfstr));
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
107 /* Determine output buffer size */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
108 CFStringGetBytes(cfstr, convertRange, to, NULL, FALSE, NULL, 0, (CFIndex *)&buflen);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
109 retval = (buflen > 0) ? alloc(buflen) : NULL;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
110 if (retval == NULL) {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
111 CFRelease(cfstr);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
112 return NULL;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
113 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
114
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
115 if (lenp)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
116 *lenp = buflen / sizeof(char_u);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
117
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
118 if (!CFStringGetBytes(cfstr, convertRange, to, NULL, FALSE, retval, buflen, NULL))
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
119 #endif
501
ce2181d14aa0 updated for version 7.0139
vimboss
parents: 474
diff changeset
120 if (!CFStringGetCString(cfstr, (char *)retval, buflen, to))
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
121 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
122 CFRelease(cfstr);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
123 if (fail_on_error)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
124 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
125 vim_free(retval);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
126 return NULL;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
127 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
128
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
129 fprintf(stderr, "Trying char-by-char conversion...\n");
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
130 /* conversion failed for the whole string, but maybe it will work
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
131 * for each character */
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
132 for (d = retval, in = 0, out = 0; in < len && out < buflen - 1;)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
133 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
134 if (from == kCFStringEncodingUTF8)
474
a5fcf36ef512 updated for version 7.0127
vimboss
parents: 179
diff changeset
135 l = utf_ptr2len(ptr + in);
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
136 else
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
137 l = 1;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
138 cfstr = CFStringCreateWithBytes(NULL, ptr + in, l, from, 0);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
139 if (cfstr == NULL)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
140 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
141 *d++ = '?';
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
142 out++;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
143 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
144 else
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
145 {
501
ce2181d14aa0 updated for version 7.0139
vimboss
parents: 474
diff changeset
146 if (!CFStringGetCString(cfstr, (char *)d, buflen - out, to))
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
147 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
148 *d++ = '?';
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
149 out++;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
150 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
151 else
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
152 {
501
ce2181d14aa0 updated for version 7.0139
vimboss
parents: 474
diff changeset
153 i = STRLEN(d);
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
154 d += i;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
155 out += i;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
156 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
157 CFRelease(cfstr);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
158 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
159 in += l;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
160 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
161 *d = NUL;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
162 if (lenp != NULL)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
163 *lenp = out;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
164 return retval;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
165 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
166 CFRelease(cfstr);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
167 if (lenp != NULL)
501
ce2181d14aa0 updated for version 7.0139
vimboss
parents: 474
diff changeset
168 *lenp = STRLEN(retval);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
169
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
170 return retval;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
171 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
172
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
173 /*
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
174 * Conversion from Apple MacRoman char encoding to UTF-8 or latin1, using
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
175 * standard Carbon framework.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
176 * Input: "ptr[*sizep]".
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
177 * "real_size" is the size of the buffer that "ptr" points to.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
178 * output is in-place, "sizep" is adjusted.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
179 * Returns OK or FAIL.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
180 */
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
181 int
7833
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
182 macroman2enc(
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
183 char_u *ptr,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
184 long *sizep,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
185 long real_size)
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
186 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
187 CFStringRef cfstr;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
188 CFRange r;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
189 CFIndex len = *sizep;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
190
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
191 /* MacRoman is an 8-bit encoding, no need to move bytes to
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
192 * conv_rest[]. */
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
193 cfstr = CFStringCreateWithBytes(NULL, ptr, len,
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
194 kCFStringEncodingMacRoman, 0);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
195 /*
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
196 * If there is a conversion error, try using another
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
197 * conversion.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
198 */
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
199 if (cfstr == NULL)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
200 return FAIL;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
201
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
202 r.location = 0;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
203 r.length = CFStringGetLength(cfstr);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
204 if (r.length != CFStringGetBytes(cfstr, r,
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
205 (enc_utf8) ? kCFStringEncodingUTF8 : kCFStringEncodingISOLatin1,
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
206 0, /* no lossy conversion */
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
207 0, /* not external representation */
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
208 ptr + *sizep, real_size - *sizep, &len))
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
209 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
210 CFRelease(cfstr);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
211 return FAIL;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
212 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
213 CFRelease(cfstr);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
214 mch_memmove(ptr, ptr + *sizep, len);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
215 *sizep = len;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
216
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
217 return OK;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
218 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
219
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
220 /*
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
221 * Conversion from UTF-8 or latin1 to MacRoman.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
222 * Input: "from[fromlen]"
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
223 * Output: "to[maxtolen]" length in "*tolenp"
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
224 * Unconverted rest in rest[*restlenp].
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
225 * Returns OK or FAIL.
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
226 */
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
227 int
7833
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
228 enc2macroman(
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
229 char_u *from,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
230 size_t fromlen,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
231 char_u *to,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
232 int *tolenp,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
233 int maxtolen,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
234 char_u *rest,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
235 int *restlenp)
18
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
236 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
237 CFStringRef cfstr;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
238 CFRange r;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
239 CFIndex l;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
240
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
241 *restlenp = 0;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
242 cfstr = CFStringCreateWithBytes(NULL, from, fromlen,
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
243 (enc_utf8) ? kCFStringEncodingUTF8 : kCFStringEncodingISOLatin1,
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
244 0);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
245 while (cfstr == NULL && *restlenp < 3 && fromlen > 1)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
246 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
247 rest[*restlenp++] = from[--fromlen];
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
248 cfstr = CFStringCreateWithBytes(NULL, from, fromlen,
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
249 (enc_utf8) ? kCFStringEncodingUTF8 : kCFStringEncodingISOLatin1,
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
250 0);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
251 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
252 if (cfstr == NULL)
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
253 return FAIL;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
254
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
255 r.location = 0;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
256 r.length = CFStringGetLength(cfstr);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
257 if (r.length != CFStringGetBytes(cfstr, r,
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
258 kCFStringEncodingMacRoman,
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
259 0, /* no lossy conversion */
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
260 0, /* not external representation (since vim
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
261 * handles this internally */
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
262 to, maxtolen, &l))
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
263 {
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
264 CFRelease(cfstr);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
265 return FAIL;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
266 }
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
267 CFRelease(cfstr);
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
268 *tolenp = l;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
269 return OK;
293621502c4d updated for version 7.0010
vimboss
parents:
diff changeset
270 }
20
4ac1dce8dd5e updated for version 7.0012
vimboss
parents: 18
diff changeset
271
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
272 /*
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
273 * Initializes text converters
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
274 */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
275 void
7833
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
276 mac_conv_init(void)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
277 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
278 TextEncoding utf8_encoding;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
279 TextEncoding utf8_hfsplus_encoding;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
280 TextEncoding utf8_canon_encoding;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
281 TextEncoding utf16_encoding;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
282
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
283 utf8_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
284 kTextEncodingDefaultVariant, kUnicodeUTF8Format);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
285 utf8_hfsplus_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
286 kUnicodeHFSPlusCompVariant, kUnicodeUTF8Format);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
287 utf8_canon_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
288 kUnicodeCanonicalCompVariant, kUnicodeUTF8Format);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
289 utf16_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
290 kTextEncodingDefaultVariant, kUnicode16BitFormat);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
291
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
292 if (TECCreateConverter(&gPathConverter, utf8_encoding,
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
293 utf8_hfsplus_encoding) != noErr)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
294 gPathConverter = NULL;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
295
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
296 if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding,
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
297 utf8_canon_encoding) != noErr)
179
7fd70926e2e1 updated for version 7.0055
vimboss
parents: 168
diff changeset
298 {
7fd70926e2e1 updated for version 7.0055
vimboss
parents: 168
diff changeset
299 /* On pre-10.3, Unicode normalization is not available so
7fd70926e2e1 updated for version 7.0055
vimboss
parents: 168
diff changeset
300 * fall back to non-normalizing converter */
7fd70926e2e1 updated for version 7.0055
vimboss
parents: 168
diff changeset
301 if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding,
7fd70926e2e1 updated for version 7.0055
vimboss
parents: 168
diff changeset
302 utf8_encoding) != noErr)
7fd70926e2e1 updated for version 7.0055
vimboss
parents: 168
diff changeset
303 gUTF16ToUTF8Converter = NULL;
7fd70926e2e1 updated for version 7.0055
vimboss
parents: 168
diff changeset
304 }
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
305 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
306
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
307 /*
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
308 * Destroys text converters
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
309 */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
310 void
7833
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
311 mac_conv_cleanup(void)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
312 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
313 if (gUTF16ToUTF8Converter)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
314 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
315 TECDisposeConverter(gUTF16ToUTF8Converter);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
316 gUTF16ToUTF8Converter = NULL;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
317 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
318
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
319 if (gPathConverter)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
320 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
321 TECDisposeConverter(gPathConverter);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
322 gPathConverter = NULL;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
323 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
324 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
325
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
326 /*
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
327 * Conversion from UTF-16 UniChars to 'encoding'
1621
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
328 * The function signature uses the real type of UniChar (as typedef'ed in
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
329 * CFBase.h) to avoid clashes with X11 header files in the .pro file
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
330 */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
331 char_u *
7833
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
332 mac_utf16_to_enc(
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
333 unsigned short *from,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
334 size_t fromLen,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
335 size_t *actualLen)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
336 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
337 /* Following code borrows somewhat from os_mswin.c */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
338 vimconv_T conv;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
339 size_t utf8_len;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
340 char_u *utf8_str;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
341 char_u *result = NULL;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
342
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
343 /* Convert to utf-8 first, works better with iconv */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
344 utf8_len = 0;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
345 utf8_str = mac_utf16_to_utf8(from, fromLen, &utf8_len);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
346
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
347 if (utf8_str)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
348 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
349 /* We might be called before we have p_enc set up. */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
350 conv.vc_type = CONV_NONE;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
351
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
352 /* If encoding (p_enc) is any unicode, it is actually in utf-8 (vim
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
353 * internal unicode is always utf-8) so don't convert in such cases */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
354
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
355 if ((enc_canon_props(p_enc) & ENC_UNICODE) == 0)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
356 convert_setup(&conv, (char_u *)"utf-8",
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
357 p_enc? p_enc: (char_u *)"macroman");
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
358 if (conv.vc_type == CONV_NONE)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
359 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
360 /* p_enc is utf-8, so we're done. */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
361 result = utf8_str;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
362 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
363 else
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
364 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
365 result = string_convert(&conv, utf8_str, (int *)&utf8_len);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
366 vim_free(utf8_str);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
367 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
368
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
369 convert_setup(&conv, NULL, NULL);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
370
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
371 if (actualLen)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
372 *actualLen = utf8_len;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
373 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
374 else if (actualLen)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
375 *actualLen = 0;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
376
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
377 return result;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
378 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
379
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
380 /*
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
381 * Conversion from 'encoding' to UTF-16 UniChars
1621
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
382 * The function return uses the real type of UniChar (as typedef'ed in
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
383 * CFBase.h) to avoid clashes with X11 header files in the .pro file
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
384 */
1621
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
385 unsigned short *
7833
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
386 mac_enc_to_utf16(
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
387 char_u *from,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
388 size_t fromLen,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
389 size_t *actualLen)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
390 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
391 /* Following code borrows somewhat from os_mswin.c */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
392 vimconv_T conv;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
393 size_t utf8_len;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
394 char_u *utf8_str;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
395 UniChar *result = NULL;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
396 Boolean should_free_utf8 = FALSE;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
397
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
398 do
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
399 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
400 /* Use MacRoman by default, we might be called before we have p_enc
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
401 * set up. Convert to utf-8 first, works better with iconv(). Does
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
402 * nothing if 'encoding' is "utf-8". */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
403 conv.vc_type = CONV_NONE;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
404 if ((enc_canon_props(p_enc) & ENC_UNICODE) == 0 &&
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
405 convert_setup(&conv, p_enc ? p_enc : (char_u *)"macroman",
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
406 (char_u *)"utf-8") == FAIL)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
407 break;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
408
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
409 if (conv.vc_type != CONV_NONE)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
410 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
411 utf8_len = fromLen;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
412 utf8_str = string_convert(&conv, from, (int *)&utf8_len);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
413 should_free_utf8 = TRUE;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
414 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
415 else
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
416 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
417 utf8_str = from;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
418 utf8_len = fromLen;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
419 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
420
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
421 if (utf8_str == NULL)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
422 break;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
423
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
424 convert_setup(&conv, NULL, NULL);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
425
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
426 result = mac_utf8_to_utf16(utf8_str, utf8_len, actualLen);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
427
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
428 if (should_free_utf8)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
429 vim_free(utf8_str);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
430 return result;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
431 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
432 while (0);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
433
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
434 if (actualLen)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
435 *actualLen = 0;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
436
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
437 return result;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
438 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
439
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
440 /*
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
441 * Converts from UTF-16 UniChars to CFString
1621
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
442 * The void * return type is actually a CFStringRef
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
443 */
1621
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
444 void *
7833
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
445 mac_enc_to_cfstring(
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
446 char_u *from,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
447 size_t fromLen)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
448 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
449 UniChar *utf16_str;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
450 size_t utf16_len;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
451 CFStringRef result = NULL;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
452
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
453 utf16_str = mac_enc_to_utf16(from, fromLen, &utf16_len);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
454 if (utf16_str)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
455 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
456 result = CFStringCreateWithCharacters(NULL, utf16_str, utf16_len/sizeof(UniChar));
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
457 vim_free(utf16_str);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
458 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
459
1621
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
460 return (void *)result;
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
461 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
462
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
463 /*
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
464 * Converts a decomposed HFS+ UTF-8 path to precomposed UTF-8
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
465 */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
466 char_u *
7833
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
467 mac_precompose_path(
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
468 char_u *decompPath,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
469 size_t decompLen,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
470 size_t *precompLen)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
471 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
472 char_u *result = NULL;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
473 size_t actualLen = 0;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
474
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
475 if (gPathConverter)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
476 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
477 result = alloc(decompLen);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
478 if (result)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
479 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
480 if (TECConvertText(gPathConverter, decompPath,
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
481 decompLen, &decompLen, result,
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
482 decompLen, &actualLen) != noErr)
13244
ac42c4b11dbc patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents: 12879
diff changeset
483 VIM_CLEAR(result);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
484 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
485 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
486
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
487 if (precompLen)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
488 *precompLen = actualLen;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
489
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
490 return result;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
491 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
492
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
493 /*
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
494 * Converts from UTF-16 UniChars to precomposed UTF-8
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
495 */
766
f0d0d3d3a1e2 updated for version 7.0225
vimboss
parents: 501
diff changeset
496 static char_u *
7833
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
497 mac_utf16_to_utf8(
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
498 UniChar *from,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
499 size_t fromLen,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
500 size_t *actualLen)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
501 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
502 ByteCount utf8_len;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
503 ByteCount inputRead;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
504 char_u *result;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
505
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
506 if (gUTF16ToUTF8Converter)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
507 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
508 result = alloc(fromLen * 6 + 1);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
509 if (result && TECConvertText(gUTF16ToUTF8Converter, (ConstTextPtr)from,
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
510 fromLen, &inputRead, result,
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
511 (fromLen*6+1)*sizeof(char_u), &utf8_len) == noErr)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
512 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
513 TECFlushText(gUTF16ToUTF8Converter, result, (fromLen*6+1)*sizeof(char_u), &inputRead);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
514 utf8_len += inputRead;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
515 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
516 else
13244
ac42c4b11dbc patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents: 12879
diff changeset
517 VIM_CLEAR(result);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
518 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
519 else
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
520 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
521 result = NULL;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
522 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
523
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
524 if (actualLen)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
525 *actualLen = result ? utf8_len : 0;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
526
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
527 return result;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
528 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
529
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
530 /*
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
531 * Converts from UTF-8 to UTF-16 UniChars
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
532 */
766
f0d0d3d3a1e2 updated for version 7.0225
vimboss
parents: 501
diff changeset
533 static UniChar *
7833
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
534 mac_utf8_to_utf16(
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
535 char_u *from,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
536 size_t fromLen,
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
537 size_t *actualLen)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
538 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
539 CFStringRef utf8_str;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
540 CFRange convertRange;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
541 UniChar *result = NULL;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
542
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
543 utf8_str = CFStringCreateWithBytes(NULL, from, fromLen,
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
544 kCFStringEncodingUTF8, FALSE);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
545
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
546 if (utf8_str == NULL) {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
547 if (actualLen)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
548 *actualLen = 0;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
549 return NULL;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
550 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
551
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
552 convertRange = CFRangeMake(0, CFStringGetLength(utf8_str));
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
553 result = (UniChar *)alloc(convertRange.length * sizeof(UniChar));
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
554
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
555 CFStringGetCharacters(utf8_str, convertRange, result);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
556
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
557 CFRelease(utf8_str);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
558
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
559 if (actualLen)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
560 *actualLen = convertRange.length * sizeof(UniChar);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
561
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
562 return result;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 20
diff changeset
563 }
1621
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
564
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
565 /*
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
566 * Sets LANG environment variable in Vim from Mac locale
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
567 */
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
568 void
7833
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
569 mac_lang_init(void)
c079097365f3 commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents: 7811
diff changeset
570 {
1621
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
571 if (mch_getenv((char_u *)"LANG") == NULL)
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
572 {
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
573 char buf[20];
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
574 if (LocaleRefGetPartString(NULL,
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
575 kLocaleLanguageMask | kLocaleLanguageVariantMask |
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
576 kLocaleRegionMask | kLocaleRegionVariantMask,
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
577 sizeof buf, buf) == noErr && *buf)
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
578 {
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
579 vim_setenv((char_u *)"LANG", (char_u *)buf);
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
580 # ifdef HAVE_LOCALE_H
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
581 setlocale(LC_ALL, "");
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
582 # endif
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
583 }
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
584 }
82b5078be2dd updated for version 7.2a
vimboss
parents: 1212
diff changeset
585 }
766
f0d0d3d3a1e2 updated for version 7.0225
vimboss
parents: 501
diff changeset
586 #endif /* MACOS_CONVERT */