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.19 by root, Mon Jun 5 05:06:23 2006 UTC vs.
Revision 1.39 by root, Mon Jun 19 06:50:45 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient;
8use CFClient::UI; 9use CFClient::UI;
9 10
10use base 'Crossfire::Protocol::Base'; 11use base 'Crossfire::Protocol::Base';
12
13our %open_logs;
11 14
12sub new { 15sub new {
13 my $class = shift; 16 my $class = shift;
14 17
15 my $self = $class->SUPER::new (@_); 18 my $self = $class->SUPER::new (@_);
16 19
17 $self->{map_widget}->clr_commands; 20 $self->{map_widget}->clr_commands;
18 21
19 my $parser = new Pod::POM; 22 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
20 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod"); 23 my ($pom) = @_;
21 24
25 my @cmd_help;
26
22 for my $head2 ($pod->head1->[-2]->head2) { 27 for my $head2 ($pom->head1->[-2]->head2) {
23 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 28 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
24 or next; 29 or next;
25 30
26 my $cmd = $1; 31 my $cmd = $1;
27 my @args = split /\|/, $2; 32 my @args = split /\|/, $2;
28 @args = (".*") unless @args; 33 @args = (".*") unless @args;
29 34
30 $_ = $_ eq ".*" ? "" : " $_" 35 $_ = $_ eq ".*" ? "" : " $_"
31 for @args; 36 for @args;
32 37
33 my $text = CFClient::pod_to_pango $head2->content; 38 my $text = CFClient::pod_to_pango $head2->content;
34 39
35 $self->{map_widget}->add_command ("$cmd$_", $text) 40 push @cmd_help, ["$cmd$_", $text]
36 for sort { (length $a) <=> (length $b) } 41 for sort { (length $a) <=> (length $b) }
37 @args; 42 @args;
43 }
44
45 \@cmd_help
38 } 46 };
47
48 $self->{map_widget}->add_command (@$_)
49 for @$cmd_help;
39 50
40 $self->{noface} = new_from_file CFClient::Texture 51 $self->{noface} = new_from_file CFClient::Texture
41 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 52 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
42 53
43 $self->{open_container} = 0; 54 $self->{open_container} = 0;
… …
48 59
49 # per server 60 # per server
50 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 61 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
51 62
52 $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;
53} 86}
54 87
55sub stats_update { 88sub stats_update {
56 my ($self, $stats) = @_; 89 my ($self, $stats) = @_;
57 90
… …
70 103
71 if ($self->{record}) { 104 if ($self->{record}) {
72 push @{$self->{record}}, $command; 105 push @{$self->{record}}, $command;
73 } 106 }
74 107
108 $self->logprint ("send: ", $command);
75 $self->send_command ($command); 109 $self->send_command ($command);
76 ::status $command; 110 ::status $command;
77} 111}
78 112
79sub start_record { 113sub start_record {
… …
96sub feed_map1a { 130sub feed_map1a {
97 my ($self, $data) = @_; 131 my ($self, $data) = @_;
98 132
99 $self->{map}->map1a_update ($data); 133 $self->{map}->map1a_update ($data);
100 $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);
101} 141}
102 142
103sub flush_map { 143sub flush_map {
104 my ($self) = @_; 144 my ($self) = @_;
105 145
… …
118 158
119 $self->flush_map; 159 $self->flush_map;
120 delete $self->{neigh_map}; 160 delete $self->{neigh_map};
121 161
122 $self->{map}->clear; 162 $self->{map}->clear;
163 delete $self->{map_widget}{magicmap};
123} 164}
124 165
125 166
126sub load_map($$$) { 167sub load_map($$$) {
127 my ($self, $hash, $x, $y) = @_; 168 my ($self, $hash, $x, $y) = @_;
… …
270 # I love transactions 311 # I love transactions
271 for (1..100) { 312 for (1..100) {
272 my $txn = $CFClient::DB_ENV->txn_begin; 313 my $txn = $CFClient::DB_ENV->txn_begin;
273 my $status = $self->{facemap}->db_get (id => $id); 314 my $status = $self->{facemap}->db_get (id => $id);
274 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 315 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
275 $id = ($id || 16) + 1; 316 $id = ($id || 64) + 1;
276 if ($self->{facemap}->put (id => $id) == 0 317 if ($self->{facemap}->put (id => $id) == 0
277 && $self->{facemap}->put ($hash => $id) == 0) { 318 && $self->{facemap}->put ($hash => $id) == 0) {
278 $txn->txn_commit; 319 $txn->txn_commit;
279 320
280 goto gotid; 321 goto gotid;
… …
338 my ($self, $flags, $prompt) = @_; 379 my ($self, $flags, $prompt) = @_;
339 380
340 $prompt = $LAST_QUERY unless length $prompt; 381 $prompt = $LAST_QUERY unless length $prompt;
341 $LAST_QUERY = $prompt; 382 $LAST_QUERY = $prompt;
342 383
343 my $dialog = new CFClient::UI::FancyFrame 384 $self->{query}-> ($self, $flags, $prompt);
344 x => "center",
345 y => "center",
346 title => "Query",
347 child => my $vbox = new CFClient::UI::VBox,
348 ;
349
350 $vbox->add (new CFClient::UI::Label
351 max_w => $::WIDTH * 0.4,
352 ellipsise => 0,
353 text => $prompt);
354
355 if ($flags & CS_QUERY_YESNO) {
356 $vbox->add (my $hbox = new CFClient::UI::HBox);
357 $hbox->add (new CFClient::UI::Button
358 text => "No",
359 on_activate => sub {
360 $self->send ("reply n");
361 $dialog->destroy;
362 $self->{map_widget}->focus_in;
363 }
364 );
365 $hbox->add (new CFClient::UI::Button
366 text => "Yes",
367 on_activate => sub {
368 $self->send ("reply y");
369 $dialog->destroy;
370 },
371 );
372
373 $dialog->focus_in;
374
375 } elsif ($flags & CS_QUERY_SINGLECHAR) {
376 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
377 $vbox->add (my $entry = new CFClient::UI::Entry
378 on_changed => sub {
379 $self->send ("reply $_[1]");
380 $dialog->destroy;
381 },
382 );
383
384 $entry->focus_in;
385
386 } else {
387 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
388
389 $vbox->add (my $entry = new CFClient::UI::Entry
390 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
391 on_activate => sub {
392 $self->send ("reply $_[1]");
393 $dialog->destroy;
394 },
395 );
396
397 $entry->focus_in;
398 }
399
400 $dialog->show;
401} 385}
402 386
403sub drawinfo { 387sub drawinfo {
404 my ($self, $color, $text) = @_; 388 my ($self, $color, $text) = @_;
405 389
… …
417 [0.55, 0.41, 0.13], 401 [0.55, 0.41, 0.13],
418 [0.99, 0.77, 0.26], 402 [0.99, 0.77, 0.26],
419 [0.74, 0.65, 0.41], 403 [0.74, 0.65, 0.41],
420 ); 404 );
421 405
406 $self->logprint ("info: ", $text);
407
422 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 408 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
409
410 # try to create single paragraphs of multiple lines sent by the server
411 $text =~ s/(?<=\S)\n(?=\w)/ /g;
423 412
424 $text = CFClient::UI::Label::escape $text; 413 $text = CFClient::UI::Label::escape $text;
425 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
426 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
427 416
… …
443} 432}
444 433
445sub spell_add { 434sub spell_add {
446 my ($self, $spell) = @_; 435 my ($self, $spell) = @_;
447 436
448 # TODO 437 # try to create single paragraphs of multiple lines sent by the server
449 # create a widget dynamically, using spell face (CF::Protocol downloads them) 438 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
439 $spell->{message} =~ s/\n+$//;
440 $spell->{message} ||= "Server did not provide a description for this spell.";
441
450 $::SETUP_SPELLS->add_spell ($spell); 442 $::SETUP_SPELLS->add_spell ($spell);
451 443
452 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 444 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
453 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 445 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
454} 446}
… …
459} 451}
460 452
461sub addme_success { 453sub addme_success {
462 my ($self) = @_; 454 my ($self) = @_;
463 455
464 my $parser = new Pod::POM; 456 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
465 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod"); 457 my ($pom) = @_;
466 458
467 my %skill_tooltip; 459 my %skill_help;
468 460
469 for my $head2 ($pod->head1->[-2]->head2) { 461 for my $head2 ($pom->head1->[3]->head2) {
470 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content; 462 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;
463 }
464
465 \%skill_help
471 } 466 };
472 467
473 for my $skill (values %{$self->{skill_info}}) { 468 for my $skill (values %{$self->{skill_info}}) {
474 $self->{map_widget}->add_command ("ready_skill $skill", 469 $self->{map_widget}->add_command ("ready_skill $skill",
475 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 470 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
476 . $skill_tooltip{$skill}); 471 . $skill_help->{$skill});
477 $self->{map_widget}->add_command ("use_skill $skill", 472 $self->{map_widget}->add_command ("use_skill $skill",
478 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 473 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
479 . $skill_tooltip{$skill}); 474 . $skill_help->{$skill});
480 } 475 }
481} 476}
482 477
483sub eof { 478sub eof {
484 my ($self) = @_; 479 my ($self) = @_;
… …
528 523
529 $::FLOORBOX->clear; 524 $::FLOORBOX->clear;
530 525
531 my $row; 526 my $row;
532 for (@{ $::CONN->{container}{0} }) { 527 for (@{ $::CONN->{container}{0} }) {
533 if ($row < 7) { 528 if ($row < 6) {
534 local $_->{face_widget}; # hack to force recreation of widget 529 local $_->{face_widget}; # hack to force recreation of widget
535 local $_->{desc_widget}; # hack to force recreation of widget 530 local $_->{desc_widget}; # hack to force recreation of widget
536 CFClient::Item::update_widgets $_; 531 CFClient::Item::update_widgets $_;
537 532
538 $::FLOORBOX->add (0, $row, $_->{face_widget}); 533 $::FLOORBOX->add (0, $row, $_->{face_widget});
539 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 534 $::FLOORBOX->add (1, $row, $_->{desc_widget});
540 535
541 $row++; 536 $row++;
542 } else { 537 } else {
543 $::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More..."); 538 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
539 text => "More...",
540 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 },
541 );
544 last; 542 last;
545 } 543 }
546 } 544 }
547 }); 545 });
548 546
… …
562 tooltip => "Close the currently open container (if one is open)", 560 tooltip => "Close the currently open container (if one is open)",
563 on_activate => sub { 561 on_activate => sub {
564 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 562 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
565 if $tag != 0; 563 if $tag != 0;
566 #if $CONN->{open_container} != 0; 564 #if $CONN->{open_container} != 0;
565 0
567 }, 566 },
568 ); 567 );
569 } 568 }
570 569
571 $::INVR->set_items ($conn->{container}{$tag}); 570 $::INVR->set_items ($conn->{container}{$tag});
… …
657 } 656 }
658} 657}
659 658
660sub player_update { 659sub player_update {
661 my ($self, $player) = @_; 660 my ($self, $player) = @_;
661
662 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 662 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
663}
663 664
664 # do it here because it is ignored earlier, and there is no "login" event 665sub update_server_info {
666 my ($self) = @_;
667
668 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
669
670 $::SERVER_INFO->set_markup (
671 "server <tt>$self->{host}:$self->{port}</tt>\n"
672 . "protocol version <tt>$self->{version}</tt>\n"
673 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
674 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
675 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
676 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
677 . "map size $self->{mapw}×$self->{maph}\n"
678 );
679}
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
665 $self->send_command ("output-sync $::CFG->{output_sync}"); 691 $self->send_command ("output-sync $::CFG->{output_sync}");
666 $self->send_command ("output-count $::CFG->{output_count}"); 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;
667} 851}
668 852
6691; 8531;

Diff Legend

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