--- rxvt-unicode/src/rxvtperl.xs	2006/08/07 21:38:24	1.103
+++ rxvt-unicode/src/rxvtperl.xs	2006/12/10 15:14:05	1.108
@@ -943,7 +943,7 @@
 int
 GET_CUSTOM (int rend)
 	CODE:
-        RETVAL = (rend && RS_customMask) >> RS_customShift;
+        RETVAL = (rend & RS_customMask) >> RS_customShift;
 	OUTPUT:
         RETVAL
 
@@ -1124,7 +1124,14 @@
         wchar_t *wstr = sv2wcs (str);
 
 	rxvt_push_locale (THIS->locale);
-        RETVAL = wcswidth (wstr, wcslen (wstr));
+        RETVAL = 0;
+        for (wchar_t *wc = wstr; *wc; wc++)
+          {
+            int w = WCWIDTH (*wc);
+
+            if (w)
+              RETVAL += max (w, 1);
+          }
         rxvt_pop_locale ();
 
         free (wstr);
@@ -1167,6 +1174,13 @@
 	OUTPUT:
         RETVAL
 
+char *
+rxvt_term::locale ()
+	CODE:
+        RETVAL = THIS->locale;
+	OUTPUT:
+        RETVAL
+
 #define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
 
 #define TERM_OFFSET_width      TERM_OFFSET(width)