--- rxvt-unicode/src/rxvtperl.xs	2006/01/04 21:37:55	1.24
+++ rxvt-unicode/src/rxvtperl.xs	2006/01/06 01:16:58	1.27
@@ -53,6 +53,18 @@
 }
 
 static SV *
+wcs2sv (wchar_t *wstr, int len = -1)
+{
+  char *str = rxvt_wcstoutf8 (wstr, len);
+
+  SV *sv = newSVpv (str, 0);
+  SvUTF8_on (sv);
+  free (str);
+
+  return sv;
+}
+
+static SV *
 new_ref (HV *hv, const char *klass)
 {
   return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
@@ -459,6 +471,20 @@
           XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
           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);
@@ -636,12 +662,8 @@
         wchar_t *wstr = rxvt_mbstowcs (data, len);
         rxvt_pop_locale ();
 
-        char *str = rxvt_wcstoutf8 (wstr);
+        RETVAL = wcs2sv (wstr);
         free (wstr);
-
-        RETVAL = newSVpv (str, 0);
-        SvUTF8_on (RETVAL);
-        free (str);
 }
 	OUTPUT:
         RETVAL
@@ -683,11 +705,11 @@
         RETVAL
 
 U32
-rxvt_term::screen_rstyle (U32 new_rstyle = THIS->screen.s_rstyle)
+rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
 	CODE:
 {
-        RETVAL = THIS->screen.s_rstyle;
-        THIS->screen.s_rstyle = new_rstyle;
+        RETVAL = THIS->rstyle;
+        THIS->rstyle = new_rstyle;
 }
         OUTPUT:
 	RETVAL
@@ -713,7 +735,7 @@
         THIS->want_refresh = 1;
 
 void
-rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0)
+rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
 	PPCODE:
 {
         if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
@@ -728,20 +750,16 @@
             for (int col = 0; col <THIS->ncol; col++)
               wstr [col] = l.t [col];
 
-            char *str = rxvt_wcstoutf8 (wstr, THIS->ncol);
-            free (wstr);
+            XPUSHs (sv_2mortal (wcs2sv (wstr)));
 
-            SV *sv = newSVpv (str, 0);
-            SvUTF8_on (sv);
-            XPUSHs (sv_2mortal (sv));
-            free (str);
+            delete [] wstr;
           }
 
         if (new_text)
           {
             wchar_t *wstr = sv2wcs (new_text);
 
-            int len = wcslen (wstr);
+            int len = min (wcslen (wstr) - start_ofs, max_len);
 
             if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
               {
@@ -751,7 +769,7 @@
 
             for (int col = start_col; col < start_col + len; col++)
               {
-                l.t [col] = wstr [col - start_col];
+                l.t [col] = wstr [start_ofs + col - start_col];
                 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
               }
 
@@ -760,7 +778,7 @@
 }
 
 void
-rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0)
+rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
 	PPCODE:
 {
         if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
@@ -785,14 +803,14 @@
               croak ("new_rend must be arrayref");
 
             AV *av = (AV *)SvRV (new_rend);
-            int len = av_len (av) + 1;
+            int len = min (av_len (av) + 1 - start_ofs, max_len);
 
             if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
               croak ("new_rend array extends beyond horizontal margins");
 
             for (int col = start_col; col < start_col + len; col++)
               {
-                rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask;
+                rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
 
                 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
               }
@@ -800,30 +818,33 @@
 }
 
 int
-rxvt_term::ROW_l (int row_number, int new_length = -2)
+rxvt_term::ROW_l (int row_number, int new_length = -1)
 	CODE:
 {
         if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
           XSRETURN_EMPTY;
 
         line_t &l = ROW(row_number);
-        RETVAL = l.l < 0 ? THIS->ncol : l.l;
+        RETVAL = l.l;
 
-        if (new_length >= -1)
+        if (new_length >= 0)
           l.l = new_length;
 }
         OUTPUT:
         RETVAL
 
 bool
-rxvt_term::ROW_is_longer (int row_number)
+rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
 	CODE:
 {
         if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
           XSRETURN_EMPTY;
 
         line_t &l = ROW(row_number);
-        RETVAL = l.l < 0;
+        RETVAL = l.is_longer ();
+
+        if (new_is_longer >= 0)
+          l.is_longer (new_is_longer);
 }
         OUTPUT:
         RETVAL
@@ -918,13 +939,7 @@
         PPCODE:
 {
         if (GIMME_V != G_VOID)
-          {
-            char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len);
-            SV *sv = newSVpv (sel, 0);
-            SvUTF8_on (sv);
-            free (sel);
-            XPUSHs (sv_2mortal (sv));
-          }
+          XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)));
 
         if (newtext)
           {
@@ -936,6 +951,27 @@
 }
 
 void
+rxvt_term::scr_add_lines (SV *string)
+	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);
+
+        free (wstr);
+        delete [] ustr;
+}
+
+void
 rxvt_term::tt_write (SV *octets)
         INIT:
           STRLEN len;