Changeset 73

Timestamp:

05/09/08 18:50:16 (8 months ago)

Author:

scott

Message:

Many bug fixes for CuIRC

• Connecting now doesn't require two attempts.
• ParseConfig? is now imported.
• Debug logging added.
• Fixed some of the ugly all caps-ness
• Whois made into a dialog window.

Files:

• trunk/cuirc/cuirc (modified) (11 diffs)

trunk/cuirc/cuirc

@@ -19 +19 @@
 use Text::Wrap ();
 use Term::ANSIColor ":constants";
-use Config::General;
+use Config::General qw( ParseConfig );
 
 my %opt;
@@ -35 +35 @@
 
 use constant {
+    DEBUG  => 1,
     ACTIVE => 0,
 };
@@ -46 +47 @@
     local $Text::Wrap::columns = $width;
     return split /\n/, Text::Wrap::wrap(undef, "    ", $string);
+}
+
+if (DEBUG) {
+    open LOG, ">>", "cuirc-debug.log";
+    # Try to put errors in the window...
+    $SIG{"__DIE__"} = sub {
+        print LOG $_[0];
+    };
+    $SIG{"__WARN__"} = sub {
+        print LOG $_[0];
+    };
 }
 
@@ -82 +94 @@
                     $kernel->post($hostname, register => "all");
                 }
-                else {
-                    $kernel->post( 
-                        $hostname => connect => {
-                            Nick        => cuserid,
-                            Server      => $hostname,
-                            Port        => $port,
-                            Username    => cuserid,
-                            Ircname     => +(getpwnam cuserid)[6],
-                        } 
-                    ); 
-                }
+                
+                $kernel->post( 
+                    $hostname => connect => {
+                        Nick        => cuserid,
+                        Server      => $hostname,
+                        Port        => $port,
+                        Username    => cuserid,
+                        Ircname     => +(getpwnam cuserid)[6],
+                    } 
+                ); 
 
                 $kernel->yield
@@ -349 +360 @@
         )->focus;
 
-        my (%Channel, $Current, @History, $CurCon, $CurrentChannel);
+        my (%Channel, $current, @history, $CurCon, $currentChannel);
+
+        $current = 0;
 
         # The indirect method syntax isn't necessarily the best, but it does
@@ -358 +371 @@
             my $line = $input->get;
 
-            push @History, $line;
-            $Current = @History;
+            push @history, $line;
+            $current = @history;
 
             $input->text("");
@@ -435 +448 @@
         }, "\t";
         
-                set_binding $editor sub {
-                        shift->text($History[--$Current]) 
+        set_binding $editor sub {
+            shift->text($history[--$current]) if $current > 0;
         }, KEY_UP;
 
         set_binding $editor sub {
-            $Current++;
-            if ($Current > @History) { 
-                                shift->text ("") 
-                        } 
-                        else {
-                                shift->text ($History[$Current]) 
-                        }
+            $current++;
+            if ($current > @history) { 
+                shift->text("") 
+            } 
+            else {
+                shift->text($history[$current]) 
+            }
         }, KEY_DOWN;
 
@@ -534 +547 @@
 
         # DRY - All these events go to the active window... (whois)
-        $kernel->state( "irc_$_" => sub {
-                $_[KERNEL]->yield(write => active => $_[ARG1]);
-        } ) for qw( 311 312 313 314 315 316 317 318 319 );
+        # Whois now results in a popup, badass.
+#       $kernel->state( "irc_$_" => sub {
+#               $_[KERNEL]->yield(write => active => $_[ARG1]);
+#       } ) for qw( 311 312 313 314 315 316 317 318 319 );
+
+        # Do nothing for the following events...(whois)
+        # Whois is collected and displayed in a status window
+        $kernel->state( "irc_$_" => sub {} ) for
+            qw( 311 312 313 314 315 316 317 318 319 320 
+                    irc_ctcp );
     },
 
@@ -591 +611 @@
 
         if ($type eq "channel") {
-            $screen->add (
-                        "nicklist", 'Listbox',
+            my $nicklist = $screen->add(
+                "nicklist", 'Listbox',
                 -x            => -1,
                 -y            => -1,
@@ -601 +621 @@
                 -intellidraw  => 1,
                 );
+
+            set_binding $nicklist sub {
+                my $nick = $nicklist->get_active_value;
+                # Remove op symbols and stuff.
+                $nick =~ s/^[@+]//;
+
+                my ($server) = ($name =~ m/(\S+)/);
+
+                $poe_kernel->yield(window_open => query => "$server $nick",
+                        "Query with $nick");
+            }, BUTTON1_DOUBLE_CLICKED;
         }
 
@@ -747 +778 @@
                   "Window $window has no nick list..." );
         }
+    },
+
+    # Get a whois event.
+    irc_whois => sub {
+        my ($kernel, $curses, $whois) = @_[ KERNEL, HEAP, ARG0 ];
+
+        warn "Got whois event";
+
+        # It's just too much work right here...
+        no warnings;
+
+        my $idle = $whois->{idle} ? ": ($whois->{idle}s idle)" : "";
+        my $since = $whois->{signon} ? 
+            "since " . scalar localtime $whois->{signon} : "";
+
+        my $msg = <<WHOIS;
+$whois->{user}\@$whois->{host} "$whois->{real}"
+@{$whois->{channels}}
+$whois->{server} $since$idle
+WHOIS
+        $curses->dialog(
+            -message => $msg,
+            -title   => "Whois $whois->{nick}"
+        );
     },