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.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.19 by root, Sun Dec 12 06:30:25 2004 UTC

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

Diff Legend

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