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.36 by root, Thu Jun 15 15:33:58 2006 UTC vs.
Revision 1.48 by root, Wed Jun 28 22:59:58 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};
… …
107 push @{$self->{record}}, $command; 105 push @{$self->{record}}, $command;
108 } 106 }
109 107
110 $self->logprint ("send: ", $command); 108 $self->logprint ("send: ", $command);
111 $self->send_command ($command); 109 $self->send_command ($command);
112 ::status $command; 110 ::status ($command);
113} 111}
114 112
115sub start_record { 113sub start_record {
116 my ($self) = @_; 114 my ($self) = @_;
117 115
… …
160 158
161 $self->flush_map; 159 $self->flush_map;
162 delete $self->{neigh_map}; 160 delete $self->{neigh_map};
163 161
164 $self->{map}->clear; 162 $self->{map}->clear;
163 delete $self->{map_widget}{magicmap};
165} 164}
166 165
167 166
168sub load_map($$$) { 167sub load_map($$$) {
169 my ($self, $hash, $x, $y) = @_; 168 my ($self, $hash, $x, $y) = @_;
… …
413 412
414 $text = CFClient::UI::Label::escape $text; 413 $text = CFClient::UI::Label::escape $text;
415 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
416 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
417 416
418 $self->{logview}->add_paragraph ($color[$color], 417 $self->{logview}->add_paragraph ($color[$color], $_)
419 join "\n", map "$time $_", split /\n/, $text); 418 for map "$time $_", split /\n/, $text;
419 $self->{logview}->scroll_to_bottom;
420 420
421 $self->{statusbox}->add ($text, 421 $self->{statusbox}->add ($text,
422 group => $text, 422 group => $text,
423 fg => $color[$color], 423 fg => $color[$color],
424 timeout => $color >= 2 ? 60 : 10, 424 timeout => $color >= 2 ? 60 : 10,
… …
523 return unless $::CONN; 523 return unless $::CONN;
524 524
525 $::FLOORBOX->clear; 525 $::FLOORBOX->clear;
526 526
527 my $row; 527 my $row;
528 for (@{ $::CONN->{container}{0} }) { 528 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
529 if ($row < 6) { 529 if ($row < 6) {
530 local $_->{face_widget}; # hack to force recreation of widget 530 local $_->{face_widget}; # hack to force recreation of widget
531 local $_->{desc_widget}; # hack to force recreation of widget 531 local $_->{desc_widget}; # hack to force recreation of widget
532 CFClient::Item::update_widgets $_; 532 CFClient::Item::update_widgets $_;
533 533
… …
536 536
537 $row++; 537 $row++;
538 } else { 538 } else {
539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
540 text => "More...", 540 text => "More...",
541 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 },
542 ); 542 );
543 last; 543 last;
544 } 544 }
545 } 545 }
546 }); 546 });
… …
561 tooltip => "Close the currently open container (if one is open)", 561 tooltip => "Close the currently open container (if one is open)",
562 on_activate => sub { 562 on_activate => sub {
563 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 563 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
564 if $tag != 0; 564 if $tag != 0;
565 #if $CONN->{open_container} != 0; 565 #if $CONN->{open_container} != 0;
566 0
566 }, 567 },
567 ); 568 );
568 } 569 }
569 570
570 $::INVR->set_items ($conn->{container}{$tag}); 571 $::INVR->set_items ($conn->{container}{$tag});
571} 572}
572 573
573sub update_container { 574sub update_containers {
574 my ($tag) = @_; 575 my ($self) = @_;
575 576
576 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 577 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
578 # TODO: scara had a bug where $self->{uipdate_container} was not defined
579 # but this should not possibly happen?
580 for my $tag (keys %{ delete $self->{update_container} }) {
581 if ($tag == 0) {
582 update_floorbox;
583 $::INVR->set_items ($self->{container}{0})
577 if $tag == $::CONN->{open_container}; 584 if $tag == $self->{open_container};
585 } elsif ($tag == $self->{player}{tag}) {
586 $::INV->set_items ($self->{container}{$tag})
587 } else {
588 $::INVR->set_items ($self->{container}{$tag})
589 if $tag == $self->{open_container};
590 }
591 }
592 });
578} 593}
579 594
580sub container_add { 595sub container_add {
581 my ($self, $tag, $items) = @_; 596 my ($self, $tag, $items) = @_;
582 597
583 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 598 $self->{update_container}{$tag}++;
584 599 $self->update_containers;
585 if ($tag == 0) {
586 update_floorbox;
587 update_container (0);
588 } elsif ($tag == $self->{player}{tag}) {
589 $::INV->set_items ($self->{container}{$self->{player}{tag}})
590 } else {
591 update_container ($tag);
592 }
593
594 # $self-<{player}{tag} => player inv
595 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
596} 600}
597 601
598sub container_clear { 602sub container_clear {
599 my ($self, $tag) = @_; 603 my ($self, $tag) = @_;
600 604
601 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 605 $self->{update_container}{$tag}++;
602 606 $self->update_containers;
603 if ($tag == 0) {
604 update_floorbox;
605 update_container (0);
606 } elsif ($tag == $self->{player}{tag}) {
607 $::INV->set_items ($self->{container}{$tag})
608 } else {
609 update_container ($tag);
610 }
611
612# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
613} 607}
614 608
615sub item_delete { 609sub item_delete {
616 my ($self, @items) = @_; 610 my ($self, @items) = @_;
617 611
612 $self->{update_container}{$_->{tag}}++
618 for (@items) { 613 for @items;
619 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
620
621 if ($_->{container} == 0) {
622 update_floorbox;
623 update_container ($_->{tag});
624 } elsif ($_->{container} == $self->{player}{tag}) {
625 $::INV->set_items ($self->{container}{$self->{player}{tag}})
626 } else {
627 update_container ($_->{container});
628 }
629 } 614
615 $self->update_containers;
630} 616}
631 617
632sub item_update { 618sub item_update {
633 my ($self, $item) = @_; 619 my ($self, $item) = @_;
634 620
… …
644 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 630 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
645 set_opencont ($::CONN, 0, "Floor"); 631 set_opencont ($::CONN, 0, "Floor");
646 632
647 } elsif ($item->{flags} & F_OPEN) { 633 } elsif ($item->{flags} & F_OPEN) {
648 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 634 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
635
649 } else { 636 } else {
637 $self->{update_container}{$item->{container}}++;
638 $self->update_containers;
650 if ($item->{container} == 0) { 639# if ($item->{container} == 0) {
651 update_floorbox; 640# update_floorbox;
652 update_container (0); 641# update_container (0);
653 } elsif ($item->{container} == $self->{player}{tag}) { 642# } elsif ($item->{container} == $self->{player}{tag}) {
654 $::INV->set_items ($self->{container}{$item->{container}}) 643# $::INV->set_items ($self->{container}{$item->{container}})
655 } 644# }
656 } 645 }
657} 646}
658 647
659sub player_update { 648sub player_update {
660 my ($self, $player) = @_; 649 my ($self, $player) = @_;
… …
762 751
763 return unless $text =~ /\S/; 752 return unless $text =~ /\S/;
764 753
765 $entry->set_text (""); 754 $entry->set_text ("");
766 $this->send ($text); 755 $this->send ($text);
756
757 0
767 }, 758 },
768 ); 759 );
769 760
770 $vbox->add ($self->{options} = new CFClient::UI::VBox); 761 $vbox->add ($self->{options} = new CFClient::UI::VBox);
771 762
772 $self->{close_button} = new CFClient::UI::Button 763 $self->{bye_button} = new CFClient::UI::Button
773 text => "Bye (close)", 764 text => "Bye (close)",
774 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 765 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
775 on_activate => sub { $this->destroy }, 766 on_activate => sub { $this->destroy; 0 },
776 ; 767 ;
777 768
778 $self->update_options; 769 $self->update_options;
779 770
780 $self->{token} = $self->{conn}->ext_token; 771 $self->{token} = $self->{conn}->ext_token;
781 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 772 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
782 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 773 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
783 774
784 $self->{entry}->focus_in; 775 $self->{entry}->grab_focus;
785 776
786 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 777 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
787 778
788 $self->show; 779 $self->show;
789 $self 780 $self
… …
793 my ($self) = @_; 784 my ($self) = @_;
794 785
795 Scalar::Util::weaken $self; 786 Scalar::Util::weaken $self;
796 787
797 $self->{options}->clear; 788 $self->{options}->clear;
798 $self->{options}->add ($self->{close_button}); 789 $self->{options}->add ($self->{bye_button});
799 790
800 for my $kw (sort keys %{ $self->{kw} }) { 791 for my $kw (sort keys %{ $self->{kw} }) {
801 $self->{options}->add (new CFClient::UI::Button 792 $self->{options}->add (new CFClient::UI::Button
802 text => $kw, 793 text => $kw,
803 on_activate => sub { 794 on_activate => sub {
804 $self->send ($kw); 795 $self->send ($kw);
796 0
805 }, 797 },
806 ); 798 );
807 } 799 }
808} 800}
809 801
810sub feed { 802sub feed {
811 my ($self, $data) = @_; 803 my ($self, $data) = @_;
804
805 Scalar::Util::weaken $self;
812 806
813 my ($type, $msg) = split / /, $data, 2; 807 my ($type, $msg) = split / /, $data, 2;
814 808
815 if ($type eq "msg") { 809 if ($type eq "msg") {
816 my ($msg, @kw) = split /\x00/, $msg; 810 my ($msg, @kw) = split /\x00/, $msg;
817 $self->{kw}{$_} = 1 for @kw; 811 $self->{kw}{$_} = 1 for @kw;
818 812
819 $msg = CFClient::UI::Label::escape $msg; 813 $msg = "\n" . CFClient::UI::Label::escape $msg;
820 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 814 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
821 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh. 815 my @link;
816 $msg =~ s{
817 ($match)
818 }{
819 my $kw = $1;
820
821 push @link, new CFClient::UI::Label
822 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
823 can_hover => 1,
824 can_events => 1,
825 padding_x => 0,
826 padding_y => 0,
827 on_button_up => sub {
828 $self->send ($kw);
829 };
830
831 chr 0xfffc
832 }giex;
822 833
823 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 834 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
835 $self->{textview}->scroll_to_bottom;
824 $self->update_options; 836 $self->update_options;
825 } else { 837 } else {
826 $self->destroy; 838 $self->destroy;
827 } 839 }
828 840
… …
832sub send { 844sub send {
833 my ($self, $msg) = @_; 845 my ($self, $msg) = @_;
834 846
835 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 847 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
836 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 848 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
849 $self->{textview}->scroll_to_bottom;
837} 850}
838 851
839sub destroy { 852sub destroy {
840 my ($self) = @_; 853 my ($self) = @_;
841 854
842 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 855 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
843 856
844 delete $self->{conn}{npc_dialog}; 857 delete $self->{conn}{npc_dialog};
845 $self->{conn}->disconnect_ext ($self->{token}); 858 $self->{conn}->disconnect_ext ($self->{token});
846 859
847 $self->SUPER::destroy; 860 $self->SUPER::destroy;

Diff Legend

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