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.4 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.10 by pcg, Sat Mar 6 00:05:01 2004 UTC

… …
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 * 10 *
10 * 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
11 * 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
12 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 14 * (at your option) any later version.
… …
26#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
27#include "misc.intpro" /* PROTOS for internal routines */ 28#include "misc.intpro" /* PROTOS for internal routines */
28 29
29/* EXTPROTO */ 30/* EXTPROTO */
30char * 31char *
32rxvt_wcstombs (const wchar_t *str, int len)
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 int l = wcrtomb (dst, *str++, mbs);
41 if (l < 0)
42 *dst++ = '?';
43 else
44 dst += l;
45 }
46
47 *dst++ = 0;
48
49 return r;
50}
51
52/* EXTPROTO */
53char *
31rxvt_strdup (const char *str) 54rxvt_strdup (const char *str)
32{ 55{
33 return str ? strdup (str) : 0; 56 return str ? strdup (str) : 0;
34} 57}
35 58
36/* EXTPROTO */ 59/* EXTPROTO */
37char * 60char *
38rxvt_r_basename(const char *str) 61rxvt_r_basename (const char *str)
39{ 62{
40 char *base = STRRCHR(str, '/'); 63 char *base = STRRCHR (str, '/');
41 64
42 return (char *)(base ? base + 1 : str); 65 return (char *) (base ? base + 1 : str);
43} 66}
44 67
45/* 68/*
46 * Print an error message 69 * Print an error message
47 */ 70 */
48/* EXTPROTO */ 71/* EXTPROTO */
49void 72void
50rxvt_print_error(const char *fmt,...) 73rxvt_print_error (const char *fmt,...)
51{ 74{
52 va_list arg_ptr; 75 va_list arg_ptr;
53 76
54 va_start(arg_ptr, fmt); 77 va_start (arg_ptr, fmt);
55 fprintf(stderr, APL_NAME ": "); 78 fprintf (stderr, RESNAME ": ");
56 vfprintf(stderr, fmt, arg_ptr); 79 vfprintf (stderr, fmt, arg_ptr);
57 fprintf(stderr, "\n"); 80 fprintf (stderr, "\n");
58 va_end(arg_ptr); 81 va_end (arg_ptr);
59} 82}
60 83
61/* 84/*
62 * check that the first characters of S1 match S2 85 * check that the first characters of S1 match S2
63 * 86 *
… …
66 * Match 89 * Match
67 * return: STRLEN (S2) 90 * return: STRLEN (S2)
68 */ 91 */
69/* EXTPROTO */ 92/* EXTPROTO */
70int 93int
71rxvt_Str_match(const char *s1, const char *s2) 94rxvt_Str_match (const char *s1, const char *s2)
72{ 95{
73 int n = STRLEN(s2); 96 int n = STRLEN (s2);
74 97
75 return ((STRNCMP(s1, s2, n) == 0) ? n : 0); 98 return ((STRNCMP (s1, s2, n) == 0) ? n : 0);
76} 99}
77 100
78/* EXTPROTO */ 101/* EXTPROTO */
79const char * 102const char *
80rxvt_Str_skip_space(const char *str) 103rxvt_Str_skip_space (const char *str)
81{ 104{
82 if (str) 105 if (str)
83 while (*str && isspace(*str)) 106 while (*str && isspace (*str))
84 str++; 107 str++;
108
85 return str; 109 return str;
86} 110}
87 111
88/* 112/*
89 * remove leading/trailing space and strip-off leading/trailing quotes. 113 * remove leading/trailing space and strip-off leading/trailing quotes.
90 * in place. 114 * in place.
91 */ 115 */
92/* EXTPROTO */ 116/* EXTPROTO */
93char * 117char *
94rxvt_Str_trim(char *str) 118rxvt_Str_trim (char *str)
95{ 119{
96 char *r, *s; 120 char *r, *s;
97 int n; 121 int n;
98 122
99 if (!str || !*str) /* shortcut */ 123 if (!str || !*str) /* shortcut */
100 return str;
101
102/* skip leading spaces */
103 for (s = str; *s && isspace(*s); s++) ;
104/* goto end of string */
105 for (n = 0, r = s; *r++; n++) ;
106 r -= 2;
107/* dump return */
108 if (n > 0 && *r == '\n')
109 n--, r--;
110/* backtrack along trailing spaces */
111 for (; n > 0 && isspace(*r); r--, n--) ;
112/* skip matching leading/trailing quotes */
113 if (*s == '"' && *r == '"' && n > 1) {
114 s++;
115 n -= 2;
116 }
117/* copy back over: forwards copy */
118 for (r = str; n; n--)
119 *r++ = *s++;
120 *r = '\0';
121
122 return str; 124 return str;
125
126 /* skip leading spaces */
127 for (s = str; *s && isspace (*s); s++) ;
128 /* goto end of string */
129 for (n = 0, r = s; *r++; n++) ;
130 r -= 2;
131 /* dump return */
132 if (n > 0 && *r == '\n')
133 n--, r--;
134 /* backtrack along trailing spaces */
135 for (; n > 0 && isspace (*r); r--, n--) ;
136 /* skip matching leading/trailing quotes */
137 if (*s == '"' && *r == '"' && n > 1)
138 {
139 s++;
140 n -= 2;
141 }
142
143 /* copy back over: forwards copy */
144 for (r = str; n; n--)
145 *r++ = *s++;
146 *r = '\0';
147
148 return str;
123} 149}
124 150
125/* 151/*
126 * in-place interpretation of string: 152 * in-place interpretation of string:
127 * 153 *
… …
136 * 162 *
137 * returns the converted string length 163 * returns the converted string length
138 */ 164 */
139/* EXTPROTO */ 165/* EXTPROTO */
140int 166int
141rxvt_Str_escaped(char *str) 167rxvt_Str_escaped (char *str)
142{ 168{
143 char ch, *s, *d; 169 char ch, *s, *d;
144 int i, num, append = 0; 170 int i, num, append = 0;
145 171
146 if (!str || !*str) 172 if (!str || !*str)
147 return 0; 173 return 0;
148 174
149 d = s = str; 175 d = s = str;
150 176
151 if (*s == 'M' && s[1] == '-') { 177 if (*s == 'M' && s[1] == '-')
178 {
152 /* Emacs convenience, replace leading `M-..' with `\E..' */ 179 /* Emacs convenience, replace leading `M-..' with `\E..' */
153 *d++ = C0_ESC; 180 *d++ = C0_ESC;
154 s += 2; 181 s += 2;
155 if (toupper(*s) == 'X') 182 if (toupper (*s) == 'X')
156 /* append carriage-return for `M-xcommand' */ 183 /* append carriage-return for `M-xcommand' */
157 for (*d++ = 'x', append = '\r', s++; isspace(*s); s++) ; 184 for (*d++ = 'x', append = '\r', s++; isspace (*s); s++) ;
158 } 185 }
159 for (; (ch = *s++);) { 186 for (; (ch = *s++);)
187 {
160 if (ch == '\\') { 188 if (ch == '\\')
189 {
161 ch = *s++; 190 ch = *s++;
162 if (ch >= '0' && ch <= '7') { /* octal */ 191 if (ch >= '0' && ch <= '7')
163 num = ch - '0'; 192 { /* octal */
193 num = ch - '0';
164 for (i = 0; i < 2; i++, s++) { 194 for (i = 0; i < 2; i++, s++)
165 ch = *s; 195 {
196 ch = *s;
166 if (ch < '0' || ch > '7') 197 if (ch < '0' || ch > '7')
167 break; 198 break;
168 num = num * 8 + ch - '0'; 199 num = num * 8 + ch - '0';
169 } 200 }
170 ch = (char)num; 201 ch = (char)num;
171 } else if (ch == 'a') 202 }
203 else if (ch == 'a')
172 ch = C0_BEL; /* bell */ 204 ch = C0_BEL; /* bell */
173 else if (ch == 'b') 205 else if (ch == 'b')
174 ch = C0_BS; /* backspace */ 206 ch = C0_BS; /* backspace */
175 else if (ch == 'E' || ch == 'e') 207 else if (ch == 'E' || ch == 'e')
176 ch = C0_ESC; /* escape */ 208 ch = C0_ESC; /* escape */
209 else if (ch == 'n')
210 ch = '\n'; /* newline */
211 else if (ch == 'r')
212 ch = '\r'; /* carriage-return */
213 else if (ch == 't')
214 ch = C0_HT; /* tab */
215 }
177 else if (ch == 'n') 216 else if (ch == '^')
178 ch = '\n'; /* newline */ 217 {
179 else if (ch == 'r')
180 ch = '\r'; /* carriage-return */
181 else if (ch == 't')
182 ch = C0_HT; /* tab */
183 } else if (ch == '^') {
184 ch = *s++; 218 ch = *s++;
185 ch = toupper(ch); 219 ch = toupper (ch);
186 ch = (ch == '?' ? 127 : (ch - '@')); 220 ch = (ch == '?' ? 127 : (ch - '@'));
187 } 221 }
188 *d++ = ch; 222 *d++ = ch;
189 } 223 }
190 224
191/* ESC] is an XTerm escape sequence, must be terminated */ 225 /* ESC] is an XTerm escape sequence, must be terminated */
192 if (*str == '\0' && str[1] == C0_ESC && str[2] == ']') 226 if (*str == '\0' && str[1] == C0_ESC && str[2] == ']')
193 append = CHAR_ST; 227 append = CHAR_ST;
194 228
195/* add trailing character as required */ 229 /* add trailing character as required */
196 if (append && d[-1] != append) 230 if (append && d[-1] != append)
197 *d++ = append; 231 *d++ = append;
198 *d = '\0'; 232 *d = '\0';
199 233
200 return (d - str); 234 return (d - str);
201} 235}
202 236
203/* 237/*
204 * Split a comma-separated string into an array, stripping leading and 238 * Split a comma-separated string into an array, stripping leading and
205 * trailing spaces (and paired quotes) from each entry. Empty strings 239 * trailing spaces (and paired quotes) from each entry. Empty strings
206 * are properly returned 240 * are properly returned
207 * Caller should free each entry and array when done 241 * Caller should free each entry and array when done
208 */ 242 */
209/* EXTPROTO */ 243/* EXTPROTO */
210char ** 244char **
211rxvt_splitcommastring(const char *cs) 245rxvt_splitcommastring (const char *cs)
212{ 246{
213 int l, n, p; 247 int l, n, p;
214 const char *s, *t; 248 const char *s, *t;
215 char **ret; 249 char **ret;
216 250
217 if ((s = cs) == NULL) 251 if ((s = cs) == NULL)
218 s = ""; 252 s = "";
219 253
220 for (n = 1, t = s; *t; t++) 254 for (n = 1, t = s; *t; t++)
221 if (*t == ',') 255 if (*t == ',')
222 n++; 256 n++;
223 ret = (char **)malloc((n + 1) * sizeof(char *)); 257 ret = (char **)malloc ((n + 1) * sizeof (char *));
224 ret[n] = NULL; 258 ret[n] = NULL;
225 259
226 for (l = 0, t = s; l < n; l++) { 260 for (l = 0, t = s; l < n; l++)
261 {
227 for ( ; *t && *t != ','; t++) ; 262 for ( ; *t && *t != ','; t++) ;
228 p = t - s; 263 p = t - s;
229 ret[l] = (char *)malloc(p + 1); 264 ret[l] = (char *)malloc (p + 1);
230 strncpy(ret[l], s, p); 265 strncpy (ret[l], s, p);
231 ret[l][p] = '\0'; 266 ret[l][p] = '\0';
232 rxvt_Str_trim(ret[l]); 267 rxvt_Str_trim (ret[l]);
233 s = ++t; 268 s = ++t;
234 } 269 }
235 return ret; 270 return ret;
236} 271}
237 272
238/*----------------------------------------------------------------------* 273/*----------------------------------------------------------------------*
239 * file searching 274 * file searching
240 */ 275 */
… …
248 * 283 *
249 * FILE is either semi-colon or zero terminated 284 * FILE is either semi-colon or zero terminated
250 */ 285 */
251/* INTPROTO */ 286/* INTPROTO */
252char * 287char *
253rxvt_File_search_path(const char *pathlist, const char *file, const char *ext) 288rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
254{ 289{
255 int maxpath, len; 290 int maxpath, len;
256 const char *p, *path; 291 const char *p, *path;
257 char name[256]; 292 char name[256];
258 293
259 if (!access(file, R_OK)) /* found (plain name) in current directory */ 294 if (!access (file, R_OK)) /* found (plain name) in current directory */
260 return STRDUP(file); 295 return STRDUP (file);
261 296
262/* semi-colon delimited */ 297 /* semi-colon delimited */
263 if ((p = STRCHR(file, ';'))) 298 if ((p = STRCHR (file, ';')))
264 len = (p - file); 299 len = (p - file);
265 else 300 else
266 len = STRLEN(file); 301 len = STRLEN (file);
267 302
268#ifdef DEBUG_SEARCH_PATH 303#ifdef DEBUG_SEARCH_PATH
269 getcwd(name, sizeof(name)); 304 getcwd (name, sizeof (name));
270 fprintf(stderr, "pwd: \"%s\"\n", name); 305 fprintf (stderr, "pwd: \"%s\"\n", name);
271 fprintf(stderr, "find: \"%.*s\"\n", len, file); 306 fprintf (stderr, "find: \"%.*s\"\n", len, file);
272#endif 307#endif
273 308
274/* leave room for an extra '/' and trailing '\0' */ 309 /* leave room for an extra '/' and trailing '\0' */
275 maxpath = sizeof(name) - (len + (ext ? STRLEN(ext) : 0) + 2); 310 maxpath = sizeof (name) - (len + (ext ? STRLEN (ext) : 0) + 2);
276 if (maxpath <= 0) 311 if (maxpath <= 0)
277 return NULL;
278
279/* check if we can find it now */
280 STRNCPY(name, file, len);
281 name[len] = '\0';
282
283 if (!access(name, R_OK))
284 return STRDUP(name);
285 if (ext) {
286 STRCAT(name, ext);
287 if (!access(name, R_OK))
288 return STRDUP(name);
289 }
290 for (path = pathlist; path != NULL && *path != '\0'; path = p) {
291 int n;
292
293 /* colon delimited */
294 if ((p = STRCHR(path, ':')) == NULL)
295 p = STRCHR(path, '\0');
296
297 n = (p - path);
298 if (*p != '\0')
299 p++;
300
301 if (n > 0 && n <= maxpath) {
302 STRNCPY(name, path, n);
303 if (name[n - 1] != '/')
304 name[n++] = '/';
305 name[n] = '\0';
306 STRNCAT(name, file, len);
307
308 if (!access(name, R_OK))
309 return STRDUP(name);
310 if (ext) {
311 STRCAT(name, ext);
312 if (!access(name, R_OK))
313 return STRDUP(name);
314 }
315 }
316 }
317 return NULL; 312 return NULL;
313
314 /* check if we can find it now */
315 STRNCPY (name, file, len);
316 name[len] = '\0';
317
318 if (!access (name, R_OK))
319 return STRDUP (name);
320 if (ext)
321 {
322 STRCAT (name, ext);
323 if (!access (name, R_OK))
324 return STRDUP (name);
325 }
326 for (path = pathlist; path != NULL && *path != '\0'; path = p)
327 {
328 int n;
329
330 /* colon delimited */
331 if ((p = STRCHR (path, ':')) == NULL)
332 p = STRCHR (path, '\0');
333
334 n = (p - path);
335 if (*p != '\0')
336 p++;
337
338 if (n > 0 && n <= maxpath)
339 {
340 STRNCPY (name, path, n);
341 if (name[n - 1] != '/')
342 name[n++] = '/';
343 name[n] = '\0';
344 STRNCAT (name, file, len);
345
346 if (!access (name, R_OK))
347 return STRDUP (name);
348 if (ext)
349 {
350 STRCAT (name, ext);
351 if (!access (name, R_OK))
352 return STRDUP (name);
353 }
354 }
355 }
356 return NULL;
318} 357}
319 358
320/* EXTPROTO */ 359/* EXTPROTO */
321char * 360char *
322rxvt_File_find(const char *file, const char *ext, const char *path) 361rxvt_File_find (const char *file, const char *ext, const char *path)
323{ 362{
324 char *f; 363 char *f;
325 364
326 if (file == NULL || *file == '\0') 365 if (file == NULL || *file == '\0')
327 return NULL; 366 return NULL;
328 367
329/* search environment variables here too */ 368 /* search environment variables here too */
330 if ((f = rxvt_File_search_path(path, file, ext)) == NULL) 369 if ((f = rxvt_File_search_path (path, file, ext)) == NULL)
331#ifdef PATH_ENV 370#ifdef PATH_ENV
332 if ((f = rxvt_File_search_path(getenv(PATH_ENV), file, ext)) == NULL) 371 if ((f = rxvt_File_search_path (getenv (PATH_ENV), file, ext)) == NULL)
333#endif 372#endif
334 f = rxvt_File_search_path(getenv("PATH"), file, ext); 373 f = rxvt_File_search_path (getenv ("PATH"), file, ext);
335 374
336#ifdef DEBUG_SEARCH_PATH 375#ifdef DEBUG_SEARCH_PATH
337 if (f) 376 if (f)
338 fprintf(stderr, "found: \"%s\"\n", f); 377 fprintf (stderr, "found: \"%s\"\n", f);
339#endif 378#endif
340 379
341 return f; 380 return f;
342} 381}
343#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 382#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
344 383
345/*----------------------------------------------------------------------* 384/*----------------------------------------------------------------------*
346 * miscellaneous drawing routines 385 * miscellaneous drawing routines
… …
350 * Draw top/left and bottom/right border shadows around windows 389 * Draw top/left and bottom/right border shadows around windows
351 */ 390 */
352#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 391#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
353/* EXTPROTO */ 392/* EXTPROTO */
354void 393void
355rxvt_Draw_Shadow(Display *Xdisplay, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) 394rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
356{ 395{
357 int shadow; 396 int shadow;
358 397
359 shadow = (w == 0 || h == 0) ? 1 : SHADOW; 398 shadow = (w == 0 || h == 0) ? 1 : SHADOW;
360 w += x - 1; 399 w += x - 1;
361 h += y - 1; 400 h += y - 1;
362 for (; shadow-- > 0; x++, y++, w--, h--) { 401 for (; shadow-- > 0; x++, y++, w--, h--)
402 {
363 XDrawLine(Xdisplay, win, topShadow, x, y, w, y); 403 XDrawLine (display, win, topShadow, x, y, w, y);
364 XDrawLine(Xdisplay, win, topShadow, x, y, x, h); 404 XDrawLine (display, win, topShadow, x, y, x, h);
365 XDrawLine(Xdisplay, win, botShadow, w, h, w, y + 1); 405 XDrawLine (display, win, botShadow, w, h, w, y + 1);
366 XDrawLine(Xdisplay, win, botShadow, w, h, x + 1, h); 406 XDrawLine (display, win, botShadow, w, h, x + 1, h);
367 } 407 }
368} 408}
369#endif 409#endif
370 410
371/* button shapes */ 411/* button shapes */
372#ifdef MENUBAR 412#ifdef MENUBAR
373/* EXTPROTO */ 413/* EXTPROTO */
374void 414void
375rxvt_Draw_Triangle(Display *Xdisplay, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type) 415rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
376{ 416{
377 switch (type) { 417 switch (type)
418 {
378 case 'r': /* right triangle */ 419 case 'r': /* right triangle */
379 XDrawLine(Xdisplay, win, topShadow, x, y, x, y + w); 420 XDrawLine (display, win, topShadow, x, y, x, y + w);
380 XDrawLine(Xdisplay, win, topShadow, x, y, x + w, y + w / 2); 421 XDrawLine (display, win, topShadow, x, y, x + w, y + w / 2);
381 XDrawLine(Xdisplay, win, botShadow, x, y + w, x + w, y + w / 2); 422 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w / 2);
382 break; 423 break;
383 424
384 case 'l': /* left triangle */ 425 case 'l': /* left triangle */
385 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x + w, y); 426 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
386 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x, y + w / 2); 427 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w / 2);
387 XDrawLine(Xdisplay, win, topShadow, x, y + w / 2, x + w, y); 428 XDrawLine (display, win, topShadow, x, y + w / 2, x + w, y);
388 break; 429 break;
389 430
390 case 'd': /* down triangle */ 431 case 'd': /* down triangle */
391 XDrawLine(Xdisplay, win, topShadow, x, y, x + w / 2, y + w); 432 XDrawLine (display, win, topShadow, x, y, x + w / 2, y + w);
392 XDrawLine(Xdisplay, win, topShadow, x, y, x + w, y); 433 XDrawLine (display, win, topShadow, x, y, x + w, y);
393 XDrawLine(Xdisplay, win, botShadow, x + w, y, x + w / 2, y + w); 434 XDrawLine (display, win, botShadow, x + w, y, x + w / 2, y + w);
394 break; 435 break;
395 436
396 case 'u': /* up triangle */ 437 case 'u': /* up triangle */
397 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x + w / 2, y); 438 XDrawLine (display, win, botShadow, x + w, y + w, x + w / 2, y);
398 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x, y + w); 439 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w);
399 XDrawLine(Xdisplay, win, topShadow, x, y + w, x + w / 2, y); 440 XDrawLine (display, win, topShadow, x, y + w, x + w / 2, y);
400 break; 441 break;
401#if 0 442#if 0
402 case 's': /* square */ 443 case 's': /* square */
403 XDrawLine(Xdisplay, win, topShadow, x + w, y, x, y); 444 XDrawLine (display, win, topShadow, x + w, y, x, y);
404 XDrawLine(Xdisplay, win, topShadow, x, y, x, y + w); 445 XDrawLine (display, win, topShadow, x, y, x, y + w);
405 XDrawLine(Xdisplay, win, botShadow, x, y + w, x + w, y + w); 446 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w);
406 XDrawLine(Xdisplay, win, botShadow, x + w, y + w, x + w, y); 447 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
407 break; 448 break;
408#endif 449#endif
450
409 } 451 }
410} 452}
411#endif 453#endif
412/*----------------------- end-of-file (C source) -----------------------*/ 454/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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