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> |
… | |
… | |
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 | char * |
|
|
31 | rxvt_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 | |
|
|
53 | wchar_t * |
|
|
54 | rxvt_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 | |
|
|
66 | char * |
|
|
67 | rxvt_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 | |
|
|
101 | wchar_t * |
|
|
102 | rxvt_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 | |
31 | char * |
167 | char * |
32 | rxvt_strdup (const char *str) |
168 | rxvt_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 */ |
38 | char * |
174 | char * |
39 | rxvt_r_basename (const char *str) |
175 | rxvt_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 */ |
50 | void |
186 | void |
|
|
187 | rxvt_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 */ |
|
|
200 | void |
51 | rxvt_print_error (const char *fmt,...) |
201 | rxvt_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 */ |
|
|
214 | void |
|
|
215 | rxvt_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 */ |
|
|
227 | void |
|
|
228 | rxvt_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 | |
|
|
241 | class rxvt_failure_exception rxvt_failure_exception; |
|
|
242 | |
|
|
243 | /* INTPROTO */ |
|
|
244 | void |
|
|
245 | rxvt_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 */ |
71 | int |
259 | int |
72 | rxvt_Str_match (const char *s1, const char *s2) |
260 | rxvt_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 */ |
80 | const char * |
268 | const char * |
81 | rxvt_Str_skip_space (const char *str) |
269 | rxvt_Str_skip_space (const char *str) |
82 | { |
270 | { |
83 | if (str) |
271 | if (str) |
84 | while (*str && isspace (*str)) |
272 | while (*str && isspace (*str)) |
… | |
… | |
89 | |
277 | |
90 | /* |
278 | /* |
91 | * remove leading/trailing space and strip-off leading/trailing quotes. |
279 | * remove leading/trailing space and strip-off leading/trailing quotes. |
92 | * in place. |
280 | * in place. |
93 | */ |
281 | */ |
94 | /* EXTPROTO */ |
282 | /* INTPROTO */ |
95 | char * |
283 | char * |
96 | rxvt_Str_trim (char *str) |
284 | rxvt_Str_trim (char *str) |
97 | { |
285 | { |
98 | char *r, *s; |
286 | char *r, *s; |
99 | int n; |
|
|
100 | |
287 | |
101 | if (!str || !*str) /* shortcut */ |
288 | if (!str || !*str) /* shortcut */ |
102 | return str; |
289 | return str; |
103 | |
290 | |
104 | /* skip leading spaces */ |
291 | /* skip leading spaces */ |
105 | for (s = str; *s && isspace (*s); s++) ; |
292 | for (s = str; *s && isspace (*s); s++) ; |
|
|
293 | |
106 | /* goto end of string */ |
294 | /* goto end of string */ |
107 | for (n = 0, r = s; *r++; n++) ; |
295 | r = s + strlen (s) - 1; |
108 | r -= 2; |
296 | |
109 | /* dump return */ |
297 | /* dump return and other trailing whitespace */ |
110 | if (n > 0 && *r == '\n') |
298 | while (r > s && isspace (*r)) |
111 | n--, r--; |
299 | r--; |
112 | /* backtrack along trailing spaces */ |
300 | |
113 | for (; n > 0 && isspace (*r); r--, n--) ; |
301 | #if 0 |
114 | /* skip matching leading/trailing quotes */ |
302 | /* skip matching leading/trailing quotes */ |
115 | if (*s == '"' && *r == '"' && n > 1) |
303 | if (*s == '"' && *r == '"' && n > 1) |
116 | { |
304 | { |
117 | s++; |
305 | s++; |
118 | n -= 2; |
306 | n -= 2; |
119 | } |
307 | } |
|
|
308 | #endif |
120 | |
309 | |
121 | /* copy back over: forwards copy */ |
310 | memmove (str, s, r + 1 - s); |
122 | for (r = str; n; n--) |
311 | str[r + 1 - s] = 0; |
123 | *r++ = *s++; |
|
|
124 | *r = '\0'; |
|
|
125 | |
312 | |
126 | return str; |
313 | return str; |
127 | } |
314 | } |
128 | |
315 | |
129 | /* |
316 | /* |
… | |
… | |
138 | * "M-x" prefixed strings, append "\r" if needed |
325 | * "M-x" prefixed strings, append "\r" if needed |
139 | * "\E]" prefixed strings (XTerm escape sequence) append ST if needed |
326 | * "\E]" prefixed strings (XTerm escape sequence) append ST if needed |
140 | * |
327 | * |
141 | * returns the converted string length |
328 | * returns the converted string length |
142 | */ |
329 | */ |
143 | /* EXTPROTO */ |
330 | /* INTPROTO */ |
144 | int |
331 | int |
145 | rxvt_Str_escaped (char *str) |
332 | rxvt_Str_escaped (char *str) |
146 | { |
333 | { |
147 | char ch, *s, *d; |
334 | char ch, *s, *d; |
148 | int i, num, append = 0; |
335 | int i, num, append = 0; |
… | |
… | |
212 | return (d - str); |
399 | return (d - str); |
213 | } |
400 | } |
214 | |
401 | |
215 | /* |
402 | /* |
216 | * Split a comma-separated string into an array, stripping leading and |
403 | * Split a comma-separated string into an array, stripping leading and |
217 | * trailing spaces (and paired quotes) from each entry. Empty strings |
404 | * trailing spaces from each entry. Empty strings are properly returned |
218 | * are properly returned |
|
|
219 | * Caller should free each entry and array when done |
405 | * Caller should free each entry and array when done |
220 | */ |
406 | */ |
221 | /* EXTPROTO */ |
407 | /* INTPROTO */ |
222 | char ** |
408 | char ** |
223 | rxvt_splitcommastring (const char *cs) |
409 | rxvt_splitcommastring (const char *cs) |
224 | { |
410 | { |
225 | int l, n, p; |
411 | int l, n, p; |
226 | const char *s, *t; |
412 | const char *s, *t; |
… | |
… | |
230 | s = ""; |
416 | s = ""; |
231 | |
417 | |
232 | for (n = 1, t = s; *t; t++) |
418 | for (n = 1, t = s; *t; t++) |
233 | if (*t == ',') |
419 | if (*t == ',') |
234 | n++; |
420 | n++; |
|
|
421 | |
235 | ret = (char **)malloc ((n + 1) * sizeof (char *)); |
422 | ret = (char **)malloc ((n + 1) * sizeof (char *)); |
236 | ret[n] = NULL; |
423 | ret[n] = NULL; |
237 | |
424 | |
238 | for (l = 0, t = s; l < n; l++) |
425 | for (l = 0, t = s; l < n; l++) |
239 | { |
426 | { |
… | |
… | |
243 | strncpy (ret[l], s, p); |
430 | strncpy (ret[l], s, p); |
244 | ret[l][p] = '\0'; |
431 | ret[l][p] = '\0'; |
245 | rxvt_Str_trim (ret[l]); |
432 | rxvt_Str_trim (ret[l]); |
246 | s = ++t; |
433 | s = ++t; |
247 | } |
434 | } |
|
|
435 | |
248 | return ret; |
436 | return ret; |
|
|
437 | } |
|
|
438 | |
|
|
439 | void |
|
|
440 | rxvt_freecommastring (char **cs) |
|
|
441 | { |
|
|
442 | for (int i = 0; cs[i]; ++i) |
|
|
443 | free (cs[i]); |
|
|
444 | |
|
|
445 | free (cs); |
249 | } |
446 | } |
250 | |
447 | |
251 | /*----------------------------------------------------------------------* |
448 | /*----------------------------------------------------------------------* |
252 | * file searching |
449 | * file searching |
253 | */ |
450 | */ |
… | |
… | |
268 | int maxpath, len; |
465 | int maxpath, len; |
269 | const char *p, *path; |
466 | const char *p, *path; |
270 | char name[256]; |
467 | char name[256]; |
271 | |
468 | |
272 | if (!access (file, R_OK)) /* found (plain name) in current directory */ |
469 | if (!access (file, R_OK)) /* found (plain name) in current directory */ |
273 | return STRDUP (file); |
470 | return strdup (file); |
274 | |
471 | |
275 | /* semi-colon delimited */ |
472 | /* semi-colon delimited */ |
276 | if ((p = STRCHR (file, ';'))) |
473 | if ((p = strchr (file, ';'))) |
277 | len = (p - file); |
474 | len = (p - file); |
278 | else |
475 | else |
279 | len = STRLEN (file); |
476 | len = strlen (file); |
280 | |
477 | |
281 | #ifdef DEBUG_SEARCH_PATH |
478 | #ifdef DEBUG_SEARCH_PATH |
282 | getcwd (name, sizeof (name)); |
479 | getcwd (name, sizeof (name)); |
283 | fprintf (stderr, "pwd: \"%s\"\n", name); |
480 | fprintf (stderr, "pwd: \"%s\"\n", name); |
284 | fprintf (stderr, "find: \"%.*s\"\n", len, file); |
481 | fprintf (stderr, "find: \"%.*s\"\n", len, file); |
285 | #endif |
482 | #endif |
286 | |
483 | |
287 | /* leave room for an extra '/' and trailing '\0' */ |
484 | /* leave room for an extra '/' and trailing '\0' */ |
288 | maxpath = sizeof (name) - (len + (ext ? STRLEN (ext) : 0) + 2); |
485 | maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2); |
289 | if (maxpath <= 0) |
486 | if (maxpath <= 0) |
290 | return NULL; |
487 | return NULL; |
291 | |
488 | |
292 | /* check if we can find it now */ |
489 | /* check if we can find it now */ |
293 | STRNCPY (name, file, len); |
490 | strncpy (name, file, len); |
294 | name[len] = '\0'; |
491 | name[len] = '\0'; |
295 | |
492 | |
296 | if (!access (name, R_OK)) |
493 | if (!access (name, R_OK)) |
297 | return STRDUP (name); |
494 | return strdup (name); |
298 | if (ext) |
495 | if (ext) |
299 | { |
496 | { |
300 | STRCAT (name, ext); |
497 | strcat (name, ext); |
301 | if (!access (name, R_OK)) |
498 | if (!access (name, R_OK)) |
302 | return STRDUP (name); |
499 | return strdup (name); |
303 | } |
500 | } |
304 | for (path = pathlist; path != NULL && *path != '\0'; path = p) |
501 | for (path = pathlist; path != NULL && *path != '\0'; path = p) |
305 | { |
502 | { |
306 | int n; |
503 | int n; |
307 | |
504 | |
308 | /* colon delimited */ |
505 | /* colon delimited */ |
309 | if ((p = STRCHR (path, ':')) == NULL) |
506 | if ((p = strchr (path, ':')) == NULL) |
310 | p = STRCHR (path, '\0'); |
507 | p = strchr (path, '\0'); |
311 | |
508 | |
312 | n = (p - path); |
509 | n = (p - path); |
313 | if (*p != '\0') |
510 | if (*p != '\0') |
314 | p++; |
511 | p++; |
315 | |
512 | |
316 | if (n > 0 && n <= maxpath) |
513 | if (n > 0 && n <= maxpath) |
317 | { |
514 | { |
318 | STRNCPY (name, path, n); |
515 | strncpy (name, path, n); |
319 | if (name[n - 1] != '/') |
516 | if (name[n - 1] != '/') |
320 | name[n++] = '/'; |
517 | name[n++] = '/'; |
321 | name[n] = '\0'; |
518 | name[n] = '\0'; |
322 | STRNCAT (name, file, len); |
519 | strncat (name, file, len); |
323 | |
520 | |
324 | if (!access (name, R_OK)) |
521 | if (!access (name, R_OK)) |
325 | return STRDUP (name); |
522 | return strdup (name); |
326 | if (ext) |
523 | if (ext) |
327 | { |
524 | { |
328 | STRCAT (name, ext); |
525 | strcat (name, ext); |
329 | if (!access (name, R_OK)) |
526 | if (!access (name, R_OK)) |
330 | return STRDUP (name); |
527 | return strdup (name); |
331 | } |
528 | } |
332 | } |
529 | } |
333 | } |
530 | } |
334 | return NULL; |
531 | return NULL; |
335 | } |
532 | } |
336 | |
533 | |
337 | /* EXTPROTO */ |
534 | /* INTPROTO */ |
338 | char * |
535 | char * |
339 | rxvt_File_find (const char *file, const char *ext, const char *path) |
536 | rxvt_File_find (const char *file, const char *ext, const char *path) |
340 | { |
537 | { |
341 | char *f; |
538 | char *f; |
342 | |
539 | |
… | |
… | |
365 | |
562 | |
366 | /* |
563 | /* |
367 | * Draw top/left and bottom/right border shadows around windows |
564 | * Draw top/left and bottom/right border shadows around windows |
368 | */ |
565 | */ |
369 | #if defined(RXVT_SCROLLBAR) || defined(MENUBAR) |
566 | #if defined(RXVT_SCROLLBAR) || defined(MENUBAR) |
370 | /* EXTPROTO */ |
567 | /* INTPROTO */ |
371 | void |
568 | void |
372 | rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) |
569 | rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) |
373 | { |
570 | { |
374 | int shadow; |
571 | int shadow; |
375 | |
572 | |
… | |
… | |
386 | } |
583 | } |
387 | #endif |
584 | #endif |
388 | |
585 | |
389 | /* button shapes */ |
586 | /* button shapes */ |
390 | #ifdef MENUBAR |
587 | #ifdef MENUBAR |
391 | /* EXTPROTO */ |
588 | /* INTPROTO */ |
392 | void |
589 | void |
393 | rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type) |
590 | rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type) |
394 | { |
591 | { |
395 | switch (type) |
592 | switch (type) |
396 | { |
593 | { |