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.57 by root, Thu May 22 18:54:33 2014 UTC vs.
Revision 1.59 by sf-exg, Wed Nov 12 12:12:02 2014 UTC

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
327 if (!p) 350 if (!p)
328 rxvt_fatal ("memory allocation failure. aborting.\n"); 351 rxvt_fatal ("memory allocation failure. aborting.\n");
329 352
330 return p; 353 return p;
331} 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