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.30 by root, Sun Jun 11 18:41:30 2006 UTC vs.
Revision 1.51 by root, Sun Jul 2 21:07:26 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,
… …
403 # try to create single paragraphs of multiple lines sent by the server 438 # try to create single paragraphs of multiple lines sent by the server
404 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
405 $spell->{message} =~ s/\n+$//; 440 $spell->{message} =~ s/\n+$//;
406 $spell->{message} ||= "Server did not provide a description for this spell."; 441 $spell->{message} ||= "Server did not provide a description for this spell.";
407 442
408 $::SETUP_SPELLS->add_spell ($spell); 443 $::SPELL_PAGE->add_spell ($spell);
409 444
410 $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});
411 $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});
412} 447}
413 448
414sub spell_delete { 449sub spell_delete {
415 my ($self, $spell) = @_; 450 my ($self, $spell) = @_;
451
416 $::SETUP_SPELLS->remove_spell ($spell); 452 $::SPELL_PAGE->remove_spell ($spell);
417} 453}
418 454
419sub addme_success { 455sub addme_success {
420 my ($self) = @_; 456 my ($self) = @_;
421 457
… …
488 return unless $::CONN; 524 return unless $::CONN;
489 525
490 $::FLOORBOX->clear; 526 $::FLOORBOX->clear;
491 527
492 my $row; 528 my $row;
493 for (@{ $::CONN->{container}{0} }) { 529 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
494 if ($row < 6) { 530 if ($row < 6) {
495 local $_->{face_widget}; # hack to force recreation of widget 531 local $_->{face_widget}; # hack to force recreation of widget
496 local $_->{desc_widget}; # hack to force recreation of widget 532 local $_->{desc_widget}; # hack to force recreation of widget
497 CFClient::Item::update_widgets $_; 533 CFClient::Item::update_widgets $_;
498 534
… …
501 537
502 $row++; 538 $row++;
503 } else { 539 } else {
504 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 540 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
505 text => "More...", 541 text => "More...",
506 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 542 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
507 ); 543 );
508 last; 544 last;
509 } 545 }
510 } 546 }
511 }); 547 });
… …
526 tooltip => "Close the currently open container (if one is open)", 562 tooltip => "Close the currently open container (if one is open)",
527 on_activate => sub { 563 on_activate => sub {
528 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 564 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
529 if $tag != 0; 565 if $tag != 0;
530 #if $CONN->{open_container} != 0; 566 #if $CONN->{open_container} != 0;
567 0
531 }, 568 },
532 ); 569 );
533 } 570 }
534 571
535 $::INVR->set_items ($conn->{container}{$tag}); 572 $::INVR->set_items ($conn->{container}{$tag});
536} 573}
537 574
538sub update_container { 575sub update_containers {
539 my ($tag) = @_; 576 my ($self) = @_;
540 577
541 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 578 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
579 for my $tag (keys %{ delete $self->{update_container} }) {
580 if ($tag == 0) {
581 update_floorbox;
582 $::INVR->set_items ($self->{container}{0})
542 if $tag == $::CONN->{open_container}; 583 if $tag == $self->{open_container};
584 } elsif ($tag == $self->{player}{tag}) {
585 $::INV->set_items ($self->{container}{$tag})
586 } else {
587 $::INVR->set_items ($self->{container}{$tag})
588 if $tag == $self->{open_container};
589 }
590 }
591 });
543} 592}
544 593
545sub container_add { 594sub container_add {
546 my ($self, $tag, $items) = @_; 595 my ($self, $tag, $items) = @_;
547 596
548 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 597 $self->{update_container}{$tag}++;
549 598 $self->update_containers;
550 if ($tag == 0) {
551 update_floorbox;
552 update_container (0);
553 } elsif ($tag == $self->{player}{tag}) {
554 $::INV->set_items ($self->{container}{$self->{player}{tag}})
555 } else {
556 update_container ($tag);
557 }
558
559 # $self-<{player}{tag} => player inv
560 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
561} 599}
562 600
563sub container_clear { 601sub container_clear {
564 my ($self, $tag) = @_; 602 my ($self, $tag) = @_;
565 603
566 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 604 $self->{update_container}{$tag}++;
567 605 $self->update_containers;
568 if ($tag == 0) {
569 update_floorbox;
570 update_container (0);
571 } elsif ($tag == $self->{player}{tag}) {
572 $::INV->set_items ($self->{container}{$tag})
573 } else {
574 update_container ($tag);
575 }
576
577# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
578} 606}
579 607
580sub item_delete { 608sub item_delete {
581 my ($self, @items) = @_; 609 my ($self, @items) = @_;
582 610
611 $self->{update_container}{$_->{container}}++
583 for (@items) { 612 for @items;
584 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
585
586 if ($_->{container} == 0) {
587 update_floorbox;
588 update_container ($_->{tag});
589 } elsif ($_->{container} == $self->{player}{tag}) {
590 $::INV->set_items ($self->{container}{$self->{player}{tag}})
591 } else {
592 update_container ($_->{container});
593 }
594 } 613
614 $self->update_containers;
595} 615}
596 616
597sub item_update { 617sub item_update {
598 my ($self, $item) = @_; 618 my ($self, $item) = @_;
599 619
600 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 620 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
601 621
602 if ($item->{tag} == $self->{player}{tag}) {
603 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
604 return;
605 }
606
607 CFClient::Item::update_widgets $item; 622 CFClient::Item::update_widgets $item;
608 623
609 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 624 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
610 set_opencont ($::CONN, 0, "Floor"); 625 set_opencont ($::CONN, 0, "Floor");
611 626
612 } elsif ($item->{flags} & F_OPEN) { 627 } elsif ($item->{flags} & F_OPEN) {
613 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 628 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
629
614 } else { 630 } else {
631 $self->{update_container}{$item->{container}}++;
632 $self->update_containers;
615 if ($item->{container} == 0) { 633# if ($item->{container} == 0) {
616 update_floorbox; 634# update_floorbox;
617 update_container (0); 635# update_container (0);
618 } elsif ($item->{container} == $self->{player}{tag}) { 636# } elsif ($item->{container} == $self->{player}{tag}) {
619 $::INV->set_items ($self->{container}{$item->{container}}) 637# $::INV->set_items ($self->{container}{$item->{container}})
620 } 638# }
621 } 639 }
622} 640}
623 641
624sub player_update { 642sub player_update {
625 my ($self, $player) = @_; 643 my ($self, $player) = @_;
626
627 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 644 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
628} 645}
629 646
630sub logged_in { 647sub update_server_info {
631 my ($self) = @_; 648 my ($self) = @_;
632
633 $self->send_ext_req (cfplus => "version", "1", sub {
634 $self->{cfplus_ext} = $_[0];
635 });
636
637 $self->send_command ("output-sync $::CFG->{output_sync}");
638 $self->send_command ("output-count $::CFG->{output_count}");
639 $self->send_command ("pickup $::CFG->{pickup}");
640 649
641 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 650 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
642 651
643 $::SERVER_INFO->set_markup ( 652 $::SERVER_INFO->set_markup (
644 "server <tt>$self->{host}:$self->{port}</tt>\n" 653 "server <tt>$self->{host}:$self->{port}</tt>\n"
645 . "protocol version <tt>$self->{version}</tt>\n" 654 . "protocol version <tt>$self->{version}</tt>\n"
646 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 655 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
647 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 656 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
648 . "cfplus support $yesno[$self->{cfplus_ext} > 0]\n" 657 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
658 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
649 . "map size $self->{mapw}×$self->{maph}\n" 659 . "map size $self->{mapw}×$self->{maph}\n"
650 ); 660 );
651} 661}
652 662
663sub logged_in {
664 my ($self) = @_;
665
666 $self->send_ext_req (cfplus_support => "1", sub {
667 $self->{cfplus_ext} = $_[0];
668 $self->update_server_info;
669 });
670
671 $self->update_server_info;
672
673 $self->send_command ("output-sync $::CFG->{output_sync}");
674 $self->send_command ("output-count $::CFG->{output_count}");
675 $self->send_command ("pickup $::CFG->{pickup}");
676}
677
678sub lookat {
679 my ($self, $x, $y) = @_;
680
681 if ($self->{cfplus_ext}) {
682 $self->send_ext_req (lookat => "$x $y", sub {
683 my %res = split /\x00/, $_[0];
684
685 if (exists $res{npc_dialog}) {
686 # start npc chat dialog
687 $self->{npc_dialog} = new CFClient::NPCDialog::
688 dx => $x,
689 dy => $y,
690 title => "$res{npc_dialog} (NPC)",
691 conn => $self,
692 ;
693 }
694 });
695 }
696
697 $self->send ("lookat $x $y");
698}
699
700sub destroy {
701 my ($self) = @_;
702
703 $self->{npc_dialog}->destroy
704 if $self->{npc_dialog};
705
706 $self->SUPER::destroy;
707}
708
709package CFClient::NPCDialog;
710
711our @ISA = 'CFClient::UI::FancyFrame';
712
713sub new {
714 my $class = shift;
715
716 my $self = $class->SUPER::new (
717 x => 'center',
718 y => 'center',
719 name => "npc_dialog",
720 force_w => $::WIDTH * 0.7,
721 force_h => $::HEIGHT * 0.7,
722 title => "NPC Dialog",
723 kw => { hi => 0, yes => 0, no => 0 },
724 @_,
725 );
726
727 Scalar::Util::weaken (my $this = $self);
728
729 # better use a pane...
730 $self->add (my $hbox = new CFClient::UI::HBox);
731 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
732
733 $hbox->add (my $vbox = new CFClient::UI::VBox);
734
735 $vbox->add (new CFClient::UI::Label text => "Message Entry:");
736 $vbox->add ($self->{entry} = new CFClient::UI::Entry
737 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
738 . "Sometimes you have to tell an NPC something you cannot find out during "
739 . "a normal conversation (such as a password). In those cases you have to use "
740 . "this text entry. You can also enter responses manually instead of using the response "
741 . "buttons below.",
742 on_activate => sub {
743 my ($entry, $text) = @_;
744
745 return unless $text =~ /\S/;
746
747 $entry->set_text ("");
748 $this->send ($text);
749
750 0
751 },
752 );
753
754 $vbox->add ($self->{options} = new CFClient::UI::VBox);
755
756 $self->{bye_button} = new CFClient::UI::Button
757 text => "Bye (close)",
758 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
759 on_activate => sub { $this->destroy; 0 },
760 ;
761
762 $self->update_options;
763
764 $self->{token} = $self->{conn}->ext_token;
765 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
766 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
767
768 $self->{entry}->grab_focus;
769
770 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
771
772 $self->show;
773 $self
774};
775
776sub update_options {
777 my ($self) = @_;
778
779 Scalar::Util::weaken $self;
780
781 $self->{options}->clear;
782 $self->{options}->add ($self->{bye_button});
783
784 for my $kw (sort keys %{ $self->{kw} }) {
785 $self->{options}->add (new CFClient::UI::Button
786 text => $kw,
787 on_activate => sub {
788 $self->send ($kw);
789 0
790 },
791 );
792 }
793}
794
795sub feed {
796 my ($self, $data) = @_;
797
798 Scalar::Util::weaken $self;
799
800 my ($type, $msg) = split / /, $data, 2;
801
802 if ($type eq "msg") {
803 my ($msg, @kw) = split /\x00/, $msg;
804 $self->{kw}{$_} = 1 for @kw;
805
806 $msg = "\n" . CFClient::UI::Label::escape $msg;
807 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
808 my @link;
809 $msg =~ s{
810 ($match)
811 }{
812 my $kw = $1;
813
814 push @link, new CFClient::UI::Label
815 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
816 can_hover => 1,
817 can_events => 1,
818 padding_x => 0,
819 padding_y => 0,
820 on_button_up => sub {
821 $self->send ($kw);
822 };
823
824 chr 0xfffc
825 }giex;
826
827 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
828 $self->{textview}->scroll_to_bottom;
829 $self->update_options;
830 } else {
831 $self->destroy;
832 }
833
834 1
835}
836
837sub send {
838 my ($self, $msg) = @_;
839
840 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
841 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
842 $self->{textview}->scroll_to_bottom;
843}
844
845sub destroy {
846 my ($self) = @_;
847
848 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
849
850 delete $self->{conn}{npc_dialog};
851 $self->{conn}->disconnect_ext ($self->{token});
852
853 $self->SUPER::destroy;
854}
855
6531; 8561;

Diff Legend

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