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.3 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.25 by root, Mon Feb 7 01:17:03 2005 UTC

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

Diff Legend

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