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

Diff Legend

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