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.32 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.50 by elmex, Sun Jul 2 16:25:19 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,
… …
488 return unless $::CONN; 523 return unless $::CONN;
489 524
490 $::FLOORBOX->clear; 525 $::FLOORBOX->clear;
491 526
492 my $row; 527 my $row;
493 for (@{ $::CONN->{container}{0} }) { 528 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
494 if ($row < 6) { 529 if ($row < 6) {
495 local $_->{face_widget}; # hack to force recreation of widget 530 local $_->{face_widget}; # hack to force recreation of widget
496 local $_->{desc_widget}; # hack to force recreation of widget 531 local $_->{desc_widget}; # hack to force recreation of widget
497 CFClient::Item::update_widgets $_; 532 CFClient::Item::update_widgets $_;
498 533
… …
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});
536} 572}
537 573
538sub update_container { 574sub update_containers {
539 my ($tag) = @_; 575 my ($self) = @_;
540 576
541 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 577 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
578 for my $tag (keys %{ delete $self->{update_container} }) {
579 if ($tag == 0) {
580 update_floorbox;
581 $::INVR->set_items ($self->{container}{0})
542 if $tag == $::CONN->{open_container}; 582 if $tag == $self->{open_container};
583 } elsif ($tag == $self->{player}{tag}) {
584 $::INV->set_items ($self->{container}{$tag})
585 } else {
586 $::INVR->set_items ($self->{container}{$tag})
587 if $tag == $self->{open_container};
588 }
589 }
590 });
543} 591}
544 592
545sub container_add { 593sub container_add {
546 my ($self, $tag, $items) = @_; 594 my ($self, $tag, $items) = @_;
547 595
548 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 596 $self->{update_container}{$tag}++;
549 597 $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} 598}
562 599
563sub container_clear { 600sub container_clear {
564 my ($self, $tag) = @_; 601 my ($self, $tag) = @_;
565 602
566 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 603 $self->{update_container}{$tag}++;
567 604 $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} 605}
579 606
580sub item_delete { 607sub item_delete {
581 my ($self, @items) = @_; 608 my ($self, @items) = @_;
582 609
610 $self->{update_container}{$_->{container}}++
583 for (@items) { 611 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 } 612
613 $self->update_containers;
595} 614}
596 615
597sub item_update { 616sub item_update {
598 my ($self, $item) = @_; 617 my ($self, $item) = @_;
599 618
600 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 619 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
601 620
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; 621 CFClient::Item::update_widgets $item;
608 622
609 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 623 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
610 set_opencont ($::CONN, 0, "Floor"); 624 set_opencont ($::CONN, 0, "Floor");
611 625
612 } elsif ($item->{flags} & F_OPEN) { 626 } elsif ($item->{flags} & F_OPEN) {
613 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 627 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
628
614 } else { 629 } else {
630 $self->{update_container}{$item->{container}}++;
631 $self->update_containers;
615 if ($item->{container} == 0) { 632# if ($item->{container} == 0) {
616 update_floorbox; 633# update_floorbox;
617 update_container (0); 634# update_container (0);
618 } elsif ($item->{container} == $self->{player}{tag}) { 635# } elsif ($item->{container} == $self->{player}{tag}) {
619 $::INV->set_items ($self->{container}{$item->{container}}) 636# $::INV->set_items ($self->{container}{$item->{container}})
620 } 637# }
621 } 638 }
622} 639}
623 640
624sub player_update { 641sub player_update {
625 my ($self, $player) = @_; 642 my ($self, $player) = @_;
626
627 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 643 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
628} 644}
629 645
630sub update_server_info { 646sub update_server_info {
631 my ($self) = @_; 647 my ($self) = @_;
… …
727 743
728 return unless $text =~ /\S/; 744 return unless $text =~ /\S/;
729 745
730 $entry->set_text (""); 746 $entry->set_text ("");
731 $this->send ($text); 747 $this->send ($text);
748
749 0
732 }, 750 },
733 ); 751 );
734 752
735 $vbox->add ($self->{options} = new CFClient::UI::VBox); 753 $vbox->add ($self->{options} = new CFClient::UI::VBox);
736 754
737 $self->{close_button} = new CFClient::UI::Button 755 $self->{bye_button} = new CFClient::UI::Button
738 text => "Bye (close)", 756 text => "Bye (close)",
739 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 757 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
740 on_activate => sub { $this->destroy }, 758 on_activate => sub { $this->destroy; 0 },
741 ; 759 ;
742 760
743 $self->update_options; 761 $self->update_options;
744 762
745 $self->{token} = $self->{conn}->ext_token; 763 $self->{token} = $self->{conn}->ext_token;
746 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 764 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
747 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 765 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
748 766
749 $self->{entry}->focus_in; 767 $self->{entry}->grab_focus;
750 768
751 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 769 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
752 770
753 $self->show; 771 $self->show;
754 $self 772 $self
… …
758 my ($self) = @_; 776 my ($self) = @_;
759 777
760 Scalar::Util::weaken $self; 778 Scalar::Util::weaken $self;
761 779
762 $self->{options}->clear; 780 $self->{options}->clear;
763 $self->{options}->add ($self->{close_button}); 781 $self->{options}->add ($self->{bye_button});
764 782
765 for my $kw (sort keys %{ $self->{kw} }) { 783 for my $kw (sort keys %{ $self->{kw} }) {
766 $self->{options}->add (new CFClient::UI::Button 784 $self->{options}->add (new CFClient::UI::Button
767 text => $kw, 785 text => $kw,
768 on_activate => sub { 786 on_activate => sub {
769 $self->send ($kw); 787 $self->send ($kw);
788 0
770 }, 789 },
771 ); 790 );
772 } 791 }
773} 792}
774 793
775sub feed { 794sub feed {
776 my ($self, $data) = @_; 795 my ($self, $data) = @_;
796
797 Scalar::Util::weaken $self;
777 798
778 my ($type, $msg) = split / /, $data, 2; 799 my ($type, $msg) = split / /, $data, 2;
779 800
780 if ($type eq "msg") { 801 if ($type eq "msg") {
781 my ($msg, @kw) = split /\x00/, $msg; 802 my ($msg, @kw) = split /\x00/, $msg;
782 $self->{kw}{$_} = 1 for @kw; 803 $self->{kw}{$_} = 1 for @kw;
783 804
784 warn "<<<<@kw>>>>\n";#d#
785
786 $msg = CFClient::UI::Label::escape $msg; 805 $msg = "\n" . CFClient::UI::Label::escape $msg;
787 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 806 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
788 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh. 807 my @link;
808 $msg =~ s{
809 ($match)
810 }{
811 my $kw = $1;
812
813 push @link, new CFClient::UI::Label
814 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
815 can_hover => 1,
816 can_events => 1,
817 padding_x => 0,
818 padding_y => 0,
819 on_button_up => sub {
820 $self->send ($kw);
821 };
822
823 chr 0xfffc
824 }giex;
789 825
790 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 826 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
827 $self->{textview}->scroll_to_bottom;
791 $self->update_options; 828 $self->update_options;
792 } else { 829 } else {
793 $self->destroy; 830 $self->destroy;
794 } 831 }
795 832
… …
799sub send { 836sub send {
800 my ($self, $msg) = @_; 837 my ($self, $msg) = @_;
801 838
802 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 839 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
803 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 840 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
841 $self->{textview}->scroll_to_bottom;
804} 842}
805 843
806sub destroy { 844sub destroy {
807 my ($self) = @_; 845 my ($self) = @_;
808 846
809 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 847 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
810 848
811 delete $self->{conn}{npc_dialog}; 849 delete $self->{conn}{npc_dialog};
812 $self->{conn}->disconnect_ext ($self->{token}); 850 $self->{conn}->disconnect_ext ($self->{token});
813 851
814 $self->SUPER::destroy; 852 $self->SUPER::destroy;

Diff Legend

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