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.49 by root, Wed Jun 28 23:39:15 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
… …
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,
… …
524 return unless $::CONN; 523 return unless $::CONN;
525 524
526 $::FLOORBOX->clear; 525 $::FLOORBOX->clear;
527 526
528 my $row; 527 my $row;
529 for (@{ $::CONN->{container}{0} }) { 528 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
530 if ($row < 6) { 529 if ($row < 6) {
531 local $_->{face_widget}; # hack to force recreation of widget 530 local $_->{face_widget}; # hack to force recreation of widget
532 local $_->{desc_widget}; # hack to force recreation of widget 531 local $_->{desc_widget}; # hack to force recreation of widget
533 CFClient::Item::update_widgets $_; 532 CFClient::Item::update_widgets $_;
534 533
… …
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});
572} 572}
573 573
574sub update_container { 574sub update_containers {
575 my ($tag) = @_; 575 my ($self) = @_;
576 576
577 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 577 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
578 for my $tag (keys %{ delete $self->{update_container} }) {
579 if ($tag == 0) {
580 update_floorbox;
581 $::INVR->set_items ($self->{container}{0})
578 if $tag == $::CONN->{open_container}; 582 if $tag == $self->{open_container};
583 } elsif ($tag == $self->{player}{tag}) {
584 $::INV->set_items ($self->{container}{$tag})
585 } else {
586 $::INVR->set_items ($self->{container}{$tag})
587 if $tag == $self->{open_container};
588 }
589 }
590 });
579} 591}
580 592
581sub container_add { 593sub container_add {
582 my ($self, $tag, $items) = @_; 594 my ($self, $tag, $items) = @_;
583 595
584 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 596 $self->{update_container}{$tag}++;
585 597 $self->update_containers;
586 if ($tag == 0) {
587 update_floorbox;
588 update_container (0);
589 } elsif ($tag == $self->{player}{tag}) {
590 $::INV->set_items ($self->{container}{$self->{player}{tag}})
591 } else {
592 update_container ($tag);
593 }
594
595 # $self-<{player}{tag} => player inv
596 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
597} 598}
598 599
599sub container_clear { 600sub container_clear {
600 my ($self, $tag) = @_; 601 my ($self, $tag) = @_;
601 602
602 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 603 $self->{update_container}{$tag}++;
603 604 $self->update_containers;
604 if ($tag == 0) {
605 update_floorbox;
606 update_container (0);
607 } elsif ($tag == $self->{player}{tag}) {
608 $::INV->set_items ($self->{container}{$tag})
609 } else {
610 update_container ($tag);
611 }
612
613# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
614} 605}
615 606
616sub item_delete { 607sub item_delete {
617 my ($self, @items) = @_; 608 my ($self, @items) = @_;
618 609
610 $self->{update_container}{$_->{container}}++
619 for (@items) { 611 for @items;
620 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
621
622 if ($_->{container} == 0) {
623 update_floorbox;
624 update_container ($_->{tag});
625 } elsif ($_->{container} == $self->{player}{tag}) {
626 $::INV->set_items ($self->{container}{$self->{player}{tag}})
627 } else {
628 update_container ($_->{container});
629 }
630 } 612
613 $self->update_containers;
631} 614}
632 615
633sub item_update { 616sub item_update {
634 my ($self, $item) = @_; 617 my ($self, $item) = @_;
635 618
… …
645 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 628 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646 set_opencont ($::CONN, 0, "Floor"); 629 set_opencont ($::CONN, 0, "Floor");
647 630
648 } elsif ($item->{flags} & F_OPEN) { 631 } elsif ($item->{flags} & F_OPEN) {
649 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 632 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
633
650 } else { 634 } else {
635 $self->{update_container}{$item->{container}}++;
636 $self->update_containers;
651 if ($item->{container} == 0) { 637# if ($item->{container} == 0) {
652 update_floorbox; 638# update_floorbox;
653 update_container (0); 639# update_container (0);
654 } elsif ($item->{container} == $self->{player}{tag}) { 640# } elsif ($item->{container} == $self->{player}{tag}) {
655 $::INV->set_items ($self->{container}{$item->{container}}) 641# $::INV->set_items ($self->{container}{$item->{container}})
656 } 642# }
657 } 643 }
658} 644}
659 645
660sub player_update { 646sub player_update {
661 my ($self, $player) = @_; 647 my ($self, $player) = @_;
… …
763 749
764 return unless $text =~ /\S/; 750 return unless $text =~ /\S/;
765 751
766 $entry->set_text (""); 752 $entry->set_text ("");
767 $this->send ($text); 753 $this->send ($text);
754
755 0
768 }, 756 },
769 ); 757 );
770 758
771 $vbox->add ($self->{options} = new CFClient::UI::VBox); 759 $vbox->add ($self->{options} = new CFClient::UI::VBox);
772 760
773 $self->{close_button} = new CFClient::UI::Button 761 $self->{bye_button} = new CFClient::UI::Button
774 text => "Bye (close)", 762 text => "Bye (close)",
775 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 763 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
776 on_activate => sub { $this->destroy }, 764 on_activate => sub { $this->destroy; 0 },
777 ; 765 ;
778 766
779 $self->update_options; 767 $self->update_options;
780 768
781 $self->{token} = $self->{conn}->ext_token; 769 $self->{token} = $self->{conn}->ext_token;
782 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 770 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
783 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 771 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
784 772
785 $self->{entry}->focus_in; 773 $self->{entry}->grab_focus;
786 774
787 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 775 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
788 776
789 $self->show; 777 $self->show;
790 $self 778 $self
… …
794 my ($self) = @_; 782 my ($self) = @_;
795 783
796 Scalar::Util::weaken $self; 784 Scalar::Util::weaken $self;
797 785
798 $self->{options}->clear; 786 $self->{options}->clear;
799 $self->{options}->add ($self->{close_button}); 787 $self->{options}->add ($self->{bye_button});
800 788
801 for my $kw (sort keys %{ $self->{kw} }) { 789 for my $kw (sort keys %{ $self->{kw} }) {
802 $self->{options}->add (new CFClient::UI::Button 790 $self->{options}->add (new CFClient::UI::Button
803 text => $kw, 791 text => $kw,
804 on_activate => sub { 792 on_activate => sub {
805 $self->send ($kw); 793 $self->send ($kw);
794 0
806 }, 795 },
807 ); 796 );
808 } 797 }
809} 798}
810 799
811sub feed { 800sub feed {
812 my ($self, $data) = @_; 801 my ($self, $data) = @_;
802
803 Scalar::Util::weaken $self;
813 804
814 my ($type, $msg) = split / /, $data, 2; 805 my ($type, $msg) = split / /, $data, 2;
815 806
816 if ($type eq "msg") { 807 if ($type eq "msg") {
817 my ($msg, @kw) = split /\x00/, $msg; 808 my ($msg, @kw) = split /\x00/, $msg;
818 $self->{kw}{$_} = 1 for @kw; 809 $self->{kw}{$_} = 1 for @kw;
819 810
820 $msg = CFClient::UI::Label::escape $msg; 811 $msg = "\n" . CFClient::UI::Label::escape $msg;
821 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 812 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. 813 my @link;
814 $msg =~ s{
815 ($match)
816 }{
817 my $kw = $1;
818
819 push @link, new CFClient::UI::Label
820 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
821 can_hover => 1,
822 can_events => 1,
823 padding_x => 0,
824 padding_y => 0,
825 on_button_up => sub {
826 $self->send ($kw);
827 };
828
829 chr 0xfffc
830 }giex;
823 831
824 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 832 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
833 $self->{textview}->scroll_to_bottom;
825 $self->update_options; 834 $self->update_options;
826 } else { 835 } else {
827 $self->destroy; 836 $self->destroy;
828 } 837 }
829 838
… …
833sub send { 842sub send {
834 my ($self, $msg) = @_; 843 my ($self, $msg) = @_;
835 844
836 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 845 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
837 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 846 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
847 $self->{textview}->scroll_to_bottom;
838} 848}
839 849
840sub destroy { 850sub destroy {
841 my ($self) = @_; 851 my ($self) = @_;
842 852
843 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 853 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
844 854
845 delete $self->{conn}{npc_dialog}; 855 delete $self->{conn}{npc_dialog};
846 $self->{conn}->disconnect_ext ($self->{token}); 856 $self->{conn}->disconnect_ext ($self->{token});
847 857
848 $self->SUPER::destroy; 858 $self->SUPER::destroy;

Diff Legend

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