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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.26 by root, Wed Feb 16 20:32:05 2005 UTC

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

Diff Legend

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