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.24 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.37 by root, Thu Jun 15 15:47:36 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 (@_);
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
62} 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;
86}
87
88
63 89
64sub stats_update { 90sub stats_update {
65 my ($self, $stats) = @_; 91 my ($self, $stats) = @_;
66 92
67 if (my $exp = $stats->{+CS_STAT_EXP64}) { 93 if (my $exp = $stats->{+CS_STAT_EXP64}) {
79 105
80 if ($self->{record}) { 106 if ($self->{record}) {
81 push @{$self->{record}}, $command; 107 push @{$self->{record}}, $command;
82 } 108 }
83 109
110 $self->logprint ("send: ", $command);
84 $self->send_command ($command); 111 $self->send_command ($command);
85 ::status $command; 112 ::status $command;
86} 113}
87 114
88sub start_record { 115sub start_record {
105sub feed_map1a { 132sub feed_map1a {
106 my ($self, $data) = @_; 133 my ($self, $data) = @_;
107 134
108 $self->{map}->map1a_update ($data); 135 $self->{map}->map1a_update ($data);
109 $self->{map_widget}->update; 136 $self->{map_widget}->update;
137}
138
139sub magicmap {
140 my ($self, $w, $h, $x, $y, $data) = @_;
141
142 $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
110} 143}
111 144
112sub flush_map { 145sub flush_map {
113 my ($self) = @_; 146 my ($self) = @_;
114 147
127 160
128 $self->flush_map; 161 $self->flush_map;
129 delete $self->{neigh_map}; 162 delete $self->{neigh_map};
130 163
131 $self->{map}->clear; 164 $self->{map}->clear;
165 delete $self->{map_widget}{magicmap};
132} 166}
133 167
134 168
135sub load_map($$$) { 169sub load_map($$$) {
136 my ($self, $hash, $x, $y) = @_; 170 my ($self, $hash, $x, $y) = @_;
279 # I love transactions 313 # I love transactions
280 for (1..100) { 314 for (1..100) {
281 my $txn = $CFClient::DB_ENV->txn_begin; 315 my $txn = $CFClient::DB_ENV->txn_begin;
282 my $status = $self->{facemap}->db_get (id => $id); 316 my $status = $self->{facemap}->db_get (id => $id);
283 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 317 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
284 $id = ($id || 16) + 1; 318 $id = ($id || 64) + 1;
285 if ($self->{facemap}->put (id => $id) == 0 319 if ($self->{facemap}->put (id => $id) == 0
286 && $self->{facemap}->put ($hash => $id) == 0) { 320 && $self->{facemap}->put ($hash => $id) == 0) {
287 $txn->txn_commit; 321 $txn->txn_commit;
288 322
289 goto gotid; 323 goto gotid;
369 [0.55, 0.41, 0.13], 403 [0.55, 0.41, 0.13],
370 [0.99, 0.77, 0.26], 404 [0.99, 0.77, 0.26],
371 [0.74, 0.65, 0.41], 405 [0.74, 0.65, 0.41],
372 ); 406 );
373 407
408 $self->logprint ("info: ", $text);
409
374 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 410 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
375 411
376 # try to create single paragraphs of multiple lines sent by the server 412 # try to create single paragraphs of multiple lines sent by the server
377 $text =~ s/(?<=\S)\n(?=\w)/ /g; 413 $text =~ s/(?<=\S)\n(?=\w)/ /g;
378 414
398} 434}
399 435
400sub spell_add { 436sub spell_add {
401 my ($self, $spell) = @_; 437 my ($self, $spell) = @_;
402 438
403 # TODO 439 # try to create single paragraphs of multiple lines sent by the server
404 # create a widget dynamically, using spell face (CF::Protocol downloads them) 440 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
441 $spell->{message} =~ s/\n+$//;
442 $spell->{message} ||= "Server did not provide a description for this spell.";
443
405 $::SETUP_SPELLS->add_spell ($spell); 444 $::SETUP_SPELLS->add_spell ($spell);
406 445
407 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 446 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
408 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 447 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
409} 448}
486 525
487 $::FLOORBOX->clear; 526 $::FLOORBOX->clear;
488 527
489 my $row; 528 my $row;
490 for (@{ $::CONN->{container}{0} }) { 529 for (@{ $::CONN->{container}{0} }) {
491 if ($row < 7) { 530 if ($row < 6) {
492 local $_->{face_widget}; # hack to force recreation of widget 531 local $_->{face_widget}; # hack to force recreation of widget
493 local $_->{desc_widget}; # hack to force recreation of widget 532 local $_->{desc_widget}; # hack to force recreation of widget
494 CFClient::Item::update_widgets $_; 533 CFClient::Item::update_widgets $_;
495 534
496 $::FLOORBOX->add (0, $row, $_->{face_widget}); 535 $::FLOORBOX->add (0, $row, $_->{face_widget});
497 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 536 $::FLOORBOX->add (1, $row, $_->{desc_widget});
498 537
499 $row++; 538 $row++;
500 } else { 539 } else {
501 $::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More..."); 540 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
541 text => "More...",
542 on_activate => sub { $::INV_WINDOW->toggle_visibility },
543 );
502 last; 544 last;
503 } 545 }
504 } 546 }
505 }); 547 });
506 548
615 } 657 }
616} 658}
617 659
618sub player_update { 660sub player_update {
619 my ($self, $player) = @_; 661 my ($self, $player) = @_;
662
620 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 663 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
664}
621 665
622 # do it here because it is ignored earlier, and there is no "login" event 666sub update_server_info {
667 my ($self) = @_;
668
669 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
670
671 $::SERVER_INFO->set_markup (
672 "server <tt>$self->{host}:$self->{port}</tt>\n"
673 . "protocol version <tt>$self->{version}</tt>\n"
674 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
675 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
676 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
677 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
678 . "map size $self->{mapw}×$self->{maph}\n"
679 );
680}
681
682sub logged_in {
683 my ($self) = @_;
684
685 $self->send_ext_req (cfplus_support => "1", sub {
686 $self->{cfplus_ext} = $_[0];
687 $self->update_server_info;
688 });
689
690 $self->update_server_info;
691
623 $self->send_command ("output-sync $::CFG->{output_sync}"); 692 $self->send_command ("output-sync $::CFG->{output_sync}");
624 $self->send_command ("output-count $::CFG->{output_count}"); 693 $self->send_command ("output-count $::CFG->{output_count}");
694 $self->send_command ("pickup $::CFG->{pickup}");
695}
696
697sub lookat {
698 my ($self, $x, $y) = @_;
699
700 if ($self->{cfplus_ext}) {
701 $self->send_ext_req (lookat => "$x $y", sub {
702 my %res = split /\x00/, $_[0];
703
704 if (exists $res{npc_dialog}) {
705 # start npc chat dialog
706 $self->{npc_dialog} = new CFClient::NPCDialog::
707 dx => $x,
708 dy => $y,
709 title => "$res{npc_dialog} (NPC)",
710 conn => $self,
711 ;
712 }
713 });
714 }
715
716 $self->send ("lookat $x $y");
717}
718
719sub destroy {
720 my ($self) = @_;
721
722 $self->{npc_dialog}->destroy
723 if $self->{npc_dialog};
724
725 $self->SUPER::destroy;
726}
727
728package CFClient::NPCDialog;
729
730our @ISA = 'CFClient::UI::FancyFrame';
731
732sub new {
733 my $class = shift;
734
735 my $self = $class->SUPER::new (
736 x => 'center',
737 y => 'center',
738 name => "npc_dialog",
739 force_w => $::WIDTH * 0.7,
740 force_h => $::HEIGHT * 0.7,
741 title => "NPC Dialog",
742 kw => { hi => 0, yes => 0, no => 0 },
743 @_,
744 );
745
746 Scalar::Util::weaken (my $this = $self);
747
748 # better use a pane...
749 $self->add (my $hbox = new CFClient::UI::HBox);
750 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
751
752 $hbox->add (my $vbox = new CFClient::UI::VBox);
753
754 $vbox->add (new CFClient::UI::Label text => "Message Entry:");
755 $vbox->add ($self->{entry} = new CFClient::UI::Entry
756 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
757 . "Sometimes you have to tell an NPC something you cannot find out during "
758 . "a normal conversation (such as a password). In those cases you have to use "
759 . "this text entry. You can also enter responses manually instead of using the response "
760 . "buttons below.",
761 on_activate => sub {
762 my ($entry, $text) = @_;
763
764 return unless $text =~ /\S/;
765
766 $entry->set_text ("");
767 $this->send ($text);
768 },
769 );
770
771 $vbox->add ($self->{options} = new CFClient::UI::VBox);
772
773 $self->{close_button} = new CFClient::UI::Button
774 text => "Bye (close)",
775 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
776 on_activate => sub { $this->destroy },
777 ;
778
779 $self->update_options;
780
781 $self->{token} = $self->{conn}->ext_token;
782 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
783 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
784
785 $self->{entry}->focus_in;
786
787 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
788
789 $self->show;
790 $self
791};
792
793sub update_options {
794 my ($self) = @_;
795
796 Scalar::Util::weaken $self;
797
798 $self->{options}->clear;
799 $self->{options}->add ($self->{close_button});
800
801 for my $kw (sort keys %{ $self->{kw} }) {
802 $self->{options}->add (new CFClient::UI::Button
803 text => $kw,
804 on_activate => sub {
805 $self->send ($kw);
806 },
807 );
808 }
809}
810
811sub feed {
812 my ($self, $data) = @_;
813
814 my ($type, $msg) = split / /, $data, 2;
815
816 if ($type eq "msg") {
817 my ($msg, @kw) = split /\x00/, $msg;
818 $self->{kw}{$_} = 1 for @kw;
819
820 $msg = CFClient::UI::Label::escape $msg;
821 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.
823
824 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg");
825 $self->update_options;
826 } else {
827 $self->destroy;
828 }
829
830 1
831}
832
833sub send {
834 my ($self, $msg) = @_;
835
836 $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);
838}
839
840sub destroy {
841 my ($self) = @_;
842
843 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1
844
845 delete $self->{conn}{npc_dialog};
846 $self->{conn}->disconnect_ext ($self->{token});
847
848 $self->SUPER::destroy;
625} 849}
626 850
6271; 8511;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines