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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.15 by root, Sun Aug 15 04:54:21 2004 UTC

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

Diff Legend

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