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

Diff Legend

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