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

Diff Legend

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