Changeset 67 for trunk

Timestamp:

05/04/08 18:30:03 (8 months ago)

Author:

scott

Message:

Fixed IRC client example

Location:

trunk/Curses-UI-POE

Files:

• MANIFEST.SKIP (modified) (2 diffs)
• POE.pm (modified) (8 diffs)
• examples/irc_client (modified) (9 diffs)

trunk/Curses-UI-POE/MANIFEST.SKIP

@@ -6 +6 @@
 ^blib/
 ^Makefile$
-^POE-Component-Client-TCPMulti-
+^Curses-UI-POE
 ^MANIFEST.bak$
 ^pm_to_blib$
@@ -19 +19 @@
 \.tar\.gz$
 \.tgz$
+^reproduce.*
+tmp

trunk/Curses-UI-POE/POE.pm

@@ -24 +24 @@
 BEGIN { run POE::Kernel }
 
-*VERSION = \0.03;
+*VERSION = \0.032;
 our $VERSION;
 
@@ -72 +72 @@
           object_states  => [
             @{ $options{object_states} },
-            $self, [ qw( _start keyin timer shutdown ) ]
+            $self, [ qw( _start init keyin timer shutdown ) ]
           ],
           
@@ -84 +84 @@
 }
 
-sub _start {
+# Wait until the kernel actually starts before we muck with things.
+sub _start { $_[KERNEL]->yield("init") }
+
+sub init {
     my ($self, $kernel) = @_[ OBJECT, KERNEL ];
 
@@ -138 +141 @@
     }
 
-# This was a hack to make sure to pick up the extra events when things got out
-# of sync.  I'm not sure if I need it.  But let's try getting C::U::P working
-# first.
-#   if (my $key = $self->get_key(0)) {
-#       $self->feedkey($key) unless $key eq "-1";
-#       $self->do_one_event;
-#   }
-
+    # This was a hack to make sure to pick up the extra events when things got
+    # out of sync.  It was suggested
+    if (my $key = $self->get_key(0)) {
+        $self->feedkey($key) unless $key eq "-1";
+        $self->do_one_event;
+    }
+ 
     # Set the root cursor mode
     unless ($self->{-no_output}) {
@@ -190 +192 @@
     }
 
+
+
+    no warnings "redefine";
+
+    my $modalfocus = \&Curses::UI::Widget::modalfocus;
+
+    # Let modalfocus() be a reentrant into the POE Kernel.  This is stackable,
+    # so it should not impact other behaviors, and POE keeps chugging along
+    # uneffected.  This is a modal focus without a callback, this method does
+    # not return until the modal widget get's cleared out.
+    #
+    # This is done here so that ->dailog will still work as it did previously.
+    # until this is run.  And just in case, we save the old modalfocus
+    # definition and redefine it later.
+    sub Curses::UI::Widget::modalfocus () {
+        my ($this) = @_;
+
+        # "Fake" focus for this object.
+        $this->{-has_modal_focus} = 1;
+        $this->focus;
+        $this->draw;
+
+        push @modal_objects, $this;
+        push @modal_callbacks, undef;
+
+        # This is reentrant into the POE::Kernel 
+        while ( $this->{-has_modal_focus} ) {
+            $poe_kernel->loop_do_timeslice;
+        }
+
+        $this->{-focus} = 0;
+
+        pop @modal_callbacks;
+        pop @modal_objects;
+
+        return $this;
+    }
+
     POE::Kernel->run;
+
+    # Replace previously defined method into the symbol table.
+    *{"Curses::UI::Widget::modalfocus"} = $modalfocus;
 }
 
@@ -242 +285 @@
     }
 
-    # Let modalfocus() be a reentrant into the POE Kernel.  This is stackable,
-    # so it should not impact other behaviors, and POE keeps chugging along
-    # uneffected.  This is a modal focus without a callback, this method does
-    # not return until the modal widget get's cleared out.
-    sub Curses::UI::Widget::modalfocus () {
-        my ($this) = @_;
-
-        # "Fake" focus for this object.
-        $this->{-has_modal_focus} = 1;
-        $this->focus;
-        $this->draw;
-
-        push @modal_objects, $this;
-        push @modal_callbacks, undef;
-
-        # This is reentrant into the POE::Kernel 
-        while ( $this->{-has_modal_focus} ) {
-            $poe_kernel->loop_do_timeslice;
-        }
-
-        $this->{-focus} = 0;
-
-        pop @modal_callbacks;
-        pop @modal_objects;
-
-        return $this;
-    }
 }
 
@@ -360 +376 @@
 =head1 BUGS
 
-None Known.  Whoohoo!
-
-Find any?  Send them to me!  tag@cpan.org
+=over 2
+
+=item Dialogs before ->mainloop()
+
+Dialogs before Curses::UI::Mainloop
+
+=back
+
+Find more?  Send them to me!  tag@cpan.org
 
 =head1 AUTHOR
@@ -386 +408 @@
 
 1;
-
-__END__
-This is a block of no longer needed code.  When I feel up to it,
-I will remove it.
-
-# The tempdialog does this modalfocus in Curses::UI::Widget which
-# starts a secondary event loop.  I need to force use of POE. 
-
-#sub tempdialog {
-#    my $this = shift;
-#    my $class = shift;
-#    my %args = @_;
-#
-#    my $id = "__window_$class";
-#
-#    my $dialog = $this->add($id, $class, %args);
-#
-#    $dialog->{-has_modal_focus} = 1;
-#
-#    $dialog->focus;
-#    $dialog->draw;
-#
-#    # We loop ourself, this is a modial dialog..but its still gotta multitask.
-#    while ( $dialog->{-has_modal_focus} ) {
-#        $poe_kernel->loop_do_timeslice;
-#    }
-#
-#    my $return = $dialog->get;
-#
-#    $dialog->{-focus} = 0;
-#
-#    $this->delete($id);
-#    $this->root->focus(undef, 1);
-#
-#    return $return;
-#}
-
-# This is null prototyped only to match the Curses::UI::Widget
-# subroutine it replaces...it SHOULDN'T be prototyped at all
-# since it is a method.
-

trunk/Curses-UI-POE/examples/irc_client

@@ -8 +8 @@
 use POE qw( Component::IRC );
 use Curses::UI::POE;
+use Carp;
 
 my $Curses;
@@ -14 +15 @@
     _start => sub {
         $_[HEAP]->{irc} =
-            POE::Component::IRC->spawn();
+            POE::Component::IRC->spawn( alias => "IRC" );
 
         # Even if we dont use all events, it shouldn't create an error since
@@ -22 +23 @@
         # efficiency *really* isn't a big issue here.
 
-        $_[KERNEL]->yield(register => "all");
+        $_[KERNEL]->post(IRC => register => "all");
 
     },
 
     irc_connected => sub {
-        printf "Connected to %s", $_[SENDER]->get_heap->server_name();
+        my $server_name = $_[ SENDER ]->get_heap->server_name;
+        unless (defined $server_name) {
+            print "Connected...";
+        }
+        else {
+            print "Connected to %s", $server_name;
+        }
     },
 
@@ -104 +111 @@
 select CURWIN;
 
+
+open LOG, ">>", "cuirc-debug.log";
+
+# Try to put errors in the window...
+$SIG{"__DIE__"} = sub {
+    print LOG $_[0];
+};
+$SIG{"__WARN__"} = sub {
+    print LOG $_[0];
+};
+
 print "Welcome to Curses::UI::POE's IRC example";
 
@@ -116 +134 @@
 use POSIX qw( strftime cuserid );
 use Curses;
+use Carp qw( carp );
 
 my @nicks;
@@ -164 +183 @@
     my $object = shift;
     my ($viewer, $curses) = @$object{qw( -viewer -curses )};
+
+    # XXX Hack: Just ignore bunk requests for now...
+    if (grep !defined $_, @_) {
+        carp "Attempt to print undefined value";
+    }
 
     push @Channel, sprintf shift, @_;
@@ -272 +296 @@
             printf "Sending Connect EVENT for %s:%s", $server, $port;
 
-            $_[KERNEL]->yield
-                ( connect => {
+            $poe_kernel->post
+                ( IRC => connect => {
                     Nick        => cuserid,
                     Server      => $server,
@@ -291 +315 @@
             else {
                 $Channel{$Join} = 1;
-                $_[KERNEL]->yield( join => $Join );
+                $poe_kernel->post( IRC => join => $Join );
                 $CurrentChannel = $Join;
             }
         },
 
-        nick => sub { $_[KERNEL]->yield( nick => $_[1] ) },
-        kick => sub { $_[KERNEL]->yield( kick => $_[1..$#_] ) },
-        msg  => sub { $_[KERNEL]->yield( privmsg => $_[1..$#_] ) },
+        nick => sub { $poe_kernel->post( IRC => nick => $_[1] ) },
+        kick => sub { $poe_kernel->post( IRC => kick => $_[1..$#_] ) },
+        msg  => sub { $poe_kernel->post( IRC => privmsg => $_[1..$#_] ) },
         
         quote => sub {
-            $_[KERNEL]->yield( sl => join " ", @_[1..$#_] );
+            $poe_kernel->post( IRC => sl => join " ", @_[1..$#_] );
         },
 
         quit => sub {
-            $_[KERNEL]->yield( quit => join " ", @_[1..$#_] );
+            $poe_kernel->post( IRC => quit => join " ", @_[1..$#_] );
 
             print "Have a nice day";
@@ -332 +356 @@
         else {
             if ($CurrentChannel) {
-                $_[KERNEL]->yield( privmsg => $CurrentChannel, $line );
+                $poe_kernel->post( IRC => privmsg => $CurrentChannel, $line );
                 print "> $line";
             }