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.42 by ayin, Mon Aug 27 20:00:26 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 * check that the first characters of S1 match S2 238 * remove leading/trailing space in place.
239 *
240 * No Match
241 * return: 0
242 * Match
243 * return: strlen (S2)
244 */ 239 */
245int 240char *
246rxvt_Str_match (const char *s1, const char *s2) NOTHROW
247{
248 int n = strlen (s2);
249
250 return ((strncmp (s1, s2, n) == 0) ? n : 0);
251}
252
253/*
254 * remove leading/trailing space and strip-off leading/trailing quotes.
255 * in place.
256 */
257char *
258rxvt_Str_trim (char *str) NOTHROW 241rxvt_strtrim (char *str) NOTHROW
259{ 242{
260 char *r, *s; 243 char *r, *s;
261 244
262 if (!str || !*str) /* shortcut */ 245 if (!str || !*str) /* shortcut */
263 return str; 246 return str;
270 253
271 /* dump return and other trailing whitespace */ 254 /* dump return and other trailing whitespace */
272 while (r > s && isspace (*r)) 255 while (r > s && isspace (*r))
273 r--; 256 r--;
274 257
275#if 0
276 /* skip matching leading/trailing quotes */
277 if (*s == '"' && *r == '"' && n > 1)
278 {
279 s++;
280 n -= 2;
281 }
282#endif
283
284 memmove (str, s, r + 1 - s); 258 memmove (str, s, r + 1 - s);
285 str[r + 1 - s] = 0; 259 str[r + 1 - s] = 0;
286 260
287 return str; 261 return str;
288}
289
290/*
291 * in-place interpretation of string:
292 *
293 * backslash-escaped: "\a\b\E\e\n\r\t", "\octal"
294 * Ctrl chars: ^@ .. ^_, ^?
295 *
296 * Emacs-style: "M-" prefix
297 *
298 * Also,
299 * "M-x" prefixed strings, append "\r" if needed
300 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
301 *
302 * returns the converted string length
303 */
304int
305rxvt_Str_escaped (char *str) NOTHROW
306{
307 char ch, *s, *d;
308 int i, num, append = 0;
309
310 if (!str || !*str)
311 return 0;
312
313 d = s = str;
314
315 if (*s == 'M' && s[1] == '-')
316 {
317 /* Emacs convenience, replace leading `M-..' with `\E..' */
318 *d++ = C0_ESC;
319 s += 2;
320 if (toupper (*s) == 'X')
321 /* append carriage-return for `M-xcommand' */
322 for (*d++ = 'x', append = '\r', s++; isspace (*s); s++) ;
323 }
324 for (; (ch = *s++);)
325 {
326 if (ch == '\\')
327 {
328 ch = *s++;
329 if (ch >= '0' && ch <= '7')
330 { /* octal */
331 num = ch - '0';
332 for (i = 0; i < 2; i++, s++)
333 {
334 ch = *s;
335 if (ch < '0' || ch > '7')
336 break;
337 num = num * 8 + ch - '0';
338 }
339 ch = (char)num;
340 }
341 else if (ch == 'a')
342 ch = C0_BEL; /* bell */
343 else if (ch == 'b')
344 ch = C0_BS; /* backspace */
345 else if (ch == 'E' || ch == 'e')
346 ch = C0_ESC; /* escape */
347 else if (ch == 'n')
348 ch = '\n'; /* newline */
349 else if (ch == 'r')
350 ch = '\r'; /* carriage-return */
351 else if (ch == 't')
352 ch = C0_HT; /* tab */
353 }
354 else if (ch == '^')
355 {
356 ch = *s++;
357 ch = toupper (ch);
358 ch = (ch == '?' ? 127 : (ch - '@'));
359 }
360 *d++ = ch;
361 }
362
363 /* ESC] is an XTerm escape sequence, must be terminated */
364 if (*str == '\0' && str[1] == C0_ESC && str[2] == ']')
365 append = CHAR_ST;
366
367 /* add trailing character as required */
368 if (append && d[-1] != append)
369 *d++ = append;
370 *d = '\0';
371
372 return (d - str);
373} 262}
374 263
375/* 264/*
376 * Split a comma-separated string into an array, stripping leading and 265 * Split a comma-separated string into an array, stripping leading and
377 * trailing spaces from each entry. Empty strings are properly returned 266 * trailing spaces from each entry. Empty strings are properly returned
378 * Caller should free each entry and array when done
379 */ 267 */
380char ** 268char **
381rxvt_splitcommastring (const char *cs) NOTHROW 269rxvt_splitcommastring (const char *cs) NOTHROW
382{ 270{
383 int l, n, p; 271 int l, n, p;
384 const char *s, *t; 272 const char *s, *t;
385 char **ret; 273 char **ret;
399 for ( ; *t && *t != ','; t++) ; 287 for ( ; *t && *t != ','; t++) ;
400 p = t - s; 288 p = t - s;
401 ret[l] = (char *)malloc (p + 1); 289 ret[l] = (char *)malloc (p + 1);
402 strncpy (ret[l], s, p); 290 strncpy (ret[l], s, p);
403 ret[l][p] = '\0'; 291 ret[l][p] = '\0';
404 rxvt_Str_trim (ret[l]); 292 rxvt_strtrim (ret[l]);
405 s = ++t; 293 s = ++t;
406 } 294 }
407 295
408 return ret; 296 return ret;
409} 297}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines