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

Diff Legend

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