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.25 by root, Tue Jun 6 03:13:00 2006 UTC vs.
Revision 1.35 by root, Thu Jun 15 13:40:02 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 {
… …
279 # I love transactions 306 # I love transactions
280 for (1..100) { 307 for (1..100) {
281 my $txn = $CFClient::DB_ENV->txn_begin; 308 my $txn = $CFClient::DB_ENV->txn_begin;
282 my $status = $self->{facemap}->db_get (id => $id); 309 my $status = $self->{facemap}->db_get (id => $id);
283 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 310 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
284 $id = ($id || 16) + 1; 311 $id = ($id || 64) + 1;
285 if ($self->{facemap}->put (id => $id) == 0 312 if ($self->{facemap}->put (id => $id) == 0
286 && $self->{facemap}->put ($hash => $id) == 0) { 313 && $self->{facemap}->put ($hash => $id) == 0) {
287 $txn->txn_commit; 314 $txn->txn_commit;
288 315
289 goto gotid; 316 goto gotid;
… …
369 [0.55, 0.41, 0.13], 396 [0.55, 0.41, 0.13],
370 [0.99, 0.77, 0.26], 397 [0.99, 0.77, 0.26],
371 [0.74, 0.65, 0.41], 398 [0.74, 0.65, 0.41],
372 ); 399 );
373 400
401 $self->logprint ("info: ", $text);
402
374 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 403 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
375 404
376 # try to create single paragraphs of multiple lines sent by the server 405 # try to create single paragraphs of multiple lines sent by the server
377 $text =~ s/(?<=\S)\n(?=\w)/ /g; 406 $text =~ s/(?<=\S)\n(?=\w)/ /g;
378 407
… …
398} 427}
399 428
400sub spell_add { 429sub spell_add {
401 my ($self, $spell) = @_; 430 my ($self, $spell) = @_;
402 431
403 # TODO 432 # try to create single paragraphs of multiple lines sent by the server
404 # create a widget dynamically, using spell face (CF::Protocol downloads them) 433 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
434 $spell->{message} =~ s/\n+$//;
435 $spell->{message} ||= "Server did not provide a description for this spell.";
436
405 $::SETUP_SPELLS->add_spell ($spell); 437 $::SETUP_SPELLS->add_spell ($spell);
406 438
407 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 439 $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}); 440 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
409} 441}
… …
497 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 529 $::FLOORBOX->add (1, $row, $_->{desc_widget});
498 530
499 $row++; 531 $row++;
500 } else { 532 } else {
501 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 533 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
502 text => "More...", 534 text => "More...",
503 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 535 on_activate => sub { $::INV_WINDOW->toggle_visibility },
504 ); 536 );
505 last; 537 last;
506 } 538 }
507 } 539 }
… …
618 } 650 }
619} 651}
620 652
621sub player_update { 653sub player_update {
622 my ($self, $player) = @_; 654 my ($self, $player) = @_;
655
623 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 656 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
657}
624 658
625 # do it here because it is ignored earlier, and there is no "login" event 659sub update_server_info {
660 my ($self) = @_;
661
662 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
663
664 $::SERVER_INFO->set_markup (
665 "server <tt>$self->{host}:$self->{port}</tt>\n"
666 . "protocol version <tt>$self->{version}</tt>\n"
667 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
668 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
669 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
670 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
671 . "map size $self->{mapw}×$self->{maph}\n"
672 );
673}
674
675sub logged_in {
676 my ($self) = @_;
677
678 $self->send_ext_req (cfplus_support => "1", sub {
679 $self->{cfplus_ext} = $_[0];
680 $self->update_server_info;
681 });
682
683 $self->update_server_info;
684
626 $self->send_command ("output-sync $::CFG->{output_sync}"); 685 $self->send_command ("output-sync $::CFG->{output_sync}");
627 $self->send_command ("output-count $::CFG->{output_count}"); 686 $self->send_command ("output-count $::CFG->{output_count}");
687 $self->send_command ("pickup $::CFG->{pickup}");
688}
689
690sub lookat {
691 my ($self, $x, $y) = @_;
692
693 if ($self->{cfplus_ext}) {
694 $self->send_ext_req (lookat => "$x $y", sub {
695 my %res = split /\x00/, $_[0];
696
697 if (exists $res{npc_dialog}) {
698 # start npc chat dialog
699 $self->{npc_dialog} = new CFClient::NPCDialog::
700 dx => $x,
701 dy => $y,
702 title => "$res{npc_dialog} (NPC)",
703 conn => $self,
704 ;
705 }
706 });
707 }
708
709 $self->send ("lookat $x $y");
710}
711
712sub destroy {
713 my ($self) = @_;
714
715 $self->{npc_dialog}->destroy
716 if $self->{npc_dialog};
717
718 $self->SUPER::destroy;
719}
720
721package CFClient::NPCDialog;
722
723our @ISA = 'CFClient::UI::FancyFrame';
724
725sub new {
726 my $class = shift;
727
728 my $self = $class->SUPER::new (
729 x => 'center',
730 y => 'center',
731 name => "npc_dialog",
732 force_w => $::WIDTH * 0.7,
733 force_h => $::HEIGHT * 0.7,
734 title => "NPC Dialog",
735 kw => { hi => 0, yes => 0, no => 0 },
736 @_,
737 );
738
739 Scalar::Util::weaken (my $this = $self);
740
741 # better use a pane...
742 $self->add (my $hbox = new CFClient::UI::HBox);
743 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
744
745 $hbox->add (my $vbox = new CFClient::UI::VBox);
746
747 $vbox->add (new CFClient::UI::Label text => "Message Entry:");
748 $vbox->add ($self->{entry} = new CFClient::UI::Entry
749 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
750 . "Sometimes you have to tell an NPC something you cannot find out during "
751 . "a normal conversation (such as a password). In those cases you have to use "
752 . "this text entry. You can also enter responses manually instead of using the response "
753 . "buttons below.",
754 on_activate => sub {
755 my ($entry, $text) = @_;
756
757 return unless $text =~ /\S/;
758
759 $entry->set_text ("");
760 $this->send ($text);
761 },
762 );
763
764 $vbox->add ($self->{options} = new CFClient::UI::VBox);
765
766 $self->{close_button} = new CFClient::UI::Button
767 text => "Bye (close)",
768 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
769 on_activate => sub { $this->destroy },
770 ;
771
772 $self->update_options;
773
774 $self->{token} = $self->{conn}->ext_token;
775 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
776 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
777
778 $self->{entry}->focus_in;
779
780 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
781
782 $self->show;
783 $self
784};
785
786sub update_options {
787 my ($self) = @_;
788
789 Scalar::Util::weaken $self;
790
791 $self->{options}->clear;
792 $self->{options}->add ($self->{close_button});
793
794 for my $kw (sort keys %{ $self->{kw} }) {
795 $self->{options}->add (new CFClient::UI::Button
796 text => $kw,
797 on_activate => sub {
798 $self->send ($kw);
799 },
800 );
801 }
802}
803
804sub feed {
805 my ($self, $data) = @_;
806
807 my ($type, $msg) = split / /, $data, 2;
808
809 if ($type eq "msg") {
810 my ($msg, @kw) = split /\x00/, $msg;
811 $self->{kw}{$_} = 1 for @kw;
812
813 $msg = CFClient::UI::Label::escape $msg;
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.
816
817 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg");
818 $self->update_options;
819 } else {
820 $self->destroy;
821 }
822
823 1
824}
825
826sub send {
827 my ($self, $msg) = @_;
828
829 $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);
831}
832
833sub destroy {
834 my ($self) = @_;
835
836 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1
837
838 delete $self->{conn}{npc_dialog};
839 $self->{conn}->disconnect_ext ($self->{token});
840
841 $self->SUPER::destroy;
628} 842}
629 843
6301; 8441;

Diff Legend

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