--- rxvt-unicode/src/rxvtperl.xs	2006/01/06 05:28:55	1.30
+++ rxvt-unicode/src/rxvtperl.xs	2006/01/06 21:06:09	1.34
@@ -3,7 +3,7 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2005-2005 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
  *
  * 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
@@ -467,11 +467,11 @@
           XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
           break;
 
-        case DT_STRING:
+        case DT_STR:
           XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
           break;
 
-        case DT_STRING_LEN:
+        case DT_STR_LEN:
           {
             char *str = va_arg (ap, char *);
             int len = va_arg (ap, int);
@@ -480,6 +480,15 @@
           }
           break;
 
+        case DT_WCS_LEN:
+          {
+            wchar_t *wstr = va_arg (ap, wchar_t *);
+            int wlen = va_arg (ap, int);
+
+            XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
+          }
+         break;
+
         case DT_XEVENT:
           {
             XEvent *xe = va_arg (ap, XEvent *);
@@ -532,20 +541,6 @@
           }
           break;
 
-        case DT_USTRING_LEN:
-          {
-            unicode_t *ustr = va_arg (ap, unicode_t *);
-            int ulen = va_arg (ap, int);
-            wchar_t *wstr = new wchar_t [ulen];
-
-            for (int i = ulen; i--; )
-              wstr [i] = ustr [i];
-
-            XPUSHs (sv_2mortal (wcs2sv (wstr, ulen)));
-
-            delete [] wstr;
-          }
-
         case DT_END:
           {
             va_end (ap);
@@ -799,9 +794,16 @@
         RETVAL
 
 U32
+rxvt_term::parent ()
+	CODE:
+        RETVAL = (U32)THIS->parent [0];
+        OUTPUT:
+        RETVAL
+
+U32
 rxvt_term::vt ()
 	CODE:
-        RETVAL = THIS->vt;
+        RETVAL = (U32)THIS->vt;
         OUTPUT:
         RETVAL
 
@@ -848,10 +850,10 @@
           {
             wchar_t *wstr = new wchar_t [THIS->ncol];
 
-            for (int col = 0; col <THIS->ncol; col++)
+            for (int col = 0; col < THIS->ncol; col++)
               wstr [col] = l.t [col];
 
-            XPUSHs (sv_2mortal (wcs2sv (wstr)));
+            XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
 
             delete [] wstr;
           }
@@ -951,14 +953,79 @@
         RETVAL
 
 SV *
-rxvt_term::special_encode (SV *str)
+rxvt_term::special_encode (SV *string)
 	CODE:
-        abort ();//TODO
+{
+        wchar_t *wstr = sv2wcs (string);
+        int wlen = wcslen (wstr);
+        wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
+
+	rxvt_push_locale (THIS->locale);
+
+        wchar_t *r = rstr;
+        for (wchar_t *s = wstr; *s; s++)
+          if (wcwidth (*s) == 0)
+            {
+              if (r == rstr)
+                croak ("leading combining character unencodable");
+
+              unicode_t n = rxvt_compose (r[-1], *s);
+              if (n == NOCHAR)
+                n = rxvt_composite.compose (r[-1], *s);
+
+              r[-1] = n;
+            }
+#if !UNICODE_3
+          else if (*s >= 0x10000)
+            *r++ = rxvt_composite.compose (*s);
+#endif
+          else
+            *r++ = *s;
+
+	rxvt_pop_locale ();
+
+        RETVAL = wcs2sv (rstr, r - rstr);
+
+        delete [] rstr;
+}
+	OUTPUT:
+        RETVAL
 
 SV *
-rxvt_term::special_decode (SV *str)
+rxvt_term::special_decode (SV *text)
 	CODE:
-        abort ();//TODO
+{
+        wchar_t *wstr = sv2wcs (text);
+        int wlen = wcslen (wstr);
+        int dlen = 0;
+
+        // find length
+        for (wchar_t *s = wstr; *s; s++)
+          if (*s == NOCHAR)
+            ;
+          else if (IS_COMPOSE (*s))
+            dlen += rxvt_composite.expand (*s, 0);
+          else
+            dlen++;
+
+        wchar_t *rstr = new wchar_t [dlen];
+
+        // decode
+        wchar_t *r = rstr;
+        for (wchar_t *s = wstr; *s; s++)
+          if (*s == NOCHAR)
+            ;
+          else if (IS_COMPOSE (*s))
+            r += rxvt_composite.expand (*s, r);
+          else
+            *r++ = *s;
+
+        RETVAL = wcs2sv (rstr, r - rstr);
+
+        delete [] rstr;
+}
+	OUTPUT:
+        RETVAL
 
 void
 rxvt_term::_resource (char *name, int index, SV *newval = 0)
@@ -1056,20 +1123,8 @@
 	CODE:
 {
         wchar_t *wstr = sv2wcs (string);
-        int wlen = wcslen (wstr);
-        unicode_t *ustr = new unicode_t [wlen];
-        int nlines = 0;
-
-        for (int i = wlen; i--; )
-          {
-            ustr [i] = wstr [i];
-            nlines += ustr [i] == '\012';
-          }
-
-        THIS->scr_add_lines (ustr, nlines, wlen);
-
+        THIS->scr_add_lines (wstr, wcslen (wstr));
         free (wstr);
-        delete [] ustr;
 }
 
 void