[ViewVC] Diff of: cvs/rxvt-unicode/src/misc.C

Comparing rxvt-unicode/src/misc.C (file contents):
Revision 1.48 by ayin, Tue Oct 23 21:54:42 2007 UTC vs.
Revision 1.60 by sf-exg, Thu May 13 19:40:19 2021 UTC

  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1996      mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2000 Geoff Wing <gcw@pobox.com>
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *----------------------------------------------------------------------*/
 #include "../config.h"		/* NECESSARY */
 #include "rxvt.h"		/* NECESSARY */
+#include <new>
+// alas new/delete cannot be specified as inline in C++11 (see 17.6.4.6)
+void *
+operator new (size_t s)
+{
+  return rxvt_malloc (s);
+}
+void
+operator delete (void *p) noexcept
+{
+  free (p);
+}
 char *
 rxvt_wcstombs (const wchar_t *str, int len)
 {
   if (len < 0) len = wcslen (str);
   while (len--)
     {
       ssize_t l = wcrtomb (dst, *str++, mbs);
       if (l < 0)
+        {
-        *dst++ = '?';
+          *dst++ = '?';
+          wcrtomb (0, 0, mbs); // reset undefined state
+        }
       else
         dst += l;
     }
   *dst++ = 0;
       if (len == 0)
         break;
       else if (s[0] < 0x80)
         *p++ = *s++;
       else if (len >= 2
                && s[0] >= 0xc2 && s[0] <= 0xdf
                && (s[1] & 0xc0) == 0x80)
         {
           *p++ = ((s[0] & 0x1f) << 6)
                |  (s[1] & 0x3f);
           s += 2;
                    || (s[0] == 0xf4                 && s[1] >= 0x80 && s[1] <= 0x8f)
                   )
                && (s[2] & 0xc0) == 0x80
                && (s[3] & 0xc0) == 0x80)
         {
           *p++ = ((s[0] & 0x07) << 18)
                | ((s[1] & 0x3f) << 12)
                | ((s[2] & 0x3f) <<  6)
                |  (s[3] & 0x3f);
           s += 4;
         }
       else
         {
   *p = 0;
   return r;
 }
-char *
+const char *
-rxvt_basename (const char *str) NOTHROW
+rxvt_basename (const char *str) noexcept
 {
-  char *base = strrchr (str, '/');
+  const char *base = strrchr (str, '/');
-  return (char *) (base ? base + 1 : str);
+  return base ? base + 1 : str;
 }
 /*
  * Print an error message
  */
 void
-rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW
+rxvt_vlog (const char *fmt, va_list arg_ptr) noexcept
 {
   char msg[1024];
   vsnprintf (msg, sizeof msg, fmt, arg_ptr);
   else
     write (STDOUT_FILENO, msg, strlen (msg));
 }
 void
-rxvt_log (const char *fmt,...) NOTHROW
+rxvt_log (const char *fmt,...) noexcept
 {
   va_list arg_ptr;
   va_start (arg_ptr, fmt);
   rxvt_vlog (fmt, arg_ptr);
 /*
  * Print an error message
  */
 void
-rxvt_warn (const char *fmt,...) NOTHROW
+rxvt_warn (const char *fmt,...) noexcept
 {
   va_list arg_ptr;
   rxvt_log ("%s: ", RESNAME);
   rxvt_vlog (fmt, arg_ptr);
   va_end (arg_ptr);
 }
 void
-rxvt_fatal (const char *fmt,...) THROW ((class rxvt_failure_exception))
+rxvt_fatal (const char *fmt,...)
 {
   va_list arg_ptr;
   rxvt_log ("%s: ", RESNAME);
   rxvt_exit_failure ();
 }
 void
-rxvt_exit_failure () THROW ((class rxvt_failure_exception))
+rxvt_exit_failure ()
 {
   static class rxvt_failure_exception rxvt_failure_exception;
   throw (rxvt_failure_exception);
 }
 /*
  * remove leading/trailing space in place.
  */
 char *
-rxvt_strtrim (char *str) NOTHROW
+rxvt_strtrim (char *str) noexcept
 {
   char *r, *s;
   if (!str || !*str)		/* shortcut */
     return str;
   return str;
 }
 /*
- * Split a comma-separated string into an array, stripping leading and
+ * Split a string into an array based on the given delimiter, stripping leading and
  * trailing spaces from each entry.  Empty strings are properly returned
  */
 char **
-rxvt_splitcommastring (const char *cs) NOTHROW
+rxvt_strsplit (char delim, const char *str) noexcept
 {
-  int             l, n, p;
+  int l, n;
-  const char     *s, *t;
+  char *s, *t;
-  char          **ret;
+  char **ret;
-  if ((s = cs) == NULL)
+  s = strdup (str ? str : "");
-    s = "";
   for (n = 1, t = s; *t; t++)
-    if (*t == ',')
+    if (*t == delim)
       n++;
   ret = (char **)malloc ((n + 1) * sizeof (char *));
   ret[n] = NULL;
   for (l = 0, t = s; l < n; l++)
     {
-      for ( ; *t && *t != ','; t++) ;
+      for (; *t && *t != delim; t++)
-      p = t - s;
+        ;
-      ret[l] = (char *)malloc (p + 1);
+      *t = '\0';
-      strncpy (ret[l], s, p);
-      ret[l][p] = '\0';
+      ret[l] = s;
       rxvt_strtrim (ret[l]);
       s = ++t;
     }
   return ret;
 }
-void
+void *
-rxvt_freecommastring (char **cs) NOTHROW
+rxvt_malloc (size_t size)
 {
-  for (int i = 0; cs[i]; ++i)
+  void *p = malloc (size);
-    free (cs[i]);
-  free (cs);
+  if (!p)
-}
+    rxvt_fatal ("memory allocation failure. aborting.\n");
+  return p;
+}
+void *
+rxvt_calloc (size_t number, size_t size)
+{
+  void *p = calloc (number, size);
+  if (!p)
+    rxvt_fatal ("memory allocation failure. aborting.\n");
+  return p;
+}
+void *
+rxvt_realloc (void *ptr, size_t size)
+{
+  void *p = realloc (ptr, size);
+  if (!p)
+    rxvt_fatal ("memory allocation failure. aborting.\n");
+  return p;
+}
+KeySym
+rxvt_XKeycodeToKeysym (Display *dpy, KeyCode code, int index)
+{
+  int size;
+  KeySym *mapping = XGetKeyboardMapping (dpy, code, 1, &size);
+  KeySym keysym = IN_RANGE_EXC (index, 0, size) ? mapping[index] : NoSymbol;
+  XFree (mapping);
+  return keysym;
+}

Diff Legend

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

Comparing rxvt-unicode/src/misc.C (file contents): Revision 1.48 by ayin, Tue Oct 23 21:54:42 2007 UTC vs. Revision 1.60 by sf-exg, Thu May 13 19:40:19 2021 UTC

Diff Legend

Comparing rxvt-unicode/src/misc.C (file contents):
Revision 1.48 by ayin, Tue Oct 23 21:54:42 2007 UTC vs.
Revision 1.60 by sf-exg, Thu May 13 19:40:19 2021 UTC