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.19 by root, Sun Dec 12 06:30:25 2004 UTC vs.
Revision 1.53 by root, Sun Apr 26 01:59:53 2009 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
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 * Copyright (c) 2003-2006 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.
… …
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
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 */
29 28
30char * 29char *
31rxvt_wcstombs (const wchar_t *str, int len) 30rxvt_wcstombs (const wchar_t *str, int len)
32{ 31{
33 if (len < 0) len = wcslen (str); 32 if (len < 0) len = wcslen (str);
… …
36 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1); 35 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1);
37 36
38 char *dst = r; 37 char *dst = r;
39 while (len--) 38 while (len--)
40 { 39 {
41 int l = wcrtomb (dst, *str++, mbs); 40 ssize_t l = wcrtomb (dst, *str++, mbs);
41
42 if (l < 0) 42 if (l < 0)
43 {
43 *dst++ = '?'; 44 *dst++ = '?';
45 wcrtomb (0, 0, mbs); // reset undefined state
46 }
44 else 47 else
45 dst += l; 48 dst += l;
46 } 49 }
47 50
48 *dst++ = 0; 51 *dst++ = 0;
49 52
50 return r; 53 return (char *)rxvt_realloc (r, dst - r);
51} 54}
52 55
53wchar_t * 56wchar_t *
54rxvt_mbstowcs (const char *str, int len) 57rxvt_mbstowcs (const char *str, int len)
55{ 58{
56 if (len < 0) len = strlen (str); 59 if (len < 0) len = strlen (str);
57 60
58 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)); 61 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
59 62
60 if (mbstowcs (r, str, len + 1) < 0) 63 if ((ssize_t)mbstowcs (r, str, len + 1) < 0)
61 *r = 0; 64 *r = 0;
62 65
63 return r; 66 return r;
64} 67}
65 68
… …
71 char *r = (char *)rxvt_malloc (len * 4 + 1); 74 char *r = (char *)rxvt_malloc (len * 4 + 1);
72 char *p = r; 75 char *p = r;
73 76
74 while (len--) 77 while (len--)
75 { 78 {
76 unicode_t w = *str++; 79 unicode_t w = *str++ & UNICODE_MASK;
77 80
78 if (w < 0x000080) 81 if (w < 0x000080)
79 *p++ = w; 82 *p++ = w;
80 else if (w < 0x000800) 83 else if (w < 0x000800)
81 *p++ = 0xc0 | ( w >> 6), 84 *p++ = 0xc0 | ( w >> 6),
82 *p++ = 0x80 | ( w & 0x3f); 85 *p++ = 0x80 | ( w & 0x3f);
83 else if (w < 0x010000) 86 else if (w < 0x010000)
84 *p++ = 0xe0 | ( w >> 12 ), 87 *p++ = 0xe0 | ( w >> 12),
85 *p++ = 0x80 | ((w >> 6) & 0x3f), 88 *p++ = 0x80 | ((w >> 6) & 0x3f),
86 *p++ = 0x80 | ( w & 0x3f); 89 *p++ = 0x80 | ( w & 0x3f);
87 else if (w < 0x110000) 90 else if (w < 0x110000)
88 *p++ = 0xf0 | ( w >> 18), 91 *p++ = 0xf0 | ( w >> 18),
89 *p++ = 0x80 | ((w >> 12) & 0x3f), 92 *p++ = 0x80 | ((w >> 12) & 0x3f),
… …
91 *p++ = 0x80 | ( w & 0x3f); 94 *p++ = 0x80 | ( w & 0x3f);
92 else 95 else
93 *p++ = '?'; 96 *p++ = '?';
94 } 97 }
95 98
96 *p = 0; 99 *p++ = 0;
97 100
98 return r; 101 return (char *)rxvt_realloc (r, p - r);
99} 102}
100 103
101wchar_t * 104wchar_t *
102rxvt_utf8towcs (const char *str, int len) 105rxvt_utf8towcs (const char *str, int len)
103{ 106{
104 if (len < 0) len = strlen (str); 107 if (len < 0) len = strlen (str);
105 108
106 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)); 109 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)),
107 wchar_t *p = r; 110 *p = r;
108 111
109 unsigned char *s = (unsigned char *)str; 112 unsigned char *s = (unsigned char *)str,
113 *e = s + len;
110 114
111 while (len--) 115 for (;;)
112 { 116 {
117 len = e - s;
118
119 if (len == 0)
120 break;
113 if (s[0] < 0x80) 121 else if (s[0] < 0x80)
114 *p++ = *s++; 122 *p++ = *s++;
115 else if (len > 0 123 else if (len >= 2
116 && s[0] >= 0xc2 && s[0] <= 0xdf 124 && s[0] >= 0xc2 && s[0] <= 0xdf
117 && (s[1] & 0xc0) == 0x80) 125 && (s[1] & 0xc0) == 0x80)
118 { 126 {
119 *p++ = ((s[0] & 0x1f) << 6) 127 *p++ = ((s[0] & 0x1f) << 6)
120 | (s[1] & 0x3f); 128 | (s[1] & 0x3f);
121 s += 2; 129 s += 2;
122 } 130 }
123 else if (len > 1 131 else if (len >= 3
124 && ( (s[0] == 0xe0 && s[1] >= 0xa0 && s[1] <= 0xbf) 132 && ( (s[0] == 0xe0 && s[1] >= 0xa0 && s[1] <= 0xbf)
125 || (s[0] >= 0xe1 && s[0] <= 0xec && s[1] >= 0x80 && s[1] <= 0xbf) 133 || (s[0] >= 0xe1 && s[0] <= 0xec && s[1] >= 0x80 && s[1] <= 0xbf)
126 || (s[0] == 0xed && s[1] >= 0x80 && s[1] <= 0x9f) 134 || (s[0] == 0xed && s[1] >= 0x80 && s[1] <= 0x9f)
127 || (s[0] >= 0xee && s[0] <= 0xef && s[1] >= 0x80 && s[1] <= 0xbf) 135 || (s[0] >= 0xee && s[0] <= 0xef && s[1] >= 0x80 && s[1] <= 0xbf)
128 ) 136 )
… …
131 *p++ = ((s[0] & 0x0f) << 12) 139 *p++ = ((s[0] & 0x0f) << 12)
132 | ((s[1] & 0x3f) << 6) 140 | ((s[1] & 0x3f) << 6)
133 | (s[2] & 0x3f); 141 | (s[2] & 0x3f);
134 s += 3; 142 s += 3;
135 } 143 }
136 else if (len > 2 144 else if (len >= 4
137 && ( (s[0] == 0xf0 && s[1] >= 0x90 && s[1] <= 0xbf) 145 && ( (s[0] == 0xf0 && s[1] >= 0x90 && s[1] <= 0xbf)
138 || (s[0] >= 0xf1 && s[0] <= 0xf3 && s[1] >= 0x80 && s[1] <= 0xbf) 146 || (s[0] >= 0xf1 && s[0] <= 0xf3 && s[1] >= 0x80 && s[1] <= 0xbf)
139 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f) 147 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f)
140 ) 148 )
141 && (s[2] & 0xc0) == 0x80 149 && (s[2] & 0xc0) == 0x80
142 && (s[3] & 0xc0) == 0x80) 150 && (s[3] & 0xc0) == 0x80)
143 { 151 {
144 *p++ = ((s[0] & 0x07) << 18) 152 *p++ = ((s[0] & 0x07) << 18)
145 | ((s[1] & 0x3f) << 12) 153 | ((s[1] & 0x3f) << 12)
146 | ((s[2] & 0x3f) << 6) 154 | ((s[2] & 0x3f) << 6)
147 | (s[3] & 0x3f); 155 | (s[3] & 0x3f);
148 s += 4; 156 s += 4;
149 } 157 }
150 else 158 else
151 { 159 {
… …
157 *p = 0; 165 *p = 0;
158 166
159 return r; 167 return r;
160} 168}
161 169
162char * 170const char *
163rxvt_strdup (const char *str)
164{
165 return str ? strdup (str) : 0;
166}
167
168/* INTPROTO */
169char *
170rxvt_r_basename (const char *str) 171rxvt_basename (const char *str) NOTHROW
171{ 172{
172 char *base = strrchr (str, '/'); 173 char *base = strrchr (str, '/');
173 174
174 return (char *) (base ? base + 1 : str); 175 return (char *) (base ? base + 1 : str);
175} 176}
176 177
177/* 178/*
178 * Print an error message 179 * Print an error message
179 */ 180 */
180/* INTPROTO */
181void 181void
182rxvt_vlog (const char *fmt, va_list arg_ptr) 182rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW
183{ 183{
184 char msg[1024]; 184 char msg[1024];
185 185
186 vsnprintf (msg, sizeof msg, fmt, arg_ptr); 186 vsnprintf (msg, sizeof msg, fmt, arg_ptr);
187 187
… …
189 (*GET_R->log_hook) (msg); 189 (*GET_R->log_hook) (msg);
190 else 190 else
191 write (STDOUT_FILENO, msg, strlen (msg)); 191 write (STDOUT_FILENO, msg, strlen (msg));
192} 192}
193 193
194/* INTPROTO */
195void 194void
196rxvt_log (const char *fmt,...) 195rxvt_log (const char *fmt,...) NOTHROW
197{ 196{
198 va_list arg_ptr; 197 va_list arg_ptr;
199 198
200 va_start (arg_ptr, fmt); 199 va_start (arg_ptr, fmt);
201 rxvt_vlog (fmt, arg_ptr); 200 rxvt_vlog (fmt, arg_ptr);
… …
203} 202}
204 203
205/* 204/*
206 * Print an error message 205 * Print an error message
207 */ 206 */
208/* INTPROTO */
209void 207void
210rxvt_warn (const char *fmt,...) 208rxvt_warn (const char *fmt,...) NOTHROW
211{ 209{
212 va_list arg_ptr; 210 va_list arg_ptr;
213 211
214 rxvt_log ("%s: ", RESNAME); 212 rxvt_log ("%s: ", RESNAME);
215 213
216 va_start (arg_ptr, fmt); 214 va_start (arg_ptr, fmt);
217 rxvt_vlog (fmt, arg_ptr); 215 rxvt_vlog (fmt, arg_ptr);
218 va_end (arg_ptr); 216 va_end (arg_ptr);
219} 217}
220 218
221/* INTPROTO */
222void 219void
223rxvt_fatal (const char *fmt,...) 220rxvt_fatal (const char *fmt,...) THROW ((class rxvt_failure_exception))
224{ 221{
225 va_list arg_ptr; 222 va_list arg_ptr;
226 223
227 rxvt_log ("%s: ", RESNAME); 224 rxvt_log ("%s: ", RESNAME);
228 225
… …
231 va_end (arg_ptr); 228 va_end (arg_ptr);
232 229
233 rxvt_exit_failure (); 230 rxvt_exit_failure ();
234} 231}
235 232
233void
234rxvt_exit_failure () THROW ((class rxvt_failure_exception))
235{
236class rxvt_failure_exception rxvt_failure_exception; 236 static class rxvt_failure_exception rxvt_failure_exception;
237
238/* INTPROTO */
239void
240rxvt_exit_failure ()
241{
242 throw (rxvt_failure_exception); 237 throw (rxvt_failure_exception);
243} 238}
244 239
245/* 240/*
246 * check that the first characters of S1 match S2 241 * remove leading/trailing space in place.
247 *
248 * No Match
249 * return: 0
250 * Match
251 * return: strlen (S2)
252 */ 242 */
253/* INTPROTO */ 243char *
254int
255rxvt_Str_match (const char *s1, const char *s2)
256{
257 int n = strlen (s2);
258
259 return ((strncmp (s1, s2, n) == 0) ? n : 0);
260}
261
262/* INTPROTO */
263const char *
264rxvt_Str_skip_space (const char *str)
265{
266 if (str)
267 while (*str && isspace (*str))
268 str++;
269
270 return str;
271}
272
273/*
274 * remove leading/trailing space and strip-off leading/trailing quotes.
275 * in place.
276 */
277/* INTPROTO */
278char *
279rxvt_Str_trim (char *str) 244rxvt_strtrim (char *str) NOTHROW
280{ 245{
281 char *r, *s; 246 char *r, *s;
282 int n;
283 247
284 if (!str || !*str) /* shortcut */ 248 if (!str || !*str) /* shortcut */
285 return str; 249 return str;
286 250
287 /* skip leading spaces */ 251 /* skip leading spaces */
288 for (s = str; *s && isspace (*s); s++) ; 252 for (s = str; *s && isspace (*s); s++) ;
253
289 /* goto end of string */ 254 /* goto end of string */
290 for (n = 0, r = s; *r++; n++) ; 255 r = s + strlen (s) - 1;
291 r -= 2; 256
292 /* dump return */ 257 /* dump return and other trailing whitespace */
293 if (n > 0 && *r == '\n') 258 while (r > s && isspace (*r))
294 n--, r--; 259 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 260
304 /* copy back over: forwards copy */ 261 memmove (str, s, r + 1 - s);
305 for (r = str; n; n--) 262 str[r + 1 - s] = 0;
306 *r++ = *s++;
307 *r = '\0';
308 263
309 return str; 264 return str;
310}
311
312/*
313 * in-place interpretation of string:
314 *
315 * backslash-escaped: "\a\b\E\e\n\r\t", "\octal"
316 * Ctrl chars: ^@ .. ^_, ^?
317 *
318 * Emacs-style: "M-" prefix
319 *
320 * Also,
321 * "M-x" prefixed strings, append "\r" if needed
322 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
323 *
324 * returns the converted string length
325 */
326/* INTPROTO */
327int
328rxvt_Str_escaped (char *str)
329{
330 char ch, *s, *d;
331 int i, num, append = 0;
332
333 if (!str || !*str)
334 return 0;
335
336 d = s = str;
337
338 if (*s == 'M' && s[1] == '-')
339 {
340 /* Emacs convenience, replace leading `M-..' with `\E..' */
341 *d++ = C0_ESC;
342 s += 2;
343 if (toupper (*s) == 'X')
344 /* append carriage-return for `M-xcommand' */
345 for (*d++ = 'x', append = '\r', s++; isspace (*s); s++) ;
346 }
347 for (; (ch = *s++);)
348 {
349 if (ch == '\\')
350 {
351 ch = *s++;
352 if (ch >= '0' && ch <= '7')
353 { /* octal */
354 num = ch - '0';
355 for (i = 0; i < 2; i++, s++)
356 {
357 ch = *s;
358 if (ch < '0' || ch > '7')
359 break;
360 num = num * 8 + ch - '0';
361 }
362 ch = (char)num;
363 }
364 else if (ch == 'a')
365 ch = C0_BEL; /* bell */
366 else if (ch == 'b')
367 ch = C0_BS; /* backspace */
368 else if (ch == 'E' || ch == 'e')
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 }
377 else if (ch == '^')
378 {
379 ch = *s++;
380 ch = toupper (ch);
381 ch = (ch == '?' ? 127 : (ch - '@'));
382 }
383 *d++ = ch;
384 }
385
386 /* ESC] is an XTerm escape sequence, must be terminated */
387 if (*str == '\0' && str[1] == C0_ESC && str[2] == ']')
388 append = CHAR_ST;
389
390 /* add trailing character as required */
391 if (append && d[-1] != append)
392 *d++ = append;
393 *d = '\0';
394
395 return (d - str);
396} 265}
397 266
398/* 267/*
399 * Split a comma-separated string into an array, stripping leading and 268 * Split a comma-separated string into an array, stripping leading and
400 * trailing spaces (and paired quotes) from each entry. Empty strings 269 * trailing spaces from each entry. Empty strings are properly returned
401 * are properly returned
402 * Caller should free each entry and array when done
403 */ 270 */
404/* INTPROTO */ 271char **
405char **
406rxvt_splitcommastring (const char *cs) 272rxvt_splitcommastring (const char *cs) NOTHROW
407{ 273{
408 int l, n, p; 274 int l, n, p;
409 const char *s, *t; 275 const char *s, *t;
410 char **ret; 276 char **ret;
411 277
… …
413 s = ""; 279 s = "";
414 280
415 for (n = 1, t = s; *t; t++) 281 for (n = 1, t = s; *t; t++)
416 if (*t == ',') 282 if (*t == ',')
417 n++; 283 n++;
284
418 ret = (char **)malloc ((n + 1) * sizeof (char *)); 285 ret = (char **)malloc ((n + 1) * sizeof (char *));
419 ret[n] = NULL; 286 ret[n] = NULL;
420 287
421 for (l = 0, t = s; l < n; l++) 288 for (l = 0, t = s; l < n; l++)
422 { 289 {
423 for ( ; *t && *t != ','; t++) ; 290 for ( ; *t && *t != ','; t++) ;
424 p = t - s; 291 p = t - s;
425 ret[l] = (char *)malloc (p + 1); 292 ret[l] = (char *)malloc (p + 1);
426 strncpy (ret[l], s, p); 293 memcpy (ret[l], s, p);
427 ret[l][p] = '\0'; 294 ret[l][p] = '\0';
428 rxvt_Str_trim (ret[l]); 295 rxvt_strtrim (ret[l]);
429 s = ++t; 296 s = ++t;
430 } 297 }
298
431 return ret; 299 return ret;
432} 300}
433 301
434void 302void
435rxvt_freecommastring (char **cs) 303rxvt_freecommastring (char **cs) NOTHROW
436{ 304{
437 for (int i = 0; cs[i]; ++i) 305 for (int i = 0; cs[i]; ++i)
438 free (cs[i]); 306 free (cs[i]);
439 307
440 free (cs); 308 free (cs);
441} 309}
442 310
443/*----------------------------------------------------------------------* 311void *
444 * file searching 312rxvt_malloc (size_t size)
445 */
446
447/* #define DEBUG_SEARCH_PATH */
448
449#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
450/*
451 * search for FILE in the current working directory, and within the
452 * colon-delimited PATHLIST, adding the file extension EXT if required.
453 *
454 * FILE is either semi-colon or zero terminated
455 */
456/* INTPROTO */
457char *
458rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
459{ 313{
460 int maxpath, len; 314 void *p = malloc (size);
461 const char *p, *path;
462 char name[256];
463 315
464 if (!access (file, R_OK)) /* found (plain name) in current directory */
465 return strdup (file);
466
467 /* semi-colon delimited */
468 if ((p = strchr (file, ';')))
469 len = (p - file);
470 else
471 len = strlen (file);
472
473#ifdef DEBUG_SEARCH_PATH
474 getcwd (name, sizeof (name));
475 fprintf (stderr, "pwd: \"%s\"\n", name);
476 fprintf (stderr, "find: \"%.*s\"\n", len, file);
477#endif
478
479 /* leave room for an extra '/' and trailing '\0' */
480 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
481 if (maxpath <= 0)
482 return NULL;
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
529/* INTPROTO */
530char *
531rxvt_File_find (const char *file, const char *ext, const char *path)
532{
533 char *f;
534
535 if (file == NULL || *file == '\0')
536 return NULL;
537
538 /* search environment variables here too */
539 if ((f = rxvt_File_search_path (path, file, ext)) == NULL)
540#ifdef PATH_ENV
541 if ((f = rxvt_File_search_path (getenv (PATH_ENV), file, ext)) == NULL)
542#endif
543 f = rxvt_File_search_path (getenv ("PATH"), file, ext);
544
545#ifdef DEBUG_SEARCH_PATH
546 if (f) 316 if (!p)
547 fprintf (stderr, "found: \"%s\"\n", f); 317 rxvt_fatal ("memory allocation failure. aborting.\n");
548#endif
549 318
550 return f; 319 return p;
551} 320}
552#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
553 321
554/*----------------------------------------------------------------------*
555 * miscellaneous drawing routines
556 */
557
558/*
559 * Draw top/left and bottom/right border shadows around windows
560 */
561#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
562/* INTPROTO */
563void 322void *
564rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) 323rxvt_calloc (size_t number, size_t size)
565{ 324{
566 int shadow; 325 void *p = calloc (number, size);
567 326
568 shadow = (w == 0 || h == 0) ? 1 : SHADOW; 327 if (!p)
569 w += x - 1; 328 rxvt_fatal ("memory allocation failure. aborting.\n");
570 h += y - 1;
571 for (; shadow-- > 0; x++, y++, w--, h--)
572 {
573 XDrawLine (display, win, topShadow, x, y, w, y);
574 XDrawLine (display, win, topShadow, x, y, x, h);
575 XDrawLine (display, win, botShadow, w, h, w, y + 1);
576 XDrawLine (display, win, botShadow, w, h, x + 1, h);
577 }
578}
579#endif
580 329
581/* button shapes */ 330 return p;
582#ifdef MENUBAR 331}
583/* INTPROTO */ 332
584void 333void *
585rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type) 334rxvt_realloc (void *ptr, size_t size)
586{ 335{
587 switch (type) 336 void *p = realloc (ptr, size);
588 {
589 case 'r': /* right triangle */
590 XDrawLine (display, win, topShadow, x, y, x, y + w);
591 XDrawLine (display, win, topShadow, x, y, x + w, y + w / 2);
592 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w / 2);
593 break;
594 337
595 case 'l': /* left triangle */ 338 if (!p)
596 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y); 339 rxvt_fatal ("memory allocation failure. aborting.\n");
597 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w / 2);
598 XDrawLine (display, win, topShadow, x, y + w / 2, x + w, y);
599 break;
600 340
601 case 'd': /* down triangle */ 341 return p;
602 XDrawLine (display, win, topShadow, x, y, x + w / 2, y + w);
603 XDrawLine (display, win, topShadow, x, y, x + w, y);
604 XDrawLine (display, win, botShadow, x + w, y, x + w / 2, y + w);
605 break;
606
607 case 'u': /* up triangle */
608 XDrawLine (display, win, botShadow, x + w, y + w, x + w / 2, y);
609 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w);
610 XDrawLine (display, win, topShadow, x, y + w, x + w / 2, y);
611 break;
612#if 0
613 case 's': /* square */
614 XDrawLine (display, win, topShadow, x + w, y, x, y);
615 XDrawLine (display, win, topShadow, x, y, x, y + w);
616 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w);
617 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
618 break;
619#endif
620
621 }
622} 342}
623#endif
624/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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