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.31 by root, Sun Jun 11 18:43:09 2006 UTC vs.
Revision 1.41 by root, Fri Jun 23 22:35:16 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
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,
501 536
502 $row++; 537 $row++;
503 } else { 538 } else {
504 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
505 text => "More...", 540 text => "More...",
506 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 },
507 ); 542 );
508 last; 543 last;
509 } 544 }
510 } 545 }
511 }); 546 });
526 tooltip => "Close the currently open container (if one is open)", 561 tooltip => "Close the currently open container (if one is open)",
527 on_activate => sub { 562 on_activate => sub {
528 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 563 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
529 if $tag != 0; 564 if $tag != 0;
530 #if $CONN->{open_container} != 0; 565 #if $CONN->{open_container} != 0;
566 0
531 }, 567 },
532 ); 568 );
533 } 569 }
534 570
535 $::INVR->set_items ($conn->{container}{$tag}); 571 $::INVR->set_items ($conn->{container}{$tag});
625 my ($self, $player) = @_; 661 my ($self, $player) = @_;
626 662
627 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 663 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
628} 664}
629 665
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
630sub logged_in { 682sub logged_in {
631 my ($self) = @_; 683 my ($self) = @_;
632 684
633 $self->send_ext_req (cfplus => "version", "1", sub { 685 $self->send_ext_req (cfplus_support => "1", sub {
634 $self->{cfplus_ext} = $_[0]; 686 $self->{cfplus_ext} = $_[0];
635 687 $self->update_server_info;
636 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
637
638 $::SERVER_INFO->set_markup (
639 "server <tt>$self->{host}:$self->{port}</tt>\n"
640 . "protocol version <tt>$self->{version}</tt>\n"
641 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
642 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
643 . "cfplus support $yesno[$self->{cfplus_ext} > 0]\n"
644 . "map size $self->{mapw}×$self->{maph}\n"
645 );
646 }); 688 });
689
690 $self->update_server_info;
647 691
648 $self->send_command ("output-sync $::CFG->{output_sync}"); 692 $self->send_command ("output-sync $::CFG->{output_sync}");
649 $self->send_command ("output-count $::CFG->{output_count}"); 693 $self->send_command ("output-count $::CFG->{output_count}");
650 $self->send_command ("pickup $::CFG->{pickup}"); 694 $self->send_command ("pickup $::CFG->{pickup}");
651} 695}
652 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 0
770 },
771 );
772
773 $vbox->add ($self->{options} = new CFClient::UI::VBox);
774
775 $self->{bye_button} = new CFClient::UI::Button
776 text => "Bye (close)",
777 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
778 on_activate => sub { $this->destroy; 0 },
779 ;
780
781 $self->update_options;
782
783 $self->{token} = $self->{conn}->ext_token;
784 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
785 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
786
787 $self->{entry}->grab_focus;
788
789 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
790
791 $self->show;
792 $self
793};
794
795sub update_options {
796 my ($self) = @_;
797
798 Scalar::Util::weaken $self;
799
800 $self->{options}->clear;
801 $self->{options}->add ($self->{bye_button});
802
803 for my $kw (sort keys %{ $self->{kw} }) {
804 $self->{options}->add (new CFClient::UI::Button
805 text => $kw,
806 on_activate => sub {
807 $self->send ($kw);
808 0
809 },
810 );
811 }
812}
813
814sub feed {
815 my ($self, $data) = @_;
816
817 my ($type, $msg) = split / /, $data, 2;
818
819 if ($type eq "msg") {
820 my ($msg, @kw) = split /\x00/, $msg;
821 $self->{kw}{$_} = 1 for @kw;
822
823 $msg = "\n" . CFClient::UI::Label::escape $msg;
824 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
825 my @link;
826 $msg =~ s{
827 ($match)
828 }{
829 push @link, new CFClient::UI::Label
830 markup => "<span foreground='#c0c0ff' underline='single'>$1</span>",
831 can_hover => 1,
832 can_events => 1;
833
834 chr 0xfffc
835 }giex;
836
837 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
838 $self->update_options;
839 } else {
840 $self->destroy;
841 }
842
843 1
844}
845
846sub send {
847 my ($self, $msg) = @_;
848
849 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
850 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
851}
852
853sub destroy {
854 my ($self) = @_;
855
856 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
857
858 delete $self->{conn}{npc_dialog};
859 $self->{conn}->disconnect_ext ($self->{token});
860
861 $self->SUPER::destroy;
862}
863
6531; 8641;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines