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.48 by ayin, Tue Oct 23 21:54:42 2007 UTC

… …
79 *p++ = w; 79 *p++ = w;
80 else if (w < 0x000800) 80 else if (w < 0x000800)
81 *p++ = 0xc0 | ( w >> 6), 81 *p++ = 0xc0 | ( w >> 6),
82 *p++ = 0x80 | ( w & 0x3f); 82 *p++ = 0x80 | ( w & 0x3f);
83 else if (w < 0x010000) 83 else if (w < 0x010000)
84 *p++ = 0xe0 | ( w >> 12 ), 84 *p++ = 0xe0 | ( w >> 12),
85 *p++ = 0x80 | ((w >> 6) & 0x3f), 85 *p++ = 0x80 | ((w >> 6) & 0x3f),
86 *p++ = 0x80 | ( w & 0x3f); 86 *p++ = 0x80 | ( w & 0x3f);
87 else if (w < 0x110000) 87 else if (w < 0x110000)
88 *p++ = 0xf0 | ( w >> 18), 88 *p++ = 0xf0 | ( w >> 18),
89 *p++ = 0x80 | ((w >> 12) & 0x3f), 89 *p++ = 0x80 | ((w >> 12) & 0x3f),
… …
163 163
164 return r; 164 return r;
165} 165}
166 166
167char * 167char *
168rxvt_r_basename (const char *str) NOTHROW 168rxvt_basename (const char *str) NOTHROW
169{ 169{
170 char *base = strrchr (str, '/'); 170 char *base = strrchr (str, '/');
171 171
172 return (char *) (base ? base + 1 : str); 172 return (char *) (base ? base + 1 : str);
173} 173}
… …
233 static class rxvt_failure_exception rxvt_failure_exception; 233 static class rxvt_failure_exception rxvt_failure_exception;
234 throw (rxvt_failure_exception); 234 throw (rxvt_failure_exception);
235} 235}
236 236
237/* 237/*
238 * remove leading/trailing space and strip-off leading/trailing quotes. 238 * remove leading/trailing space in place.
239 * in place.
240 */ 239 */
241char * 240char *
242rxvt_Str_trim (char *str) NOTHROW 241rxvt_strtrim (char *str) NOTHROW
243{ 242{
244 char *r, *s; 243 char *r, *s;
245 244
246 if (!str || !*str) /* shortcut */ 245 if (!str || !*str) /* shortcut */
247 return str; 246 return str;
… …
254 253
255 /* dump return and other trailing whitespace */ 254 /* dump return and other trailing whitespace */
256 while (r > s && isspace (*r)) 255 while (r > s && isspace (*r))
257 r--; 256 r--;
258 257
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); 258 memmove (str, s, r + 1 - s);
269 str[r + 1 - s] = 0; 259 str[r + 1 - s] = 0;
270 260
271 return str; 261 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} 262}
358 263
359/* 264/*
360 * Split a comma-separated string into an array, stripping leading and 265 * Split a comma-separated string into an array, stripping leading and
361 * trailing spaces from each entry. Empty strings are properly returned 266 * trailing spaces from each entry. Empty strings are properly returned
362 * Caller should free each entry and array when done
363 */ 267 */
364char ** 268char **
365rxvt_splitcommastring (const char *cs) NOTHROW 269rxvt_splitcommastring (const char *cs) NOTHROW
366{ 270{
367 int l, n, p; 271 int l, n, p;
368 const char *s, *t; 272 const char *s, *t;
369 char **ret; 273 char **ret;
… …
383 for ( ; *t && *t != ','; t++) ; 287 for ( ; *t && *t != ','; t++) ;
384 p = t - s; 288 p = t - s;
385 ret[l] = (char *)malloc (p + 1); 289 ret[l] = (char *)malloc (p + 1);
386 strncpy (ret[l], s, p); 290 strncpy (ret[l], s, p);
387 ret[l][p] = '\0'; 291 ret[l][p] = '\0';
388 rxvt_Str_trim (ret[l]); 292 rxvt_strtrim (ret[l]);
389 s = ++t; 293 s = ++t;
390 } 294 }
391 295
392 return ret; 296 return ret;
393} 297}

Diff Legend

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