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

Diff Legend

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