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.16 by root, Sun Nov 21 19:04:07 2004 UTC

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

Diff Legend

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