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

Diff Legend

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