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

Diff Legend

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