ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.37 by root, Thu Jun 15 15:47:36 2006 UTC vs.
Revision 1.41 by root, Fri Jun 23 22:35:16 2006 UTC

… …
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec; 82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83 83
84 print $fh "$ts ", @a, "\n"; 84 print $fh "$ts ", @a, "\n";
85 $fh->flush; 85 $fh->flush;
86} 86}
87
88
89 87
90sub stats_update { 88sub stats_update {
91 my ($self, $stats) = @_; 89 my ($self, $stats) = @_;
92 90
93 if (my $exp = $stats->{+CS_STAT_EXP64}) { 91 if (my $exp = $stats->{+CS_STAT_EXP64}) {
… …
414 412
415 $text = CFClient::UI::Label::escape $text; 413 $text = CFClient::UI::Label::escape $text;
416 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
417 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
418 416
419 $self->{logview}->add_paragraph ($color[$color], 417 $self->{logview}->add_paragraph ($color[$color], $_)
420 join "\n", map "$time $_", split /\n/, $text); 418 for map "$time $_", split /\n/, $text;
419 $self->{logview}->scroll_to_bottom;
421 420
422 $self->{statusbox}->add ($text, 421 $self->{statusbox}->add ($text,
423 group => $text, 422 group => $text,
424 fg => $color[$color], 423 fg => $color[$color],
425 timeout => $color >= 2 ? 60 : 10, 424 timeout => $color >= 2 ? 60 : 10,
… …
537 536
538 $row++; 537 $row++;
539 } else { 538 } else {
540 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
541 text => "More...", 540 text => "More...",
542 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 },
543 ); 542 );
544 last; 543 last;
545 } 544 }
546 } 545 }
547 }); 546 });
… …
562 tooltip => "Close the currently open container (if one is open)", 561 tooltip => "Close the currently open container (if one is open)",
563 on_activate => sub { 562 on_activate => sub {
564 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 563 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
565 if $tag != 0; 564 if $tag != 0;
566 #if $CONN->{open_container} != 0; 565 #if $CONN->{open_container} != 0;
566 0
567 }, 567 },
568 ); 568 );
569 } 569 }
570 570
571 $::INVR->set_items ($conn->{container}{$tag}); 571 $::INVR->set_items ($conn->{container}{$tag});
… …
763 763
764 return unless $text =~ /\S/; 764 return unless $text =~ /\S/;
765 765
766 $entry->set_text (""); 766 $entry->set_text ("");
767 $this->send ($text); 767 $this->send ($text);
768
769 0
768 }, 770 },
769 ); 771 );
770 772
771 $vbox->add ($self->{options} = new CFClient::UI::VBox); 773 $vbox->add ($self->{options} = new CFClient::UI::VBox);
772 774
773 $self->{close_button} = new CFClient::UI::Button 775 $self->{bye_button} = new CFClient::UI::Button
774 text => "Bye (close)", 776 text => "Bye (close)",
775 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 777 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
776 on_activate => sub { $this->destroy }, 778 on_activate => sub { $this->destroy; 0 },
777 ; 779 ;
778 780
779 $self->update_options; 781 $self->update_options;
780 782
781 $self->{token} = $self->{conn}->ext_token; 783 $self->{token} = $self->{conn}->ext_token;
782 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 784 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
783 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 785 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
784 786
785 $self->{entry}->focus_in; 787 $self->{entry}->grab_focus;
786 788
787 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 789 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
788 790
789 $self->show; 791 $self->show;
790 $self 792 $self
… …
794 my ($self) = @_; 796 my ($self) = @_;
795 797
796 Scalar::Util::weaken $self; 798 Scalar::Util::weaken $self;
797 799
798 $self->{options}->clear; 800 $self->{options}->clear;
799 $self->{options}->add ($self->{close_button}); 801 $self->{options}->add ($self->{bye_button});
800 802
801 for my $kw (sort keys %{ $self->{kw} }) { 803 for my $kw (sort keys %{ $self->{kw} }) {
802 $self->{options}->add (new CFClient::UI::Button 804 $self->{options}->add (new CFClient::UI::Button
803 text => $kw, 805 text => $kw,
804 on_activate => sub { 806 on_activate => sub {
805 $self->send ($kw); 807 $self->send ($kw);
808 0
806 }, 809 },
807 ); 810 );
808 } 811 }
809} 812}
810 813
… …
815 818
816 if ($type eq "msg") { 819 if ($type eq "msg") {
817 my ($msg, @kw) = split /\x00/, $msg; 820 my ($msg, @kw) = split /\x00/, $msg;
818 $self->{kw}{$_} = 1 for @kw; 821 $self->{kw}{$_} = 1 for @kw;
819 822
820 $msg = CFClient::UI::Label::escape $msg; 823 $msg = "\n" . CFClient::UI::Label::escape $msg;
821 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 824 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
822 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh. 825 my @link;
826 $msg =~ s{
827 ($match)
828 }{
829 push @link, new CFClient::UI::Label
830 markup => "<span foreground='#c0c0ff' underline='single'>$1</span>",
831 can_hover => 1,
832 can_events => 1;
833
834 chr 0xfffc
835 }giex;
823 836
824 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 837 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
825 $self->update_options; 838 $self->update_options;
826 } else { 839 } else {
827 $self->destroy; 840 $self->destroy;
828 } 841 }
829 842
… …
838} 851}
839 852
840sub destroy { 853sub destroy {
841 my ($self) = @_; 854 my ($self) = @_;
842 855
843 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 856 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
844 857
845 delete $self->{conn}{npc_dialog}; 858 delete $self->{conn}{npc_dialog};
846 $self->{conn}->disconnect_ext ($self->{token}); 859 $self->{conn}->disconnect_ext ($self->{token});
847 860
848 $self->SUPER::destroy; 861 $self->SUPER::destroy;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines