ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/misc.C
(Generate patch)

Comparing rxvt-unicode/src/misc.C (file contents):
Revision 1.43 by ayin, Mon Aug 27 20:53:16 2007 UTC vs.
Revision 1.53 by root, Sun Apr 26 01:59:53 2009 UTC

… …
38 while (len--) 38 while (len--)
39 { 39 {
40 ssize_t l = wcrtomb (dst, *str++, mbs); 40 ssize_t l = wcrtomb (dst, *str++, mbs);
41 41
42 if (l < 0) 42 if (l < 0)
43 {
43 *dst++ = '?'; 44 *dst++ = '?';
45 wcrtomb (0, 0, mbs); // reset undefined state
46 }
44 else 47 else
45 dst += l; 48 dst += l;
46 } 49 }
47 50
48 *dst++ = 0; 51 *dst++ = 0;
… …
79 *p++ = w; 82 *p++ = w;
80 else if (w < 0x000800) 83 else if (w < 0x000800)
81 *p++ = 0xc0 | ( w >> 6), 84 *p++ = 0xc0 | ( w >> 6),
82 *p++ = 0x80 | ( w & 0x3f); 85 *p++ = 0x80 | ( w & 0x3f);
83 else if (w < 0x010000) 86 else if (w < 0x010000)
84 *p++ = 0xe0 | ( w >> 12 ), 87 *p++ = 0xe0 | ( w >> 12),
85 *p++ = 0x80 | ((w >> 6) & 0x3f), 88 *p++ = 0x80 | ((w >> 6) & 0x3f),
86 *p++ = 0x80 | ( w & 0x3f); 89 *p++ = 0x80 | ( w & 0x3f);
87 else if (w < 0x110000) 90 else if (w < 0x110000)
88 *p++ = 0xf0 | ( w >> 18), 91 *p++ = 0xf0 | ( w >> 18),
89 *p++ = 0x80 | ((w >> 12) & 0x3f), 92 *p++ = 0x80 | ((w >> 12) & 0x3f),
… …
116 if (len == 0) 119 if (len == 0)
117 break; 120 break;
118 else if (s[0] < 0x80) 121 else if (s[0] < 0x80)
119 *p++ = *s++; 122 *p++ = *s++;
120 else if (len >= 2 123 else if (len >= 2
121 && s[0] >= 0xc2 && s[0] <= 0xdf 124 && s[0] >= 0xc2 && s[0] <= 0xdf
122 && (s[1] & 0xc0) == 0x80) 125 && (s[1] & 0xc0) == 0x80)
123 { 126 {
124 *p++ = ((s[0] & 0x1f) << 6) 127 *p++ = ((s[0] & 0x1f) << 6)
125 | (s[1] & 0x3f); 128 | (s[1] & 0x3f);
126 s += 2; 129 s += 2;
… …
144 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f) 147 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f)
145 ) 148 )
146 && (s[2] & 0xc0) == 0x80 149 && (s[2] & 0xc0) == 0x80
147 && (s[3] & 0xc0) == 0x80) 150 && (s[3] & 0xc0) == 0x80)
148 { 151 {
149 *p++ = ((s[0] & 0x07) << 18) 152 *p++ = ((s[0] & 0x07) << 18)
150 | ((s[1] & 0x3f) << 12) 153 | ((s[1] & 0x3f) << 12)
151 | ((s[2] & 0x3f) << 6) 154 | ((s[2] & 0x3f) << 6)
152 | (s[3] & 0x3f); 155 | (s[3] & 0x3f);
153 s += 4; 156 s += 4;
154 } 157 }
155 else 158 else
156 { 159 {
… …
162 *p = 0; 165 *p = 0;
163 166
164 return r; 167 return r;
165} 168}
166 169
167char * 170const char *
168rxvt_r_basename (const char *str) NOTHROW 171rxvt_basename (const char *str) NOTHROW
169{ 172{
170 char *base = strrchr (str, '/'); 173 char *base = strrchr (str, '/');
171 174
172 return (char *) (base ? base + 1 : str); 175 return (char *) (base ? base + 1 : str);
173} 176}
… …
233 static class rxvt_failure_exception rxvt_failure_exception; 236 static class rxvt_failure_exception rxvt_failure_exception;
234 throw (rxvt_failure_exception); 237 throw (rxvt_failure_exception);
235} 238}
236 239
237/* 240/*
238 * remove leading/trailing space and strip-off leading/trailing quotes. 241 * remove leading/trailing space in place.
239 * in place.
240 */ 242 */
241char * 243char *
242rxvt_Str_trim (char *str) NOTHROW 244rxvt_strtrim (char *str) NOTHROW
243{ 245{
244 char *r, *s; 246 char *r, *s;
245 247
246 if (!str || !*str) /* shortcut */ 248 if (!str || !*str) /* shortcut */
247 return str; 249 return str;
… …
254 256
255 /* dump return and other trailing whitespace */ 257 /* dump return and other trailing whitespace */
256 while (r > s && isspace (*r)) 258 while (r > s && isspace (*r))
257 r--; 259 r--;
258 260
259#if 0
260 /* skip matching leading/trailing quotes */
261 if (*s == '"' && *r == '"' && n > 1)
262 {
263 s++;
264 n -= 2;
265 }
266#endif
267
268 memmove (str, s, r + 1 - s); 261 memmove (str, s, r + 1 - s);
269 str[r + 1 - s] = 0; 262 str[r + 1 - s] = 0;
270 263
271 return str; 264 return str;
272}
273
274/*
275 * in-place interpretation of string:
276 *
277 * backslash-escaped: "\a\b\E\e\n\r\t", "\octal"
278 * Ctrl chars: ^@ .. ^_, ^?
279 *
280 * Emacs-style: "M-" prefix
281 *
282 * Also,
283 * "M-x" prefixed strings, append "\r" if needed
284 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
285 *
286 * returns the converted string length
287 */
288int
289rxvt_Str_escaped (char *str) NOTHROW
290{
291 char ch, *s, *d;
292 int i, num, append = 0;
293
294 if (!str || !*str)
295 return 0;
296
297 d = s = str;
298
299 if (*s == 'M' && s[1] == '-')
300 {
301 /* Emacs convenience, replace leading `M-..' with `\E..' */
302 *d++ = C0_ESC;
303 s += 2;
304 if (toupper (*s) == 'X')
305 /* append carriage-return for `M-xcommand' */
306 for (*d++ = 'x', append = '\r', s++; isspace (*s); s++) ;
307 }
308 for (; (ch = *s++);)
309 {
310 if (ch == '\\')
311 {
312 ch = *s++;
313 if (ch >= '0' && ch <= '7')
314 { /* octal */
315 num = ch - '0';
316 for (i = 0; i < 2; i++, s++)
317 {
318 ch = *s;
319 if (ch < '0' || ch > '7')
320 break;
321 num = num * 8 + ch - '0';
322 }
323 ch = (char)num;
324 }
325 else if (ch == 'a')
326 ch = C0_BEL; /* bell */
327 else if (ch == 'b')
328 ch = C0_BS; /* backspace */
329 else if (ch == 'E' || ch == 'e')
330 ch = C0_ESC; /* escape */
331 else if (ch == 'n')
332 ch = '\n'; /* newline */
333 else if (ch == 'r')
334 ch = '\r'; /* carriage-return */
335 else if (ch == 't')
336 ch = C0_HT; /* tab */
337 }
338 else if (ch == '^')
339 {
340 ch = *s++;
341 ch = toupper (ch);
342 ch = (ch == '?' ? 127 : (ch - '@'));
343 }
344 *d++ = ch;
345 }
346
347 /* ESC] is an XTerm escape sequence, must be terminated */
348 if (*str == '\0' && str[1] == C0_ESC && str[2] == ']')
349 append = CHAR_ST;
350
351 /* add trailing character as required */
352 if (append && d[-1] != append)
353 *d++ = append;
354 *d = '\0';
355
356 return (d - str);
357} 265}
358 266
359/* 267/*
360 * Split a comma-separated string into an array, stripping leading and 268 * Split a comma-separated string into an array, stripping leading and
361 * trailing spaces from each entry. Empty strings are properly returned 269 * trailing spaces from each entry. Empty strings are properly returned
362 * Caller should free each entry and array when done
363 */ 270 */
364char ** 271char **
365rxvt_splitcommastring (const char *cs) NOTHROW 272rxvt_splitcommastring (const char *cs) NOTHROW
366{ 273{
367 int l, n, p; 274 int l, n, p;
368 const char *s, *t; 275 const char *s, *t;
369 char **ret; 276 char **ret;
… …
381 for (l = 0, t = s; l < n; l++) 288 for (l = 0, t = s; l < n; l++)
382 { 289 {
383 for ( ; *t && *t != ','; t++) ; 290 for ( ; *t && *t != ','; t++) ;
384 p = t - s; 291 p = t - s;
385 ret[l] = (char *)malloc (p + 1); 292 ret[l] = (char *)malloc (p + 1);
386 strncpy (ret[l], s, p); 293 memcpy (ret[l], s, p);
387 ret[l][p] = '\0'; 294 ret[l][p] = '\0';
388 rxvt_Str_trim (ret[l]); 295 rxvt_strtrim (ret[l]);
389 s = ++t; 296 s = ++t;
390 } 297 }
391 298
392 return ret; 299 return ret;
393} 300}
… …
399 free (cs[i]); 306 free (cs[i]);
400 307
401 free (cs); 308 free (cs);
402} 309}
403 310
311void *
312rxvt_malloc (size_t size)
313{
314 void *p = malloc (size);
404 315
316 if (!p)
317 rxvt_fatal ("memory allocation failure. aborting.\n");
405 318
319 return p;
320}
321
322void *
323rxvt_calloc (size_t number, size_t size)
324{
325 void *p = calloc (number, size);
326
327 if (!p)
328 rxvt_fatal ("memory allocation failure. aborting.\n");
329
330 return p;
331}
332
333void *
334rxvt_realloc (void *ptr, size_t size)
335{
336 void *p = realloc (ptr, size);
337
338 if (!p)
339 rxvt_fatal ("memory allocation failure. aborting.\n");
340
341 return p;
342}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines