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

Diff Legend

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