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.59 by sf-exg, Wed Nov 12 12:12:02 2014 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 <schmorp@schmorp.de>
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 3 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
15 * 15 *
16 * This program is distributed in the hope that it will be useful, 16 * This program is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of 17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 */ 28
29#include <new>
30
31// alas new/delete cannot be specified as inline in C++11 (see 17.6.4.6)
32void *
33operator new (size_t s)
34#if !ECB_CPP11
35 throw (std::bad_alloc)
36#endif
37{
38 return rxvt_malloc (s);
39}
40
41void
42operator delete (void *p)
43#if ECB_CPP11
44 noexcept
45#else
46 throw ()
47#endif
48{
49 free (p);
50}
29 51
30char * 52char *
31rxvt_wcstombs (const wchar_t *str, int len) 53rxvt_wcstombs (const wchar_t *str, int len)
32{ 54{
33 if (len < 0) len = wcslen (str); 55 if (len < 0) len = wcslen (str);
… …
36 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1); 58 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1);
37 59
38 char *dst = r; 60 char *dst = r;
39 while (len--) 61 while (len--)
40 { 62 {
41 int l = wcrtomb (dst, *str++, mbs); 63 ssize_t l = wcrtomb (dst, *str++, mbs);
64
42 if (l < 0) 65 if (l < 0)
66 {
43 *dst++ = '?'; 67 *dst++ = '?';
68 wcrtomb (0, 0, mbs); // reset undefined state
69 }
44 else 70 else
45 dst += l; 71 dst += l;
46 } 72 }
47 73
48 *dst++ = 0; 74 *dst++ = 0;
49 75
50 return r; 76 return (char *)rxvt_realloc (r, dst - r);
51} 77}
52 78
53wchar_t * 79wchar_t *
54rxvt_mbstowcs (const char *str, int len) 80rxvt_mbstowcs (const char *str, int len)
55{ 81{
56 if (len < 0) len = strlen (str); 82 if (len < 0) len = strlen (str);
57 83
58 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)); 84 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
59 85
60 if (mbstowcs (r, str, len + 1) < 0) 86 if ((ssize_t)mbstowcs (r, str, len + 1) < 0)
61 *r = 0; 87 *r = 0;
62 88
63 return r; 89 return r;
64} 90}
65 91
… …
71 char *r = (char *)rxvt_malloc (len * 4 + 1); 97 char *r = (char *)rxvt_malloc (len * 4 + 1);
72 char *p = r; 98 char *p = r;
73 99
74 while (len--) 100 while (len--)
75 { 101 {
76 unicode_t w = *str++; 102 unicode_t w = *str++ & UNICODE_MASK;
77 103
78 if (w < 0x000080) 104 if (w < 0x000080)
79 *p++ = w; 105 *p++ = w;
80 else if (w < 0x000800) 106 else if (w < 0x000800)
81 *p++ = 0xc0 | ( w >> 6), 107 *p++ = 0xc0 | ( w >> 6),
82 *p++ = 0x80 | ( w & 0x3f); 108 *p++ = 0x80 | ( w & 0x3f);
83 else if (w < 0x010000) 109 else if (w < 0x010000)
84 *p++ = 0xe0 | ( w >> 12 ), 110 *p++ = 0xe0 | ( w >> 12),
85 *p++ = 0x80 | ((w >> 6) & 0x3f), 111 *p++ = 0x80 | ((w >> 6) & 0x3f),
86 *p++ = 0x80 | ( w & 0x3f); 112 *p++ = 0x80 | ( w & 0x3f);
87 else if (w < 0x110000) 113 else if (w < 0x110000)
88 *p++ = 0xf0 | ( w >> 18), 114 *p++ = 0xf0 | ( w >> 18),
89 *p++ = 0x80 | ((w >> 12) & 0x3f), 115 *p++ = 0x80 | ((w >> 12) & 0x3f),
… …
91 *p++ = 0x80 | ( w & 0x3f); 117 *p++ = 0x80 | ( w & 0x3f);
92 else 118 else
93 *p++ = '?'; 119 *p++ = '?';
94 } 120 }
95 121
96 *p = 0; 122 *p++ = 0;
97 123
98 return r; 124 return (char *)rxvt_realloc (r, p - r);
99} 125}
100 126
101wchar_t * 127wchar_t *
102rxvt_utf8towcs (const char *str, int len) 128rxvt_utf8towcs (const char *str, int len)
103{ 129{
104 if (len < 0) len = strlen (str); 130 if (len < 0) len = strlen (str);
105 131
106 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)); 132 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)),
107 wchar_t *p = r; 133 *p = r;
108 134
109 unsigned char *s = (unsigned char *)str; 135 unsigned char *s = (unsigned char *)str,
136 *e = s + len;
110 137
111 while (len--) 138 for (;;)
112 { 139 {
140 len = e - s;
141
142 if (len == 0)
143 break;
113 if (s[0] < 0x80) 144 else if (s[0] < 0x80)
114 *p++ = *s++; 145 *p++ = *s++;
115 else if (len > 0 146 else if (len >= 2
116 && s[0] >= 0xc2 && s[0] <= 0xdf 147 && s[0] >= 0xc2 && s[0] <= 0xdf
117 && (s[1] & 0xc0) == 0x80) 148 && (s[1] & 0xc0) == 0x80)
118 { 149 {
119 *p++ = ((s[0] & 0x1f) << 6) 150 *p++ = ((s[0] & 0x1f) << 6)
120 | (s[1] & 0x3f); 151 | (s[1] & 0x3f);
121 s += 2; 152 s += 2;
122 } 153 }
123 else if (len > 1 154 else if (len >= 3
124 && ( (s[0] == 0xe0 && s[1] >= 0xa0 && s[1] <= 0xbf) 155 && ( (s[0] == 0xe0 && s[1] >= 0xa0 && s[1] <= 0xbf)
125 || (s[0] >= 0xe1 && s[0] <= 0xec && s[1] >= 0x80 && s[1] <= 0xbf) 156 || (s[0] >= 0xe1 && s[0] <= 0xec && s[1] >= 0x80 && s[1] <= 0xbf)
126 || (s[0] == 0xed && s[1] >= 0x80 && s[1] <= 0x9f) 157 || (s[0] == 0xed && s[1] >= 0x80 && s[1] <= 0x9f)
127 || (s[0] >= 0xee && s[0] <= 0xef && s[1] >= 0x80 && s[1] <= 0xbf) 158 || (s[0] >= 0xee && s[0] <= 0xef && s[1] >= 0x80 && s[1] <= 0xbf)
128 ) 159 )
… …
131 *p++ = ((s[0] & 0x0f) << 12) 162 *p++ = ((s[0] & 0x0f) << 12)
132 | ((s[1] & 0x3f) << 6) 163 | ((s[1] & 0x3f) << 6)
133 | (s[2] & 0x3f); 164 | (s[2] & 0x3f);
134 s += 3; 165 s += 3;
135 } 166 }
136 else if (len > 2 167 else if (len >= 4
137 && ( (s[0] == 0xf0 && s[1] >= 0x90 && s[1] <= 0xbf) 168 && ( (s[0] == 0xf0 && s[1] >= 0x90 && s[1] <= 0xbf)
138 || (s[0] >= 0xf1 && s[0] <= 0xf3 && s[1] >= 0x80 && s[1] <= 0xbf) 169 || (s[0] >= 0xf1 && s[0] <= 0xf3 && s[1] >= 0x80 && s[1] <= 0xbf)
139 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f) 170 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f)
140 ) 171 )
141 && (s[2] & 0xc0) == 0x80 172 && (s[2] & 0xc0) == 0x80
142 && (s[3] & 0xc0) == 0x80) 173 && (s[3] & 0xc0) == 0x80)
143 { 174 {
144 *p++ = ((s[0] & 0x07) << 18) 175 *p++ = ((s[0] & 0x07) << 18)
145 | ((s[1] & 0x3f) << 12) 176 | ((s[1] & 0x3f) << 12)
146 | ((s[2] & 0x3f) << 6) 177 | ((s[2] & 0x3f) << 6)
147 | (s[3] & 0x3f); 178 | (s[3] & 0x3f);
148 s += 4; 179 s += 4;
149 } 180 }
150 else 181 else
151 { 182 {
… …
157 *p = 0; 188 *p = 0;
158 189
159 return r; 190 return r;
160} 191}
161 192
162char * 193const char *
163rxvt_strdup (const char *str)
164{
165 return str ? strdup (str) : 0;
166}
167
168/* INTPROTO */
169char *
170rxvt_r_basename (const char *str) 194rxvt_basename (const char *str) NOTHROW
171{ 195{
172 char *base = strrchr (str, '/'); 196 const char *base = strrchr (str, '/');
173 197
174 return (char *) (base ? base + 1 : str); 198 return base ? base + 1 : str;
175} 199}
176 200
177/* 201/*
178 * Print an error message 202 * Print an error message
179 */ 203 */
180/* INTPROTO */
181void 204void
182rxvt_vlog (const char *fmt, va_list arg_ptr) 205rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW
183{ 206{
184 char msg[1024]; 207 char msg[1024];
185 208
186 vsnprintf (msg, sizeof msg, fmt, arg_ptr); 209 vsnprintf (msg, sizeof msg, fmt, arg_ptr);
187 210
… …
189 (*GET_R->log_hook) (msg); 212 (*GET_R->log_hook) (msg);
190 else 213 else
191 write (STDOUT_FILENO, msg, strlen (msg)); 214 write (STDOUT_FILENO, msg, strlen (msg));
192} 215}
193 216
194/* INTPROTO */
195void 217void
196rxvt_log (const char *fmt,...) 218rxvt_log (const char *fmt,...) NOTHROW
197{ 219{
198 va_list arg_ptr; 220 va_list arg_ptr;
199 221
200 va_start (arg_ptr, fmt); 222 va_start (arg_ptr, fmt);
201 rxvt_vlog (fmt, arg_ptr); 223 rxvt_vlog (fmt, arg_ptr);
… …
203} 225}
204 226
205/* 227/*
206 * Print an error message 228 * Print an error message
207 */ 229 */
208/* INTPROTO */
209void 230void
210rxvt_warn (const char *fmt,...) 231rxvt_warn (const char *fmt,...) NOTHROW
211{ 232{
212 va_list arg_ptr; 233 va_list arg_ptr;
213 234
214 rxvt_log ("%s: ", RESNAME); 235 rxvt_log ("%s: ", RESNAME);
215 236
216 va_start (arg_ptr, fmt); 237 va_start (arg_ptr, fmt);
217 rxvt_vlog (fmt, arg_ptr); 238 rxvt_vlog (fmt, arg_ptr);
218 va_end (arg_ptr); 239 va_end (arg_ptr);
219} 240}
220 241
221/* INTPROTO */
222void 242void
223rxvt_fatal (const char *fmt,...) 243rxvt_fatal (const char *fmt,...) THROW ((class rxvt_failure_exception))
224{ 244{
225 va_list arg_ptr; 245 va_list arg_ptr;
226 246
227 rxvt_log ("%s: ", RESNAME); 247 rxvt_log ("%s: ", RESNAME);
228 248
… …
231 va_end (arg_ptr); 251 va_end (arg_ptr);
232 252
233 rxvt_exit_failure (); 253 rxvt_exit_failure ();
234} 254}
235 255
256void
257rxvt_exit_failure () THROW ((class rxvt_failure_exception))
258{
236class rxvt_failure_exception rxvt_failure_exception; 259 static class rxvt_failure_exception rxvt_failure_exception;
237
238/* INTPROTO */
239void
240rxvt_exit_failure ()
241{
242 throw (rxvt_failure_exception); 260 throw (rxvt_failure_exception);
243} 261}
244 262
245/* 263/*
246 * check that the first characters of S1 match S2 264 * remove leading/trailing space in place.
247 *
248 * No Match
249 * return: 0
250 * Match
251 * return: strlen (S2)
252 */ 265 */
253/* INTPROTO */ 266char *
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) 267rxvt_strtrim (char *str) NOTHROW
280{ 268{
281 char *r, *s; 269 char *r, *s;
282 int n;
283 270
284 if (!str || !*str) /* shortcut */ 271 if (!str || !*str) /* shortcut */
285 return str; 272 return str;
286 273
287 /* skip leading spaces */ 274 /* skip leading spaces */
288 for (s = str; *s && isspace (*s); s++) ; 275 for (s = str; *s && isspace (*s); s++) ;
276
289 /* goto end of string */ 277 /* goto end of string */
290 for (n = 0, r = s; *r++; n++) ; 278 r = s + strlen (s) - 1;
291 r -= 2; 279
292 /* dump return */ 280 /* dump return and other trailing whitespace */
293 if (n > 0 && *r == '\n') 281 while (r > s && isspace (*r))
294 n--, r--; 282 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 283
304 /* copy back over: forwards copy */ 284 memmove (str, s, r + 1 - s);
305 for (r = str; n; n--) 285 str[r + 1 - s] = 0;
306 *r++ = *s++;
307 *r = '\0';
308 286
309 return str; 287 return str;
310} 288}
311 289
312/* 290/*
313 * in-place interpretation of string: 291 * Split a string into an array based on the given delimiter, stripping leading and
314 * 292 * trailing spaces from each entry. Empty strings are properly returned
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 */ 293 */
326/* INTPROTO */ 294char **
327int 295rxvt_strsplit (char delim, const char *str) NOTHROW
328rxvt_Str_escaped (char *str)
329{ 296{
330 char ch, *s, *d; 297 int l, n;
331 int i, num, append = 0; 298 char *s, *t;
299 char **ret;
332 300
333 if (!str || !*str) 301 s = strdup (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}
397
398/*
399 * Split a comma-separated string into an array, stripping leading and
400 * trailing spaces (and paired quotes) from each entry. Empty strings
401 * are properly returned
402 * Caller should free each entry and array when done
403 */
404/* INTPROTO */
405char **
406rxvt_splitcommastring (const char *cs)
407{
408 int l, n, p;
409 const char *s, *t;
410 char **ret;
411
412 if ((s = cs) == NULL)
413 s = "";
414 302
415 for (n = 1, t = s; *t; t++) 303 for (n = 1, t = s; *t; t++)
416 if (*t == ',') 304 if (*t == delim)
417 n++; 305 n++;
306
418 ret = (char **)malloc ((n + 1) * sizeof (char *)); 307 ret = (char **)malloc ((n + 1) * sizeof (char *));
419 ret[n] = NULL; 308 ret[n] = NULL;
420 309
421 for (l = 0, t = s; l < n; l++) 310 for (l = 0, t = s; l < n; l++)
422 { 311 {
423 for ( ; *t && *t != ','; t++) ; 312 for (; *t && *t != delim; t++)
424 p = t - s; 313 ;
425 ret[l] = (char *)malloc (p + 1); 314 *t = '\0';
426 strncpy (ret[l], s, p);
427 ret[l][p] = '\0'; 315 ret[l] = s;
428 rxvt_Str_trim (ret[l]); 316 rxvt_strtrim (ret[l]);
429 s = ++t; 317 s = ++t;
430 } 318 }
319
431 return ret; 320 return ret;
432} 321}
433 322
434void 323void *
435rxvt_freecommastring (char **cs) 324rxvt_malloc (size_t size)
436{ 325{
437 for (int i = 0; cs[i]; ++i) 326 void *p = malloc (size);
438 free (cs[i]);
439 327
440 free (cs);
441}
442
443/*----------------------------------------------------------------------*
444 * file searching
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{
460 int maxpath, len;
461 const char *p, *path;
462 char name[256];
463
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) 328 if (!p)
547 fprintf (stderr, "found: \"%s\"\n", f); 329 rxvt_fatal ("memory allocation failure. aborting.\n");
548#endif
549 330
550 return f; 331 return p;
551} 332}
552#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
553 333
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 334void *
564rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) 335rxvt_calloc (size_t number, size_t size)
565{ 336{
566 int shadow; 337 void *p = calloc (number, size);
567 338
568 shadow = (w == 0 || h == 0) ? 1 : SHADOW; 339 if (!p)
569 w += x - 1; 340 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 341
581/* button shapes */ 342 return p;
582#ifdef MENUBAR 343}
583/* INTPROTO */ 344
584void 345void *
585rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type) 346rxvt_realloc (void *ptr, size_t size)
586{ 347{
587 switch (type) 348 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 349
595 case 'l': /* left triangle */ 350 if (!p)
596 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y); 351 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 352
601 case 'd': /* down triangle */ 353 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} 354}
623#endif 355
624/*----------------------- end-of-file (C source) -----------------------*/ 356KeySym
357rxvt_XKeycodeToKeysym (Display *dpy, KeyCode code, int index)
358{
359 int size;
360 KeySym *mapping = XGetKeyboardMapping (dpy, code, 1, &size);
361 KeySym keysym = IN_RANGE_EXC (index, 0, size) ? mapping[index] : NoSymbol;
362 XFree (mapping);
363 return keysym;
364}

Diff Legend

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