diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/perl/common/module.h | 7 | ||||
-rw-r--r-- | src/perl/common/typemap | 4 | ||||
-rwxr-xr-x | src/perl/get-signals.pl | 21 |
3 files changed, 27 insertions, 5 deletions
diff --git a/src/perl/common/module.h b/src/perl/common/module.h index fec283f0..5eb6cf32 100644 --- a/src/perl/common/module.h +++ b/src/perl/common/module.h @@ -12,6 +12,7 @@ #include "settings.h" #include "masks.h" +#include "chatnets.h" #include "servers.h" #include "servers-reconnect.h" #include "servers-setup.h" @@ -22,13 +23,17 @@ #include "perl/perl-common.h" #include "fe-common/core/windows.h" +#include "fe-common/core/themes.h" +#include "fe-common/core/keyboard.h" typedef COMMAND_REC *Irssi__Command; typedef LOG_REC *Irssi__Log; typedef LOG_ITEM_REC *Irssi__LogItem; typedef RAWLOG_REC *Irssi__Rawlog; typedef IGNORE_REC *Irssi__Ignore; +typedef MODULE_REC *Irssi__Module; +typedef CHATNET_REC *Irssi__Chatnet; typedef SERVER_REC *Irssi__Server; typedef SERVER_CONNECT_REC *Irssi__Connect; typedef RECONNECT_REC *Irssi__Reconnect; @@ -36,5 +41,7 @@ typedef CHANNEL_REC *Irssi__Channel; typedef QUERY_REC *Irssi__Query; typedef NICK_REC *Irssi__Nick; +typedef THEME_REC *Irssi__Theme; +typedef KEYINFO_REC *Irssi__Keyinfo; typedef WINDOW_REC *Irssi__Window; typedef WI_ITEM_REC *Irssi__Windowitem; diff --git a/src/perl/common/typemap b/src/perl/common/typemap index 7e2cf17e..b642cbb4 100644 --- a/src/perl/common/typemap +++ b/src/perl/common/typemap @@ -1,4 +1,5 @@ TYPEMAP +Irssi::Chatnet T_PTROBJ Irssi::Server T_PTROBJ Irssi::Connect T_PTROBJ Irssi::Reconnect T_PTROBJ @@ -10,5 +11,8 @@ Irssi::Ignore T_PTROBJ Irssi::Log T_PTROBJ Irssi::LogItem T_PTROBJ Irssi::Rawlog T_PTROBJ +Irssi::Module T_PTROBJ +Irssi::Theme T_PTROBJ +Irssi::Keyinfo T_PTROBJ Irssi::Window T_PTROBJ Irssi::Windowitem T_PTROBJ diff --git a/src/perl/get-signals.pl b/src/perl/get-signals.pl index 716e25f2..65355d3d 100755 --- a/src/perl/get-signals.pl +++ b/src/perl/get-signals.pl @@ -5,7 +5,6 @@ print "static PERL_SIGNAL_ARGS_REC perl_signal_args[] =\n{\n"; while (<STDIN>) { chomp; - last if (/UI common/); next if (!/^ "([^"]*)"(<.*>)?,\s*(.*)/); next if (/\.\.\./); next if (/\(/); @@ -18,20 +17,32 @@ while (<STDIN>) { s/int[^,]*/int/g; s/GSList of (\w+)s/gslist_\1/g; + # core + s/CHATNET_REC[^,]*/iobject/g; s/SERVER_REC[^,]*/iobject/g; s/RECONNECT_REC[^,]*/iobject/g; s/CHANNEL_REC[^,]*/iobject/g; s/QUERY_REC[^,]*/iobject/g; s/COMMAND_REC[^,]*/Irssi::Command/g; s/NICK_REC[^,]*/Irssi::Nick/g; + s/LOG_REC[^,]*/Irssi::Log/g; + s/RAWLOG_REC[^,]*/Irssi::Rawlog/g; + s/IGNORE_REC[^,]*/Irssi::Ignore/g; + s/MODULE_REC[^,]*/Irssi::Module/g; + + # irc s/BAN_REC[^,]*/Irssi::Ban/g; - s/DCC_REC[^,]*/Irssi::Dcc/g; s/NETSPLIT_REC[^,]*/Irssi::Netsplit/g; + s/NETSPLIT_SERVER_REC[^,]*/Irssi::Netsplitserver/g; + + # irc modules + s/DCC_REC[^,]*/Irssi::Dcc/g; s/AUTOIGNORE_REC[^,]*/Irssi::Autoignore/g; - s/LOG_REC[^,]*/Irssi::Log/g; - s/RAWLOG_REC[^,]*/Irssi::Rawlog/g; s/NOTIFYLIST_REC[^,]*/Irssi::Notifylist/g; - s/IGNORE_REC[^,]*/Irssi::Ignore/g; + + # fe-common + s/THEME_REC[^,]*/Irssi::Theme/g; + s/KEYINFO_REC[^,]*/Irssi::Keyinfo/g; s/WINDOW_REC[^,]*/Irssi::Window/g; s/WI_ITEM_REC[^,]*/iobject/g; |