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

Diff Legend

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