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.34 by elmex, Tue Jun 13 14:35:17 2006 UTC vs.
Revision 1.50 by elmex, Sun Jul 2 16:25:19 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) = @_;
… …
306 # I love transactions 311 # I love transactions
307 for (1..100) { 312 for (1..100) {
308 my $txn = $CFClient::DB_ENV->txn_begin; 313 my $txn = $CFClient::DB_ENV->txn_begin;
309 my $status = $self->{facemap}->db_get (id => $id); 314 my $status = $self->{facemap}->db_get (id => $id);
310 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 315 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
311 $id = ($id || 16) + 1; 316 $id = ($id || 64) + 1;
312 if ($self->{facemap}->put (id => $id) == 0 317 if ($self->{facemap}->put (id => $id) == 0
313 && $self->{facemap}->put ($hash => $id) == 0) { 318 && $self->{facemap}->put ($hash => $id) == 0) {
314 $txn->txn_commit; 319 $txn->txn_commit;
315 320
316 goto gotid; 321 goto gotid;
… …
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 for my $tag (keys %{ delete $self->{update_container} }) {
579 if ($tag == 0) {
580 update_floorbox;
581 $::INVR->set_items ($self->{container}{0})
571 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 });
572} 591}
573 592
574sub container_add { 593sub container_add {
575 my ($self, $tag, $items) = @_; 594 my ($self, $tag, $items) = @_;
576 595
577 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 596 $self->{update_container}{$tag}++;
578 597 $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} 598}
591 599
592sub container_clear { 600sub container_clear {
593 my ($self, $tag) = @_; 601 my ($self, $tag) = @_;
594 602
595 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 603 $self->{update_container}{$tag}++;
596 604 $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} 605}
608 606
609sub item_delete { 607sub item_delete {
610 my ($self, @items) = @_; 608 my ($self, @items) = @_;
611 609
610 $self->{update_container}{$_->{container}}++
612 for (@items) { 611 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 } 612
613 $self->update_containers;
624} 614}
625 615
626sub item_update { 616sub item_update {
627 my ($self, $item) = @_; 617 my ($self, $item) = @_;
628 618
629 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 619 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
630 620
631 if ($item->{tag} == $self->{player}{tag}) {
632 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
633 return;
634 }
635
636 CFClient::Item::update_widgets $item; 621 CFClient::Item::update_widgets $item;
637 622
638 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 623 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
639 set_opencont ($::CONN, 0, "Floor"); 624 set_opencont ($::CONN, 0, "Floor");
640 625
641 } elsif ($item->{flags} & F_OPEN) { 626 } elsif ($item->{flags} & F_OPEN) {
642 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 627 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
628
643 } else { 629 } else {
630 $self->{update_container}{$item->{container}}++;
631 $self->update_containers;
644 if ($item->{container} == 0) { 632# if ($item->{container} == 0) {
645 update_floorbox; 633# update_floorbox;
646 update_container (0); 634# update_container (0);
647 } elsif ($item->{container} == $self->{player}{tag}) { 635# } elsif ($item->{container} == $self->{player}{tag}) {
648 $::INV->set_items ($self->{container}{$item->{container}}) 636# $::INV->set_items ($self->{container}{$item->{container}})
649 } 637# }
650 } 638 }
651} 639}
652 640
653sub player_update { 641sub player_update {
654 my ($self, $player) = @_; 642 my ($self, $player) = @_;
655
656 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 643 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
657} 644}
658 645
659sub update_server_info { 646sub update_server_info {
660 my ($self) = @_; 647 my ($self) = @_;
… …
756 743
757 return unless $text =~ /\S/; 744 return unless $text =~ /\S/;
758 745
759 $entry->set_text (""); 746 $entry->set_text ("");
760 $this->send ($text); 747 $this->send ($text);
748
749 0
761 }, 750 },
762 ); 751 );
763 752
764 $vbox->add ($self->{options} = new CFClient::UI::VBox); 753 $vbox->add ($self->{options} = new CFClient::UI::VBox);
765 754
766 $self->{close_button} = new CFClient::UI::Button 755 $self->{bye_button} = new CFClient::UI::Button
767 text => "Bye (close)", 756 text => "Bye (close)",
768 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 757 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
769 on_activate => sub { $this->destroy }, 758 on_activate => sub { $this->destroy; 0 },
770 ; 759 ;
771 760
772 $self->update_options; 761 $self->update_options;
773 762
774 $self->{token} = $self->{conn}->ext_token; 763 $self->{token} = $self->{conn}->ext_token;
775 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 764 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
776 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 765 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
777 766
778 $self->{entry}->focus_in; 767 $self->{entry}->grab_focus;
779 768
780 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 769 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
781 770
782 $self->show; 771 $self->show;
783 $self 772 $self
… …
787 my ($self) = @_; 776 my ($self) = @_;
788 777
789 Scalar::Util::weaken $self; 778 Scalar::Util::weaken $self;
790 779
791 $self->{options}->clear; 780 $self->{options}->clear;
792 $self->{options}->add ($self->{close_button}); 781 $self->{options}->add ($self->{bye_button});
793 782
794 for my $kw (sort keys %{ $self->{kw} }) { 783 for my $kw (sort keys %{ $self->{kw} }) {
795 $self->{options}->add (new CFClient::UI::Button 784 $self->{options}->add (new CFClient::UI::Button
796 text => $kw, 785 text => $kw,
797 on_activate => sub { 786 on_activate => sub {
798 $self->send ($kw); 787 $self->send ($kw);
788 0
799 }, 789 },
800 ); 790 );
801 } 791 }
802} 792}
803 793
804sub feed { 794sub feed {
805 my ($self, $data) = @_; 795 my ($self, $data) = @_;
796
797 Scalar::Util::weaken $self;
806 798
807 my ($type, $msg) = split / /, $data, 2; 799 my ($type, $msg) = split / /, $data, 2;
808 800
809 if ($type eq "msg") { 801 if ($type eq "msg") {
810 my ($msg, @kw) = split /\x00/, $msg; 802 my ($msg, @kw) = split /\x00/, $msg;
811 $self->{kw}{$_} = 1 for @kw; 803 $self->{kw}{$_} = 1 for @kw;
812 804
813 $msg = CFClient::UI::Label::escape $msg; 805 $msg = "\n" . CFClient::UI::Label::escape $msg;
814 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 806 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. 807 my @link;
808 $msg =~ s{
809 ($match)
810 }{
811 my $kw = $1;
812
813 push @link, new CFClient::UI::Label
814 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
815 can_hover => 1,
816 can_events => 1,
817 padding_x => 0,
818 padding_y => 0,
819 on_button_up => sub {
820 $self->send ($kw);
821 };
822
823 chr 0xfffc
824 }giex;
816 825
817 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 826 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
827 $self->{textview}->scroll_to_bottom;
818 $self->update_options; 828 $self->update_options;
819 } else { 829 } else {
820 $self->destroy; 830 $self->destroy;
821 } 831 }
822 832
… …
826sub send { 836sub send {
827 my ($self, $msg) = @_; 837 my ($self, $msg) = @_;
828 838
829 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 839 $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); 840 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
841 $self->{textview}->scroll_to_bottom;
831} 842}
832 843
833sub destroy { 844sub destroy {
834 my ($self) = @_; 845 my ($self) = @_;
835 846
836 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 847 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
837 848
838 delete $self->{conn}{npc_dialog}; 849 delete $self->{conn}{npc_dialog};
839 $self->{conn}->disconnect_ext ($self->{token}); 850 $self->{conn}->disconnect_ext ($self->{token});
840 851
841 $self->SUPER::destroy; 852 $self->SUPER::destroy;

Diff Legend

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