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

Diff Legend

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