X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=videosite.git;a=blobdiff_plain;f=videosite-irssi.pl;h=aa838c0897430e1ea78aa78b1236890cbe405d57;hp=2e5a0ec434f6c655f019466101855dca4e822d6e;hb=HEAD;hpb=513fff57bcf5c5724ea25fc69831b97f8f0bc0cc diff --git a/videosite-irssi.pl b/videosite-irssi.pl index 2e5a0ec..aa838c0 100644 --- a/videosite-irssi.pl +++ b/videosite-irssi.pl @@ -9,6 +9,9 @@ use File::Spec; use Module::Load; use XML::Simple; use JSON -support_by_pp; +use Carp; + +$SIG{ __DIE__ } = sub { Carp::confess( @_ ) }; # # List of foreground colors. This list is not complete, it just @@ -211,7 +214,7 @@ sub videosite_hook { my ($cmdline, $server, $witem) = @_; my %event = ( message => $cmdline, - ewpf => sub { defined($witem)?$witem->print($_[0], MSGLEVEL_CLIENTCRAP):Irssi::print($_[0]) }, + io => sub { defined($witem)?$witem->print($_[0], MSGLEVEL_CLIENTCRAP):Irssi::print($_[0]) }, window => defined($witem)?$witem->{server}->{real_address} . "/" . $witem->{name}:"", ); @@ -227,7 +230,7 @@ sub message_hook { my $witem = $server->window_item_find($channel); my %event = ( message => $msg, - ewpf => sub { defined($witem)?$witem->print($_[0], MSGLEVEL_CLIENTCRAP):Irssi::print($_[0]) }, + io => sub { defined($witem)?$witem->print($_[0], MSGLEVEL_CLIENTCRAP):Irssi::print($_[0]) }, window => defined($witem)?$witem->{server}->{real_address} . "/" . $witem->{name}:"", ); @@ -263,6 +266,8 @@ sub videosite_reset { module_path => sub { return File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts') }, quote => sub { s/%/%%/g; return $_ }, reload => \&videosite_reset, + # irssi needs this to prevent fork()ed child processes becoming zombies: + wait_for_child => sub { Irssi::pidwait_add($_[0]) }, })) { Irssi::print(sprintf("videosite API register failed: %s", $libvideosite::error)); return 0;