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.51 by root, Sun Jul 2 21:07:26 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,
… …
438 # try to create single paragraphs of multiple lines sent by the server 438 # try to create single paragraphs of multiple lines sent by the server
439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440 $spell->{message} =~ s/\n+$//; 440 $spell->{message} =~ s/\n+$//;
441 $spell->{message} ||= "Server did not provide a description for this spell."; 441 $spell->{message} ||= "Server did not provide a description for this spell.";
442 442
443 $::SETUP_SPELLS->add_spell ($spell); 443 $::SPELL_PAGE->add_spell ($spell);
444 444
445 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 445 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
446 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 446 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
447} 447}
448 448
449sub spell_delete { 449sub spell_delete {
450 my ($self, $spell) = @_; 450 my ($self, $spell) = @_;
451
451 $::SETUP_SPELLS->remove_spell ($spell); 452 $::SPELL_PAGE->remove_spell ($spell);
452} 453}
453 454
454sub addme_success { 455sub addme_success {
455 my ($self) = @_; 456 my ($self) = @_;
456 457
… …
523 return unless $::CONN; 524 return unless $::CONN;
524 525
525 $::FLOORBOX->clear; 526 $::FLOORBOX->clear;
526 527
527 my $row; 528 my $row;
528 for (@{ $::CONN->{container}{0} }) { 529 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
529 if ($row < 6) { 530 if ($row < 6) {
530 local $_->{face_widget}; # hack to force recreation of widget 531 local $_->{face_widget}; # hack to force recreation of widget
531 local $_->{desc_widget}; # hack to force recreation of widget 532 local $_->{desc_widget}; # hack to force recreation of widget
532 CFClient::Item::update_widgets $_; 533 CFClient::Item::update_widgets $_;
533 534
… …
536 537
537 $row++; 538 $row++;
538 } else { 539 } else {
539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 540 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
540 text => "More...", 541 text => "More...",
541 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 542 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
542 ); 543 );
543 last; 544 last;
544 } 545 }
545 } 546 }
546 }); 547 });
… …
561 tooltip => "Close the currently open container (if one is open)", 562 tooltip => "Close the currently open container (if one is open)",
562 on_activate => sub { 563 on_activate => sub {
563 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 564 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
564 if $tag != 0; 565 if $tag != 0;
565 #if $CONN->{open_container} != 0; 566 #if $CONN->{open_container} != 0;
567 0
566 }, 568 },
567 ); 569 );
568 } 570 }
569 571
570 $::INVR->set_items ($conn->{container}{$tag}); 572 $::INVR->set_items ($conn->{container}{$tag});
571} 573}
572 574
573sub update_container { 575sub update_containers {
574 my ($tag) = @_; 576 my ($self) = @_;
575 577
576 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 578 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
579 for my $tag (keys %{ delete $self->{update_container} }) {
580 if ($tag == 0) {
581 update_floorbox;
582 $::INVR->set_items ($self->{container}{0})
577 if $tag == $::CONN->{open_container}; 583 if $tag == $self->{open_container};
584 } elsif ($tag == $self->{player}{tag}) {
585 $::INV->set_items ($self->{container}{$tag})
586 } else {
587 $::INVR->set_items ($self->{container}{$tag})
588 if $tag == $self->{open_container};
589 }
590 }
591 });
578} 592}
579 593
580sub container_add { 594sub container_add {
581 my ($self, $tag, $items) = @_; 595 my ($self, $tag, $items) = @_;
582 596
583 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 597 $self->{update_container}{$tag}++;
584 598 $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} 599}
597 600
598sub container_clear { 601sub container_clear {
599 my ($self, $tag) = @_; 602 my ($self, $tag) = @_;
600 603
601 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 604 $self->{update_container}{$tag}++;
602 605 $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} 606}
614 607
615sub item_delete { 608sub item_delete {
616 my ($self, @items) = @_; 609 my ($self, @items) = @_;
617 610
611 $self->{update_container}{$_->{container}}++
618 for (@items) { 612 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 } 613
614 $self->update_containers;
630} 615}
631 616
632sub item_update { 617sub item_update {
633 my ($self, $item) = @_; 618 my ($self, $item) = @_;
634 619
635 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 620 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
636 621
637 if ($item->{tag} == $self->{player}{tag}) {
638 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
639 return;
640 }
641
642 CFClient::Item::update_widgets $item; 622 CFClient::Item::update_widgets $item;
643 623
644 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 624 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
645 set_opencont ($::CONN, 0, "Floor"); 625 set_opencont ($::CONN, 0, "Floor");
646 626
647 } elsif ($item->{flags} & F_OPEN) { 627 } elsif ($item->{flags} & F_OPEN) {
648 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 628 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
629
649 } else { 630 } else {
631 $self->{update_container}{$item->{container}}++;
632 $self->update_containers;
650 if ($item->{container} == 0) { 633# if ($item->{container} == 0) {
651 update_floorbox; 634# update_floorbox;
652 update_container (0); 635# update_container (0);
653 } elsif ($item->{container} == $self->{player}{tag}) { 636# } elsif ($item->{container} == $self->{player}{tag}) {
654 $::INV->set_items ($self->{container}{$item->{container}}) 637# $::INV->set_items ($self->{container}{$item->{container}})
655 } 638# }
656 } 639 }
657} 640}
658 641
659sub player_update { 642sub player_update {
660 my ($self, $player) = @_; 643 my ($self, $player) = @_;
661
662 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 644 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
663} 645}
664 646
665sub update_server_info { 647sub update_server_info {
666 my ($self) = @_; 648 my ($self) = @_;
… …
762 744
763 return unless $text =~ /\S/; 745 return unless $text =~ /\S/;
764 746
765 $entry->set_text (""); 747 $entry->set_text ("");
766 $this->send ($text); 748 $this->send ($text);
749
750 0
767 }, 751 },
768 ); 752 );
769 753
770 $vbox->add ($self->{options} = new CFClient::UI::VBox); 754 $vbox->add ($self->{options} = new CFClient::UI::VBox);
771 755
772 $self->{close_button} = new CFClient::UI::Button 756 $self->{bye_button} = new CFClient::UI::Button
773 text => "Bye (close)", 757 text => "Bye (close)",
774 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 758 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
775 on_activate => sub { $this->destroy }, 759 on_activate => sub { $this->destroy; 0 },
776 ; 760 ;
777 761
778 $self->update_options; 762 $self->update_options;
779 763
780 $self->{token} = $self->{conn}->ext_token; 764 $self->{token} = $self->{conn}->ext_token;
781 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 765 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
782 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 766 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
783 767
784 $self->{entry}->focus_in; 768 $self->{entry}->grab_focus;
785 769
786 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 770 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
787 771
788 $self->show; 772 $self->show;
789 $self 773 $self
… …
793 my ($self) = @_; 777 my ($self) = @_;
794 778
795 Scalar::Util::weaken $self; 779 Scalar::Util::weaken $self;
796 780
797 $self->{options}->clear; 781 $self->{options}->clear;
798 $self->{options}->add ($self->{close_button}); 782 $self->{options}->add ($self->{bye_button});
799 783
800 for my $kw (sort keys %{ $self->{kw} }) { 784 for my $kw (sort keys %{ $self->{kw} }) {
801 $self->{options}->add (new CFClient::UI::Button 785 $self->{options}->add (new CFClient::UI::Button
802 text => $kw, 786 text => $kw,
803 on_activate => sub { 787 on_activate => sub {
804 $self->send ($kw); 788 $self->send ($kw);
789 0
805 }, 790 },
806 ); 791 );
807 } 792 }
808} 793}
809 794
810sub feed { 795sub feed {
811 my ($self, $data) = @_; 796 my ($self, $data) = @_;
797
798 Scalar::Util::weaken $self;
812 799
813 my ($type, $msg) = split / /, $data, 2; 800 my ($type, $msg) = split / /, $data, 2;
814 801
815 if ($type eq "msg") { 802 if ($type eq "msg") {
816 my ($msg, @kw) = split /\x00/, $msg; 803 my ($msg, @kw) = split /\x00/, $msg;
817 $self->{kw}{$_} = 1 for @kw; 804 $self->{kw}{$_} = 1 for @kw;
818 805
819 $msg = CFClient::UI::Label::escape $msg; 806 $msg = "\n" . CFClient::UI::Label::escape $msg;
820 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 807 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. 808 my @link;
809 $msg =~ s{
810 ($match)
811 }{
812 my $kw = $1;
813
814 push @link, new CFClient::UI::Label
815 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
816 can_hover => 1,
817 can_events => 1,
818 padding_x => 0,
819 padding_y => 0,
820 on_button_up => sub {
821 $self->send ($kw);
822 };
823
824 chr 0xfffc
825 }giex;
822 826
823 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 827 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
828 $self->{textview}->scroll_to_bottom;
824 $self->update_options; 829 $self->update_options;
825 } else { 830 } else {
826 $self->destroy; 831 $self->destroy;
827 } 832 }
828 833
… …
832sub send { 837sub send {
833 my ($self, $msg) = @_; 838 my ($self, $msg) = @_;
834 839
835 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 840 $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); 841 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
842 $self->{textview}->scroll_to_bottom;
837} 843}
838 844
839sub destroy { 845sub destroy {
840 my ($self) = @_; 846 my ($self) = @_;
841 847
842 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 848 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
843 849
844 delete $self->{conn}{npc_dialog}; 850 delete $self->{conn}{npc_dialog};
845 $self->{conn}->disconnect_ext ($self->{token}); 851 $self->{conn}->disconnect_ext ($self->{token});
846 852
847 $self->SUPER::destroy; 853 $self->SUPER::destroy;

Diff Legend

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