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.30 by root, Sun Jun 11 18:41:30 2006 UTC vs.
Revision 1.39 by root, Mon Jun 19 06:50:45 2006 UTC

7 7
8use CFClient; 8use CFClient;
9use CFClient::UI; 9use CFClient::UI;
10 10
11use base 'Crossfire::Protocol::Base'; 11use base 'Crossfire::Protocol::Base';
12
13our %open_logs;
12 14
13sub new { 15sub new {
14 my $class = shift; 16 my $class = shift;
15 17
16 my $self = $class->SUPER::new (@_); 18 my $self = $class->SUPER::new (@_);
57 59
58 # per server 60 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 61 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
60 62
61 $self 63 $self
64}
65
66sub logprint {
67 my ($self, @a) = @_;
68 my $filename = "$Crossfire::VARDIR/log.$self->{host}";
69
70 my $fh = $open_logs{$filename};
71 unless ($fh) {
72 # FIXME: handle this more gracefully?
73 open $fh, ">>", $filename
74 or die "Couldn't open logfile: log.$self->{host}: $!";
75
76 $open_logs{$filename} = $fh;
77 }
78
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time);
80
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83
84 print $fh "$ts ", @a, "\n";
85 $fh->flush;
62} 86}
63 87
64sub stats_update { 88sub stats_update {
65 my ($self, $stats) = @_; 89 my ($self, $stats) = @_;
66 90
79 103
80 if ($self->{record}) { 104 if ($self->{record}) {
81 push @{$self->{record}}, $command; 105 push @{$self->{record}}, $command;
82 } 106 }
83 107
108 $self->logprint ("send: ", $command);
84 $self->send_command ($command); 109 $self->send_command ($command);
85 ::status $command; 110 ::status $command;
86} 111}
87 112
88sub start_record { 113sub start_record {
105sub feed_map1a { 130sub feed_map1a {
106 my ($self, $data) = @_; 131 my ($self, $data) = @_;
107 132
108 $self->{map}->map1a_update ($data); 133 $self->{map}->map1a_update ($data);
109 $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);
110} 141}
111 142
112sub flush_map { 143sub flush_map {
113 my ($self) = @_; 144 my ($self) = @_;
114 145
127 158
128 $self->flush_map; 159 $self->flush_map;
129 delete $self->{neigh_map}; 160 delete $self->{neigh_map};
130 161
131 $self->{map}->clear; 162 $self->{map}->clear;
163 delete $self->{map_widget}{magicmap};
132} 164}
133 165
134 166
135sub load_map($$$) { 167sub load_map($$$) {
136 my ($self, $hash, $x, $y) = @_; 168 my ($self, $hash, $x, $y) = @_;
279 # I love transactions 311 # I love transactions
280 for (1..100) { 312 for (1..100) {
281 my $txn = $CFClient::DB_ENV->txn_begin; 313 my $txn = $CFClient::DB_ENV->txn_begin;
282 my $status = $self->{facemap}->db_get (id => $id); 314 my $status = $self->{facemap}->db_get (id => $id);
283 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 315 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
284 $id = ($id || 16) + 1; 316 $id = ($id || 64) + 1;
285 if ($self->{facemap}->put (id => $id) == 0 317 if ($self->{facemap}->put (id => $id) == 0
286 && $self->{facemap}->put ($hash => $id) == 0) { 318 && $self->{facemap}->put ($hash => $id) == 0) {
287 $txn->txn_commit; 319 $txn->txn_commit;
288 320
289 goto gotid; 321 goto gotid;
369 [0.55, 0.41, 0.13], 401 [0.55, 0.41, 0.13],
370 [0.99, 0.77, 0.26], 402 [0.99, 0.77, 0.26],
371 [0.74, 0.65, 0.41], 403 [0.74, 0.65, 0.41],
372 ); 404 );
373 405
406 $self->logprint ("info: ", $text);
407
374 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 408 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
375 409
376 # try to create single paragraphs of multiple lines sent by the server 410 # try to create single paragraphs of multiple lines sent by the server
377 $text =~ s/(?<=\S)\n(?=\w)/ /g; 411 $text =~ s/(?<=\S)\n(?=\w)/ /g;
378 412
501 535
502 $row++; 536 $row++;
503 } else { 537 } else {
504 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 538 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
505 text => "More...", 539 text => "More...",
506 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 540 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 },
507 ); 541 );
508 last; 542 last;
509 } 543 }
510 } 544 }
511 }); 545 });
526 tooltip => "Close the currently open container (if one is open)", 560 tooltip => "Close the currently open container (if one is open)",
527 on_activate => sub { 561 on_activate => sub {
528 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 562 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
529 if $tag != 0; 563 if $tag != 0;
530 #if $CONN->{open_container} != 0; 564 #if $CONN->{open_container} != 0;
565 0
531 }, 566 },
532 ); 567 );
533 } 568 }
534 569
535 $::INVR->set_items ($conn->{container}{$tag}); 570 $::INVR->set_items ($conn->{container}{$tag});
625 my ($self, $player) = @_; 660 my ($self, $player) = @_;
626 661
627 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 662 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
628} 663}
629 664
630sub logged_in { 665sub update_server_info {
631 my ($self) = @_; 666 my ($self) = @_;
632
633 $self->send_ext_req (cfplus => "version", "1", sub {
634 $self->{cfplus_ext} = $_[0];
635 });
636
637 $self->send_command ("output-sync $::CFG->{output_sync}");
638 $self->send_command ("output-count $::CFG->{output_count}");
639 $self->send_command ("pickup $::CFG->{pickup}");
640 667
641 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 668 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
642 669
643 $::SERVER_INFO->set_markup ( 670 $::SERVER_INFO->set_markup (
644 "server <tt>$self->{host}:$self->{port}</tt>\n" 671 "server <tt>$self->{host}:$self->{port}</tt>\n"
645 . "protocol version <tt>$self->{version}</tt>\n" 672 . "protocol version <tt>$self->{version}</tt>\n"
646 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 673 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
647 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 674 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
648 . "cfplus support $yesno[$self->{cfplus_ext} > 0]\n" 675 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
676 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
649 . "map size $self->{mapw}×$self->{maph}\n" 677 . "map size $self->{mapw}×$self->{maph}\n"
650 ); 678 );
651} 679}
652 680
681sub logged_in {
682 my ($self) = @_;
683
684 $self->send_ext_req (cfplus_support => "1", sub {
685 $self->{cfplus_ext} = $_[0];
686 $self->update_server_info;
687 });
688
689 $self->update_server_info;
690
691 $self->send_command ("output-sync $::CFG->{output_sync}");
692 $self->send_command ("output-count $::CFG->{output_count}");
693 $self->send_command ("pickup $::CFG->{pickup}");
694}
695
696sub lookat {
697 my ($self, $x, $y) = @_;
698
699 if ($self->{cfplus_ext}) {
700 $self->send_ext_req (lookat => "$x $y", sub {
701 my %res = split /\x00/, $_[0];
702
703 if (exists $res{npc_dialog}) {
704 # start npc chat dialog
705 $self->{npc_dialog} = new CFClient::NPCDialog::
706 dx => $x,
707 dy => $y,
708 title => "$res{npc_dialog} (NPC)",
709 conn => $self,
710 ;
711 }
712 });
713 }
714
715 $self->send ("lookat $x $y");
716}
717
718sub destroy {
719 my ($self) = @_;
720
721 $self->{npc_dialog}->destroy
722 if $self->{npc_dialog};
723
724 $self->SUPER::destroy;
725}
726
727package CFClient::NPCDialog;
728
729our @ISA = 'CFClient::UI::FancyFrame';
730
731sub new {
732 my $class = shift;
733
734 my $self = $class->SUPER::new (
735 x => 'center',
736 y => 'center',
737 name => "npc_dialog",
738 force_w => $::WIDTH * 0.7,
739 force_h => $::HEIGHT * 0.7,
740 title => "NPC Dialog",
741 kw => { hi => 0, yes => 0, no => 0 },
742 @_,
743 );
744
745 Scalar::Util::weaken (my $this = $self);
746
747 # better use a pane...
748 $self->add (my $hbox = new CFClient::UI::HBox);
749 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
750
751 $hbox->add (my $vbox = new CFClient::UI::VBox);
752
753 $vbox->add (new CFClient::UI::Label text => "Message Entry:");
754 $vbox->add ($self->{entry} = new CFClient::UI::Entry
755 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
756 . "Sometimes you have to tell an NPC something you cannot find out during "
757 . "a normal conversation (such as a password). In those cases you have to use "
758 . "this text entry. You can also enter responses manually instead of using the response "
759 . "buttons below.",
760 on_activate => sub {
761 my ($entry, $text) = @_;
762
763 return unless $text =~ /\S/;
764
765 $entry->set_text ("");
766 $this->send ($text);
767
768 0
769 },
770 );
771
772 $vbox->add ($self->{options} = new CFClient::UI::VBox);
773
774 $self->{bye_button} = new CFClient::UI::Button
775 text => "Bye (close)",
776 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
777 on_activate => sub { $this->destroy; 0 },
778 ;
779
780 $self->update_options;
781
782 $self->{token} = $self->{conn}->ext_token;
783 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
784 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
785
786 $self->{entry}->grab_focus;
787
788 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
789
790 $self->show;
791 $self
792};
793
794sub update_options {
795 my ($self) = @_;
796
797 Scalar::Util::weaken $self;
798
799 $self->{options}->clear;
800 $self->{options}->add ($self->{bye_button});
801
802 for my $kw (sort keys %{ $self->{kw} }) {
803 $self->{options}->add (new CFClient::UI::Button
804 text => $kw,
805 on_activate => sub {
806 $self->send ($kw);
807 0
808 },
809 );
810 }
811}
812
813sub feed {
814 my ($self, $data) = @_;
815
816 my ($type, $msg) = split / /, $data, 2;
817
818 if ($type eq "msg") {
819 my ($msg, @kw) = split /\x00/, $msg;
820 $self->{kw}{$_} = 1 for @kw;
821
822 $msg = CFClient::UI::Label::escape $msg;
823 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
824 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh.
825
826 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg");
827 $self->update_options;
828 } else {
829 $self->destroy;
830 }
831
832 1
833}
834
835sub send {
836 my ($self, $msg) = @_;
837
838 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
839 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
840}
841
842sub destroy {
843 my ($self) = @_;
844
845 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
846
847 delete $self->{conn}{npc_dialog};
848 $self->{conn}->disconnect_ext ($self->{token});
849
850 $self->SUPER::destroy;
851}
852
6531; 8531;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines