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.44 by ayin, Mon Sep 3 07:31:12 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}
235} 235}
236 236
237/* 237/*
238 * remove leading/trailing space in place. 238 * remove leading/trailing space in place.
239 */ 239 */
240char * 240char *
241rxvt_Str_trim (char *str) NOTHROW 241rxvt_strtrim (char *str) NOTHROW
242{ 242{
243 char *r, *s; 243 char *r, *s;
244 244
245 if (!str || !*str) /* shortcut */ 245 if (!str || !*str) /* shortcut */
246 return str; 246 return str;
260 260
261 return str; 261 return str;
262} 262}
263 263
264/* 264/*
265 * in-place interpretation of string:
266 *
267 * backslash-escaped: "\a\b\E\e\n\r\t", "\octal"
268 * Ctrl chars: ^@ .. ^_, ^?
269 *
270 * Emacs-style: "M-" prefix
271 *
272 * Also,
273 * "M-x" prefixed strings, append "\r" if needed
274 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
275 *
276 * returns the converted string length
277 */
278int
279rxvt_Str_escaped (char *str) NOTHROW
280{
281 char ch, *s, *d;
282 int i, num, append = 0;
283
284 if (!str || !*str)
285 return 0;
286
287 d = s = str;
288
289 if (*s == 'M' && s[1] == '-')
290 {
291 /* Emacs convenience, replace leading `M-..' with `\E..' */
292 *d++ = C0_ESC;
293 s += 2;
294 if (toupper (*s) == 'X')
295 /* append carriage-return for `M-xcommand' */
296 for (*d++ = 'x', append = '\r', s++; isspace (*s); s++) ;
297 }
298 for (; (ch = *s++);)
299 {
300 if (ch == '\\')
301 {
302 ch = *s++;
303 if (ch >= '0' && ch <= '7')
304 { /* octal */
305 num = ch - '0';
306 for (i = 0; i < 2; i++, s++)
307 {
308 ch = *s;
309 if (ch < '0' || ch > '7')
310 break;
311 num = num * 8 + ch - '0';
312 }
313 ch = (char)num;
314 }
315 else if (ch == 'a')
316 ch = C0_BEL; /* bell */
317 else if (ch == 'b')
318 ch = C0_BS; /* backspace */
319 else if (ch == 'E' || ch == 'e')
320 ch = C0_ESC; /* escape */
321 else if (ch == 'n')
322 ch = '\n'; /* newline */
323 else if (ch == 'r')
324 ch = '\r'; /* carriage-return */
325 else if (ch == 't')
326 ch = C0_HT; /* tab */
327 }
328 else if (ch == '^')
329 {
330 ch = *s++;
331 ch = toupper (ch);
332 ch = (ch == '?' ? 127 : (ch - '@'));
333 }
334 *d++ = ch;
335 }
336
337 /* ESC] is an XTerm escape sequence, must be terminated */
338 if (*str == '\0' && str[1] == C0_ESC && str[2] == ']')
339 append = CHAR_ST;
340
341 /* add trailing character as required */
342 if (append && d[-1] != append)
343 *d++ = append;
344 *d = '\0';
345
346 return (d - str);
347}
348
349/*
350 * Split a comma-separated string into an array, stripping leading and 265 * Split a comma-separated string into an array, stripping leading and
351 * trailing spaces from each entry. Empty strings are properly returned 266 * trailing spaces from each entry. Empty strings are properly returned
352 * Caller should free each entry and array when done
353 */ 267 */
354char ** 268char **
355rxvt_splitcommastring (const char *cs) NOTHROW 269rxvt_splitcommastring (const char *cs) NOTHROW
356{ 270{
357 int l, n, p; 271 int l, n, p;
358 const char *s, *t; 272 const char *s, *t;
359 char **ret; 273 char **ret;
373 for ( ; *t && *t != ','; t++) ; 287 for ( ; *t && *t != ','; t++) ;
374 p = t - s; 288 p = t - s;
375 ret[l] = (char *)malloc (p + 1); 289 ret[l] = (char *)malloc (p + 1);
376 strncpy (ret[l], s, p); 290 strncpy (ret[l], s, p);
377 ret[l][p] = '\0'; 291 ret[l][p] = '\0';
378 rxvt_Str_trim (ret[l]); 292 rxvt_strtrim (ret[l]);
379 s = ++t; 293 s = ++t;
380 } 294 }
381 295
382 return ret; 296 return ret;
383} 297}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines