[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtperl.xs

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.2 by root, Mon Jan 2 17:17:02 2006 UTC vs.
Revision 1.4 by root, Mon Jan 2 19:05:05 2006 UTC

 }
 bool
 rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
 {
-  if (!perl)
+  // INIT and DESTROY must be requested by the runtime
+  if (!perl || !should_invoke [htype])
     return false;
   if (htype == HOOK_INIT) // first hook ever called
     term->self = (void *)newSVptr ((void *)term, "urxvt::term");
-  else if (htype == HOOK_DESTROY)
-    {
-      // TODO: clear magic
-      hv_clear ((HV *)SvRV ((SV *)term->self));
-      SvREFCNT_dec ((SV *)term->self);
-    }
-  if (!should_invoke [htype])
-    return false;
   dSP;
   va_list ap;
   va_start (ap, htype);
             FREETMPS;
             LEAVE;
             if (SvTRUE (ERRSV))
               rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
+            if (htype == HOOK_DESTROY)
+              {
+                // TODO: clear magic
+                hv_clear ((HV *)SvRV ((SV *)term->self));
+                SvREFCNT_dec ((SV *)term->self);
+              }
             return count;
           }
         default:
 void
 fatal (const char *msg)
 	CODE:
         rxvt_fatal ("%s", msg);
-int
-wcswidth (SV *str)
-	CODE:
-{
-        wchar_t *wstr = sv2wcs (str);
-        RETVAL = wcswidth (wstr, wcslen (wstr));
-        free (wstr);
-}
-	OUTPUT:
-        RETVAL
 NV
 NOW ()
 	CODE:
         RETVAL = NOW;
         OUTPUT:
         RETVAL
 MODULE = urxvt             PACKAGE = urxvt::term
+int
+rxvt_term::strwidth (SV *str)
+	CODE:
+{
+        wchar_t *wstr = sv2wcs (str);
+	rxvt_push_locale (THIS->locale);
+        RETVAL = wcswidth (wstr, wcslen (wstr));
+        rxvt_pop_locale ();
+        free (wstr);
+}
+	OUTPUT:
+        RETVAL
+SV *
+rxvt_term::locale_encode (SV *str)
+	CODE:
+{
+        wchar_t *wstr = sv2wcs (str);
+	rxvt_push_locale (THIS->locale);
+        char *mbstr = rxvt_wcstombs (wstr);
+        rxvt_pop_locale ();
+        free (wstr);
+        RETVAL = newSVpv (mbstr, 0);
+        free (mbstr);
+}
+	OUTPUT:
+        RETVAL
+SV *
+rxvt_term::locale_decode (SV *octets)
+	CODE:
+{
+	STRLEN len;
+        char *data = SvPVbyte (octets, len);
+	rxvt_push_locale (THIS->locale);
+        wchar_t *wstr = rxvt_mbstowcs (data, len);
+        rxvt_pop_locale ();
+        char *str = rxvt_wcstoutf8 (wstr);
+        free (wstr);
+        RETVAL = newSVpv (str, 0);
+        SvUTF8_on (RETVAL);
+        free (str);
+}
+	OUTPUT:
+        RETVAL
 void
 rxvt_term::_resource (char *name, int index, SV *newval = 0)
 	PPCODE:
 {
         wchar_t *wtext = sv2wcs (text);
         THIS->scr_overlay_set (x, y, wtext);
         free (wtext);
 }
+void
+rxvt_term::tt_write (SV *octets)
+        INIT:
+          STRLEN len;
+          char *str = SvPVbyte (octets, len);
+	C_ARGS:
+          (unsigned char *)str, len
 MODULE = urxvt             PACKAGE = urxvt::timer
 SV *
 timer::new ()
 	CODE:

Diff Legend

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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents): Revision 1.2 by root, Mon Jan 2 17:17:02 2006 UTC vs. Revision 1.4 by root, Mon Jan 2 19:05:05 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.2 by root, Mon Jan 2 17:17:02 2006 UTC vs.
Revision 1.4 by root, Mon Jan 2 19:05:05 2006 UTC