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.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
… …
132sub feed_map1a { 130sub feed_map1a {
133 my ($self, $data) = @_; 131 my ($self, $data) = @_;
134 132
135 $self->{map}->map1a_update ($data); 133 $self->{map}->map1a_update ($data);
136 $self->{map_widget}->update; 134 $self->{map_widget}->update;
135}
136
137sub magicmap {
138 my ($self, $w, $h, $x, $y, $data) = @_;
139
140 $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
137} 141}
138 142
139sub flush_map { 143sub flush_map {
140 my ($self) = @_; 144 my ($self) = @_;
141 145
… …
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,
… …
517 return unless $::CONN; 523 return unless $::CONN;
518 524
519 $::FLOORBOX->clear; 525 $::FLOORBOX->clear;
520 526
521 my $row; 527 my $row;
522 for (@{ $::CONN->{container}{0} }) { 528 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
523 if ($row < 6) { 529 if ($row < 6) {
524 local $_->{face_widget}; # hack to force recreation of widget 530 local $_->{face_widget}; # hack to force recreation of widget
525 local $_->{desc_widget}; # hack to force recreation of widget 531 local $_->{desc_widget}; # hack to force recreation of widget
526 CFClient::Item::update_widgets $_; 532 CFClient::Item::update_widgets $_;
527 533
… …
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});
565} 572}
566 573
567sub update_container { 574sub update_containers {
568 my ($tag) = @_; 575 my ($self) = @_;
569 576
570 $::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})
571 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 });
572} 593}
573 594
574sub container_add { 595sub container_add {
575 my ($self, $tag, $items) = @_; 596 my ($self, $tag, $items) = @_;
576 597
577 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 598 $self->{update_container}{$tag}++;
578 599 $self->update_containers;
579 if ($tag == 0) {
580 update_floorbox;
581 update_container (0);
582 } elsif ($tag == $self->{player}{tag}) {
583 $::INV->set_items ($self->{container}{$self->{player}{tag}})
584 } else {
585 update_container ($tag);
586 }
587
588 # $self-<{player}{tag} => player inv
589 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
590} 600}
591 601
592sub container_clear { 602sub container_clear {
593 my ($self, $tag) = @_; 603 my ($self, $tag) = @_;
594 604
595 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 605 $self->{update_container}{$tag}++;
596 606 $self->update_containers;
597 if ($tag == 0) {
598 update_floorbox;
599 update_container (0);
600 } elsif ($tag == $self->{player}{tag}) {
601 $::INV->set_items ($self->{container}{$tag})
602 } else {
603 update_container ($tag);
604 }
605
606# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
607} 607}
608 608
609sub item_delete { 609sub item_delete {
610 my ($self, @items) = @_; 610 my ($self, @items) = @_;
611 611
612 $self->{update_container}{$_->{tag}}++
612 for (@items) { 613 for @items;
613 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
614
615 if ($_->{container} == 0) {
616 update_floorbox;
617 update_container ($_->{tag});
618 } elsif ($_->{container} == $self->{player}{tag}) {
619 $::INV->set_items ($self->{container}{$self->{player}{tag}})
620 } else {
621 update_container ($_->{container});
622 }
623 } 614
615 $self->update_containers;
624} 616}
625 617
626sub item_update { 618sub item_update {
627 my ($self, $item) = @_; 619 my ($self, $item) = @_;
628 620
… …
638 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 630 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
639 set_opencont ($::CONN, 0, "Floor"); 631 set_opencont ($::CONN, 0, "Floor");
640 632
641 } elsif ($item->{flags} & F_OPEN) { 633 } elsif ($item->{flags} & F_OPEN) {
642 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 634 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
635
643 } else { 636 } else {
637 $self->{update_container}{$item->{container}}++;
638 $self->update_containers;
644 if ($item->{container} == 0) { 639# if ($item->{container} == 0) {
645 update_floorbox; 640# update_floorbox;
646 update_container (0); 641# update_container (0);
647 } elsif ($item->{container} == $self->{player}{tag}) { 642# } elsif ($item->{container} == $self->{player}{tag}) {
648 $::INV->set_items ($self->{container}{$item->{container}}) 643# $::INV->set_items ($self->{container}{$item->{container}})
649 } 644# }
650 } 645 }
651} 646}
652 647
653sub player_update { 648sub player_update {
654 my ($self, $player) = @_; 649 my ($self, $player) = @_;
… …
756 751
757 return unless $text =~ /\S/; 752 return unless $text =~ /\S/;
758 753
759 $entry->set_text (""); 754 $entry->set_text ("");
760 $this->send ($text); 755 $this->send ($text);
756
757 0
761 }, 758 },
762 ); 759 );
763 760
764 $vbox->add ($self->{options} = new CFClient::UI::VBox); 761 $vbox->add ($self->{options} = new CFClient::UI::VBox);
765 762
766 $self->{close_button} = new CFClient::UI::Button 763 $self->{bye_button} = new CFClient::UI::Button
767 text => "Bye (close)", 764 text => "Bye (close)",
768 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.",
769 on_activate => sub { $this->destroy }, 766 on_activate => sub { $this->destroy; 0 },
770 ; 767 ;
771 768
772 $self->update_options; 769 $self->update_options;
773 770
774 $self->{token} = $self->{conn}->ext_token; 771 $self->{token} = $self->{conn}->ext_token;
775 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 772 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
776 $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}");
777 774
778 $self->{entry}->focus_in; 775 $self->{entry}->grab_focus;
779 776
780 $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");
781 778
782 $self->show; 779 $self->show;
783 $self 780 $self
… …
787 my ($self) = @_; 784 my ($self) = @_;
788 785
789 Scalar::Util::weaken $self; 786 Scalar::Util::weaken $self;
790 787
791 $self->{options}->clear; 788 $self->{options}->clear;
792 $self->{options}->add ($self->{close_button}); 789 $self->{options}->add ($self->{bye_button});
793 790
794 for my $kw (sort keys %{ $self->{kw} }) { 791 for my $kw (sort keys %{ $self->{kw} }) {
795 $self->{options}->add (new CFClient::UI::Button 792 $self->{options}->add (new CFClient::UI::Button
796 text => $kw, 793 text => $kw,
797 on_activate => sub { 794 on_activate => sub {
798 $self->send ($kw); 795 $self->send ($kw);
796 0
799 }, 797 },
800 ); 798 );
801 } 799 }
802} 800}
803 801
804sub feed { 802sub feed {
805 my ($self, $data) = @_; 803 my ($self, $data) = @_;
804
805 Scalar::Util::weaken $self;
806 806
807 my ($type, $msg) = split / /, $data, 2; 807 my ($type, $msg) = split / /, $data, 2;
808 808
809 if ($type eq "msg") { 809 if ($type eq "msg") {
810 my ($msg, @kw) = split /\x00/, $msg; 810 my ($msg, @kw) = split /\x00/, $msg;
811 $self->{kw}{$_} = 1 for @kw; 811 $self->{kw}{$_} = 1 for @kw;
812 812
813 $msg = CFClient::UI::Label::escape $msg; 813 $msg = "\n" . CFClient::UI::Label::escape $msg;
814 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} };
815 $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;
816 833
817 $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;
818 $self->update_options; 836 $self->update_options;
819 } else { 837 } else {
820 $self->destroy; 838 $self->destroy;
821 } 839 }
822 840
… …
826sub send { 844sub send {
827 my ($self, $msg) = @_; 845 my ($self, $msg) = @_;
828 846
829 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 847 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
830 $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;
831} 850}
832 851
833sub destroy { 852sub destroy {
834 my ($self) = @_; 853 my ($self) = @_;
835 854
836 #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
837 856
838 delete $self->{conn}{npc_dialog}; 857 delete $self->{conn}{npc_dialog};
839 $self->{conn}->disconnect_ext ($self->{token}); 858 $self->{conn}->disconnect_ext ($self->{token});
840 859
841 $self->SUPER::destroy; 860 $self->SUPER::destroy;

Diff Legend

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