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.81 by root, Sat Aug 19 02:49:55 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 (@_, setup_req => { extmap => 0 });
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"
51 or die "tilecache: unable to open database table";
57 $self->{facemap} = CFClient::db_table "facemap"; 52 $self->{facemap} = CFPlus::db_table "facemap"
53 or die "facemap: unable to open database table";
58 54
59 # per server 55 # per server
60 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 56 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
57 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
61 58
62 $self 59 $self
63} 60}
64 61
65sub logprint { 62sub logprint {
… …
254 my @skills = keys %{ $self->{skill_info} }; 251 my @skills = keys %{ $self->{skill_info} };
255 252
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 253 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257 $sktbl->clear; 254 $sktbl->clear;
258 255
259 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 256 $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); 257 $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); 258 $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); 259 $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); 260 $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); 261 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
262
263 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
264
265 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
266 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
265 267
266 my ($x, $y) = (0, 1); 268 my ($x, $y) = (0, 1);
267 for ( 269 for (
268 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 270 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
269 map [$_, $self->{skill_info}{$_}], 271 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_}, 272 grep exists $stats->{$_},
271 @skills 273 @skills
272 ) { 274 ) {
273 my ($idx, $name) = @$_; 275 my ($idx, $name) = @$_;
274 276
277 my $spell_cb = sub {
278 my ($widget, $ev) = @_;
279
280 if ($ev->{button} == 1) {
281 $::CONN->user_send ("ready_skill $name");
282 } elsif ($ev->{button} == 2) {
283 $::CONN->user_send ("use_skill $name");
284 } elsif ($ev->{button} == 3) {
285 (new CFPlus::UI::Menu
286 items => [
287 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
288 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
289 ],
290 )->popup ($ev);
291 } else {
292 return 0;
293 }
294
295 1
296 };
297
275 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 298 $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]); 299 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 300 $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); 301 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); 302 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
303 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
280 304
281 $x++ and ($x, $y) = (0, $y + 1); 305 $x++ and ($x, $y) = (0, $y + 1);
282 } 306 }
283 } 307 }
284 308
… …
318} 342}
319 343
320sub feed_map1a { 344sub feed_map1a {
321 my ($self, $data) = @_; 345 my ($self, $data) = @_;
322 346
323 $self->{map}->map1a_update ($data); 347 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
324 $self->{map_widget}->update; 348 $self->{map_widget}->update;
325} 349}
326 350
327sub magicmap { 351sub magicmap {
328 my ($self, $w, $h, $x, $y, $data) = @_; 352 my ($self, $w, $h, $x, $y, $data) = @_;
… …
498 522
499 unless ($id) { 523 unless ($id) {
500 # create new id for face 524 # create new id for face
501 # I love transactions 525 # I love transactions
502 for (1..100) { 526 for (1..100) {
503 my $txn = $CFClient::DB_ENV->txn_begin; 527 my $txn = $CFPlus::DB_ENV->txn_begin;
504 my $status = $self->{facemap}->db_get (id => $id); 528 my $status = $self->{facemap}->db_get (id => $id);
505 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 529 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
506 $id = ($id || 64) + 1; 530 $id = ($id || 64) + 1;
507 if ($self->{facemap}->put (id => $id) == 0 531 if ($self->{facemap}->put (id => $id) == 0
508 && $self->{facemap}->put ($hash => $id) == 0) { 532 && $self->{facemap}->put ($hash => $id) == 0) {
… …
512 } 536 }
513 } 537 }
514 $txn->txn_abort; 538 $txn->txn_abort;
515 } 539 }
516 540
517 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 541 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
518 } 542 }
519 543
520gotid: 544gotid:
521 $face->{id} = $id; 545 $face->{id} = $id;
522 $self->{map}->set_face ($facenum => $id); 546 $self->{map}->set_face ($facenum => $id);
… …
545sub set_texture { 569sub set_texture {
546 my ($self, $id, $data) = @_; 570 my ($self, $id, $data) = @_;
547 571
548 $self->{texture}[$id] ||= do { 572 $self->{texture}[$id] ||= do {
549 my $tex = 573 my $tex =
550 new_from_image CFClient::Texture 574 new_from_image CFPlus::Texture
551 $data, minify => 1, mipmap => 1; 575 $data, minify => 1, mipmap => 1;
552 576
553 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 577 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554 $self->{map_widget}->update; 578 $self->{map_widget}->update;
555 579
… …
598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 622 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
599 623
600 # try to create single paragraphs of multiple lines sent by the server 624 # try to create single paragraphs of multiple lines sent by the server
601 $text =~ s/(?<=\S)\n(?=\w)/ /g; 625 $text =~ s/(?<=\S)\n(?=\w)/ /g;
602 626
603 $text = CFClient::asxml $text; 627 $text = CFPlus::asxml $text;
604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 628 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 629 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
606 630
607 $self->{logview}->add_paragraph ($color[$color], $_) 631 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
608 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 632 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
609 $self->{logview}->scroll_to_bottom; 633 $self->{logview}->scroll_to_bottom;
610 634
611 $self->{statusbox}->add ($text, 635 $self->{statusbox}->add ($text,
612 group => $text, 636 group => $text,
613 fg => $color[$color], 637 fg => $color[$color],
614 timeout => $color >= 2 ? 60 : 10, 638 timeout => $color >= 2 ? 180 : 10,
615 tooltip_font => $::FONT_FIXED, 639 tooltip_font => $::FONT_FIXED,
616 ); 640 );
617} 641}
618 642
619sub drawextinfo { 643sub drawextinfo {
… …
623} 647}
624 648
625sub spell_add { 649sub spell_add {
626 my ($self, $spell) = @_; 650 my ($self, $spell) = @_;
627 651
628 # try to create single paragraphs of multiple lines sent by the server 652 # try to create single paragraphs out of the multiple lines sent by the server
629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 653 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
630 $spell->{message} =~ s/\n+$//; 654 $spell->{message} =~ s/\n+$//;
631 $spell->{message} ||= "Server did not provide a description for this spell."; 655 $spell->{message} ||= "Server did not provide a description for this spell.";
632 656
633 $::SPELL_PAGE->add_spell ($spell); 657 $::SPELL_PAGE->add_spell ($spell);
634 658
635 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); 659 $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}); 660 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
637} 661}
638 662
639sub spell_delete { 663sub spell_delete {
640 my ($self, $spell) = @_; 664 my ($self, $spell) = @_;
641 665
… …
643} 667}
644 668
645sub addme_success { 669sub addme_success {
646 my ($self) = @_; 670 my ($self) = @_;
647 671
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; 672 my %skill_help;
652 673
653 for my $head2 ($pom->head1->[3]->head2) { 674 for my $node (CFPlus::Pod::find skill_description => "*") {
654 $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content; 675 my (undef, @par) = CFPlus::Pod::section_of $node;
655 } 676 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
656
657 \%skill_help
658 }; 677 };
659 678
660 for my $skill (values %{$self->{skill_info}}) { 679 for my $skill (values %{$self->{skill_info}}) {
661 $self->{map_widget}->add_command ("ready_skill $skill", 680 $self->{map_widget}->add_command ("ready_skill $skill",
662 (CFClient::asxml "Ready the skill '$skill'\n\n") 681 (CFPlus::asxml "Ready the skill '$skill'\n\n")
663 . $skill_help->{$skill}); 682 . $skill_help{$skill});
664 $self->{map_widget}->add_command ("use_skill $skill", 683 $self->{map_widget}->add_command ("use_skill $skill",
665 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 684 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
666 . $skill_help->{$skill}); 685 . $skill_help{$skill});
667 } 686 }
668} 687}
669 688
670sub eof { 689sub eof {
671 my ($self) = @_; 690 my ($self) = @_;
… …
695 714
696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 715 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
697 716
698 $self->send ("requestinfo image_sums $face $face"); 717 $self->send ("requestinfo image_sums $face $face");
699 718
700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 719 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 720 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
702 } elsif (!exists $self->{num_faces}) { 721 } elsif (!exists $self->{num_faces}) {
703 $self->send ("requestinfo image_info"); 722 $self->send ("requestinfo image_info");
704 723
705 $self->{num_faces} = 0; 724 $self->{num_faces} = 0;
706 725
707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 726 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 727 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
709 } 728 }
710} 729}
711 730
712sub update_floorbox { 731sub update_floorbox {
713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 732 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
714 return unless $::CONN; 733 return unless $::CONN;
715 734
716 $::FLOORBOX->clear; 735 $::FLOORBOX->clear;
717 736
718 my $row; 737 my $row;
719 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 738 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
720 if ($row < 6) { 739 if ($row < 6) {
721 local $_->{face_widget}; # hack to force recreation of widget 740 local $_->{face_widget}; # hack to force recreation of widget
722 local $_->{desc_widget}; # hack to force recreation of widget 741 local $_->{desc_widget}; # hack to force recreation of widget
723 CFClient::Item::update_widgets $_; 742 CFPlus::Item::update_widgets $_;
724 743
725 $::FLOORBOX->add (0, $row, $_->{face_widget}); 744 $::FLOORBOX->add (0, $row, $_->{face_widget});
726 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 745 $::FLOORBOX->add (1, $row, $_->{desc_widget});
727 746
728 $row++; 747 $row++;
729 } else { 748 } else {
730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 749 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
731 text => "More...", 750 text => "More...",
732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 751 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
733 ); 752 );
734 last; 753 last;
735 } 754 }
736 } 755 }
737 if ($::CONN->{open_container}) { 756 if ($::CONN->{open_container}) {
738 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 757 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
739 text => "Close container", 758 text => "Close container",
740 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 759 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
741 ); 760 );
742 } 761 }
743 }); 762 });
… …
749 my ($conn, $tag, $name) = @_; 768 my ($conn, $tag, $name) = @_;
750 $conn->{open_container} = $tag; 769 $conn->{open_container} = $tag;
751 update_floorbox; 770 update_floorbox;
752 771
753 $::INV_RIGHT_HB->clear (); 772 $::INV_RIGHT_HB->clear ();
754 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 773 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
755 774
756 if ($tag != 0) { # Floor isn't closable, is it? 775 if ($tag != 0) { # Floor isn't closable, is it?
757 $::INV_RIGHT_HB->add (new CFClient::UI::Button 776 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
758 text => "Close container", 777 text => "Close container",
759 tooltip => "Close the currently open container (if one is open)", 778 tooltip => "Close the currently open container (if one is open)",
760 on_activate => sub { 779 on_activate => sub {
761 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 780 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
762 if $tag != 0; 781 if $tag != 0;
… …
770} 789}
771 790
772sub update_containers { 791sub update_containers {
773 my ($self) = @_; 792 my ($self) = @_;
774 793
775 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 794 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
776 my $todo = delete $self->{update_container} 795 my $todo = delete $self->{update_container}
777 or return; 796 or return;
778 797
779 for my $tag (keys %$todo) { 798 for my $tag (keys %$todo) {
780 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 799 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
817sub item_update { 836sub item_update {
818 my ($self, $item) = @_; 837 my ($self, $item) = @_;
819 838
820 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 839 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
821 840
822 CFClient::Item::update_widgets $item; 841 CFPlus::Item::update_widgets $item;
823 842
824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 843 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
825 set_opencont ($::CONN, 0, "Floor"); 844 set_opencont ($::CONN, 0, "Floor");
826 845
827 } elsif ($item->{flags} & F_OPEN) { 846 } elsif ($item->{flags} & F_OPEN) {
828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 847 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
829 848
830 } else { 849 } else {
831 $self->{update_container}{$item->{container}}++; 850 $self->{update_container}{$item->{container}}++;
832 $self->update_containers; 851 $self->update_containers;
833 } 852 }
… …
858 $::SERVER_INFO->set_markup ( 877 $::SERVER_INFO->set_markup (
859 "server <tt>$self->{host}:$self->{port}</tt>\n" 878 "server <tt>$self->{host}:$self->{port}</tt>\n"
860 . "protocol version <tt>$self->{version}</tt>\n" 879 . "protocol version <tt>$self->{version}</tt>\n"
861 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 880 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
862 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 881 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
882 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
863 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 883 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
864 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 884 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
865 . "map size $self->{mapw}×$self->{maph}\n" 885 . "map size $self->{mapw}×$self->{maph}\n"
866 ); 886 );
867} 887}
868 888
869sub logged_in { 889sub logged_in {
870 my ($self) = @_; 890 my ($self) = @_;
871 891
872 $self->send_ext_req (cfplus_support => "1", sub { 892 $self->send_ext_req (cfplus_support => version => 1, sub {
873 $self->{cfplus_ext} = $_[0]; 893 $self->{cfplus_ext} = $_[0]{version};
874 $self->update_server_info; 894 $self->update_server_info;
895
896 0
875 }); 897 });
876 898
877 $self->update_server_info; 899 $self->update_server_info;
878 900
879 $self->send_command ("output-sync $::CFG->{output_sync}"); 901 $self->send_command ("output-sync $::CFG->{output_sync}");
… …
883 905
884sub lookat { 906sub lookat {
885 my ($self, $x, $y) = @_; 907 my ($self, $x, $y) = @_;
886 908
887 if ($self->{cfplus_ext}) { 909 if ($self->{cfplus_ext}) {
888 $self->send_ext_req (lookat => "$x $y", sub { 910 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
889 my %res = split /\x00/, $_[0]; 911 my ($msg) = @_;
890 912
891 if (exists $res{npc_dialog}) { 913 if (exists $msg->{npc_dialog}) {
892 # start npc chat dialog 914 # start npc chat dialog
893 $self->{npc_dialog} = new CFClient::NPCDialog:: 915 $self->{npc_dialog} = new CFPlus::NPCDialog::
894 dx => $x, 916 dx => $x,
895 dy => $y, 917 dy => $y,
896 title => "$res{npc_dialog} (NPC)", 918 title => "$msg->{npc_dialog} (NPC)",
897 conn => $self, 919 conn => $self,
898 ; 920 ;
899 } 921 }
900 }); 922 });
901 } 923 }
… …
904} 926}
905 927
906sub destroy { 928sub destroy {
907 my ($self) = @_; 929 my ($self) = @_;
908 930
909 $self->{npc_dialog}->destroy 931 (delete $self->{npc_dialog})->destroy
910 if $self->{npc_dialog}; 932 if $self->{npc_dialog};
911 933
912 $self->SUPER::destroy; 934 $self->SUPER::destroy;
913} 935}
914 936
915package CFClient::NPCDialog; 937package CFPlus::NPCDialog;
916 938
917our @ISA = 'CFClient::UI::FancyFrame'; 939our @ISA = 'CFPlus::UI::Toplevel';
918 940
919sub new { 941sub new {
920 my $class = shift; 942 my $class = shift;
921 943
922 my $self = $class->SUPER::new ( 944 my $self = $class->SUPER::new (
… …
934 Scalar::Util::weaken (my $this = $self); 956 Scalar::Util::weaken (my $this = $self);
935 957
936 $self->connect (delete => sub { $this->destroy; 1 }); 958 $self->connect (delete => sub { $this->destroy; 1 });
937 959
938 # better use a pane... 960 # better use a pane...
939 $self->add (my $hbox = new CFClient::UI::HBox); 961 $self->add (my $hbox = new CFPlus::UI::HBox);
940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 962 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
941 963
942 $hbox->add (my $vbox = new CFClient::UI::VBox); 964 $hbox->add (my $vbox = new CFPlus::UI::VBox);
943 965
944 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 966 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
945 $vbox->add ($self->{entry} = new CFClient::UI::Entry 967 $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" 968 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 { 969 on_activate => sub {
952 my ($entry, $text) = @_; 970 my ($entry, $text) = @_;
953 971
954 return unless $text =~ /\S/; 972 return unless $text =~ /\S/;
955 973
… …
958 976
959 0 977 0
960 }, 978 },
961 ); 979 );
962 980
963 $vbox->add ($self->{options} = new CFClient::UI::VBox); 981 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
964 982
965 $self->{bye_button} = new CFClient::UI::Button 983 $self->{bye_button} = new CFPlus::UI::Button
966 text => "Bye (close)", 984 text => "Bye (close)",
967 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 985 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
968 on_activate => sub { $this->destroy; 1 }, 986 on_activate => sub { $this->destroy; 1 },
969 ; 987 ;
970 988
971 $self->update_options; 989 $self->update_options;
972 990
973 $self->{token} = $self->{conn}->ext_token; 991 $self->{id} = $self->{conn}->send_ext_req (
974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 992 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
975 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 993 sub { $this && $this->feed (@_) }
994 );
976 995
977 $self->{entry}->grab_focus; 996 $self->{entry}->grab_focus;
978 997
979 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 998 $self->{textview}->add_paragraph ({
999 fg => [1, 1, 0, 1],
1000 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1001 });
980 1002
981 $self->show; 1003 $self->show;
982 $self 1004 $self
983}; 1005};
984 1006
… …
989 1011
990 $self->{options}->clear; 1012 $self->{options}->clear;
991 $self->{options}->add ($self->{bye_button}); 1013 $self->{options}->add ($self->{bye_button});
992 1014
993 for my $kw (sort keys %{ $self->{kw} }) { 1015 for my $kw (sort keys %{ $self->{kw} }) {
994 $self->{options}->add (new CFClient::UI::Button 1016 $self->{options}->add (new CFPlus::UI::Button
995 text => $kw, 1017 text => $kw,
996 on_activate => sub { 1018 on_activate => sub {
997 $self->send ($kw); 1019 $self->send ($kw);
998 0 1020 0
999 }, 1021 },
1000 ); 1022 );
1001 } 1023 }
1002} 1024}
1003 1025
1004sub feed { 1026sub feed {
1005 my ($self, $data) = @_; 1027 my ($self, $msg) = @_;
1006 1028
1007 Scalar::Util::weaken $self; 1029 Scalar::Util::weaken $self;
1008 1030
1009 my ($type, $msg) = split / /, $data, 2; 1031 if ($msg->{msgtype} eq "reply") {
1032 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1033 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1010 1034
1011 if ($type eq "msg") { 1035 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} }; 1036 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1020 my @link; 1037 my @link;
1021 $msg =~ s{ 1038 $text =~ s{
1022 ($match) 1039 ($match)
1023 }{ 1040 }{
1024 my $kw = $1; 1041 my $kw = $1;
1025 1042
1026 push @link, new CFClient::UI::Label 1043 push @link, new CFPlus::UI::Label
1027 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1044 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1028 can_hover => 1, 1045 can_hover => 1,
1029 can_events => 1, 1046 can_events => 1,
1030 padding_x => 0, 1047 padding_x => 0,
1031 padding_y => 0, 1048 padding_y => 0,
1032 on_button_up => sub { 1049 on_button_up => sub {
1033 $self->send ($kw); 1050 $self->send ($kw);
1034 }; 1051 };
1035 1052
1036 chr 0xfffc 1053 "\x{fffc}"
1037 }giex; 1054 }giex;
1038 1055
1039 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1056 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1040 $self->{textview}->scroll_to_bottom; 1057 $self->{textview}->scroll_to_bottom;
1041 $self->update_options; 1058 $self->update_options;
1042 } else { 1059 } else {
1043 $self->destroy; 1060 $self->destroy;
1044 } 1061 }
… …
1047} 1064}
1048 1065
1049sub send { 1066sub send {
1050 my ($self, $msg) = @_; 1067 my ($self, $msg) = @_;
1051 1068
1052 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg); 1069 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1053 $self->{textview}->scroll_to_bottom; 1070 $self->{textview}->scroll_to_bottom;
1054 1071
1055 utf8::encode $msg; 1072 $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} 1073}
1058 1074
1059sub destroy { 1075sub destroy {
1060 my ($self) = @_; 1076 my ($self) = @_;
1061 1077
1062 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1078 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1063 1079
1080 if ($self->{conn}) {
1064 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1081 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1065 delete $self->{conn}{npc_dialog}; 1082 delete $self->{conn}{npc_dialog};
1066 $self->{conn}->disconnect_ext ($self->{token}); 1083 $self->{conn}->disconnect_ext ($self->{id});
1084 }
1067 1085
1068 $self->SUPER::destroy; 1086 $self->SUPER::destroy;
1069} 1087}
1070 1088
10711; 10891

Diff Legend

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