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.65 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.77 by root, Mon Aug 14 04:15:04 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_xml $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 {
… …
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);
259
260 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
261
262 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the 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);
265 264
266 my ($x, $y) = (0, 1); 265 my ($x, $y) = (0, 1);
267 for ( 266 for (
268 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] }
269 map [$_, $self->{skill_info}{$_}], 268 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_}, 269 grep exists $stats->{$_},
271 @skills 270 @skills
272 ) { 271 ) {
273 my ($idx, $name) = @$_; 272 my ($idx, $name) = @$_;
274 273
274 my $spell_cb = sub {
275 my ($widget, $ev) = @_;
276
277 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) {
282 (new CFPlus::UI::Menu
283 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
285 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
286 ],
287 )->popup ($ev);
288 } else {
289 return 0;
290 }
291
292 1
293 };
294
275 $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
276 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
277 $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
278 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
279 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $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);
280 301
281 $x++ and ($x, $y) = (0, $y + 1); 302 $x++ and ($x, $y) = (0, $y + 1);
282 } 303 }
283 } 304 }
284 305
… …
498 519
499 unless ($id) { 520 unless ($id) {
500 # create new id for face 521 # create new id for face
501 # I love transactions 522 # I love transactions
502 for (1..100) { 523 for (1..100) {
503 my $txn = $CFClient::DB_ENV->txn_begin; 524 my $txn = $CFPlus::DB_ENV->txn_begin;
504 my $status = $self->{facemap}->db_get (id => $id); 525 my $status = $self->{facemap}->db_get (id => $id);
505 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 526 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
506 $id = ($id || 64) + 1; 527 $id = ($id || 64) + 1;
507 if ($self->{facemap}->put (id => $id) == 0 528 if ($self->{facemap}->put (id => $id) == 0
508 && $self->{facemap}->put ($hash => $id) == 0) { 529 && $self->{facemap}->put ($hash => $id) == 0) {
… …
512 } 533 }
513 } 534 }
514 $txn->txn_abort; 535 $txn->txn_abort;
515 } 536 }
516 537
517 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 538 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
518 } 539 }
519 540
520gotid: 541gotid:
521 $face->{id} = $id; 542 $face->{id} = $id;
522 $self->{map}->set_face ($facenum => $id); 543 $self->{map}->set_face ($facenum => $id);
… …
545sub set_texture { 566sub set_texture {
546 my ($self, $id, $data) = @_; 567 my ($self, $id, $data) = @_;
547 568
548 $self->{texture}[$id] ||= do { 569 $self->{texture}[$id] ||= do {
549 my $tex = 570 my $tex =
550 new_from_image CFClient::Texture 571 new_from_image CFPlus::Texture
551 $data, minify => 1, mipmap => 1; 572 $data, minify => 1, mipmap => 1;
552 573
553 $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}});
554 $self->{map_widget}->update; 575 $self->{map_widget}->update;
555 576
… …
598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 619 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
599 620
600 # 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
601 $text =~ s/(?<=\S)\n(?=\w)/ /g; 622 $text =~ s/(?<=\S)\n(?=\w)/ /g;
602 623
603 $text = CFClient::asxml $text; 624 $text = CFPlus::asxml $text;
604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 625 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 626 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
606 627
607 $self->{logview}->add_paragraph ($color[$color], $_) 628 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
608 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 629 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
609 $self->{logview}->scroll_to_bottom; 630 $self->{logview}->scroll_to_bottom;
610 631
611 $self->{statusbox}->add ($text, 632 $self->{statusbox}->add ($text,
612 group => $text, 633 group => $text,
613 fg => $color[$color], 634 fg => $color[$color],
614 timeout => $color >= 2 ? 60 : 10, 635 timeout => $color >= 2 ? 180 : 10,
615 tooltip_font => $::FONT_FIXED, 636 tooltip_font => $::FONT_FIXED,
616 ); 637 );
617} 638}
618 639
619sub drawextinfo { 640sub drawextinfo {
… …
623} 644}
624 645
625sub spell_add { 646sub spell_add {
626 my ($self, $spell) = @_; 647 my ($self, $spell) = @_;
627 648
628 # try to create single paragraphs of multiple lines sent by the server 649 # try to create single paragraphs out of the multiple lines sent by the server
629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 650 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
630 $spell->{message} =~ s/\n+$//; 651 $spell->{message} =~ s/\n+$//;
631 $spell->{message} ||= "Server did not provide a description for this spell."; 652 $spell->{message} ||= "Server did not provide a description for this spell.";
632 653
633 $::SPELL_PAGE->add_spell ($spell); 654 $::SPELL_PAGE->add_spell ($spell);
634 655
635 $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});
636 $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});
637} 658}
638 659
639sub spell_delete { 660sub spell_delete {
640 my ($self, $spell) = @_; 661 my ($self, $spell) = @_;
641 662
… …
643} 664}
644 665
645sub addme_success { 666sub addme_success {
646 my ($self) = @_; 667 my ($self) = @_;
647 668
648 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
649 my ($pom) = @_;
650
651 my %skill_help; 669 my %skill_help;
652 670
653 for my $head2 ($pom->head1->[3]->head2) { 671 for my $node (CFPlus::Pod::find skill_description => "*") {
654 $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content; 672 my (undef, @par) = CFPlus::Pod::section_of $node;
655 } 673 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
656
657 \%skill_help
658 }; 674 };
659 675
660 for my $skill (values %{$self->{skill_info}}) { 676 for my $skill (values %{$self->{skill_info}}) {
661 $self->{map_widget}->add_command ("ready_skill $skill", 677 $self->{map_widget}->add_command ("ready_skill $skill",
662 (CFClient::asxml "Ready the skill '$skill'\n\n") 678 (CFPlus::asxml "Ready the skill '$skill'\n\n")
663 . $skill_help->{$skill}); 679 . $skill_help{$skill});
664 $self->{map_widget}->add_command ("use_skill $skill", 680 $self->{map_widget}->add_command ("use_skill $skill",
665 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 681 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
666 . $skill_help->{$skill}); 682 . $skill_help{$skill});
667 } 683 }
668} 684}
669 685
670sub eof { 686sub eof {
671 my ($self) = @_; 687 my ($self) = @_;
… …
695 711
696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 712 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
697 713
698 $self->send ("requestinfo image_sums $face $face"); 714 $self->send ("requestinfo image_sums $face $face");
699 715
700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 716 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 717 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
702 } elsif (!exists $self->{num_faces}) { 718 } elsif (!exists $self->{num_faces}) {
703 $self->send ("requestinfo image_info"); 719 $self->send ("requestinfo image_info");
704 720
705 $self->{num_faces} = 0; 721 $self->{num_faces} = 0;
706 722
707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 723 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 724 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
709 } 725 }
710} 726}
711 727
712sub update_floorbox { 728sub update_floorbox {
713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 729 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
714 return unless $::CONN; 730 return unless $::CONN;
715 731
716 $::FLOORBOX->clear; 732 $::FLOORBOX->clear;
717 733
718 my $row; 734 my $row;
719 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} }) {
720 if ($row < 6) { 736 if ($row < 6) {
721 local $_->{face_widget}; # hack to force recreation of widget 737 local $_->{face_widget}; # hack to force recreation of widget
722 local $_->{desc_widget}; # hack to force recreation of widget 738 local $_->{desc_widget}; # hack to force recreation of widget
723 CFClient::Item::update_widgets $_; 739 CFPlus::Item::update_widgets $_;
724 740
725 $::FLOORBOX->add (0, $row, $_->{face_widget}); 741 $::FLOORBOX->add (0, $row, $_->{face_widget});
726 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 742 $::FLOORBOX->add (1, $row, $_->{desc_widget});
727 743
728 $row++; 744 $row++;
729 } else { 745 } else {
730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 746 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
731 text => "More...", 747 text => "More...",
732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 748 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
733 ); 749 );
734 last; 750 last;
735 } 751 }
736 } 752 }
737 if ($::CONN->{open_container}) { 753 if ($::CONN->{open_container}) {
738 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 754 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
739 text => "Close container", 755 text => "Close container",
740 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 756 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
741 ); 757 );
742 } 758 }
743 }); 759 });
… …
749 my ($conn, $tag, $name) = @_; 765 my ($conn, $tag, $name) = @_;
750 $conn->{open_container} = $tag; 766 $conn->{open_container} = $tag;
751 update_floorbox; 767 update_floorbox;
752 768
753 $::INV_RIGHT_HB->clear (); 769 $::INV_RIGHT_HB->clear ();
754 $::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);
755 771
756 if ($tag != 0) { # Floor isn't closable, is it? 772 if ($tag != 0) { # Floor isn't closable, is it?
757 $::INV_RIGHT_HB->add (new CFClient::UI::Button 773 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
758 text => "Close container", 774 text => "Close container",
759 tooltip => "Close the currently open container (if one is open)", 775 tooltip => "Close the currently open container (if one is open)",
760 on_activate => sub { 776 on_activate => sub {
761 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 777 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
762 if $tag != 0; 778 if $tag != 0;
… …
770} 786}
771 787
772sub update_containers { 788sub update_containers {
773 my ($self) = @_; 789 my ($self) = @_;
774 790
775 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 791 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
776 my $todo = delete $self->{update_container} 792 my $todo = delete $self->{update_container}
777 or return; 793 or return;
778 794
779 for my $tag (keys %$todo) { 795 for my $tag (keys %$todo) {
780 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 796 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
817sub item_update { 833sub item_update {
818 my ($self, $item) = @_; 834 my ($self, $item) = @_;
819 835
820 #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";
821 837
822 CFClient::Item::update_widgets $item; 838 CFPlus::Item::update_widgets $item;
823 839
824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 840 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
825 set_opencont ($::CONN, 0, "Floor"); 841 set_opencont ($::CONN, 0, "Floor");
826 842
827 } elsif ($item->{flags} & F_OPEN) { 843 } elsif ($item->{flags} & F_OPEN) {
828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 844 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
829 845
830 } else { 846 } else {
831 $self->{update_container}{$item->{container}}++; 847 $self->{update_container}{$item->{container}}++;
832 $self->update_containers; 848 $self->update_containers;
833 } 849 }
… …
867} 883}
868 884
869sub logged_in { 885sub logged_in {
870 my ($self) = @_; 886 my ($self) = @_;
871 887
872 $self->send_ext_req (cfplus_support => "1", sub { 888 $self->send_ext_req (cfplus_support => version => 1, sub {
873 $self->{cfplus_ext} = $_[0]; 889 $self->{cfplus_ext} = $_[0]{version};
874 $self->update_server_info; 890 $self->update_server_info;
891
892 0
875 }); 893 });
876 894
877 $self->update_server_info; 895 $self->update_server_info;
878 896
879 $self->send_command ("output-sync $::CFG->{output_sync}"); 897 $self->send_command ("output-sync $::CFG->{output_sync}");
… …
883 901
884sub lookat { 902sub lookat {
885 my ($self, $x, $y) = @_; 903 my ($self, $x, $y) = @_;
886 904
887 if ($self->{cfplus_ext}) { 905 if ($self->{cfplus_ext}) {
888 $self->send_ext_req (lookat => "$x $y", sub { 906 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
889 my %res = split /\x00/, $_[0]; 907 my ($msg) = @_;
890 908
891 if (exists $res{npc_dialog}) { 909 if (exists $msg->{npc_dialog}) {
892 # start npc chat dialog 910 # start npc chat dialog
893 $self->{npc_dialog} = new CFClient::NPCDialog:: 911 $self->{npc_dialog} = new CFPlus::NPCDialog::
894 dx => $x, 912 dx => $x,
895 dy => $y, 913 dy => $y,
896 title => "$res{npc_dialog} (NPC)", 914 title => "$msg->{npc_dialog} (NPC)",
897 conn => $self, 915 conn => $self,
898 ; 916 ;
899 } 917 }
900 }); 918 });
901 } 919 }
… …
910 if $self->{npc_dialog}; 928 if $self->{npc_dialog};
911 929
912 $self->SUPER::destroy; 930 $self->SUPER::destroy;
913} 931}
914 932
915package CFClient::NPCDialog; 933package CFPlus::NPCDialog;
916 934
917our @ISA = 'CFClient::UI::FancyFrame'; 935our @ISA = 'CFPlus::UI::Toplevel';
918 936
919sub new { 937sub new {
920 my $class = shift; 938 my $class = shift;
921 939
922 my $self = $class->SUPER::new ( 940 my $self = $class->SUPER::new (
… …
934 Scalar::Util::weaken (my $this = $self); 952 Scalar::Util::weaken (my $this = $self);
935 953
936 $self->connect (delete => sub { $this->destroy; 1 }); 954 $self->connect (delete => sub { $this->destroy; 1 });
937 955
938 # better use a pane... 956 # better use a pane...
939 $self->add (my $hbox = new CFClient::UI::HBox); 957 $self->add (my $hbox = new CFPlus::UI::HBox);
940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 958 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
941 959
942 $hbox->add (my $vbox = new CFClient::UI::VBox); 960 $hbox->add (my $vbox = new CFPlus::UI::VBox);
943 961
944 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 962 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
945 $vbox->add ($self->{entry} = new CFClient::UI::Entry 963 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
946 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 964 tooltip => "#npc_message_entry",
947 . "Sometimes you have to tell an NPC something you cannot find out during "
948 . "a normal conversation (such as a password). In those cases you have to use "
949 . "this text entry. You can also enter responses manually instead of using the response "
950 . "buttons below.",
951 on_activate => sub { 965 on_activate => sub {
952 my ($entry, $text) = @_; 966 my ($entry, $text) = @_;
953 967
954 return unless $text =~ /\S/; 968 return unless $text =~ /\S/;
955 969
… …
958 972
959 0 973 0
960 }, 974 },
961 ); 975 );
962 976
963 $vbox->add ($self->{options} = new CFClient::UI::VBox); 977 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
964 978
965 $self->{bye_button} = new CFClient::UI::Button 979 $self->{bye_button} = new CFPlus::UI::Button
966 text => "Bye (close)", 980 text => "Bye (close)",
967 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.",
968 on_activate => sub { $this->destroy; 1 }, 982 on_activate => sub { $this->destroy; 1 },
969 ; 983 ;
970 984
971 $self->update_options; 985 $self->update_options;
972 986
973 $self->{token} = $self->{conn}->ext_token; 987 $self->{id} = $self->{conn}->send_ext_req (
974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 988 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
975 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 989 sub { $this && $this->feed (@_) }
990 );
976 991
977 $self->{entry}->grab_focus; 992 $self->{entry}->grab_focus;
978 993
979 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 994 $self->{textview}->add_paragraph ({
995 fg => [1, 1, 0, 1],
996 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
997 });
980 998
981 $self->show; 999 $self->show;
982 $self 1000 $self
983}; 1001};
984 1002
… …
989 1007
990 $self->{options}->clear; 1008 $self->{options}->clear;
991 $self->{options}->add ($self->{bye_button}); 1009 $self->{options}->add ($self->{bye_button});
992 1010
993 for my $kw (sort keys %{ $self->{kw} }) { 1011 for my $kw (sort keys %{ $self->{kw} }) {
994 $self->{options}->add (new CFClient::UI::Button 1012 $self->{options}->add (new CFPlus::UI::Button
995 text => $kw, 1013 text => $kw,
996 on_activate => sub { 1014 on_activate => sub {
997 $self->send ($kw); 1015 $self->send ($kw);
998 0 1016 0
999 }, 1017 },
1000 ); 1018 );
1001 } 1019 }
1002} 1020}
1003 1021
1004sub feed { 1022sub feed {
1005 my ($self, $data) = @_; 1023 my ($self, $msg) = @_;
1006 1024
1007 Scalar::Util::weaken $self; 1025 Scalar::Util::weaken $self;
1008 1026
1009 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} || []};
1010 1030
1011 if ($type eq "msg") { 1031 my $text = "\n" . CFPlus::asxml $msg->{msg};
1012 my ($msg, @kw) = split /\x00/, $msg;
1013
1014 utf8::decode $_ for ($msg, @kw);
1015
1016 $self->{kw}{$_} = 1 for @kw;
1017
1018 $msg = "\n" . CFClient::UI::asxml $msg;
1019 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} };
1020 my @link; 1033 my @link;
1021 $msg =~ s{ 1034 $text =~ s{
1022 ($match) 1035 ($match)
1023 }{ 1036 }{
1024 my $kw = $1; 1037 my $kw = $1;
1025 1038
1026 push @link, new CFClient::UI::Label 1039 push @link, new CFPlus::UI::Label
1027 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1040 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1028 can_hover => 1, 1041 can_hover => 1,
1029 can_events => 1, 1042 can_events => 1,
1030 padding_x => 0, 1043 padding_x => 0,
1031 padding_y => 0, 1044 padding_y => 0,
1032 on_button_up => sub { 1045 on_button_up => sub {
1033 $self->send ($kw); 1046 $self->send ($kw);
1034 }; 1047 };
1035 1048
1036 chr 0xfffc 1049 "\x{fffc}"
1037 }giex; 1050 }giex;
1038 1051
1039 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1052 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1040 $self->{textview}->scroll_to_bottom; 1053 $self->{textview}->scroll_to_bottom;
1041 $self->update_options; 1054 $self->update_options;
1042 } else { 1055 } else {
1043 $self->destroy; 1056 $self->destroy;
1044 } 1057 }
… …
1047} 1060}
1048 1061
1049sub send { 1062sub send {
1050 my ($self, $msg) = @_; 1063 my ($self, $msg) = @_;
1051 1064
1052 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg); 1065 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1053 $self->{textview}->scroll_to_bottom; 1066 $self->{textview}->scroll_to_bottom;
1054 1067
1055 utf8::encode $msg; 1068 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1056 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1057} 1069}
1058 1070
1059sub destroy { 1071sub destroy {
1060 my ($self) = @_; 1072 my ($self) = @_;
1061 1073
1062 #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
1063 1075
1076 if ($self->{conn}) {
1064 $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};
1065 delete $self->{conn}{npc_dialog}; 1078 delete $self->{conn}{npc_dialog};
1066 $self->{conn}->disconnect_ext ($self->{token}); 1079 $self->{conn}->disconnect_ext ($self->{id});
1080 }
1067 1081
1068 $self->SUPER::destroy; 1082 $self->SUPER::destroy;
1069} 1083}
1070 1084
10711; 10851

Diff Legend

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