Dependencies finally work correctly in perl libraries (they're each compiled

separately now). Added statusbar code to available to perl, it's now
possible to create new statusbar items with perl scripts.

statusbar_items_redraw(char *name) can now be used to easily redraw all
named statusbar items in screen.

Probably several other changes I've already forgotten :)


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1861 dbcabf3a-b0e7-0310-adc4-f8d773084564

6 files changed, 23 insertions, 20 deletions

diff --git a/src/perl/ui/.cvsignore b/src/perl/ui/.cvsignore
index 239deafc..335ef887 100644
--- a/src/perl/ui/.cvsignore
+++ b/src/perl/ui/.cvsignore
@@ -1,7 +1,7 @@
 Makefile
 Makefile.PL
-UI.c
 UI.bs
+*.c
 *.o
 pm_to_blib
 blib
diff --git a/src/perl/ui/Makefile.PL.in b/src/perl/ui/Makefile.PL.in
index 601c3b9d..a349918e 100644
--- a/src/perl/ui/Makefile.PL.in
+++ b/src/perl/ui/Makefile.PL.in
@@ -2,6 +2,7 @@ use ExtUtils::MakeMaker;
 
 WriteMakefile('NAME' => 'Irssi::UI',
               'LIBS' => '',
+	      'OBJECT' => '$(O_FILES)',
               'TYPEMAPS' => ['../common/typemap'],
               'INC' => '-I../../.. -I@top_srcdir@/src -I@top_srcdir@/src/core -I@top_srcdir@/src/fe-common/core @GLIB_CFLAGS@',
 	      'VERSION_FROM' => '@srcdir@/UI.pm');
diff --git a/src/perl/ui/Themes.xs b/src/perl/ui/Themes.xs
index 427952ff..c2a0f1bc 100644
--- a/src/perl/ui/Themes.xs
+++ b/src/perl/ui/Themes.xs
@@ -1,5 +1,7 @@
+#include "module.h"
 
-MODULE = Irssi::UI  PACKAGE = Irssi
+MODULE = Irssi::UI::Themes  PACKAGE = Irssi
+PROTOTYPES: ENABLE
 
 void
 theme_register(formats)
@@ -53,7 +55,7 @@ CODE:
         printformat_perl(&dest, format, arglist);
 
 #*******************************
-MODULE = Irssi::UI  PACKAGE = Irssi::Server
+MODULE = Irssi::UI::Themes  PACKAGE = Irssi::Server
 #*******************************
 
 void
@@ -77,7 +79,7 @@ CODE:
         printformat_perl(&dest, format, arglist);
 
 #*******************************
-MODULE = Irssi::UI  PACKAGE = Irssi::UI::Window
+MODULE = Irssi::UI::Themes  PACKAGE = Irssi::UI::Window
 #*******************************
 
 void
@@ -100,7 +102,7 @@ CODE:
         printformat_perl(&dest, format, arglist);
 
 #*******************************
-MODULE = Irssi::UI  PACKAGE = Irssi::Windowitem
+MODULE = Irssi::UI::Themes  PACKAGE = Irssi::Windowitem
 #*******************************
 
 void
diff --git a/src/perl/ui/UI.pm b/src/perl/ui/UI.pm
index 7701d178..0ef9c711 100644
--- a/src/perl/ui/UI.pm
+++ b/src/perl/ui/UI.pm
@@ -7,7 +7,7 @@ package Irssi::UI;
 use strict;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-$VERSION = "0.8";
+$VERSION = "0.9";
 
 require Exporter;
 require DynaLoader;
@@ -21,4 +21,3 @@ bootstrap Irssi::UI $VERSION;
 Irssi::UI::init();
 
 1;
-
diff --git a/src/perl/ui/UI.xs b/src/perl/ui/UI.xs
index 2e9dbeac..8ad60bd7 100644
--- a/src/perl/ui/UI.xs
+++ b/src/perl/ui/UI.xs
@@ -104,12 +104,6 @@ static PLAIN_OBJECT_INIT_REC fe_plains[] = {
 	{ NULL, NULL }
 };
 
-static void sig_deinit(void)
-{
-	signal_remove("script destroy", (SIGNAL_FUNC) sig_script_destroy);
-	signal_remove("perl scripts deinit", (SIGNAL_FUNC) sig_deinit);
-}
-
 MODULE = Irssi::UI  PACKAGE = Irssi::UI
 
 PROTOTYPES: ENABLE
@@ -126,8 +120,12 @@ CODE:
         irssi_add_plains(fe_plains);
 
 	signal_add("script destroy", (SIGNAL_FUNC) sig_script_destroy);
-	signal_add("perl scripts deinit", (SIGNAL_FUNC) sig_deinit);
 
+void
+deinit()
+CODE:
+	signal_remove("script destroy", (SIGNAL_FUNC) sig_script_destroy);
 
-INCLUDE: Themes.xs
-INCLUDE: Window.xs
+BOOT:
+	irssi_boot(UI__Themes);
+	irssi_boot(UI__Window);
diff --git a/src/perl/ui/Window.xs b/src/perl/ui/Window.xs
index 520c5bb8..322be79c 100644
--- a/src/perl/ui/Window.xs
+++ b/src/perl/ui/Window.xs
@@ -1,4 +1,7 @@
-MODULE = Irssi::UI  PACKAGE = Irssi
+#include "module.h"
+
+MODULE = Irssi::UI::Window  PACKAGE = Irssi
+PROTOTYPES: ENABLE
 
 void
 windows()
@@ -93,7 +96,7 @@ OUTPUT:
 
 
 #*******************************
-MODULE = Irssi::UI  PACKAGE = Irssi::Server
+MODULE = Irssi::UI::Window  PACKAGE = Irssi::Server
 #*******************************
 
 void
@@ -135,7 +138,7 @@ window_find_closest(server, name, level)
 
 
 #*******************************
-MODULE = Irssi::UI  PACKAGE = Irssi::UI::Window  PREFIX=window_
+MODULE = Irssi::UI::Window  PACKAGE = Irssi::UI::Window  PREFIX=window_
 #*******************************
 
 void
@@ -230,7 +233,7 @@ OUTPUT:
 	RETVAL
 
 #*******************************
-MODULE = Irssi::UI  PACKAGE = Irssi::Windowitem  PREFIX = window_item_
+MODULE = Irssi::UI::Window  PACKAGE = Irssi::Windowitem  PREFIX = window_item_
 #*******************************
 
 void