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.46 by root, Wed Jun 28 21:17:01 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 {
89 my ($self) = @_; 114 my ($self) = @_;
90 115
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
379 $text = CFClient::UI::Label::escape $text; 413 $text = CFClient::UI::Label::escape $text;
380 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
381 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
382 416
383 $self->{logview}->add_paragraph ($color[$color], 417 $self->{logview}->add_paragraph ($color[$color], $_)
384 join "\n", map "$time $_", split /\n/, $text); 418 for map "$time $_", split /\n/, $text;
419 $self->{logview}->scroll_to_bottom;
385 420
386 $self->{statusbox}->add ($text, 421 $self->{statusbox}->add ($text,
387 group => $text, 422 group => $text,
388 fg => $color[$color], 423 fg => $color[$color],
389 timeout => $color >= 2 ? 60 : 10, 424 timeout => $color >= 2 ? 60 : 10,
398} 433}
399 434
400sub spell_add { 435sub spell_add {
401 my ($self, $spell) = @_; 436 my ($self, $spell) = @_;
402 437
403 # TODO 438 # try to create single paragraphs of multiple lines sent by the server
404 # create a widget dynamically, using spell face (CF::Protocol downloads them) 439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440 $spell->{message} =~ s/\n+$//;
441 $spell->{message} ||= "Server did not provide a description for this spell.";
442
405 $::SETUP_SPELLS->add_spell ($spell); 443 $::SETUP_SPELLS->add_spell ($spell);
406 444
407 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 445 $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}); 446 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
409} 447}
485 return unless $::CONN; 523 return unless $::CONN;
486 524
487 $::FLOORBOX->clear; 525 $::FLOORBOX->clear;
488 526
489 my $row; 527 my $row;
490 for (@{ $::CONN->{container}{0} }) { 528 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
491 if ($row < 6) { 529 if ($row < 6) {
492 local $_->{face_widget}; # hack to force recreation of widget 530 local $_->{face_widget}; # hack to force recreation of widget
493 local $_->{desc_widget}; # hack to force recreation of widget 531 local $_->{desc_widget}; # hack to force recreation of widget
494 CFClient::Item::update_widgets $_; 532 CFClient::Item::update_widgets $_;
495 533
497 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 535 $::FLOORBOX->add (1, $row, $_->{desc_widget});
498 536
499 $row++; 537 $row++;
500 } else { 538 } else {
501 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
502 text => "More...", 540 text => "More...",
503 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 },
504 ); 542 );
505 last; 543 last;
506 } 544 }
507 } 545 }
508 }); 546 });
523 tooltip => "Close the currently open container (if one is open)", 561 tooltip => "Close the currently open container (if one is open)",
524 on_activate => sub { 562 on_activate => sub {
525 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 563 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
526 if $tag != 0; 564 if $tag != 0;
527 #if $CONN->{open_container} != 0; 565 #if $CONN->{open_container} != 0;
566 0
528 }, 567 },
529 ); 568 );
530 } 569 }
531 570
532 $::INVR->set_items ($conn->{container}{$tag}); 571 $::INVR->set_items ($conn->{container}{$tag});
546 585
547 if ($tag == 0) { 586 if ($tag == 0) {
548 update_floorbox; 587 update_floorbox;
549 update_container (0); 588 update_container (0);
550 } elsif ($tag == $self->{player}{tag}) { 589 } elsif ($tag == $self->{player}{tag}) {
590 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $self->{player}->{weight} / 1000);
551 $::INV->set_items ($self->{container}{$self->{player}{tag}}) 591 $::INV->set_items ($self->{container}{$self->{player}{tag}})
552 } else { 592 } else {
553 update_container ($tag); 593 update_container ($tag);
554 } 594 }
555 595
618 } 658 }
619} 659}
620 660
621sub player_update { 661sub player_update {
622 my ($self, $player) = @_; 662 my ($self, $player) = @_;
663
623 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 664 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
665}
624 666
625 # do it here because it is ignored earlier, and there is no "login" event 667sub update_server_info {
668 my ($self) = @_;
669
670 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
671
672 $::SERVER_INFO->set_markup (
673 "server <tt>$self->{host}:$self->{port}</tt>\n"
674 . "protocol version <tt>$self->{version}</tt>\n"
675 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
676 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
677 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
678 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
679 . "map size $self->{mapw}×$self->{maph}\n"
680 );
681}
682
683sub logged_in {
684 my ($self) = @_;
685
686 $self->send_ext_req (cfplus_support => "1", sub {
687 $self->{cfplus_ext} = $_[0];
688 $self->update_server_info;
689 });
690
691 $self->update_server_info;
692
626 $self->send_command ("output-sync $::CFG->{output_sync}"); 693 $self->send_command ("output-sync $::CFG->{output_sync}");
627 $self->send_command ("output-count $::CFG->{output_count}"); 694 $self->send_command ("output-count $::CFG->{output_count}");
695 $self->send_command ("pickup $::CFG->{pickup}");
696}
697
698sub lookat {
699 my ($self, $x, $y) = @_;
700
701 if ($self->{cfplus_ext}) {
702 $self->send_ext_req (lookat => "$x $y", sub {
703 my %res = split /\x00/, $_[0];
704
705 if (exists $res{npc_dialog}) {
706 # start npc chat dialog
707 $self->{npc_dialog} = new CFClient::NPCDialog::
708 dx => $x,
709 dy => $y,
710 title => "$res{npc_dialog} (NPC)",
711 conn => $self,
712 ;
713 }
714 });
715 }
716
717 $self->send ("lookat $x $y");
718}
719
720sub destroy {
721 my ($self) = @_;
722
723 $self->{npc_dialog}->destroy
724 if $self->{npc_dialog};
725
726 $self->SUPER::destroy;
727}
728
729package CFClient::NPCDialog;
730
731our @ISA = 'CFClient::UI::FancyFrame';
732
733sub new {
734 my $class = shift;
735
736 my $self = $class->SUPER::new (
737 x => 'center',
738 y => 'center',
739 name => "npc_dialog",
740 force_w => $::WIDTH * 0.7,
741 force_h => $::HEIGHT * 0.7,
742 title => "NPC Dialog",
743 kw => { hi => 0, yes => 0, no => 0 },
744 @_,
745 );
746
747 Scalar::Util::weaken (my $this = $self);
748
749 # better use a pane...
750 $self->add (my $hbox = new CFClient::UI::HBox);
751 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
752
753 $hbox->add (my $vbox = new CFClient::UI::VBox);
754
755 $vbox->add (new CFClient::UI::Label text => "Message Entry:");
756 $vbox->add ($self->{entry} = new CFClient::UI::Entry
757 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
758 . "Sometimes you have to tell an NPC something you cannot find out during "
759 . "a normal conversation (such as a password). In those cases you have to use "
760 . "this text entry. You can also enter responses manually instead of using the response "
761 . "buttons below.",
762 on_activate => sub {
763 my ($entry, $text) = @_;
764
765 return unless $text =~ /\S/;
766
767 $entry->set_text ("");
768 $this->send ($text);
769
770 0
771 },
772 );
773
774 $vbox->add ($self->{options} = new CFClient::UI::VBox);
775
776 $self->{bye_button} = new CFClient::UI::Button
777 text => "Bye (close)",
778 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
779 on_activate => sub { $this->destroy; 0 },
780 ;
781
782 $self->update_options;
783
784 $self->{token} = $self->{conn}->ext_token;
785 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
786 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
787
788 $self->{entry}->grab_focus;
789
790 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
791
792 $self->show;
793 $self
794};
795
796sub update_options {
797 my ($self) = @_;
798
799 Scalar::Util::weaken $self;
800
801 $self->{options}->clear;
802 $self->{options}->add ($self->{bye_button});
803
804 for my $kw (sort keys %{ $self->{kw} }) {
805 $self->{options}->add (new CFClient::UI::Button
806 text => $kw,
807 on_activate => sub {
808 $self->send ($kw);
809 0
810 },
811 );
812 }
813}
814
815sub feed {
816 my ($self, $data) = @_;
817
818 Scalar::Util::weaken $self;
819
820 my ($type, $msg) = split / /, $data, 2;
821
822 if ($type eq "msg") {
823 my ($msg, @kw) = split /\x00/, $msg;
824 $self->{kw}{$_} = 1 for @kw;
825
826 $msg = "\n" . CFClient::UI::Label::escape $msg;
827 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
828 my @link;
829 $msg =~ s{
830 ($match)
831 }{
832 my $kw = $1;
833
834 push @link, new CFClient::UI::Label
835 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
836 can_hover => 1,
837 can_events => 1,
838 padding_x => 0,
839 padding_y => 0,
840 on_button_up => sub {
841 $self->send ($kw);
842 };
843
844 chr 0xfffc
845 }giex;
846
847 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
848 $self->{textview}->scroll_to_bottom;
849 $self->update_options;
850 } else {
851 $self->destroy;
852 }
853
854 1
855}
856
857sub send {
858 my ($self, $msg) = @_;
859
860 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
861 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
862 $self->{textview}->scroll_to_bottom;
863}
864
865sub destroy {
866 my ($self) = @_;
867
868 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
869
870 delete $self->{conn}{npc_dialog};
871 $self->{conn}->disconnect_ext ($self->{token});
872
873 $self->SUPER::destroy;
628} 874}
629 875
6301; 8761;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines