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.17 by root, Sat Jun 3 02:39:27 2006 UTC vs.
Revision 1.37 by root, Thu Jun 15 15:47:36 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;
… …
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
53} 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
54 89
55sub stats_update { 90sub stats_update {
56 my ($self, $stats) = @_; 91 my ($self, $stats) = @_;
57 92
58 if (my $exp = $stats->{+CS_STAT_EXP64}) { 93 if (my $exp = $stats->{+CS_STAT_EXP64}) {
… …
70 105
71 if ($self->{record}) { 106 if ($self->{record}) {
72 push @{$self->{record}}, $command; 107 push @{$self->{record}}, $command;
73 } 108 }
74 109
110 $self->logprint ("send: ", $command);
75 $self->send_command ($command); 111 $self->send_command ($command);
76 ::status $command; 112 ::status $command;
77} 113}
78 114
79sub start_record { 115sub start_record {
… …
96sub feed_map1a { 132sub feed_map1a {
97 my ($self, $data) = @_; 133 my ($self, $data) = @_;
98 134
99 $self->{map}->map1a_update ($data); 135 $self->{map}->map1a_update ($data);
100 $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);
101} 143}
102 144
103sub flush_map { 145sub flush_map {
104 my ($self) = @_; 146 my ($self) = @_;
105 147
… …
118 160
119 $self->flush_map; 161 $self->flush_map;
120 delete $self->{neigh_map}; 162 delete $self->{neigh_map};
121 163
122 $self->{map}->clear; 164 $self->{map}->clear;
165 delete $self->{map_widget}{magicmap};
123} 166}
124 167
125 168
126sub load_map($$$) { 169sub load_map($$$) {
127 my ($self, $hash, $x, $y) = @_; 170 my ($self, $hash, $x, $y) = @_;
… …
270 # I love transactions 313 # I love transactions
271 for (1..100) { 314 for (1..100) {
272 my $txn = $CFClient::DB_ENV->txn_begin; 315 my $txn = $CFClient::DB_ENV->txn_begin;
273 my $status = $self->{facemap}->db_get (id => $id); 316 my $status = $self->{facemap}->db_get (id => $id);
274 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 317 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
275 $id = ($id || 16) + 1; 318 $id = ($id || 64) + 1;
276 if ($self->{facemap}->put (id => $id) == 0 319 if ($self->{facemap}->put (id => $id) == 0
277 && $self->{facemap}->put ($hash => $id) == 0) { 320 && $self->{facemap}->put ($hash => $id) == 0) {
278 $txn->txn_commit; 321 $txn->txn_commit;
279 322
280 goto gotid; 323 goto gotid;
… …
338 my ($self, $flags, $prompt) = @_; 381 my ($self, $flags, $prompt) = @_;
339 382
340 $prompt = $LAST_QUERY unless length $prompt; 383 $prompt = $LAST_QUERY unless length $prompt;
341 $LAST_QUERY = $prompt; 384 $LAST_QUERY = $prompt;
342 385
343 my $dialog = new CFClient::UI::FancyFrame 386 $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} 387}
402 388
403sub drawinfo { 389sub drawinfo {
404 my ($self, $color, $text) = @_; 390 my ($self, $color, $text) = @_;
405 391
… …
417 [0.55, 0.41, 0.13], 403 [0.55, 0.41, 0.13],
418 [0.99, 0.77, 0.26], 404 [0.99, 0.77, 0.26],
419 [0.74, 0.65, 0.41], 405 [0.74, 0.65, 0.41],
420 ); 406 );
421 407
408 $self->logprint ("info: ", $text);
409
422 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 410 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
411
412 # try to create single paragraphs of multiple lines sent by the server
413 $text =~ s/(?<=\S)\n(?=\w)/ /g;
423 414
424 $text = CFClient::UI::Label::escape $text; 415 $text = CFClient::UI::Label::escape $text;
425 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 416 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
426 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 417 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
427 418
… …
429 join "\n", map "$time $_", split /\n/, $text); 420 join "\n", map "$time $_", split /\n/, $text);
430 421
431 $self->{statusbox}->add ($text, 422 $self->{statusbox}->add ($text,
432 group => $text, 423 group => $text,
433 fg => $color[$color], 424 fg => $color[$color],
434 timeout => 10, 425 timeout => $color >= 2 ? 60 : 10,
435 tooltip_font => $::FONT_FIXED, 426 tooltip_font => $::FONT_FIXED,
436 ); 427 );
437} 428}
438 429
439sub drawextinfo { 430sub drawextinfo {
… …
443} 434}
444 435
445sub spell_add { 436sub spell_add {
446 my ($self, $spell) = @_; 437 my ($self, $spell) = @_;
447 438
448 # TODO 439 # try to create single paragraphs of multiple lines sent by the server
449 # 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
450 $::SETUP_SPELLS->add_spell ($spell); 444 $::SETUP_SPELLS->add_spell ($spell);
451 445
452 $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});
453 $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});
454} 448}
… …
459} 453}
460 454
461sub addme_success { 455sub addme_success {
462 my ($self) = @_; 456 my ($self) = @_;
463 457
464 my $parser = new Pod::POM; 458 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"); 459 my ($pom) = @_;
466 460
467 my %skill_tooltip; 461 my %skill_help;
468 462
469 for my $head2 ($pod->head1->[-2]->head2) { 463 for my $head2 ($pom->head1->[3]->head2) {
470 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content; 464 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;
465 }
466
467 \%skill_help
471 } 468 };
472 469
473 for my $skill (values %{$self->{skill_info}}) { 470 for my $skill (values %{$self->{skill_info}}) {
474 $self->{map_widget}->add_command ("ready_skill $skill", 471 $self->{map_widget}->add_command ("ready_skill $skill",
475 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 472 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
476 . $skill_tooltip{$skill}); 473 . $skill_help->{$skill});
477 $self->{map_widget}->add_command ("use_skill $skill", 474 $self->{map_widget}->add_command ("use_skill $skill",
478 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 475 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
479 . $skill_tooltip{$skill}); 476 . $skill_help->{$skill});
480 } 477 }
481} 478}
482 479
483sub eof { 480sub eof {
484 my ($self) = @_; 481 my ($self) = @_;
… …
509 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 506 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
510 507
511 $self->send ("requestinfo image_sums $face $face"); 508 $self->send ("requestinfo image_sums $face $face");
512 509
513 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 510 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
514 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 511 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
515 } elsif (!exists $self->{num_faces}) { 512 } elsif (!exists $self->{num_faces}) {
516 $self->send ("requestinfo image_info"); 513 $self->send ("requestinfo image_info");
517 514
518 $self->{num_faces} = 0; 515 $self->{num_faces} = 0;
519 516
520 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 517 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
521 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 518 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
522 } 519 }
523} 520}
524 521
525sub update_floorbox { 522sub update_floorbox {
526 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 523 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
… …
528 525
529 $::FLOORBOX->clear; 526 $::FLOORBOX->clear;
530 527
531 my $row; 528 my $row;
532 for (@{ $::CONN->{container}{0} }) { 529 for (@{ $::CONN->{container}{0} }) {
533 if ($row < 7) { 530 if ($row < 6) {
534 local $_->{face_widget}; # hack to force recreation of widget 531 local $_->{face_widget}; # hack to force recreation of widget
535 local $_->{desc_widget}; # hack to force recreation of widget 532 local $_->{desc_widget}; # hack to force recreation of widget
536 CFClient::Item::update_widgets $_; 533 CFClient::Item::update_widgets $_;
537 534
538 $::FLOORBOX->add (0, $row, $_->{face_widget}); 535 $::FLOORBOX->add (0, $row, $_->{face_widget});
539 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 536 $::FLOORBOX->add (1, $row, $_->{desc_widget});
540 537
541 $row++; 538 $row++;
542 } else { 539 } else {
543 $::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 );
544 last; 544 last;
545 } 545 }
546 } 546 }
547 }); 547 });
548 548
… …
657 } 657 }
658} 658}
659 659
660sub player_update { 660sub player_update {
661 my ($self, $player) = @_; 661 my ($self, $player) = @_;
662
662 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 663 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
664}
663 665
664 # 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
665 $self->send_command ("output-sync $::CFG->{output_sync}"); 692 $self->send_command ("output-sync $::CFG->{output_sync}");
666 $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;
667} 849}
668 850
6691; 8511;

Diff Legend

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