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.12 by pcg, Wed Mar 17 05:15:02 2004 UTC vs.
Revision 1.25 by root, Mon Feb 7 01:17:03 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: misc.c 2 * File: misc.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1996 mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston 6 * Copyright (c) 1996 mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
… …
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28#include "misc.intpro" /* PROTOS for internal routines */ 28#include "misc.intpro" /* PROTOS for internal routines */
29 29
30/* EXTPROTO */
31char * 30char *
32rxvt_wcstombs (const wchar_t *str, int len) 31rxvt_wcstombs (const wchar_t *str, int len)
33{ 32{
33 if (len < 0) len = wcslen (str);
34
34 mbstate mbs; 35 mbstate mbs;
35 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1); 36 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1);
36 37
37 char *dst = r; 38 char *dst = r;
38 while (len--) 39 while (len--)
39 { 40 {
40 int l = wcrtomb (dst, *str++, mbs); 41 ssize_t l = wcrtomb (dst, *str++, mbs);
41 if (l < 0) 42 if (l < 0)
42 *dst++ = '?'; 43 *dst++ = '?';
43 else 44 else
44 dst += l; 45 dst += l;
45 } 46 }
46 47
47 *dst++ = 0; 48 *dst++ = 0;
48 49
50 return (char *)rxvt_realloc (r, dst - r);
51}
52
53wchar_t *
54rxvt_mbstowcs (const char *str, int len)
55{
56 if (len < 0) len = strlen (str);
57
58 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
59
60 if ((ssize_t)mbstowcs (r, str, len + 1) < 0)
61 *r = 0;
62
49 return r; 63 return r;
50} 64}
51 65
52/* EXTPROTO */ 66char *
67rxvt_wcstoutf8 (const wchar_t *str, int len)
68{
69 if (len < 0) len = wcslen (str);
70
71 char *r = (char *)rxvt_malloc (len * 4 + 1);
72 char *p = r;
73
74 while (len--)
75 {
76 unicode_t w = *str++ & UNICODE_MASK;
77
78 if (w < 0x000080)
79 *p++ = w;
80 else if (w < 0x000800)
81 *p++ = 0xc0 | ( w >> 6),
82 *p++ = 0x80 | ( w & 0x3f);
83 else if (w < 0x010000)
84 *p++ = 0xe0 | ( w >> 12 ),
85 *p++ = 0x80 | ((w >> 6) & 0x3f),
86 *p++ = 0x80 | ( w & 0x3f);
87 else if (w < 0x110000)
88 *p++ = 0xf0 | ( w >> 18),
89 *p++ = 0x80 | ((w >> 12) & 0x3f),
90 *p++ = 0x80 | ((w >> 6) & 0x3f),
91 *p++ = 0x80 | ( w & 0x3f);
92 else
93 *p++ = '?';
94 }
95
96 *p++ = 0;
97
98 return (char *)rxvt_realloc (r, p - r);
99}
100
101wchar_t *
102rxvt_utf8towcs (const char *str, int len)
103{
104 if (len < 0) len = strlen (str);
105
106 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)),
107 *p = r;
108
109 unsigned char *s = (unsigned char *)str,
110 *e = s + len;
111
112 for (;;)
113 {
114 len = e - s;
115
116 if (len == 0)
117 break;
118 else if (s[0] < 0x80)
119 *p++ = *s++;
120 else if (len >= 2
121 && s[0] >= 0xc2 && s[0] <= 0xdf
122 && (s[1] & 0xc0) == 0x80)
123 {
124 *p++ = ((s[0] & 0x1f) << 6)
125 | (s[1] & 0x3f);
126 s += 2;
127 }
128 else if (len >= 3
129 && ( (s[0] == 0xe0 && s[1] >= 0xa0 && s[1] <= 0xbf)
130 || (s[0] >= 0xe1 && s[0] <= 0xec && s[1] >= 0x80 && s[1] <= 0xbf)
131 || (s[0] == 0xed && s[1] >= 0x80 && s[1] <= 0x9f)
132 || (s[0] >= 0xee && s[0] <= 0xef && s[1] >= 0x80 && s[1] <= 0xbf)
133 )
134 && (s[2] & 0xc0) == 0x80)
135 {
136 *p++ = ((s[0] & 0x0f) << 12)
137 | ((s[1] & 0x3f) << 6)
138 | (s[2] & 0x3f);
139 s += 3;
140 }
141 else if (len >= 4
142 && ( (s[0] == 0xf0 && s[1] >= 0x90 && s[1] <= 0xbf)
143 || (s[0] >= 0xf1 && s[0] <= 0xf3 && s[1] >= 0x80 && s[1] <= 0xbf)
144 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f)
145 )
146 && (s[2] & 0xc0) == 0x80
147 && (s[3] & 0xc0) == 0x80)
148 {
149 *p++ = ((s[0] & 0x07) << 18)
150 | ((s[1] & 0x3f) << 12)
151 | ((s[2] & 0x3f) << 6)
152 | (s[3] & 0x3f);
153 s += 4;
154 }
155 else
156 {
157 *p++ = 0xfffd;
158 s++;
159 }
160 }
161
162 *p = 0;
163
164 return r;
165}
166
53char * 167char *
54rxvt_strdup (const char *str) 168rxvt_strdup (const char *str)
55{ 169{
56 return str ? strdup (str) : 0; 170 return str ? strdup (str) : 0;
57} 171}
58 172
59/* EXTPROTO */ 173/* INTPROTO */
60char * 174char *
61rxvt_r_basename (const char *str) 175rxvt_r_basename (const char *str)
62{ 176{
63 char *base = STRRCHR (str, '/'); 177 char *base = strrchr (str, '/');
64 178
65 return (char *) (base ? base + 1 : str); 179 return (char *) (base ? base + 1 : str);
66} 180}
67 181
68/* 182/*
69 * Print an error message 183 * Print an error message
70 */ 184 */
71/* EXTPROTO */ 185/* INTPROTO */
72void 186void
73rxvt_vlog (const char *fmt, va_list arg_ptr) 187rxvt_vlog (const char *fmt, va_list arg_ptr)
74{ 188{
75 char msg[1024]; 189 char msg[1024];
76 190
… …
80 (*GET_R->log_hook) (msg); 194 (*GET_R->log_hook) (msg);
81 else 195 else
82 write (STDOUT_FILENO, msg, strlen (msg)); 196 write (STDOUT_FILENO, msg, strlen (msg));
83} 197}
84 198
85/* EXTPROTO */ 199/* INTPROTO */
86void 200void
87rxvt_log (const char *fmt,...) 201rxvt_log (const char *fmt,...)
88{ 202{
89 va_list arg_ptr; 203 va_list arg_ptr;
90 204
… …
94} 208}
95 209
96/* 210/*
97 * Print an error message 211 * Print an error message
98 */ 212 */
99/* EXTPROTO */ 213/* INTPROTO */
100void 214void
101rxvt_warn (const char *fmt,...) 215rxvt_warn (const char *fmt,...)
102{ 216{
103 va_list arg_ptr; 217 va_list arg_ptr;
104 218
… …
107 va_start (arg_ptr, fmt); 221 va_start (arg_ptr, fmt);
108 rxvt_vlog (fmt, arg_ptr); 222 rxvt_vlog (fmt, arg_ptr);
109 va_end (arg_ptr); 223 va_end (arg_ptr);
110} 224}
111 225
112/* EXTPROTO */ 226/* INTPROTO */
113void 227void
114rxvt_fatal (const char *fmt,...) 228rxvt_fatal (const char *fmt,...)
115{ 229{
116 va_list arg_ptr; 230 va_list arg_ptr;
117 231
… …
124 rxvt_exit_failure (); 238 rxvt_exit_failure ();
125} 239}
126 240
127class rxvt_failure_exception rxvt_failure_exception; 241class rxvt_failure_exception rxvt_failure_exception;
128 242
129/* EXTPROTO */ 243/* INTPROTO */
130void 244void
131rxvt_exit_failure () 245rxvt_exit_failure ()
132{ 246{
133 throw (rxvt_failure_exception); 247 throw (rxvt_failure_exception);
134} 248}
… …
137 * check that the first characters of S1 match S2 251 * check that the first characters of S1 match S2
138 * 252 *
139 * No Match 253 * No Match
140 * return: 0 254 * return: 0
141 * Match 255 * Match
142 * return: STRLEN (S2) 256 * return: strlen (S2)
143 */ 257 */
144/* EXTPROTO */ 258/* INTPROTO */
145int 259int
146rxvt_Str_match (const char *s1, const char *s2) 260rxvt_Str_match (const char *s1, const char *s2)
147{ 261{
148 int n = STRLEN (s2); 262 int n = strlen (s2);
149 263
150 return ((STRNCMP (s1, s2, n) == 0) ? n : 0); 264 return ((strncmp (s1, s2, n) == 0) ? n : 0);
151} 265}
152 266
153/* EXTPROTO */ 267/* INTPROTO */
154const char * 268const char *
155rxvt_Str_skip_space (const char *str) 269rxvt_Str_skip_space (const char *str)
156{ 270{
157 if (str) 271 if (str)
158 while (*str && isspace (*str)) 272 while (*str && isspace (*str))
… …
163 277
164/* 278/*
165 * remove leading/trailing space and strip-off leading/trailing quotes. 279 * remove leading/trailing space and strip-off leading/trailing quotes.
166 * in place. 280 * in place.
167 */ 281 */
168/* EXTPROTO */ 282/* INTPROTO */
169char * 283char *
170rxvt_Str_trim (char *str) 284rxvt_Str_trim (char *str)
171{ 285{
172 char *r, *s; 286 char *r, *s;
173 int n;
174 287
175 if (!str || !*str) /* shortcut */ 288 if (!str || !*str) /* shortcut */
176 return str; 289 return str;
177 290
178 /* skip leading spaces */ 291 /* skip leading spaces */
179 for (s = str; *s && isspace (*s); s++) ; 292 for (s = str; *s && isspace (*s); s++) ;
293
180 /* goto end of string */ 294 /* goto end of string */
181 for (n = 0, r = s; *r++; n++) ; 295 r = s + strlen (s) - 1;
182 r -= 2; 296
183 /* dump return */ 297 /* dump return and other trailing whitespace */
184 if (n > 0 && *r == '\n') 298 while (r > s && isspace (*r))
185 n--, r--; 299 r--;
186 /* backtrack along trailing spaces */ 300
187 for (; n > 0 && isspace (*r); r--, n--) ; 301#if 0
188 /* skip matching leading/trailing quotes */ 302 /* skip matching leading/trailing quotes */
189 if (*s == '"' && *r == '"' && n > 1) 303 if (*s == '"' && *r == '"' && n > 1)
190 { 304 {
191 s++; 305 s++;
192 n -= 2; 306 n -= 2;
193 } 307 }
308#endif
194 309
195 /* copy back over: forwards copy */ 310 memmove (str, s, r + 1 - s);
196 for (r = str; n; n--) 311 str[r + 1 - s] = 0;
197 *r++ = *s++;
198 *r = '\0';
199 312
200 return str; 313 return str;
201} 314}
202 315
203/* 316/*
… …
212 * "M-x" prefixed strings, append "\r" if needed 325 * "M-x" prefixed strings, append "\r" if needed
213 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed 326 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
214 * 327 *
215 * returns the converted string length 328 * returns the converted string length
216 */ 329 */
217/* EXTPROTO */ 330/* INTPROTO */
218int 331int
219rxvt_Str_escaped (char *str) 332rxvt_Str_escaped (char *str)
220{ 333{
221 char ch, *s, *d; 334 char ch, *s, *d;
222 int i, num, append = 0; 335 int i, num, append = 0;
… …
286 return (d - str); 399 return (d - str);
287} 400}
288 401
289/* 402/*
290 * Split a comma-separated string into an array, stripping leading and 403 * Split a comma-separated string into an array, stripping leading and
291 * trailing spaces (and paired quotes) from each entry. Empty strings 404 * trailing spaces from each entry. Empty strings are properly returned
292 * are properly returned
293 * Caller should free each entry and array when done 405 * Caller should free each entry and array when done
294 */ 406 */
295/* EXTPROTO */ 407/* INTPROTO */
296char ** 408char **
297rxvt_splitcommastring (const char *cs) 409rxvt_splitcommastring (const char *cs)
298{ 410{
299 int l, n, p; 411 int l, n, p;
300 const char *s, *t; 412 const char *s, *t;
… …
304 s = ""; 416 s = "";
305 417
306 for (n = 1, t = s; *t; t++) 418 for (n = 1, t = s; *t; t++)
307 if (*t == ',') 419 if (*t == ',')
308 n++; 420 n++;
421
309 ret = (char **)malloc ((n + 1) * sizeof (char *)); 422 ret = (char **)malloc ((n + 1) * sizeof (char *));
310 ret[n] = NULL; 423 ret[n] = NULL;
311 424
312 for (l = 0, t = s; l < n; l++) 425 for (l = 0, t = s; l < n; l++)
313 { 426 {
… …
317 strncpy (ret[l], s, p); 430 strncpy (ret[l], s, p);
318 ret[l][p] = '\0'; 431 ret[l][p] = '\0';
319 rxvt_Str_trim (ret[l]); 432 rxvt_Str_trim (ret[l]);
320 s = ++t; 433 s = ++t;
321 } 434 }
435
322 return ret; 436 return ret;
437}
438
439void
440rxvt_freecommastring (char **cs)
441{
442 for (int i = 0; cs[i]; ++i)
443 free (cs[i]);
444
445 free (cs);
323} 446}
324 447
325/*----------------------------------------------------------------------* 448/*----------------------------------------------------------------------*
326 * file searching 449 * file searching
327 */ 450 */
… …
342 int maxpath, len; 465 int maxpath, len;
343 const char *p, *path; 466 const char *p, *path;
344 char name[256]; 467 char name[256];
345 468
346 if (!access (file, R_OK)) /* found (plain name) in current directory */ 469 if (!access (file, R_OK)) /* found (plain name) in current directory */
347 return STRDUP (file); 470 return strdup (file);
348 471
349 /* semi-colon delimited */ 472 /* semi-colon delimited */
350 if ((p = STRCHR (file, ';'))) 473 if ((p = strchr (file, ';')))
351 len = (p - file); 474 len = (p - file);
352 else 475 else
353 len = STRLEN (file); 476 len = strlen (file);
354 477
355#ifdef DEBUG_SEARCH_PATH 478#ifdef DEBUG_SEARCH_PATH
356 getcwd (name, sizeof (name)); 479 getcwd (name, sizeof (name));
357 fprintf (stderr, "pwd: \"%s\"\n", name); 480 fprintf (stderr, "pwd: \"%s\"\n", name);
358 fprintf (stderr, "find: \"%.*s\"\n", len, file); 481 fprintf (stderr, "find: \"%.*s\"\n", len, file);
359#endif 482#endif
360 483
361 /* leave room for an extra '/' and trailing '\0' */ 484 /* leave room for an extra '/' and trailing '\0' */
362 maxpath = sizeof (name) - (len + (ext ? STRLEN (ext) : 0) + 2); 485 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
363 if (maxpath <= 0) 486 if (maxpath <= 0)
364 return NULL; 487 return NULL;
365 488
366 /* check if we can find it now */ 489 /* check if we can find it now */
367 STRNCPY (name, file, len); 490 strncpy (name, file, len);
368 name[len] = '\0'; 491 name[len] = '\0';
369 492
370 if (!access (name, R_OK)) 493 if (!access (name, R_OK))
371 return STRDUP (name); 494 return strdup (name);
372 if (ext) 495 if (ext)
373 { 496 {
374 STRCAT (name, ext); 497 strcat (name, ext);
375 if (!access (name, R_OK)) 498 if (!access (name, R_OK))
376 return STRDUP (name); 499 return strdup (name);
377 } 500 }
378 for (path = pathlist; path != NULL && *path != '\0'; path = p) 501 for (path = pathlist; path != NULL && *path != '\0'; path = p)
379 { 502 {
380 int n; 503 int n;
381 504
382 /* colon delimited */ 505 /* colon delimited */
383 if ((p = STRCHR (path, ':')) == NULL) 506 if ((p = strchr (path, ':')) == NULL)
384 p = STRCHR (path, '\0'); 507 p = strchr (path, '\0');
385 508
386 n = (p - path); 509 n = (p - path);
387 if (*p != '\0') 510 if (*p != '\0')
388 p++; 511 p++;
389 512
390 if (n > 0 && n <= maxpath) 513 if (n > 0 && n <= maxpath)
391 { 514 {
392 STRNCPY (name, path, n); 515 strncpy (name, path, n);
393 if (name[n - 1] != '/') 516 if (name[n - 1] != '/')
394 name[n++] = '/'; 517 name[n++] = '/';
395 name[n] = '\0'; 518 name[n] = '\0';
396 STRNCAT (name, file, len); 519 strncat (name, file, len);
397 520
398 if (!access (name, R_OK)) 521 if (!access (name, R_OK))
399 return STRDUP (name); 522 return strdup (name);
400 if (ext) 523 if (ext)
401 { 524 {
402 STRCAT (name, ext); 525 strcat (name, ext);
403 if (!access (name, R_OK)) 526 if (!access (name, R_OK))
404 return STRDUP (name); 527 return strdup (name);
405 } 528 }
406 } 529 }
407 } 530 }
408 return NULL; 531 return NULL;
409} 532}
410 533
411/* EXTPROTO */ 534/* INTPROTO */
412char * 535char *
413rxvt_File_find (const char *file, const char *ext, const char *path) 536rxvt_File_find (const char *file, const char *ext, const char *path)
414{ 537{
415 char *f; 538 char *f;
416 539
… …
439 562
440/* 563/*
441 * Draw top/left and bottom/right border shadows around windows 564 * Draw top/left and bottom/right border shadows around windows
442 */ 565 */
443#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 566#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
444/* EXTPROTO */ 567/* INTPROTO */
445void 568void
446rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) 569rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
447{ 570{
448 int shadow; 571 int shadow;
449 572
… …
460} 583}
461#endif 584#endif
462 585
463/* button shapes */ 586/* button shapes */
464#ifdef MENUBAR 587#ifdef MENUBAR
465/* EXTPROTO */ 588/* INTPROTO */
466void 589void
467rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type) 590rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
468{ 591{
469 switch (type) 592 switch (type)
470 { 593 {

Diff Legend

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