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.68 by elmex, Sun Jul 30 12:51:32 2006 UTC vs.
Revision 1.78 by elmex, Mon Aug 14 14:35:31 2006 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFClient::UI; 9use CFPlus::UI;
10use CFClient::Pod; 10use CFPlus::Pod;
11 11
12use base 'Crossfire::Protocol::Base'; 12use base 'Crossfire::Protocol::Base';
13 13
14sub new { 14sub new {
15 my $class = shift; 15 my $class = shift;
16 16
17 my $self = $class->SUPER::new (@_); 17 my $self = $class->SUPER::new (@_);
18 18
19 $self->{map_widget}->clr_commands; 19 $self->{map_widget}->clr_commands;
20 20
21 my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 21 my @cmd_help = map {
22 my ($pom) = @_;
23
24 my @cmd_help;
25
26 for my $head2 ($pom->head1->[-2]->head2) {
27 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 23 or die "unparseable command help: $_->{kw}[0]";
29 24
30 my $cmd = $1; 25 my $cmd = $1;
31 my @args = split /\|/, $2; 26 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 27 @args = (".*") unless @args;
33 28
29 my (undef, @par) = CFPlus::Pod::section_of $_;
30 my $text = CFPlus::Pod::as_label @par;
31
34 $_ = $_ eq ".*" ? "" : " $_" 32 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 33 for @args;
36 34
37 my $text = CFClient::Pod::as_markup $head2->content; 35 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 36 sort { (length $a) <=> (length $b) }
41 @args; 37 @args
42 } 38 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*";
43 40
44 \@cmd_help
45 };
46
47 $self->{map_widget}->add_command (@$_) 41 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 42 for @cmd_help;
49 43
50 $self->{noface} = new_from_file CFClient::Texture 44 $self->{noface} = new_from_file CFPlus::Texture
51 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
52 46
53 $self->{open_container} = 0; 47 $self->{open_container} = 0;
54 48
55 # "global" 49 # "global"
56 $self->{tilecache} = CFClient::db_table "tilecache"; 50 $self->{tilecache} = CFPlus::db_table "tilecache";
57 $self->{facemap} = CFClient::db_table "facemap"; 51 $self->{facemap} = CFPlus::db_table "facemap";
58 52
59 # per server 53 # per server
60 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 54 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";
61 55
62 $self 56 $self
63} 57}
64 58
65sub logprint { 59sub logprint {
66 my ($self, @a) = @_; 60 my ($self, @a) = @_;
67 61
62 return;
68 $self->{log_fh} ||= do { 63 $self->{log_fh} ||= do {
69 my $path = "$Crossfire::VARDIR/log.$self->{host}"; 64 my $path = "$Crossfire::VARDIR/log.$self->{host}";
70 65
71 open my $fh, ">>:utf8", $path 66 open my $fh, ">>:utf8", $path
72 or die "Couldn't open logfile $path: $!"; 67 or die "Couldn't open logfile $path: $!";
… …
254 my @skills = keys %{ $self->{skill_info} }; 249 my @skills = keys %{ $self->{skill_info} };
255 250
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 251 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257 $sktbl->clear; 252 $sktbl->clear;
258 253
259 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 254 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
260 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 255 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
261 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 256 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
262 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 257 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
263 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 258 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
264 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 259 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
265 260
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 261 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 262
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 263 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
269 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 264 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
270 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271 265
272 my ($x, $y) = (0, 1); 266 my ($x, $y) = (0, 1);
273 for ( 267 for (
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 268 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}], 269 map [$_, $self->{skill_info}{$_}],
… …
284 if ($ev->{button} == 1) { 278 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 279 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 280 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 281 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 282 } elsif ($ev->{button} == 3) {
289 (new CFClient::UI::Menu 283 (new CFPlus::UI::Menu
290 items => [ 284 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 285 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
292 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 286 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
293 ], 287 ],
294 )->popup ($ev); 288 )->popup ($ev);
… …
297 } 291 }
298 292
299 1 293 1
300 }; 294 };
301 295
302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 296 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
303 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 297 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
304 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 298 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
305 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 299 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
306 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 300 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
301 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
307 302
308 $x++ and ($x, $y) = (0, $y + 1); 303 $x++ and ($x, $y) = (0, $y + 1);
309 } 304 }
310 } 305 }
311 306
… …
525 520
526 unless ($id) { 521 unless ($id) {
527 # create new id for face 522 # create new id for face
528 # I love transactions 523 # I love transactions
529 for (1..100) { 524 for (1..100) {
530 my $txn = $CFClient::DB_ENV->txn_begin; 525 my $txn = $CFPlus::DB_ENV->txn_begin;
531 my $status = $self->{facemap}->db_get (id => $id); 526 my $status = $self->{facemap}->db_get (id => $id);
532 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 527 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
533 $id = ($id || 64) + 1; 528 $id = ($id || 64) + 1;
534 if ($self->{facemap}->put (id => $id) == 0 529 if ($self->{facemap}->put (id => $id) == 0
535 && $self->{facemap}->put ($hash => $id) == 0) { 530 && $self->{facemap}->put ($hash => $id) == 0) {
… …
539 } 534 }
540 } 535 }
541 $txn->txn_abort; 536 $txn->txn_abort;
542 } 537 }
543 538
544 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 539 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
545 } 540 }
546 541
547gotid: 542gotid:
548 $face->{id} = $id; 543 $face->{id} = $id;
549 $self->{map}->set_face ($facenum => $id); 544 $self->{map}->set_face ($facenum => $id);
… …
572sub set_texture { 567sub set_texture {
573 my ($self, $id, $data) = @_; 568 my ($self, $id, $data) = @_;
574 569
575 $self->{texture}[$id] ||= do { 570 $self->{texture}[$id] ||= do {
576 my $tex = 571 my $tex =
577 new_from_image CFClient::Texture 572 new_from_image CFPlus::Texture
578 $data, minify => 1, mipmap => 1; 573 $data, minify => 1, mipmap => 1;
579 574
580 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 575 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
581 $self->{map_widget}->update; 576 $self->{map_widget}->update;
582 577
… …
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 620 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
626 621
627 # try to create single paragraphs of multiple lines sent by the server 622 # try to create single paragraphs of multiple lines sent by the server
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 623 $text =~ s/(?<=\S)\n(?=\w)/ /g;
629 624
630 $text = CFClient::asxml $text; 625 $text = CFPlus::asxml $text;
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 626 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 627 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 628
634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 629 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 630 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
636 $self->{logview}->scroll_to_bottom; 631 $self->{logview}->scroll_to_bottom;
637 632
638 $self->{statusbox}->add ($text, 633 $self->{statusbox}->add ($text,
639 group => $text, 634 group => $text,
640 fg => $color[$color], 635 fg => $color[$color],
641 timeout => $color >= 2 ? 60 : 10, 636 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 637 tooltip_font => $::FONT_FIXED,
643 ); 638 );
644} 639}
645 640
646sub drawextinfo { 641sub drawextinfo {
… …
657 $spell->{message} =~ s/\n+$//; 652 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 653 $spell->{message} ||= "Server did not provide a description for this spell.";
659 654
660 $::SPELL_PAGE->add_spell ($spell); 655 $::SPELL_PAGE->add_spell ($spell);
661 656
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); 657 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
663 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message}); 658 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 659}
665 660
666sub spell_delete { 661sub spell_delete {
667 my ($self, $spell) = @_; 662 my ($self, $spell) = @_;
668 663
… …
670} 665}
671 666
672sub addme_success { 667sub addme_success {
673 my ($self) = @_; 668 my ($self) = @_;
674 669
675 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676 my ($pom) = @_;
677
678 my %skill_help; 670 my %skill_help;
679 671
680 for my $head2 ($pom->head1->[3]->head2) { 672 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content; 673 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 674 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 675 };
686 676
687 for my $skill (values %{$self->{skill_info}}) { 677 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 678 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFClient::asxml "Ready the skill '$skill'\n\n") 679 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 680 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 681 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 682 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 683 . $skill_help{$skill});
694 } 684 }
695} 685}
696 686
697sub eof { 687sub eof {
698 my ($self) = @_; 688 my ($self) = @_;
… …
722 712
723 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 713 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
724 714
725 $self->send ("requestinfo image_sums $face $face"); 715 $self->send ("requestinfo image_sums $face $face");
726 716
727 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 717 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
728 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 718 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
729 } elsif (!exists $self->{num_faces}) { 719 } elsif (!exists $self->{num_faces}) {
730 $self->send ("requestinfo image_info"); 720 $self->send ("requestinfo image_info");
731 721
732 $self->{num_faces} = 0; 722 $self->{num_faces} = 0;
733 723
734 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 724 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
735 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 725 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
736 } 726 }
737} 727}
738 728
739sub update_floorbox { 729sub update_floorbox {
740 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 730 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
741 return unless $::CONN; 731 return unless $::CONN;
742 732
743 $::FLOORBOX->clear; 733 $::FLOORBOX->clear;
744 734
745 my $row; 735 my $row;
746 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 736 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
747 if ($row < 6) { 737 if ($row < 6) {
748 local $_->{face_widget}; # hack to force recreation of widget 738 local $_->{face_widget}; # hack to force recreation of widget
749 local $_->{desc_widget}; # hack to force recreation of widget 739 local $_->{desc_widget}; # hack to force recreation of widget
750 CFClient::Item::update_widgets $_; 740 CFPlus::Item::update_widgets $_;
751 741
752 $::FLOORBOX->add (0, $row, $_->{face_widget}); 742 $::FLOORBOX->add (0, $row, $_->{face_widget});
753 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 743 $::FLOORBOX->add (1, $row, $_->{desc_widget});
754 744
755 $row++; 745 $row++;
756 } else { 746 } else {
757 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 747 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
758 text => "More...", 748 text => "More...",
759 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 749 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
760 ); 750 );
761 last; 751 last;
762 } 752 }
763 } 753 }
764 if ($::CONN->{open_container}) { 754 if ($::CONN->{open_container}) {
765 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 755 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
766 text => "Close container", 756 text => "Close container",
767 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 757 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
768 ); 758 );
769 } 759 }
770 }); 760 });
… …
776 my ($conn, $tag, $name) = @_; 766 my ($conn, $tag, $name) = @_;
777 $conn->{open_container} = $tag; 767 $conn->{open_container} = $tag;
778 update_floorbox; 768 update_floorbox;
779 769
780 $::INV_RIGHT_HB->clear (); 770 $::INV_RIGHT_HB->clear ();
781 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 771 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
782 772
783 if ($tag != 0) { # Floor isn't closable, is it? 773 if ($tag != 0) { # Floor isn't closable, is it?
784 $::INV_RIGHT_HB->add (new CFClient::UI::Button 774 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
785 text => "Close container", 775 text => "Close container",
786 tooltip => "Close the currently open container (if one is open)", 776 tooltip => "Close the currently open container (if one is open)",
787 on_activate => sub { 777 on_activate => sub {
788 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 778 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
789 if $tag != 0; 779 if $tag != 0;
… …
797} 787}
798 788
799sub update_containers { 789sub update_containers {
800 my ($self) = @_; 790 my ($self) = @_;
801 791
802 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 792 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
803 my $todo = delete $self->{update_container} 793 my $todo = delete $self->{update_container}
804 or return; 794 or return;
805 795
806 for my $tag (keys %$todo) { 796 for my $tag (keys %$todo) {
807 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 797 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
844sub item_update { 834sub item_update {
845 my ($self, $item) = @_; 835 my ($self, $item) = @_;
846 836
847 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 837 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
848 838
849 CFClient::Item::update_widgets $item; 839 CFPlus::Item::update_widgets $item;
850 840
851 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 841 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
852 set_opencont ($::CONN, 0, "Floor"); 842 set_opencont ($::CONN, 0, "Floor");
853 843
854 } elsif ($item->{flags} & F_OPEN) { 844 } elsif ($item->{flags} & F_OPEN) {
855 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 845 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
856 846
857 } else { 847 } else {
858 $self->{update_container}{$item->{container}}++; 848 $self->{update_container}{$item->{container}}++;
859 $self->update_containers; 849 $self->update_containers;
860 } 850 }
… …
894} 884}
895 885
896sub logged_in { 886sub logged_in {
897 my ($self) = @_; 887 my ($self) = @_;
898 888
899 $self->send_ext_req (cfplus_support => "1", sub { 889 $self->send_ext_req (cfplus_support => version => 1, sub {
900 $self->{cfplus_ext} = $_[0]; 890 $self->{cfplus_ext} = $_[0]{version};
901 $self->update_server_info; 891 $self->update_server_info;
892
893 0
902 }); 894 });
903 895
904 $self->update_server_info; 896 $self->update_server_info;
905 897
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 898 $self->send_command ("output-sync $::CFG->{output_sync}");
… …
910 902
911sub lookat { 903sub lookat {
912 my ($self, $x, $y) = @_; 904 my ($self, $x, $y) = @_;
913 905
914 if ($self->{cfplus_ext}) { 906 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 907 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
916 my %res = split /\x00/, $_[0]; 908 my ($msg) = @_;
917 909
918 if (exists $res{npc_dialog}) { 910 if (exists $msg->{npc_dialog}) {
919 # start npc chat dialog 911 # start npc chat dialog
920 $self->{npc_dialog} = new CFClient::NPCDialog:: 912 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 913 dx => $x,
922 dy => $y, 914 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 915 title => "$msg->{npc_dialog} (NPC)",
924 conn => $self, 916 conn => $self,
925 ; 917 ;
926 } 918 }
927 }); 919 });
928 } 920 }
… …
937 if $self->{npc_dialog}; 929 if $self->{npc_dialog};
938 930
939 $self->SUPER::destroy; 931 $self->SUPER::destroy;
940} 932}
941 933
942package CFClient::NPCDialog; 934package CFPlus::NPCDialog;
943 935
944our @ISA = 'CFClient::UI::FancyFrame'; 936our @ISA = 'CFPlus::UI::Toplevel';
945 937
946sub new { 938sub new {
947 my $class = shift; 939 my $class = shift;
948 940
949 my $self = $class->SUPER::new ( 941 my $self = $class->SUPER::new (
… …
961 Scalar::Util::weaken (my $this = $self); 953 Scalar::Util::weaken (my $this = $self);
962 954
963 $self->connect (delete => sub { $this->destroy; 1 }); 955 $self->connect (delete => sub { $this->destroy; 1 });
964 956
965 # better use a pane... 957 # better use a pane...
966 $self->add (my $hbox = new CFClient::UI::HBox); 958 $self->add (my $hbox = new CFPlus::UI::HBox);
967 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 959 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
968 960
969 $hbox->add (my $vbox = new CFClient::UI::VBox); 961 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 962
971 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 963 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFClient::UI::Entry 964 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
973 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 965 tooltip => "#npc_message_entry",
974 . "Sometimes you have to tell an NPC something you cannot find out during "
975 . "a normal conversation (such as a password). In those cases you have to use "
976 . "this text entry. You can also enter responses manually instead of using the response "
977 . "buttons below.",
978 on_activate => sub { 966 on_activate => sub {
979 my ($entry, $text) = @_; 967 my ($entry, $text) = @_;
980 968
981 return unless $text =~ /\S/; 969 return unless $text =~ /\S/;
982 970
… …
985 973
986 0 974 0
987 }, 975 },
988 ); 976 );
989 977
990 $vbox->add ($self->{options} = new CFClient::UI::VBox); 978 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
991 979
992 $self->{bye_button} = new CFClient::UI::Button 980 $self->{bye_button} = new CFPlus::UI::Button
993 text => "Bye (close)", 981 text => "Bye (close)",
994 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 982 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
995 on_activate => sub { $this->destroy; 1 }, 983 on_activate => sub { $this->destroy; 1 },
996 ; 984 ;
997 985
998 $self->update_options; 986 $self->update_options;
999 987
1000 $self->{token} = $self->{conn}->ext_token; 988 $self->{id} = $self->{conn}->send_ext_req (
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 989 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 990 sub { $this && $this->feed (@_) }
991 );
1003 992
1004 $self->{entry}->grab_focus; 993 $self->{entry}->grab_focus;
1005 994
1006 $self->{textview}->add_paragraph ({ 995 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 996 fg => [1, 1, 0, 1],
… …
1019 1008
1020 $self->{options}->clear; 1009 $self->{options}->clear;
1021 $self->{options}->add ($self->{bye_button}); 1010 $self->{options}->add ($self->{bye_button});
1022 1011
1023 for my $kw (sort keys %{ $self->{kw} }) { 1012 for my $kw (sort keys %{ $self->{kw} }) {
1024 $self->{options}->add (new CFClient::UI::Button 1013 $self->{options}->add (new CFPlus::UI::Button
1025 text => $kw, 1014 text => $kw,
1026 on_activate => sub { 1015 on_activate => sub {
1027 $self->send ($kw); 1016 $self->send ($kw);
1028 0 1017 0
1029 }, 1018 },
1030 ); 1019 );
1031 } 1020 }
1032} 1021}
1033 1022
1034sub feed { 1023sub feed {
1035 my ($self, $data) = @_; 1024 my ($self, $msg) = @_;
1036 1025
1037 Scalar::Util::weaken $self; 1026 Scalar::Util::weaken $self;
1038 1027
1039 my ($type, $msg) = split / /, $data, 2; 1028 if ($msg->{msgtype} eq "reply") {
1029 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1030 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1040 1031
1041 if ($type eq "msg") { 1032 my $text = "\n" . CFPlus::asxml $msg->{msg};
1042 my ($msg, @kw) = split /\x00/, $msg;
1043
1044 utf8::decode $_ for ($msg, @kw);
1045
1046 $self->{kw}{$_} = 1 for @kw;
1047
1048 $msg = "\n" . CFClient::UI::asxml $msg;
1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1033 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050 my @link; 1034 my @link;
1051 $msg =~ s{ 1035 $text =~ s{
1052 ($match) 1036 ($match)
1053 }{ 1037 }{
1054 my $kw = $1; 1038 my $kw = $1;
1055 1039
1056 push @link, new CFClient::UI::Label 1040 push @link, new CFPlus::UI::Label
1057 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1041 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1058 can_hover => 1, 1042 can_hover => 1,
1059 can_events => 1, 1043 can_events => 1,
1060 padding_x => 0, 1044 padding_x => 0,
1061 padding_y => 0, 1045 padding_y => 0,
1062 on_button_up => sub { 1046 on_button_up => sub {
1063 $self->send ($kw); 1047 $self->send ($kw);
1064 }; 1048 };
1065 1049
1066 chr 0xfffc 1050 "\x{fffc}"
1067 }giex; 1051 }giex;
1068 1052
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1053 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1054 $self->{textview}->scroll_to_bottom;
1071 $self->update_options; 1055 $self->update_options;
1072 } else { 1056 } else {
1073 $self->destroy; 1057 $self->destroy;
1074 } 1058 }
… …
1077} 1061}
1078 1062
1079sub send { 1063sub send {
1080 my ($self, $msg) = @_; 1064 my ($self, $msg) = @_;
1081 1065
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg }); 1066 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1067 $self->{textview}->scroll_to_bottom;
1084 1068
1085 utf8::encode $msg; 1069 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1087} 1070}
1088 1071
1089sub destroy { 1072sub destroy {
1090 my ($self) = @_; 1073 my ($self) = @_;
1091 1074
1092 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1075 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093 1076
1077 if ($self->{conn}) {
1094 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1078 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1095 delete $self->{conn}{npc_dialog}; 1079 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1080 $self->{conn}->disconnect_ext ($self->{id});
1081 }
1097 1082
1098 $self->SUPER::destroy; 1083 $self->SUPER::destroy;
1099} 1084}
1100 1085
11011 10861

Diff Legend

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