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.50 by ayin, Tue Dec 18 01:36:24 2007 UTC vs.
Revision 1.59 by sf-exg, Wed Nov 12 12:12:02 2014 UTC

… …
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-2006 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
… …
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 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}
51
29char * 52char *
30rxvt_wcstombs (const wchar_t *str, int len) 53rxvt_wcstombs (const wchar_t *str, int len)
31{ 54{
32 if (len < 0) len = wcslen (str); 55 if (len < 0) len = wcslen (str);
33 56
… …
38 while (len--) 61 while (len--)
39 { 62 {
40 ssize_t l = wcrtomb (dst, *str++, mbs); 63 ssize_t l = wcrtomb (dst, *str++, mbs);
41 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;
… …
162 *p = 0; 188 *p = 0;
163 189
164 return r; 190 return r;
165} 191}
166 192
167char * 193const char *
168rxvt_basename (const char *str) NOTHROW 194rxvt_basename (const char *str) NOTHROW
169{ 195{
170 char *base = strrchr (str, '/'); 196 const char *base = strrchr (str, '/');
171 197
172 return (char *) (base ? base + 1 : str); 198 return base ? base + 1 : str;
173} 199}
174 200
175/* 201/*
176 * Print an error message 202 * Print an error message
177 */ 203 */
… …
260 286
261 return str; 287 return str;
262} 288}
263 289
264/* 290/*
265 * Split a comma-separated string into an array, stripping leading and 291 * Split a string into an array based on the given delimiter, stripping leading and
266 * trailing spaces from each entry. Empty strings are properly returned 292 * trailing spaces from each entry. Empty strings are properly returned
267 */ 293 */
268char ** 294char **
269rxvt_splitcommastring (const char *cs) NOTHROW 295rxvt_strsplit (char delim, const char *str) NOTHROW
270{ 296{
271 int l, n, p; 297 int l, n;
272 const char *s, *t; 298 char *s, *t;
273 char **ret; 299 char **ret;
274 300
275 if ((s = cs) == NULL) 301 s = strdup (str ? str : "");
276 s = "";
277 302
278 for (n = 1, t = s; *t; t++) 303 for (n = 1, t = s; *t; t++)
279 if (*t == ',') 304 if (*t == delim)
280 n++; 305 n++;
281 306
282 ret = (char **)malloc ((n + 1) * sizeof (char *)); 307 ret = (char **)malloc ((n + 1) * sizeof (char *));
283 ret[n] = NULL; 308 ret[n] = NULL;
284 309
285 for (l = 0, t = s; l < n; l++) 310 for (l = 0, t = s; l < n; l++)
286 { 311 {
287 for ( ; *t && *t != ','; t++) ; 312 for (; *t && *t != delim; t++)
288 p = t - s; 313 ;
289 ret[l] = (char *)malloc (p + 1); 314 *t = '\0';
290 strncpy (ret[l], s, p);
291 ret[l][p] = '\0'; 315 ret[l] = s;
292 rxvt_strtrim (ret[l]); 316 rxvt_strtrim (ret[l]);
293 s = ++t; 317 s = ++t;
294 } 318 }
295 319
296 return ret; 320 return ret;
297} 321}
298 322
299void
300rxvt_freecommastring (char **cs) NOTHROW
301{
302 for (int i = 0; cs[i]; ++i)
303 free (cs[i]);
304
305 free (cs);
306}
307
308void * 323void *
309rxvt_malloc (size_t size) 324rxvt_malloc (size_t size)
310{ 325{
311 void *p = malloc (size); 326 void *p = malloc (size);
312 327
… …
335 if (!p) 350 if (!p)
336 rxvt_fatal ("memory allocation failure. aborting.\n"); 351 rxvt_fatal ("memory allocation failure. aborting.\n");
337 352
338 return p; 353 return p;
339} 354}
355
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