Merged Irssi SVN (upcoming irssi 0.8.11).

[silc.git] / apps / irssi / src / perl / common / Core.xs

diff --git a/apps/irssi/src/perl/common/Core.xs b/apps/irssi/src/perl/common/Core.xs
index d5b9d6e80789d6b7f198f6804a42554833b57959..451a07e2d735b8a78a20b6e125be9b81a409c9ca 100644 (file)
--- a/apps/irssi/src/perl/common/Core.xs
+++ b/apps/irssi/src/perl/common/Core.xs
@@ -3,6 +3,7 @@
 #include "core.h"
 
 #include "pidwait.h"
+#include "session.h"
 
 #define DEFAULT_COMMAND_CATEGORY "Perl scripts' commands"
 
@@ -74,6 +75,8 @@ CODE:
                        p[n-1] = irssi_ref_object(ST(n));
                else if (SvROK(ST(n)))
                        p[n-1] = (void *) SvIV((SV*)SvRV(ST(n)));
+               else if (SvIOK(ST(n)))
+                       p[n-1] = (void *)SvIV(ST(n));
                else
                        p[n-1] = NULL;
        }
@@ -93,6 +96,8 @@ CODE:
                        p[n] = irssi_ref_object(ST(n));
                else if (SvROK(ST(n)))
                        p[n] = (void *) SvIV((SV*)SvRV(ST(n)));
+               else if (SvIOK(ST(n)))
+                       p[n] = (void *) SvIV(ST(n));
                else
                        p[n] = NULL;
        }
@@ -141,6 +146,39 @@ CODE:
        else
                perl_signal_add_hash(SvIV(ST(0)), ST(1));
 
+void
+signal_register(...)
+PREINIT:
+       HV *hv;
+        HE *he;
+       I32 len, pos;
+       const char *arr[7];
+CODE:
+       if (items != 1 || !is_hvref(ST(0)))
+               croak("Usage: Irssi::signal_register(hash)");
+
+        hv = hvref(ST(0));
+       hv_iterinit(hv);
+       while ((he = hv_iternext(hv)) != NULL) {
+               const char *key = hv_iterkey(he, &len);
+               SV *val = HeVAL(he);
+               AV *av;
+
+               if (!SvROK(val) || SvTYPE(SvRV(val)) != SVt_PVAV)
+                       croak("not array reference");
+
+               av = (AV *) SvRV(val);
+               len = av_len(av)+1;
+               if (len > 6) len = 6;
+               for (pos = 0; pos < len; pos++) {
+                       SV **val = av_fetch(av, pos, 0);
+                       arr[pos] = SvPV(*val, PL_na);
+               }
+               arr[pos] = NULL;
+               perl_signal_register(key, arr);
+       }
+
+
 int
 SIGNAL_PRIORITY_LOW()
 CODE:
@@ -548,6 +586,13 @@ CODE:
 OUTPUT:
        RETVAL
 
+char *
+get_irssi_binary()
+CODE:
+       RETVAL = irssi_binary;
+OUTPUT:
+       RETVAL
+
 char *
 version()
 PREINIT: