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.13 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.19 by root, Sun Dec 12 06:30:25 2004 UTC

… …
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--)
… …
47 *dst++ = 0; 48 *dst++ = 0;
48 49
49 return r; 50 return r;
50} 51}
51 52
52/* EXTPROTO */ 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 (mbstowcs (r, str, len + 1) < 0)
61 *r = 0;
62
63 return r;
64}
65
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++;
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 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 wchar_t *p = r;
108
109 unsigned char *s = (unsigned char *)str;
110
111 while (len--)
112 {
113 if (s[0] < 0x80)
114 *p++ = *s++;
115 else if (len > 0
116 && s[0] >= 0xc2 && s[0] <= 0xdf
117 && (s[1] & 0xc0) == 0x80)
118 {
119 *p++ = ((s[0] & 0x1f) << 6)
120 | (s[1] & 0x3f);
121 s += 2;
122 }
123 else if (len > 1
124 && ( (s[0] == 0xe0 && s[1] >= 0xa0 && s[1] <= 0xbf)
125 || (s[0] >= 0xe1 && s[0] <= 0xec && s[1] >= 0x80 && s[1] <= 0xbf)
126 || (s[0] == 0xed && s[1] >= 0x80 && s[1] <= 0x9f)
127 || (s[0] >= 0xee && s[0] <= 0xef && s[1] >= 0x80 && s[1] <= 0xbf)
128 )
129 && (s[2] & 0xc0) == 0x80)
130 {
131 *p++ = ((s[0] & 0x0f) << 12)
132 | ((s[1] & 0x3f) << 6)
133 | (s[2] & 0x3f);
134 s += 3;
135 }
136 else if (len > 2
137 && ( (s[0] == 0xf0 && s[1] >= 0x90 && s[1] <= 0xbf)
138 || (s[0] >= 0xf1 && s[0] <= 0xf3 && s[1] >= 0x80 && s[1] <= 0xbf)
139 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f)
140 )
141 && (s[2] & 0xc0) == 0x80
142 && (s[3] & 0xc0) == 0x80)
143 {
144 *p++ = ((s[0] & 0x07) << 18)
145 | ((s[1] & 0x3f) << 12)
146 | ((s[2] & 0x3f) << 6)
147 | (s[3] & 0x3f);
148 s += 4;
149 }
150 else
151 {
152 *p++ = 0xfffd;
153 s++;
154 }
155 }
156
157 *p = 0;
158
159 return r;
160}
161
53char * 162char *
54rxvt_strdup (const char *str) 163rxvt_strdup (const char *str)
55{ 164{
56 return str ? strdup (str) : 0; 165 return str ? strdup (str) : 0;
57} 166}
58 167
59/* EXTPROTO */ 168/* INTPROTO */
60char * 169char *
61rxvt_r_basename (const char *str) 170rxvt_r_basename (const char *str)
62{ 171{
63 char *base = STRRCHR (str, '/'); 172 char *base = strrchr (str, '/');
64 173
65 return (char *) (base ? base + 1 : str); 174 return (char *) (base ? base + 1 : str);
66} 175}
67 176
68/* 177/*
69 * Print an error message 178 * Print an error message
70 */ 179 */
71/* EXTPROTO */ 180/* INTPROTO */
72void 181void
73rxvt_vlog (const char *fmt, va_list arg_ptr) 182rxvt_vlog (const char *fmt, va_list arg_ptr)
74{ 183{
75 char msg[1024]; 184 char msg[1024];
76 185
… …
80 (*GET_R->log_hook) (msg); 189 (*GET_R->log_hook) (msg);
81 else 190 else
82 write (STDOUT_FILENO, msg, strlen (msg)); 191 write (STDOUT_FILENO, msg, strlen (msg));
83} 192}
84 193
85/* EXTPROTO */ 194/* INTPROTO */
86void 195void
87rxvt_log (const char *fmt,...) 196rxvt_log (const char *fmt,...)
88{ 197{
89 va_list arg_ptr; 198 va_list arg_ptr;
90 199
… …
94} 203}
95 204
96/* 205/*
97 * Print an error message 206 * Print an error message
98 */ 207 */
99/* EXTPROTO */ 208/* INTPROTO */
100void 209void
101rxvt_warn (const char *fmt,...) 210rxvt_warn (const char *fmt,...)
102{ 211{
103 va_list arg_ptr; 212 va_list arg_ptr;
104 213
… …
107 va_start (arg_ptr, fmt); 216 va_start (arg_ptr, fmt);
108 rxvt_vlog (fmt, arg_ptr); 217 rxvt_vlog (fmt, arg_ptr);
109 va_end (arg_ptr); 218 va_end (arg_ptr);
110} 219}
111 220
112/* EXTPROTO */ 221/* INTPROTO */
113void 222void
114rxvt_fatal (const char *fmt,...) 223rxvt_fatal (const char *fmt,...)
115{ 224{
116 va_list arg_ptr; 225 va_list arg_ptr;
117 226
… …
124 rxvt_exit_failure (); 233 rxvt_exit_failure ();
125} 234}
126 235
127class rxvt_failure_exception rxvt_failure_exception; 236class rxvt_failure_exception rxvt_failure_exception;
128 237
129/* EXTPROTO */ 238/* INTPROTO */
130void 239void
131rxvt_exit_failure () 240rxvt_exit_failure ()
132{ 241{
133 throw (rxvt_failure_exception); 242 throw (rxvt_failure_exception);
134} 243}
… …
137 * check that the first characters of S1 match S2 246 * check that the first characters of S1 match S2
138 * 247 *
139 * No Match 248 * No Match
140 * return: 0 249 * return: 0
141 * Match 250 * Match
142 * return: STRLEN (S2) 251 * return: strlen (S2)
143 */ 252 */
144/* EXTPROTO */ 253/* INTPROTO */
145int 254int
146rxvt_Str_match (const char *s1, const char *s2) 255rxvt_Str_match (const char *s1, const char *s2)
147{ 256{
148 int n = STRLEN (s2); 257 int n = strlen (s2);
149 258
150 return ((STRNCMP (s1, s2, n) == 0) ? n : 0); 259 return ((strncmp (s1, s2, n) == 0) ? n : 0);
151} 260}
152 261
153/* EXTPROTO */ 262/* INTPROTO */
154const char * 263const char *
155rxvt_Str_skip_space (const char *str) 264rxvt_Str_skip_space (const char *str)
156{ 265{
157 if (str) 266 if (str)
158 while (*str && isspace (*str)) 267 while (*str && isspace (*str))
… …
163 272
164/* 273/*
165 * remove leading/trailing space and strip-off leading/trailing quotes. 274 * remove leading/trailing space and strip-off leading/trailing quotes.
166 * in place. 275 * in place.
167 */ 276 */
168/* EXTPROTO */ 277/* INTPROTO */
169char * 278char *
170rxvt_Str_trim (char *str) 279rxvt_Str_trim (char *str)
171{ 280{
172 char *r, *s; 281 char *r, *s;
173 int n; 282 int n;
… …
212 * "M-x" prefixed strings, append "\r" if needed 321 * "M-x" prefixed strings, append "\r" if needed
213 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed 322 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
214 * 323 *
215 * returns the converted string length 324 * returns the converted string length
216 */ 325 */
217/* EXTPROTO */ 326/* INTPROTO */
218int 327int
219rxvt_Str_escaped (char *str) 328rxvt_Str_escaped (char *str)
220{ 329{
221 char ch, *s, *d; 330 char ch, *s, *d;
222 int i, num, append = 0; 331 int i, num, append = 0;
… …
290 * Split a comma-separated string into an array, stripping leading and 399 * Split a comma-separated string into an array, stripping leading and
291 * trailing spaces (and paired quotes) from each entry. Empty strings 400 * trailing spaces (and paired quotes) from each entry. Empty strings
292 * are properly returned 401 * are properly returned
293 * Caller should free each entry and array when done 402 * Caller should free each entry and array when done
294 */ 403 */
295/* EXTPROTO */ 404/* INTPROTO */
296char ** 405char **
297rxvt_splitcommastring (const char *cs) 406rxvt_splitcommastring (const char *cs)
298{ 407{
299 int l, n, p; 408 int l, n, p;
300 const char *s, *t; 409 const char *s, *t;
… …
320 s = ++t; 429 s = ++t;
321 } 430 }
322 return ret; 431 return ret;
323} 432}
324 433
434void
435rxvt_freecommastring (char **cs)
436{
437 for (int i = 0; cs[i]; ++i)
438 free (cs[i]);
439
440 free (cs);
441}
442
325/*----------------------------------------------------------------------* 443/*----------------------------------------------------------------------*
326 * file searching 444 * file searching
327 */ 445 */
328 446
329/* #define DEBUG_SEARCH_PATH */ 447/* #define DEBUG_SEARCH_PATH */
… …
342 int maxpath, len; 460 int maxpath, len;
343 const char *p, *path; 461 const char *p, *path;
344 char name[256]; 462 char name[256];
345 463
346 if (!access (file, R_OK)) /* found (plain name) in current directory */ 464 if (!access (file, R_OK)) /* found (plain name) in current directory */
347 return STRDUP (file); 465 return strdup (file);
348 466
349 /* semi-colon delimited */ 467 /* semi-colon delimited */
350 if ((p = STRCHR (file, ';'))) 468 if ((p = strchr (file, ';')))
351 len = (p - file); 469 len = (p - file);
352 else 470 else
353 len = STRLEN (file); 471 len = strlen (file);
354 472
355#ifdef DEBUG_SEARCH_PATH 473#ifdef DEBUG_SEARCH_PATH
356 getcwd (name, sizeof (name)); 474 getcwd (name, sizeof (name));
357 fprintf (stderr, "pwd: \"%s\"\n", name); 475 fprintf (stderr, "pwd: \"%s\"\n", name);
358 fprintf (stderr, "find: \"%.*s\"\n", len, file); 476 fprintf (stderr, "find: \"%.*s\"\n", len, file);
359#endif 477#endif
360 478
361 /* leave room for an extra '/' and trailing '\0' */ 479 /* leave room for an extra '/' and trailing '\0' */
362 maxpath = sizeof (name) - (len + (ext ? STRLEN (ext) : 0) + 2); 480 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
363 if (maxpath <= 0) 481 if (maxpath <= 0)
364 return NULL; 482 return NULL;
365 483
366 /* check if we can find it now */ 484 /* check if we can find it now */
367 STRNCPY (name, file, len); 485 strncpy (name, file, len);
368 name[len] = '\0'; 486 name[len] = '\0';
369 487
370 if (!access (name, R_OK)) 488 if (!access (name, R_OK))
371 return STRDUP (name); 489 return strdup (name);
372 if (ext) 490 if (ext)
373 { 491 {
374 STRCAT (name, ext); 492 strcat (name, ext);
375 if (!access (name, R_OK)) 493 if (!access (name, R_OK))
376 return STRDUP (name); 494 return strdup (name);
377 } 495 }
378 for (path = pathlist; path != NULL && *path != '\0'; path = p) 496 for (path = pathlist; path != NULL && *path != '\0'; path = p)
379 { 497 {
380 int n; 498 int n;
381 499
382 /* colon delimited */ 500 /* colon delimited */
383 if ((p = STRCHR (path, ':')) == NULL) 501 if ((p = strchr (path, ':')) == NULL)
384 p = STRCHR (path, '\0'); 502 p = strchr (path, '\0');
385 503
386 n = (p - path); 504 n = (p - path);
387 if (*p != '\0') 505 if (*p != '\0')
388 p++; 506 p++;
389 507
390 if (n > 0 && n <= maxpath) 508 if (n > 0 && n <= maxpath)
391 { 509 {
392 STRNCPY (name, path, n); 510 strncpy (name, path, n);
393 if (name[n - 1] != '/') 511 if (name[n - 1] != '/')
394 name[n++] = '/'; 512 name[n++] = '/';
395 name[n] = '\0'; 513 name[n] = '\0';
396 STRNCAT (name, file, len); 514 strncat (name, file, len);
397 515
398 if (!access (name, R_OK)) 516 if (!access (name, R_OK))
399 return STRDUP (name); 517 return strdup (name);
400 if (ext) 518 if (ext)
401 { 519 {
402 STRCAT (name, ext); 520 strcat (name, ext);
403 if (!access (name, R_OK)) 521 if (!access (name, R_OK))
404 return STRDUP (name); 522 return strdup (name);
405 } 523 }
406 } 524 }
407 } 525 }
408 return NULL; 526 return NULL;
409} 527}
410 528
411/* EXTPROTO */ 529/* INTPROTO */
412char * 530char *
413rxvt_File_find (const char *file, const char *ext, const char *path) 531rxvt_File_find (const char *file, const char *ext, const char *path)
414{ 532{
415 char *f; 533 char *f;
416 534
… …
439 557
440/* 558/*
441 * Draw top/left and bottom/right border shadows around windows 559 * Draw top/left and bottom/right border shadows around windows
442 */ 560 */
443#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 561#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
444/* EXTPROTO */ 562/* INTPROTO */
445void 563void
446rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) 564rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
447{ 565{
448 int shadow; 566 int shadow;
449 567
… …
460} 578}
461#endif 579#endif
462 580
463/* button shapes */ 581/* button shapes */
464#ifdef MENUBAR 582#ifdef MENUBAR
465/* EXTPROTO */ 583/* INTPROTO */
466void 584void
467rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type) 585rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
468{ 586{
469 switch (type) 587 switch (type)
470 { 588 {

Diff Legend

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