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

Diff Legend

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