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.4 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.34 by root, Mon Jan 16 16:19:19 2006 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>
8 * Copyright (c) 1998-2000 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1998-2000 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
9 * 10 *
10 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 14 * (at your option) any later version.
… …
22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
24 25
25#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
26#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
27#include "misc.intpro" /* PROTOS for internal routines */
28 28
29/* EXTPROTO */ 29char *
30rxvt_wcstombs (const wchar_t *str, int len)
31{
32 if (len < 0) len = wcslen (str);
33
34 mbstate mbs;
35 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1);
36
37 char *dst = r;
38 while (len--)
39 {
40 ssize_t l = wcrtomb (dst, *str++, mbs);
41
42 if (l < 0)
43 *dst++ = '?';
44 else
45 dst += l;
46 }
47
48 *dst++ = 0;
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
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++ & 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
30char * 167char *
31rxvt_strdup (const char *str) 168rxvt_strdup (const char *str)
32{ 169{
33 return str ? strdup (str) : 0; 170 return str ? strdup (str) : 0;
34} 171}
35 172
36/* EXTPROTO */ 173char *
37char *
38rxvt_r_basename(const char *str) 174rxvt_r_basename (const char *str)
39{ 175{
40 char *base = STRRCHR(str, '/'); 176 char *base = strrchr (str, '/');
41 177
42 return (char *)(base ? base + 1 : str); 178 return (char *) (base ? base + 1 : str);
43} 179}
44 180
45/* 181/*
46 * Print an error message 182 * Print an error message
47 */ 183 */
48/* EXTPROTO */
49void 184void
185rxvt_vlog (const char *fmt, va_list arg_ptr)
186{
187 char msg[1024];
188
189 vsnprintf (msg, sizeof msg, fmt, arg_ptr);
190
191 if (GET_R && GET_R->log_hook)
192 (*GET_R->log_hook) (msg);
193 else
194 write (STDOUT_FILENO, msg, strlen (msg));
195}
196
197void
50rxvt_print_error(const char *fmt,...) 198rxvt_log (const char *fmt,...)
51{ 199{
52 va_list arg_ptr; 200 va_list arg_ptr;
53 201
54 va_start(arg_ptr, fmt); 202 va_start (arg_ptr, fmt);
55 fprintf(stderr, APL_NAME ": "); 203 rxvt_vlog (fmt, arg_ptr);
56 vfprintf(stderr, fmt, arg_ptr);
57 fprintf(stderr, "\n");
58 va_end(arg_ptr); 204 va_end (arg_ptr);
205}
206
207/*
208 * Print an error message
209 */
210void
211rxvt_warn (const char *fmt,...)
212{
213 va_list arg_ptr;
214
215 rxvt_log ("%s: ", RESNAME);
216
217 va_start (arg_ptr, fmt);
218 rxvt_vlog (fmt, arg_ptr);
219 va_end (arg_ptr);
220}
221
222void
223rxvt_fatal (const char *fmt,...)
224{
225 va_list arg_ptr;
226
227 rxvt_log ("%s: ", RESNAME);
228
229 va_start (arg_ptr, fmt);
230 rxvt_vlog (fmt, arg_ptr);
231 va_end (arg_ptr);
232
233 rxvt_exit_failure ();
234}
235
236class rxvt_failure_exception rxvt_failure_exception;
237
238void
239rxvt_exit_failure ()
240{
241 throw (rxvt_failure_exception);
59} 242}
60 243
61/* 244/*
62 * check that the first characters of S1 match S2 245 * check that the first characters of S1 match S2
63 * 246 *
64 * No Match 247 * No Match
65 * return: 0 248 * return: 0
66 * Match 249 * Match
67 * return: STRLEN (S2) 250 * return: strlen (S2)
68 */ 251 */
69/* EXTPROTO */
70int 252int
71rxvt_Str_match(const char *s1, const char *s2) 253rxvt_Str_match (const char *s1, const char *s2)
72{ 254{
73 int n = STRLEN(s2); 255 int n = strlen (s2);
74 256
75 return ((STRNCMP(s1, s2, n) == 0) ? n : 0); 257 return ((strncmp (s1, s2, n) == 0) ? n : 0);
76} 258}
77 259
78/* EXTPROTO */
79const char * 260const char *
80rxvt_Str_skip_space(const char *str) 261rxvt_Str_skip_space (const char *str)
81{ 262{
82 if (str) 263 if (str)
83 while (*str && isspace(*str)) 264 while (*str && isspace (*str))
84 str++; 265 str++;
266
85 return str; 267 return str;
86} 268}
87 269
88/* 270/*
89 * remove leading/trailing space and strip-off leading/trailing quotes. 271 * remove leading/trailing space and strip-off leading/trailing quotes.
90 * in place. 272 * in place.
91 */ 273 */
92/* EXTPROTO */
93char * 274char *
94rxvt_Str_trim(char *str) 275rxvt_Str_trim (char *str)
95{ 276{
96 char *r, *s; 277 char *r, *s;
97 int n;
98 278
99 if (!str || !*str) /* shortcut */ 279 if (!str || !*str) /* shortcut */
100 return str;
101
102/* skip leading spaces */
103 for (s = str; *s && isspace(*s); s++) ;
104/* goto end of string */
105 for (n = 0, r = s; *r++; n++) ;
106 r -= 2;
107/* dump return */
108 if (n > 0 && *r == '\n')
109 n--, r--;
110/* backtrack along trailing spaces */
111 for (; n > 0 && isspace(*r); r--, n--) ;
112/* skip matching leading/trailing quotes */
113 if (*s == '"' && *r == '"' && n > 1) {
114 s++;
115 n -= 2;
116 }
117/* copy back over: forwards copy */
118 for (r = str; n; n--)
119 *r++ = *s++;
120 *r = '\0';
121
122 return str; 280 return str;
281
282 /* skip leading spaces */
283 for (s = str; *s && isspace (*s); s++) ;
284
285 /* goto end of string */
286 r = s + strlen (s) - 1;
287
288 /* dump return and other trailing whitespace */
289 while (r > s && isspace (*r))
290 r--;
291
292#if 0
293 /* skip matching leading/trailing quotes */
294 if (*s == '"' && *r == '"' && n > 1)
295 {
296 s++;
297 n -= 2;
298 }
299#endif
300
301 memmove (str, s, r + 1 - s);
302 str[r + 1 - s] = 0;
303
304 return str;
123} 305}
124 306
125/* 307/*
126 * in-place interpretation of string: 308 * in-place interpretation of string:
127 * 309 *
… …
134 * "M-x" prefixed strings, append "\r" if needed 316 * "M-x" prefixed strings, append "\r" if needed
135 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed 317 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
136 * 318 *
137 * returns the converted string length 319 * returns the converted string length
138 */ 320 */
139/* EXTPROTO */
140int 321int
141rxvt_Str_escaped(char *str) 322rxvt_Str_escaped (char *str)
142{ 323{
143 char ch, *s, *d; 324 char ch, *s, *d;
144 int i, num, append = 0; 325 int i, num, append = 0;
145 326
146 if (!str || !*str) 327 if (!str || !*str)
147 return 0; 328 return 0;
148 329
149 d = s = str; 330 d = s = str;
150 331
151 if (*s == 'M' && s[1] == '-') { 332 if (*s == 'M' && s[1] == '-')
333 {
152 /* Emacs convenience, replace leading `M-..' with `\E..' */ 334 /* Emacs convenience, replace leading `M-..' with `\E..' */
153 *d++ = C0_ESC; 335 *d++ = C0_ESC;
154 s += 2; 336 s += 2;
155 if (toupper(*s) == 'X') 337 if (toupper (*s) == 'X')
156 /* append carriage-return for `M-xcommand' */ 338 /* append carriage-return for `M-xcommand' */
157 for (*d++ = 'x', append = '\r', s++; isspace(*s); s++) ; 339 for (*d++ = 'x', append = '\r', s++; isspace (*s); s++) ;
158 } 340 }
159 for (; (ch = *s++);) { 341 for (; (ch = *s++);)
342 {
160 if (ch == '\\') { 343 if (ch == '\\')
344 {
161 ch = *s++; 345 ch = *s++;
162 if (ch >= '0' && ch <= '7') { /* octal */ 346 if (ch >= '0' && ch <= '7')
163 num = ch - '0'; 347 { /* octal */
348 num = ch - '0';
164 for (i = 0; i < 2; i++, s++) { 349 for (i = 0; i < 2; i++, s++)
165 ch = *s; 350 {
351 ch = *s;
166 if (ch < '0' || ch > '7') 352 if (ch < '0' || ch > '7')
167 break; 353 break;
168 num = num * 8 + ch - '0'; 354 num = num * 8 + ch - '0';
169 } 355 }
170 ch = (char)num; 356 ch = (char)num;
171 } else if (ch == 'a') 357 }
358 else if (ch == 'a')
172 ch = C0_BEL; /* bell */ 359 ch = C0_BEL; /* bell */
173 else if (ch == 'b') 360 else if (ch == 'b')
174 ch = C0_BS; /* backspace */ 361 ch = C0_BS; /* backspace */
175 else if (ch == 'E' || ch == 'e') 362 else if (ch == 'E' || ch == 'e')
176 ch = C0_ESC; /* escape */ 363 ch = C0_ESC; /* escape */
364 else if (ch == 'n')
365 ch = '\n'; /* newline */
366 else if (ch == 'r')
367 ch = '\r'; /* carriage-return */
368 else if (ch == 't')
369 ch = C0_HT; /* tab */
370 }
177 else if (ch == 'n') 371 else if (ch == '^')
178 ch = '\n'; /* newline */ 372 {
179 else if (ch == 'r')
180 ch = '\r'; /* carriage-return */
181 else if (ch == 't')
182 ch = C0_HT; /* tab */
183 } else if (ch == '^') {
184 ch = *s++; 373 ch = *s++;
185 ch = toupper(ch); 374 ch = toupper (ch);
186 ch = (ch == '?' ? 127 : (ch - '@')); 375 ch = (ch == '?' ? 127 : (ch - '@'));
187 } 376 }
188 *d++ = ch; 377 *d++ = ch;
189 } 378 }
190 379
191/* ESC] is an XTerm escape sequence, must be terminated */ 380 /* ESC] is an XTerm escape sequence, must be terminated */
192 if (*str == '\0' && str[1] == C0_ESC && str[2] == ']') 381 if (*str == '\0' && str[1] == C0_ESC && str[2] == ']')
193 append = CHAR_ST; 382 append = CHAR_ST;
194 383
195/* add trailing character as required */ 384 /* add trailing character as required */
196 if (append && d[-1] != append) 385 if (append && d[-1] != append)
197 *d++ = append; 386 *d++ = append;
198 *d = '\0'; 387 *d = '\0';
199 388
200 return (d - str); 389 return (d - str);
201} 390}
202 391
203/* 392/*
204 * Split a comma-separated string into an array, stripping leading and 393 * Split a comma-separated string into an array, stripping leading and
205 * trailing spaces (and paired quotes) from each entry. Empty strings 394 * trailing spaces from each entry. Empty strings are properly returned
206 * are properly returned
207 * Caller should free each entry and array when done 395 * Caller should free each entry and array when done
208 */ 396 */
209/* EXTPROTO */
210char ** 397char **
211rxvt_splitcommastring(const char *cs) 398rxvt_splitcommastring (const char *cs)
212{ 399{
213 int l, n, p; 400 int l, n, p;
214 const char *s, *t; 401 const char *s, *t;
215 char **ret; 402 char **ret;
216 403
217 if ((s = cs) == NULL) 404 if ((s = cs) == NULL)
218 s = ""; 405 s = "";
219 406
220 for (n = 1, t = s; *t; t++) 407 for (n = 1, t = s; *t; t++)
221 if (*t == ',') 408 if (*t == ',')
222 n++; 409 n++;
410
223 ret = (char **)malloc((n + 1) * sizeof(char *)); 411 ret = (char **)malloc ((n + 1) * sizeof (char *));
224 ret[n] = NULL; 412 ret[n] = NULL;
225 413
226 for (l = 0, t = s; l < n; l++) { 414 for (l = 0, t = s; l < n; l++)
415 {
227 for ( ; *t && *t != ','; t++) ; 416 for ( ; *t && *t != ','; t++) ;
228 p = t - s; 417 p = t - s;
229 ret[l] = (char *)malloc(p + 1); 418 ret[l] = (char *)malloc (p + 1);
230 strncpy(ret[l], s, p); 419 strncpy (ret[l], s, p);
231 ret[l][p] = '\0'; 420 ret[l][p] = '\0';
232 rxvt_Str_trim(ret[l]); 421 rxvt_Str_trim (ret[l]);
233 s = ++t; 422 s = ++t;
234 } 423 }
424
235 return ret; 425 return ret;
426}
427
428void
429rxvt_freecommastring (char **cs)
430{
431 for (int i = 0; cs[i]; ++i)
432 free (cs[i]);
433
434 free (cs);
236} 435}
237 436
238/*----------------------------------------------------------------------* 437/*----------------------------------------------------------------------*
239 * file searching 438 * file searching
240 */ 439 */
241 440
242/* #define DEBUG_SEARCH_PATH */ 441/* #define DEBUG_SEARCH_PATH */
243 442
244#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 443#ifdef XPM_BACKGROUND
245/* 444/*
246 * search for FILE in the current working directory, and within the 445 * search for FILE in the current working directory, and within the
247 * colon-delimited PATHLIST, adding the file extension EXT if required. 446 * colon-delimited PATHLIST, adding the file extension EXT if required.
248 * 447 *
249 * FILE is either semi-colon or zero terminated 448 * FILE is either semi-colon or zero terminated
250 */ 449 */
251/* INTPROTO */
252char * 450char *
253rxvt_File_search_path(const char *pathlist, const char *file, const char *ext) 451rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
254{ 452{
255 int maxpath, len; 453 int maxpath, len;
256 const char *p, *path; 454 const char *p, *path;
257 char name[256]; 455 char name[256];
258 456
259 if (!access(file, R_OK)) /* found (plain name) in current directory */ 457 if (!access (file, R_OK)) /* found (plain name) in current directory */
260 return STRDUP(file); 458 return strdup (file);
261 459
262/* semi-colon delimited */ 460 /* semi-colon delimited */
263 if ((p = STRCHR(file, ';'))) 461 if ((p = strchr (file, ';')))
264 len = (p - file); 462 len = (p - file);
265 else 463 else
266 len = STRLEN(file); 464 len = strlen (file);
267 465
268#ifdef DEBUG_SEARCH_PATH 466#ifdef DEBUG_SEARCH_PATH
269 getcwd(name, sizeof(name)); 467 getcwd (name, sizeof (name));
270 fprintf(stderr, "pwd: \"%s\"\n", name); 468 fprintf (stderr, "pwd: \"%s\"\n", name);
271 fprintf(stderr, "find: \"%.*s\"\n", len, file); 469 fprintf (stderr, "find: \"%.*s\"\n", len, file);
272#endif 470#endif
273 471
274/* leave room for an extra '/' and trailing '\0' */ 472 /* leave room for an extra '/' and trailing '\0' */
275 maxpath = sizeof(name) - (len + (ext ? STRLEN(ext) : 0) + 2); 473 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
276 if (maxpath <= 0) 474 if (maxpath <= 0)
277 return NULL;
278
279/* check if we can find it now */
280 STRNCPY(name, file, len);
281 name[len] = '\0';
282
283 if (!access(name, R_OK))
284 return STRDUP(name);
285 if (ext) {
286 STRCAT(name, ext);
287 if (!access(name, R_OK))
288 return STRDUP(name);
289 }
290 for (path = pathlist; path != NULL && *path != '\0'; path = p) {
291 int n;
292
293 /* colon delimited */
294 if ((p = STRCHR(path, ':')) == NULL)
295 p = STRCHR(path, '\0');
296
297 n = (p - path);
298 if (*p != '\0')
299 p++;
300
301 if (n > 0 && n <= maxpath) {
302 STRNCPY(name, path, n);
303 if (name[n - 1] != '/')
304 name[n++] = '/';
305 name[n] = '\0';
306 STRNCAT(name, file, len);
307
308 if (!access(name, R_OK))
309 return STRDUP(name);
310 if (ext) {
311 STRCAT(name, ext);
312 if (!access(name, R_OK))
313 return STRDUP(name);
314 }
315 }
316 }
317 return NULL; 475 return NULL;
318}
319 476
320/* EXTPROTO */ 477 /* check if we can find it now */
478 strncpy (name, file, len);
479 name[len] = '\0';
480
481 if (!access (name, R_OK))
482 return strdup (name);
483 if (ext)
484 {
485 strcat (name, ext);
486 if (!access (name, R_OK))
487 return strdup (name);
488 }
489 for (path = pathlist; path != NULL && *path != '\0'; path = p)
490 {
491 int n;
492
493 /* colon delimited */
494 if ((p = strchr (path, ':')) == NULL)
495 p = strchr (path, '\0');
496
497 n = (p - path);
498 if (*p != '\0')
499 p++;
500
501 if (n > 0 && n <= maxpath)
502 {
503 strncpy (name, path, n);
504 if (name[n - 1] != '/')
505 name[n++] = '/';
506 name[n] = '\0';
507 strncat (name, file, len);
508
509 if (!access (name, R_OK))
510 return strdup (name);
511 if (ext)
512 {
513 strcat (name, ext);
514 if (!access (name, R_OK))
515 return strdup (name);
516 }
517 }
518 }
519 return NULL;
520}
521
321char * 522char *
322rxvt_File_find(const char *file, const char *ext, const char *path) 523rxvt_File_find (const char *file, const char *ext, const char *path)
323{ 524{
324 char *f; 525 char *f;
325 526
326 if (file == NULL || *file == '\0') 527 if (file == NULL || *file == '\0')
327 return NULL; 528 return NULL;
328 529
329/* search environment variables here too */
330 if ((f = rxvt_File_search_path(path, file, ext)) == NULL) 530 f = rxvt_File_search_path (path, file, ext);
331#ifdef PATH_ENV 531
332 if ((f = rxvt_File_search_path(getenv(PATH_ENV), file, ext)) == NULL) 532#ifdef DEBUG_SEARCH_PATH
533 if (f)
534 fprintf (stderr, "found: \"%s\"\n", f);
333#endif 535#endif
334 f = rxvt_File_search_path(getenv("PATH"), file, ext);
335 536
336#ifdef DEBUG_SEARCH_PATH 537 return f;
337 if (f) 538}
338 fprintf(stderr, "found: \"%s\"\n", f);
339#endif 539#endif
340
341 return f;
342}
343#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
344 540
345/*----------------------------------------------------------------------* 541/*----------------------------------------------------------------------*
346 * miscellaneous drawing routines 542 * miscellaneous drawing routines
347 */ 543 */
348 544
349/* 545/*
350 * Draw top/left and bottom/right border shadows around windows 546 * Draw top/left and bottom/right border shadows around windows
351 */ 547 */
352#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 548#ifdef RXVT_SCROLLBAR
353/* EXTPROTO */
354void 549void
355rxvt_Draw_Shadow(Display *Xdisplay, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) 550rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
356{ 551{
357 int shadow; 552 int shadow;
358 553
359 shadow = (w == 0 || h == 0) ? 1 : SHADOW; 554 shadow = (w == 0 || h == 0) ? 1 : 2;
360 w += x - 1; 555 w += x - 1;
361 h += y - 1; 556 h += y - 1;
362 for (; shadow-- > 0; x++, y++, w--, h--) { 557 for (; shadow-- > 0; x++, y++, w--, h--)
558 {
363 XDrawLine(Xdisplay, win, topShadow, x, y, w, y); 559 XDrawLine (display, win, topShadow, x, y, w, y);
364 XDrawLine(Xdisplay, win, topShadow, x, y, x, h); 560 XDrawLine (display, win, topShadow, x, y, x, h);
365 XDrawLine(Xdisplay, win, botShadow, w, h, w, y + 1); 561 XDrawLine (display, win, botShadow, w, h, w, y + 1);
366 XDrawLine(Xdisplay, win, botShadow, w, h, x + 1, h); 562 XDrawLine (display, win, botShadow, w, h, x + 1, h);
367 } 563 }
368} 564}
369#endif 565#endif
370 566
371/* button shapes */ 567// should not be used in interactive programs, for obvious reasons
372#ifdef MENUBAR 568void rxvt_usleep (int usecs)
373/* EXTPROTO */
374void
375rxvt_Draw_Triangle(Display *Xdisplay, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
376{ 569{
377 switch (type) { 570#if HAVE_NANOSLEEP
378 case 'r': /* right triangle */ 571 struct timespec ts;
379 XDrawLine(Xdisplay, win, topShadow, x, y, x, y + w);
380 XDrawLine(Xdisplay, win, topShadow, x, y, x + w, y + w / 2);
381 XDrawLine(Xdisplay, win, botShadow, x, y + w, x + w, y + w / 2);
382 break;
383 572
384 case 'l': /* left triangle */ 573 ts.tv_sec = 0;
385 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x + w, y); 574 ts.tv_nsec = usecs * 1000;
386 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x, y + w / 2); 575 nanosleep (&ts, NULL);
387 XDrawLine(Xdisplay, win, topShadow, x, y + w / 2, x + w, y); 576#else
388 break; 577 /* use select for timing */
578 struct timeval tv;
389 579
390 case 'd': /* down triangle */ 580 tv.tv_sec = 0;
391 XDrawLine(Xdisplay, win, topShadow, x, y, x + w / 2, y + w); 581 tv.tv_usec = usecs;
392 XDrawLine(Xdisplay, win, topShadow, x, y, x + w, y); 582 select (0, NULL, NULL, NULL, &tv);
393 XDrawLine(Xdisplay, win, botShadow, x + w, y, x + w / 2, y + w); 583#endif
394 break;
395
396 case 'u': /* up triangle */
397 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x + w / 2, y);
398 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x, y + w);
399 XDrawLine(Xdisplay, win, topShadow, x, y + w, x + w / 2, y);
400 break;
401#if 0
402 case 's': /* square */
403 XDrawLine(Xdisplay, win, topShadow, x + w, y, x, y);
404 XDrawLine(Xdisplay, win, topShadow, x, y, x, y + w);
405 XDrawLine(Xdisplay, win, botShadow, x, y + w, x + w, y + w);
406 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x + w, y);
407 break;
408#endif
409 }
410} 584}
411#endif 585
412/*----------------------- end-of-file (C source) -----------------------*/ 586/*----------------------- end-of-file (C source) -----------------------*/
587

Diff Legend

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