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.35 by root, Thu Jun 15 13:40:02 2006 UTC vs.
Revision 1.41 by root, Fri Jun 23 22:35:16 2006 UTC

… …
83 83
84 print $fh "$ts ", @a, "\n"; 84 print $fh "$ts ", @a, "\n";
85 $fh->flush; 85 $fh->flush;
86} 86}
87 87
88
89
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}) {
94 my $diff = $exp - $self->{prev_exp}; 92 my $diff = $exp - $self->{prev_exp};
… …
134 132
135 $self->{map}->map1a_update ($data); 133 $self->{map}->map1a_update ($data);
136 $self->{map_widget}->update; 134 $self->{map_widget}->update;
137} 135}
138 136
137sub magicmap {
138 my ($self, $w, $h, $x, $y, $data) = @_;
139
140 $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
141}
142
139sub flush_map { 143sub flush_map {
140 my ($self) = @_; 144 my ($self) = @_;
141 145
142 my $map_info = delete $self->{map_info} 146 my $map_info = delete $self->{map_info}
143 or return; 147 or return;
… …
154 158
155 $self->flush_map; 159 $self->flush_map;
156 delete $self->{neigh_map}; 160 delete $self->{neigh_map};
157 161
158 $self->{map}->clear; 162 $self->{map}->clear;
163 delete $self->{map_widget}{magicmap};
159} 164}
160 165
161 166
162sub load_map($$$) { 167sub load_map($$$) {
163 my ($self, $hash, $x, $y) = @_; 168 my ($self, $hash, $x, $y) = @_;
… …
407 412
408 $text = CFClient::UI::Label::escape $text; 413 $text = CFClient::UI::Label::escape $text;
409 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
410 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
411 416
412 $self->{logview}->add_paragraph ($color[$color], 417 $self->{logview}->add_paragraph ($color[$color], $_)
413 join "\n", map "$time $_", split /\n/, $text); 418 for map "$time $_", split /\n/, $text;
419 $self->{logview}->scroll_to_bottom;
414 420
415 $self->{statusbox}->add ($text, 421 $self->{statusbox}->add ($text,
416 group => $text, 422 group => $text,
417 fg => $color[$color], 423 fg => $color[$color],
418 timeout => $color >= 2 ? 60 : 10, 424 timeout => $color >= 2 ? 60 : 10,
… …
530 536
531 $row++; 537 $row++;
532 } else { 538 } else {
533 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
534 text => "More...", 540 text => "More...",
535 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 },
536 ); 542 );
537 last; 543 last;
538 } 544 }
539 } 545 }
540 }); 546 });
… …
555 tooltip => "Close the currently open container (if one is open)", 561 tooltip => "Close the currently open container (if one is open)",
556 on_activate => sub { 562 on_activate => sub {
557 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 563 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
558 if $tag != 0; 564 if $tag != 0;
559 #if $CONN->{open_container} != 0; 565 #if $CONN->{open_container} != 0;
566 0
560 }, 567 },
561 ); 568 );
562 } 569 }
563 570
564 $::INVR->set_items ($conn->{container}{$tag}); 571 $::INVR->set_items ($conn->{container}{$tag});
… …
756 763
757 return unless $text =~ /\S/; 764 return unless $text =~ /\S/;
758 765
759 $entry->set_text (""); 766 $entry->set_text ("");
760 $this->send ($text); 767 $this->send ($text);
768
769 0
761 }, 770 },
762 ); 771 );
763 772
764 $vbox->add ($self->{options} = new CFClient::UI::VBox); 773 $vbox->add ($self->{options} = new CFClient::UI::VBox);
765 774
766 $self->{close_button} = new CFClient::UI::Button 775 $self->{bye_button} = new CFClient::UI::Button
767 text => "Bye (close)", 776 text => "Bye (close)",
768 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.",
769 on_activate => sub { $this->destroy }, 778 on_activate => sub { $this->destroy; 0 },
770 ; 779 ;
771 780
772 $self->update_options; 781 $self->update_options;
773 782
774 $self->{token} = $self->{conn}->ext_token; 783 $self->{token} = $self->{conn}->ext_token;
775 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 784 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
776 $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}");
777 786
778 $self->{entry}->focus_in; 787 $self->{entry}->grab_focus;
779 788
780 $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");
781 790
782 $self->show; 791 $self->show;
783 $self 792 $self
… …
787 my ($self) = @_; 796 my ($self) = @_;
788 797
789 Scalar::Util::weaken $self; 798 Scalar::Util::weaken $self;
790 799
791 $self->{options}->clear; 800 $self->{options}->clear;
792 $self->{options}->add ($self->{close_button}); 801 $self->{options}->add ($self->{bye_button});
793 802
794 for my $kw (sort keys %{ $self->{kw} }) { 803 for my $kw (sort keys %{ $self->{kw} }) {
795 $self->{options}->add (new CFClient::UI::Button 804 $self->{options}->add (new CFClient::UI::Button
796 text => $kw, 805 text => $kw,
797 on_activate => sub { 806 on_activate => sub {
798 $self->send ($kw); 807 $self->send ($kw);
808 0
799 }, 809 },
800 ); 810 );
801 } 811 }
802} 812}
803 813
… …
808 818
809 if ($type eq "msg") { 819 if ($type eq "msg") {
810 my ($msg, @kw) = split /\x00/, $msg; 820 my ($msg, @kw) = split /\x00/, $msg;
811 $self->{kw}{$_} = 1 for @kw; 821 $self->{kw}{$_} = 1 for @kw;
812 822
813 $msg = CFClient::UI::Label::escape $msg; 823 $msg = "\n" . CFClient::UI::Label::escape $msg;
814 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} };
815 $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;
816 836
817 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 837 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
818 $self->update_options; 838 $self->update_options;
819 } else { 839 } else {
820 $self->destroy; 840 $self->destroy;
821 } 841 }
822 842
… …
831} 851}
832 852
833sub destroy { 853sub destroy {
834 my ($self) = @_; 854 my ($self) = @_;
835 855
836 #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
837 857
838 delete $self->{conn}{npc_dialog}; 858 delete $self->{conn}{npc_dialog};
839 $self->{conn}->disconnect_ext ($self->{token}); 859 $self->{conn}->disconnect_ext ($self->{token});
840 860
841 $self->SUPER::destroy; 861 $self->SUPER::destroy;

Diff Legend

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