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

Diff Legend

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