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.13 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.40 by root, Mon Feb 20 22:42:00 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: misc.C 2 * File: misc.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1996 mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston 6 * Copyright (c) 1996 mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8 * Copyright (c) 1998-2000 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1998-2000 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-2006 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 */
31char * 29char *
32rxvt_wcstombs (const wchar_t *str, int len) 30rxvt_wcstombs (const wchar_t *str, int len)
33{ 31{
32 if (len < 0) len = wcslen (str);
33
34 mbstate mbs; 34 mbstate mbs;
35 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1); 35 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1);
36 36
37 char *dst = r; 37 char *dst = r;
38 while (len--) 38 while (len--)
39 { 39 {
40 int l = wcrtomb (dst, *str++, mbs); 40 ssize_t l = wcrtomb (dst, *str++, mbs);
41
41 if (l < 0) 42 if (l < 0)
42 *dst++ = '?'; 43 *dst++ = '?';
43 else 44 else
44 dst += l; 45 dst += l;
45 } 46 }
46 47
47 *dst++ = 0; 48 *dst++ = 0;
48 49
50 return (char *)rxvt_realloc (r, dst - r);
51}
52
53wchar_t *
54rxvt_mbstowcs (const char *str, int len)
55{
56 if (len < 0) len = strlen (str);
57
58 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
59
60 if ((ssize_t)mbstowcs (r, str, len + 1) < 0)
61 *r = 0;
62
49 return r; 63 return r;
50} 64}
51 65
52/* EXTPROTO */
53char * 66char *
54rxvt_strdup (const char *str) 67rxvt_wcstoutf8 (const wchar_t *str, int len)
55{ 68{
56 return str ? strdup (str) : 0; 69 if (len < 0) len = wcslen (str);
57}
58 70
59/* EXTPROTO */ 71 char *r = (char *)rxvt_malloc (len * 4 + 1);
72 char *p = r;
73
74 while (len--)
75 {
76 unicode_t w = *str++ & UNICODE_MASK;
77
78 if (w < 0x000080)
79 *p++ = w;
80 else if (w < 0x000800)
81 *p++ = 0xc0 | ( w >> 6),
82 *p++ = 0x80 | ( w & 0x3f);
83 else if (w < 0x010000)
84 *p++ = 0xe0 | ( w >> 12 ),
85 *p++ = 0x80 | ((w >> 6) & 0x3f),
86 *p++ = 0x80 | ( w & 0x3f);
87 else if (w < 0x110000)
88 *p++ = 0xf0 | ( w >> 18),
89 *p++ = 0x80 | ((w >> 12) & 0x3f),
90 *p++ = 0x80 | ((w >> 6) & 0x3f),
91 *p++ = 0x80 | ( w & 0x3f);
92 else
93 *p++ = '?';
94 }
95
96 *p++ = 0;
97
98 return (char *)rxvt_realloc (r, p - r);
99}
100
101wchar_t *
102rxvt_utf8towcs (const char *str, int len)
103{
104 if (len < 0) len = strlen (str);
105
106 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)),
107 *p = r;
108
109 unsigned char *s = (unsigned char *)str,
110 *e = s + len;
111
112 for (;;)
113 {
114 len = e - s;
115
116 if (len == 0)
117 break;
118 else if (s[0] < 0x80)
119 *p++ = *s++;
120 else if (len >= 2
121 && s[0] >= 0xc2 && s[0] <= 0xdf
122 && (s[1] & 0xc0) == 0x80)
123 {
124 *p++ = ((s[0] & 0x1f) << 6)
125 | (s[1] & 0x3f);
126 s += 2;
127 }
128 else if (len >= 3
129 && ( (s[0] == 0xe0 && s[1] >= 0xa0 && s[1] <= 0xbf)
130 || (s[0] >= 0xe1 && s[0] <= 0xec && s[1] >= 0x80 && s[1] <= 0xbf)
131 || (s[0] == 0xed && s[1] >= 0x80 && s[1] <= 0x9f)
132 || (s[0] >= 0xee && s[0] <= 0xef && s[1] >= 0x80 && s[1] <= 0xbf)
133 )
134 && (s[2] & 0xc0) == 0x80)
135 {
136 *p++ = ((s[0] & 0x0f) << 12)
137 | ((s[1] & 0x3f) << 6)
138 | (s[2] & 0x3f);
139 s += 3;
140 }
141 else if (len >= 4
142 && ( (s[0] == 0xf0 && s[1] >= 0x90 && s[1] <= 0xbf)
143 || (s[0] >= 0xf1 && s[0] <= 0xf3 && s[1] >= 0x80 && s[1] <= 0xbf)
144 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f)
145 )
146 && (s[2] & 0xc0) == 0x80
147 && (s[3] & 0xc0) == 0x80)
148 {
149 *p++ = ((s[0] & 0x07) << 18)
150 | ((s[1] & 0x3f) << 12)
151 | ((s[2] & 0x3f) << 6)
152 | (s[3] & 0x3f);
153 s += 4;
154 }
155 else
156 {
157 *p++ = 0xfffd;
158 s++;
159 }
160 }
161
162 *p = 0;
163
164 return r;
165}
166
60char * 167char *
61rxvt_r_basename (const char *str) 168rxvt_r_basename (const char *str) NOTHROW
62{ 169{
63 char *base = STRRCHR (str, '/'); 170 char *base = strrchr (str, '/');
64 171
65 return (char *) (base ? base + 1 : str); 172 return (char *) (base ? base + 1 : str);
66} 173}
67 174
68/* 175/*
69 * Print an error message 176 * Print an error message
70 */ 177 */
71/* EXTPROTO */
72void 178void
73rxvt_vlog (const char *fmt, va_list arg_ptr) 179rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW
74{ 180{
75 char msg[1024]; 181 char msg[1024];
76 182
77 vsnprintf (msg, sizeof msg, fmt, arg_ptr); 183 vsnprintf (msg, sizeof msg, fmt, arg_ptr);
78 184
… …
80 (*GET_R->log_hook) (msg); 186 (*GET_R->log_hook) (msg);
81 else 187 else
82 write (STDOUT_FILENO, msg, strlen (msg)); 188 write (STDOUT_FILENO, msg, strlen (msg));
83} 189}
84 190
85/* EXTPROTO */
86void 191void
87rxvt_log (const char *fmt,...) 192rxvt_log (const char *fmt,...) NOTHROW
88{ 193{
89 va_list arg_ptr; 194 va_list arg_ptr;
90 195
91 va_start (arg_ptr, fmt); 196 va_start (arg_ptr, fmt);
92 rxvt_vlog (fmt, arg_ptr); 197 rxvt_vlog (fmt, arg_ptr);
… …
94} 199}
95 200
96/* 201/*
97 * Print an error message 202 * Print an error message
98 */ 203 */
99/* EXTPROTO */
100void 204void
101rxvt_warn (const char *fmt,...) 205rxvt_warn (const char *fmt,...) NOTHROW
102{ 206{
103 va_list arg_ptr; 207 va_list arg_ptr;
104 208
105 rxvt_log ("%s: ", RESNAME); 209 rxvt_log ("%s: ", RESNAME);
106 210
107 va_start (arg_ptr, fmt); 211 va_start (arg_ptr, fmt);
108 rxvt_vlog (fmt, arg_ptr); 212 rxvt_vlog (fmt, arg_ptr);
109 va_end (arg_ptr); 213 va_end (arg_ptr);
110} 214}
111 215
112/* EXTPROTO */
113void 216void
114rxvt_fatal (const char *fmt,...) 217rxvt_fatal (const char *fmt,...) THROW ((class rxvt_failure_exception))
115{ 218{
116 va_list arg_ptr; 219 va_list arg_ptr;
117 220
118 rxvt_log ("%s: ", RESNAME); 221 rxvt_log ("%s: ", RESNAME);
119 222
… …
122 va_end (arg_ptr); 225 va_end (arg_ptr);
123 226
124 rxvt_exit_failure (); 227 rxvt_exit_failure ();
125} 228}
126 229
127class rxvt_failure_exception rxvt_failure_exception;
128
129/* EXTPROTO */
130void 230void
131rxvt_exit_failure () 231rxvt_exit_failure () THROW ((class rxvt_failure_exception))
132{ 232{
233 static class rxvt_failure_exception rxvt_failure_exception;
133 throw (rxvt_failure_exception); 234 throw (rxvt_failure_exception);
134} 235}
135 236
136/* 237/*
137 * check that the first characters of S1 match S2 238 * check that the first characters of S1 match S2
138 * 239 *
139 * No Match 240 * No Match
140 * return: 0 241 * return: 0
141 * Match 242 * Match
142 * return: STRLEN (S2) 243 * return: strlen (S2)
143 */ 244 */
144/* EXTPROTO */
145int 245int
146rxvt_Str_match (const char *s1, const char *s2) 246rxvt_Str_match (const char *s1, const char *s2) NOTHROW
147{ 247{
148 int n = STRLEN (s2); 248 int n = strlen (s2);
149 249
150 return ((STRNCMP (s1, s2, n) == 0) ? n : 0); 250 return ((strncmp (s1, s2, n) == 0) ? n : 0);
151} 251}
152 252
153/* EXTPROTO */
154const char * 253const char *
155rxvt_Str_skip_space (const char *str) 254rxvt_Str_skip_space (const char *str) NOTHROW
156{ 255{
157 if (str) 256 if (str)
158 while (*str && isspace (*str)) 257 while (*str && isspace (*str))
159 str++; 258 str++;
160 259
… …
163 262
164/* 263/*
165 * remove leading/trailing space and strip-off leading/trailing quotes. 264 * remove leading/trailing space and strip-off leading/trailing quotes.
166 * in place. 265 * in place.
167 */ 266 */
168/* EXTPROTO */
169char * 267char *
170rxvt_Str_trim (char *str) 268rxvt_Str_trim (char *str) NOTHROW
171{ 269{
172 char *r, *s; 270 char *r, *s;
173 int n;
174 271
175 if (!str || !*str) /* shortcut */ 272 if (!str || !*str) /* shortcut */
176 return str; 273 return str;
177 274
178 /* skip leading spaces */ 275 /* skip leading spaces */
179 for (s = str; *s && isspace (*s); s++) ; 276 for (s = str; *s && isspace (*s); s++) ;
277
180 /* goto end of string */ 278 /* goto end of string */
181 for (n = 0, r = s; *r++; n++) ; 279 r = s + strlen (s) - 1;
182 r -= 2; 280
183 /* dump return */ 281 /* dump return and other trailing whitespace */
184 if (n > 0 && *r == '\n') 282 while (r > s && isspace (*r))
185 n--, r--; 283 r--;
186 /* backtrack along trailing spaces */ 284
187 for (; n > 0 && isspace (*r); r--, n--) ; 285#if 0
188 /* skip matching leading/trailing quotes */ 286 /* skip matching leading/trailing quotes */
189 if (*s == '"' && *r == '"' && n > 1) 287 if (*s == '"' && *r == '"' && n > 1)
190 { 288 {
191 s++; 289 s++;
192 n -= 2; 290 n -= 2;
193 } 291 }
292#endif
194 293
195 /* copy back over: forwards copy */ 294 memmove (str, s, r + 1 - s);
196 for (r = str; n; n--) 295 str[r + 1 - s] = 0;
197 *r++ = *s++;
198 *r = '\0';
199 296
200 return str; 297 return str;
201} 298}
202 299
203/* 300/*
… …
212 * "M-x" prefixed strings, append "\r" if needed 309 * "M-x" prefixed strings, append "\r" if needed
213 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed 310 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
214 * 311 *
215 * returns the converted string length 312 * returns the converted string length
216 */ 313 */
217/* EXTPROTO */
218int 314int
219rxvt_Str_escaped (char *str) 315rxvt_Str_escaped (char *str) NOTHROW
220{ 316{
221 char ch, *s, *d; 317 char ch, *s, *d;
222 int i, num, append = 0; 318 int i, num, append = 0;
223 319
224 if (!str || !*str) 320 if (!str || !*str)
… …
286 return (d - str); 382 return (d - str);
287} 383}
288 384
289/* 385/*
290 * Split a comma-separated string into an array, stripping leading and 386 * Split a comma-separated string into an array, stripping leading and
291 * trailing spaces (and paired quotes) from each entry. Empty strings 387 * trailing spaces from each entry. Empty strings are properly returned
292 * are properly returned
293 * Caller should free each entry and array when done 388 * Caller should free each entry and array when done
294 */ 389 */
295/* EXTPROTO */
296char ** 390char **
297rxvt_splitcommastring (const char *cs) 391rxvt_splitcommastring (const char *cs) NOTHROW
298{ 392{
299 int l, n, p; 393 int l, n, p;
300 const char *s, *t; 394 const char *s, *t;
301 char **ret; 395 char **ret;
302 396
… …
304 s = ""; 398 s = "";
305 399
306 for (n = 1, t = s; *t; t++) 400 for (n = 1, t = s; *t; t++)
307 if (*t == ',') 401 if (*t == ',')
308 n++; 402 n++;
403
309 ret = (char **)malloc ((n + 1) * sizeof (char *)); 404 ret = (char **)malloc ((n + 1) * sizeof (char *));
310 ret[n] = NULL; 405 ret[n] = NULL;
311 406
312 for (l = 0, t = s; l < n; l++) 407 for (l = 0, t = s; l < n; l++)
313 { 408 {
… …
317 strncpy (ret[l], s, p); 412 strncpy (ret[l], s, p);
318 ret[l][p] = '\0'; 413 ret[l][p] = '\0';
319 rxvt_Str_trim (ret[l]); 414 rxvt_Str_trim (ret[l]);
320 s = ++t; 415 s = ++t;
321 } 416 }
417
322 return ret; 418 return ret;
419}
420
421void
422rxvt_freecommastring (char **cs) NOTHROW
423{
424 for (int i = 0; cs[i]; ++i)
425 free (cs[i]);
426
427 free (cs);
323} 428}
324 429
325/*----------------------------------------------------------------------* 430/*----------------------------------------------------------------------*
326 * file searching 431 * file searching
327 */ 432 */
328 433
329/* #define DEBUG_SEARCH_PATH */ 434#ifdef XPM_BACKGROUND
330
331#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
332/* 435/*
333 * search for FILE in the current working directory, and within the 436 * search for FILE in the current working directory, and within the
334 * colon-delimited PATHLIST, adding the file extension EXT if required. 437 * colon-delimited PATHLIST, adding the file extension EXT if required.
335 * 438 *
336 * FILE is either semi-colon or zero terminated 439 * FILE is either semi-colon or zero terminated
337 */ 440 */
338/* INTPROTO */ 441char *
339char *
340rxvt_File_search_path (const char *pathlist, const char *file, const char *ext) 442rxvt_File_search_path (const char *pathlist, const char *file, const char *ext) NOTHROW
341{ 443{
342 int maxpath, len; 444 int maxpath, len;
343 const char *p, *path; 445 const char *p, *path;
344 char name[256]; 446 char name[256];
345 447
346 if (!access (file, R_OK)) /* found (plain name) in current directory */ 448 if (!access (file, R_OK)) /* found (plain name) in current directory */
347 return STRDUP (file); 449 return strdup (file);
348 450
349 /* semi-colon delimited */ 451 /* semi-colon delimited */
350 if ((p = STRCHR (file, ';'))) 452 if ((p = strchr (file, ';')))
351 len = (p - file); 453 len = (p - file);
352 else 454 else
353 len = STRLEN (file); 455 len = strlen (file);
354
355#ifdef DEBUG_SEARCH_PATH
356 getcwd (name, sizeof (name));
357 fprintf (stderr, "pwd: \"%s\"\n", name);
358 fprintf (stderr, "find: \"%.*s\"\n", len, file);
359#endif
360 456
361 /* leave room for an extra '/' and trailing '\0' */ 457 /* leave room for an extra '/' and trailing '\0' */
362 maxpath = sizeof (name) - (len + (ext ? STRLEN (ext) : 0) + 2); 458 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
363 if (maxpath <= 0) 459 if (maxpath <= 0)
364 return NULL; 460 return NULL;
365 461
366 /* check if we can find it now */ 462 /* check if we can find it now */
367 STRNCPY (name, file, len); 463 strncpy (name, file, len);
368 name[len] = '\0'; 464 name[len] = '\0';
369 465
370 if (!access (name, R_OK)) 466 if (!access (name, R_OK))
371 return STRDUP (name); 467 return strdup (name);
372 if (ext) 468 if (ext)
373 { 469 {
374 STRCAT (name, ext); 470 strcat (name, ext);
375 if (!access (name, R_OK)) 471 if (!access (name, R_OK))
376 return STRDUP (name); 472 return strdup (name);
377 } 473 }
378 for (path = pathlist; path != NULL && *path != '\0'; path = p) 474 for (path = pathlist; path != NULL && *path != '\0'; path = p)
379 { 475 {
380 int n; 476 int n;
381 477
382 /* colon delimited */ 478 /* colon delimited */
383 if ((p = STRCHR (path, ':')) == NULL) 479 if ((p = strchr (path, ':')) == NULL)
384 p = STRCHR (path, '\0'); 480 p = strchr (path, '\0');
385 481
386 n = (p - path); 482 n = (p - path);
387 if (*p != '\0') 483 if (*p != '\0')
388 p++; 484 p++;
389 485
390 if (n > 0 && n <= maxpath) 486 if (n > 0 && n <= maxpath)
391 { 487 {
392 STRNCPY (name, path, n); 488 strncpy (name, path, n);
393 if (name[n - 1] != '/') 489 if (name[n - 1] != '/')
394 name[n++] = '/'; 490 name[n++] = '/';
395 name[n] = '\0'; 491 name[n] = '\0';
396 STRNCAT (name, file, len); 492 strncat (name, file, len);
397 493
398 if (!access (name, R_OK)) 494 if (!access (name, R_OK))
399 return STRDUP (name); 495 return strdup (name);
400 if (ext) 496 if (ext)
401 { 497 {
402 STRCAT (name, ext); 498 strcat (name, ext);
403 if (!access (name, R_OK)) 499 if (!access (name, R_OK))
404 return STRDUP (name); 500 return strdup (name);
405 } 501 }
406 } 502 }
407 } 503 }
408 return NULL; 504 return NULL;
409} 505}
410 506
411/* EXTPROTO */ 507char *
412char *
413rxvt_File_find (const char *file, const char *ext, const char *path) 508rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW
414{ 509{
415 char *f; 510 char *f;
416 511
417 if (file == NULL || *file == '\0') 512 if (file == NULL || *file == '\0')
418 return NULL; 513 return NULL;
419 514
420 /* search environment variables here too */
421 if ((f = rxvt_File_search_path (path, file, ext)) == NULL) 515 f = rxvt_File_search_path (path, file, ext);
422#ifdef PATH_ENV 516
423 if ((f = rxvt_File_search_path (getenv (PATH_ENV), file, ext)) == NULL) 517 return f;
518}
424#endif 519#endif
425 f = rxvt_File_search_path (getenv ("PATH"), file, ext);
426 520
427#ifdef DEBUG_SEARCH_PATH
428 if (f)
429 fprintf (stderr, "found: \"%s\"\n", f);
430#endif
431 521
432 return f;
433}
434#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
435
436/*----------------------------------------------------------------------*
437 * miscellaneous drawing routines
438 */
439
440/*
441 * Draw top/left and bottom/right border shadows around windows
442 */
443#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
444/* EXTPROTO */
445void
446rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
447{
448 int shadow;
449
450 shadow = (w == 0 || h == 0) ? 1 : SHADOW;
451 w += x - 1;
452 h += y - 1;
453 for (; shadow-- > 0; x++, y++, w--, h--)
454 {
455 XDrawLine (display, win, topShadow, x, y, w, y);
456 XDrawLine (display, win, topShadow, x, y, x, h);
457 XDrawLine (display, win, botShadow, w, h, w, y + 1);
458 XDrawLine (display, win, botShadow, w, h, x + 1, h);
459 }
460}
461#endif
462
463/* button shapes */
464#ifdef MENUBAR
465/* EXTPROTO */
466void
467rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
468{
469 switch (type)
470 {
471 case 'r': /* right triangle */
472 XDrawLine (display, win, topShadow, x, y, x, y + w);
473 XDrawLine (display, win, topShadow, x, y, x + w, y + w / 2);
474 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w / 2);
475 break;
476
477 case 'l': /* left triangle */
478 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
479 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w / 2);
480 XDrawLine (display, win, topShadow, x, y + w / 2, x + w, y);
481 break;
482
483 case 'd': /* down triangle */
484 XDrawLine (display, win, topShadow, x, y, x + w / 2, y + w);
485 XDrawLine (display, win, topShadow, x, y, x + w, y);
486 XDrawLine (display, win, botShadow, x + w, y, x + w / 2, y + w);
487 break;
488
489 case 'u': /* up triangle */
490 XDrawLine (display, win, botShadow, x + w, y + w, x + w / 2, y);
491 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w);
492 XDrawLine (display, win, topShadow, x, y + w, x + w / 2, y);
493 break;
494#if 0
495 case 's': /* square */
496 XDrawLine (display, win, topShadow, x + w, y, x, y);
497 XDrawLine (display, win, topShadow, x, y, x, y + w);
498 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w);
499 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
500 break;
501#endif
502
503 }
504}
505#endif
506/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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