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.3 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.28 by root, Fri Aug 5 16:42:44 2005 UTC

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

Diff Legend

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