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.93 by root, Fri Dec 22 03:43:05 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;
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_xml $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);
272
273 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
274
275 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the 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);
265 277
266 my ($x, $y) = (0, 1); 278 my ($x, $y) = (0, 1);
267 for ( 279 for (
268 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] }
269 map [$_, $self->{skill_info}{$_}], 281 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_}, 282 grep exists $stats->{$_},
271 @skills 283 @skills
272 ) { 284 ) {
273 my ($idx, $name) = @$_; 285 my ($idx, $name) = @$_;
274 286
287 my $spell_cb = sub {
288 my ($widget, $ev) = @_;
289
290 if ($ev->{button} == 1) {
291 $::CONN->user_send ("ready_skill $name");
292 } elsif ($ev->{button} == 2) {
293 $::CONN->user_send ("use_skill $name");
294 } elsif ($ev->{button} == 3) {
295 my $shortname = CFPlus::shorten $name, 14;
296 (new CFPlus::UI::Menu
297 items => [
298 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
299 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
300 ],
301 )->popup ($ev);
302 } else {
303 return 0;
304 }
305
306 1
307 };
308
275 $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
276 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 310 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 311 $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); 312 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); 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);
280 315
281 $x++ and ($x, $y) = (0, $y + 1); 316 $x++ and ($x, $y) = (0, $y + 1);
282 } 317 }
283 } 318 }
284 319
… …
286 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
287 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
288 } 323 }
289} 324}
290 325
326sub macro_send {
327 my ($self, $macro) = @_;
328
329 for my $cmd (@{ $macro->{action} }) {
330 $self->send_command ($cmd);
331 }
332}
333
291sub user_send { 334sub user_send {
292 my ($self, $command) = @_; 335 my ($self, $command) = @_;
293 336
337 $self->{record}->($command)
294 if ($self->{record}) { 338 if $self->{record};
295 push @{$self->{record}}, $command;
296 }
297 339
298 $self->logprint ("send: ", $command); 340 $self->logprint ("send: ", $command);
299 $self->send_command ($command); 341 $self->send_command ($command);
300 ::status ($command); 342 ::status ($command);
301} 343}
302 344
303sub start_record { 345sub record {
304 my ($self) = @_; 346 my ($self, $cb) = @_;
305 347
306 $self->{record} = []; 348 $self->{record} = $cb;
307}
308
309sub stop_record {
310 my ($self) = @_;
311 return delete $self->{record};
312} 349}
313 350
314sub map_scroll { 351sub map_scroll {
315 my ($self, $dx, $dy) = @_; 352 my ($self, $dx, $dy) = @_;
316 353
… …
318} 355}
319 356
320sub feed_map1a { 357sub feed_map1a {
321 my ($self, $data) = @_; 358 my ($self, $data) = @_;
322 359
323 $self->{map}->map1a_update ($data); 360 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
324 $self->{map_widget}->update; 361 $self->{map_widget}->update;
325} 362}
326 363
327sub magicmap { 364sub magicmap {
328 my ($self, $w, $h, $x, $y, $data) = @_; 365 my ($self, $w, $h, $x, $y, $data) = @_;
… …
498 535
499 unless ($id) { 536 unless ($id) {
500 # create new id for face 537 # create new id for face
501 # I love transactions 538 # I love transactions
502 for (1..100) { 539 for (1..100) {
503 my $txn = $CFClient::DB_ENV->txn_begin; 540 my $txn = $CFPlus::DB_ENV->txn_begin;
504 my $status = $self->{facemap}->db_get (id => $id); 541 my $status = $self->{facemap}->db_get (id => $id);
505 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 542 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
506 $id = ($id || 64) + 1; 543 $id = ($id || 64) + 1;
507 if ($self->{facemap}->put (id => $id) == 0 544 if ($self->{facemap}->put (id => $id) == 0
508 && $self->{facemap}->put ($hash => $id) == 0) { 545 && $self->{facemap}->put ($hash => $id) == 0) {
… …
512 } 549 }
513 } 550 }
514 $txn->txn_abort; 551 $txn->txn_abort;
515 } 552 }
516 553
517 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 554 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
518 } 555 }
519 556
520gotid: 557gotid:
521 $face->{id} = $id; 558 $face->{id} = $id;
522 $self->{map}->set_face ($facenum => $id); 559 $self->{map}->set_face ($facenum => $id);
… …
545sub set_texture { 582sub set_texture {
546 my ($self, $id, $data) = @_; 583 my ($self, $id, $data) = @_;
547 584
548 $self->{texture}[$id] ||= do { 585 $self->{texture}[$id] ||= do {
549 my $tex = 586 my $tex =
550 new_from_image CFClient::Texture 587 new_from_image CFPlus::Texture
551 $data, minify => 1, mipmap => 1; 588 $data, minify => 1, mipmap => 1;
552 589
553 $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}});
554 $self->{map_widget}->update; 591 $self->{map_widget}->update;
555 592
… …
591 [0.75, 0.61, 0.20], 628 [0.75, 0.61, 0.20],
592 [0.99, 0.77, 0.26], 629 [0.99, 0.77, 0.26],
593 [0.74, 0.65, 0.41], 630 [0.74, 0.65, 0.41],
594 ); 631 );
595 632
633 my $fg = $color[$color % @color];
634
596 $self->logprint ("info: ", $text); 635 $self->logprint ("info: ", $text);
597
598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
599 636
600 # 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
601 $text =~ s/(?<=\S)\n(?=\w)/ /g; 638 $text =~ s/(?<=\S)\n(?=\w)/ /g;
602 639
603 $text = CFClient::asxml $text; 640 $text = CFPlus::asxml $text;
604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 641 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 642 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
606 643
607 $self->{logview}->add_paragraph ($color[$color], $_) 644 ::message ({ fg => $fg, markup => $_ })
608 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 645 for split /\n/, $text;
609 $self->{logview}->scroll_to_bottom;
610 646
611 $self->{statusbox}->add ($text, 647 $self->{statusbox}->add ($text,
612 group => $text, 648 group => $text,
613 fg => $color[$color], 649 fg => $fg,
614 timeout => $color >= 2 ? 60 : 10, 650 timeout => $color >= 2 ? 180 : 10,
615 tooltip_font => $::FONT_FIXED, 651 tooltip_font => $::FONT_FIXED,
616 ); 652 );
617} 653}
618 654
619sub drawextinfo { 655sub drawextinfo {
… …
623} 659}
624 660
625sub spell_add { 661sub spell_add {
626 my ($self, $spell) = @_; 662 my ($self, $spell) = @_;
627 663
628 # try to create single paragraphs of multiple lines sent by the server 664 # try to create single paragraphs out of the multiple lines sent by the server
629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 665 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
630 $spell->{message} =~ s/\n+$//; 666 $spell->{message} =~ s/\n+$//;
631 $spell->{message} ||= "Server did not provide a description for this spell."; 667 $spell->{message} ||= "Server did not provide a description for this spell.";
632 668
633 $::SPELL_PAGE->add_spell ($spell); 669 $::SPELL_LIST->add_spell ($spell);
634 670
635 $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});
636 $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});
637} 673}
638 674
639sub spell_delete { 675sub spell_delete {
640 my ($self, $spell) = @_; 676 my ($self, $spell) = @_;
641 677
642 $::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});
643} 685}
644 686
645sub addme_success { 687sub addme_success {
646 my ($self) = @_; 688 my ($self) = @_;
647 689
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; 690 my %skill_help;
652 691
653 for my $head2 ($pom->head1->[3]->head2) { 692 for my $node (CFPlus::Pod::find skill_description => "*") {
654 $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content; 693 my (undef, @par) = CFPlus::Pod::section_of $node;
655 } 694 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
656
657 \%skill_help
658 }; 695 };
659 696
660 for my $skill (values %{$self->{skill_info}}) { 697 for my $skill (values %{$self->{skill_info}}) {
661 $self->{map_widget}->add_command ("ready_skill $skill", 698 $self->{map_widget}->add_command ("ready_skill $skill",
662 (CFClient::asxml "Ready the skill '$skill'\n\n") 699 (CFPlus::asxml "Ready the skill '$skill'\n\n")
663 . $skill_help->{$skill}); 700 . $skill_help{$skill});
664 $self->{map_widget}->add_command ("use_skill $skill", 701 $self->{map_widget}->add_command ("use_skill $skill",
665 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 702 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
666 . $skill_help->{$skill}); 703 . $skill_help{$skill});
667 } 704 }
668} 705}
669 706
670sub eof { 707sub eof {
671 my ($self) = @_; 708 my ($self) = @_;
… …
695 732
696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 733 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
697 734
698 $self->send ("requestinfo image_sums $face $face"); 735 $self->send ("requestinfo image_sums $face $face");
699 736
700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 737 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 738 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
702 } elsif (!exists $self->{num_faces}) { 739 } elsif (!exists $self->{num_faces}) {
703 $self->send ("requestinfo image_info"); 740 $self->send ("requestinfo image_info");
704 741
705 $self->{num_faces} = 0; 742 $self->{num_faces} = 0;
706 743
707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 744 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 745 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
709 } 746 }
710} 747}
711 748
712sub update_floorbox { 749sub update_floorbox {
713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 750 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
714 return unless $::CONN; 751 return unless $::CONN;
715 752
716 $::FLOORBOX->clear; 753 $::FLOORBOX->clear;
717 754
718 my $row; 755 my $row;
719 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} }) {
720 if ($row < 6) { 757 if ($row < 6) {
721 local $_->{face_widget}; # hack to force recreation of widget 758 local $_->{face_widget}; # hack to force recreation of widget
722 local $_->{desc_widget}; # hack to force recreation of widget 759 local $_->{desc_widget}; # hack to force recreation of widget
723 CFClient::Item::update_widgets $_; 760 CFPlus::Item::update_widgets $_;
724 761
725 $::FLOORBOX->add (0, $row, $_->{face_widget}); 762 $::FLOORBOX->add (0, $row, $_->{face_widget});
726 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 763 $::FLOORBOX->add (1, $row, $_->{desc_widget});
727 764
728 $row++; 765 $row++;
729 } else { 766 } else {
730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 767 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
731 text => "More...", 768 text => "More...",
732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 769 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
733 ); 770 );
734 last; 771 last;
735 } 772 }
736 } 773 }
737 if ($::CONN->{open_container}) { 774 if ($::CONN->{open_container}) {
738 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 775 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
739 text => "Close container", 776 text => "Close container",
740 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 777 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
741 ); 778 );
742 } 779 }
743 }); 780 });
… …
749 my ($conn, $tag, $name) = @_; 786 my ($conn, $tag, $name) = @_;
750 $conn->{open_container} = $tag; 787 $conn->{open_container} = $tag;
751 update_floorbox; 788 update_floorbox;
752 789
753 $::INV_RIGHT_HB->clear (); 790 $::INV_RIGHT_HB->clear ();
754 $::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);
755 792
756 if ($tag != 0) { # Floor isn't closable, is it? 793 if ($tag != 0) { # Floor isn't closable, is it?
757 $::INV_RIGHT_HB->add (new CFClient::UI::Button 794 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
758 text => "Close container", 795 text => "Close container",
759 tooltip => "Close the currently open container (if one is open)", 796 tooltip => "Close the currently open container (if one is open)",
760 on_activate => sub { 797 on_activate => sub {
761 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 798 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
762 if $tag != 0; 799 if $tag != 0;
… …
770} 807}
771 808
772sub update_containers { 809sub update_containers {
773 my ($self) = @_; 810 my ($self) = @_;
774 811
775 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 812 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
776 my $todo = delete $self->{update_container} 813 my $todo = delete $self->{update_container}
777 or return; 814 or return;
778 815
779 for my $tag (keys %$todo) { 816 for my $tag (keys %$todo) {
780 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 817 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
817sub item_update { 854sub item_update {
818 my ($self, $item) = @_; 855 my ($self, $item) = @_;
819 856
820 #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";
821 858
822 CFClient::Item::update_widgets $item; 859 CFPlus::Item::update_widgets $item;
823 860
824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 861 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
825 set_opencont ($::CONN, 0, "Floor"); 862 set_opencont ($::CONN, 0, "Floor");
826 863
827 } elsif ($item->{flags} & F_OPEN) { 864 } elsif ($item->{flags} & F_OPEN) {
828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 865 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
829 866
830 } else { 867 } else {
831 $self->{update_container}{$item->{container}}++; 868 $self->{update_container}{$item->{container}}++;
832 $self->update_containers; 869 $self->update_containers;
833 } 870 }
… …
858 $::SERVER_INFO->set_markup ( 895 $::SERVER_INFO->set_markup (
859 "server <tt>$self->{host}:$self->{port}</tt>\n" 896 "server <tt>$self->{host}:$self->{port}</tt>\n"
860 . "protocol version <tt>$self->{version}</tt>\n" 897 . "protocol version <tt>$self->{version}</tt>\n"
861 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 898 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
862 . "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"
863 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 902 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
864 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 903 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
865 . "map size $self->{mapw}×$self->{maph}\n" 904 . "map size $self->{mapw}×$self->{maph}\n"
866 ); 905 );
906
907 ::setup_build_button ($self->{editor_support}->{builder_ui});
867} 908}
868 909
869sub logged_in { 910sub logged_in {
870 my ($self) = @_; 911 my ($self) = @_;
871 912
872 $self->send_ext_req (cfplus_support => "1", sub { 913 $self->send_ext_req (cfplus_support => version => 1, sub {
873 $self->{cfplus_ext} = $_[0]; 914 $self->{cfplus_ext} = $_[0]{version};
874 $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
875 }); 927 });
876 928
877 $self->update_server_info; 929 $self->update_server_info;
878 930
879 $self->send_command ("output-sync $::CFG->{output_sync}"); 931 $self->send_command ("output-sync $::CFG->{output_sync}");
880 $self->send_command ("output-count $::CFG->{output_count}"); 932 $self->send_command ("output-count $::CFG->{output_count}");
881 $self->send_command ("pickup $::CFG->{pickup}"); 933 $self->send_command ("pickup $::CFG->{pickup}");
882} 934}
883 935
936sub buildat {
937 my ($self, $builditem, $x, $y) = @_;
938
939 if ($self->{cfplus_ext}) {
940 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
941 }
942}
943
884sub lookat { 944sub lookat {
885 my ($self, $x, $y) = @_; 945 my ($self, $x, $y) = @_;
886 946
887 if ($self->{cfplus_ext}) { 947 if ($self->{cfplus_ext}) {
888 $self->send_ext_req (lookat => "$x $y", sub { 948 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
889 my %res = split /\x00/, $_[0]; 949 my ($msg) = @_;
890 950
891 if (exists $res{npc_dialog}) { 951 if (exists $msg->{npc_dialog}) {
892 # start npc chat dialog 952 # start npc chat dialog
893 $self->{npc_dialog} = new CFClient::NPCDialog:: 953 $self->{npc_dialog} = new CFPlus::NPCDialog::
894 dx => $x, 954 dx => $x,
895 dy => $y, 955 dy => $y,
896 title => "$res{npc_dialog} (NPC)", 956 title => "$msg->{npc_dialog} (NPC)",
897 conn => $self, 957 conn => $self,
898 ; 958 ;
899 } 959 }
900 }); 960 });
901 } 961 }
… …
904} 964}
905 965
906sub destroy { 966sub destroy {
907 my ($self) = @_; 967 my ($self) = @_;
908 968
909 $self->{npc_dialog}->destroy 969 (delete $self->{npc_dialog})->destroy
910 if $self->{npc_dialog}; 970 if $self->{npc_dialog};
911 971
912 $self->SUPER::destroy; 972 $self->SUPER::destroy;
913} 973}
914 974
915package CFClient::NPCDialog; 975package CFPlus::NPCDialog;
916 976
917our @ISA = 'CFClient::UI::FancyFrame'; 977our @ISA = 'CFPlus::UI::Toplevel';
918 978
919sub new { 979sub new {
920 my $class = shift; 980 my $class = shift;
921 981
922 my $self = $class->SUPER::new ( 982 my $self = $class->SUPER::new (
… …
929 kw => { hi => 0, yes => 0, no => 0 }, 989 kw => { hi => 0, yes => 0, no => 0 },
930 has_close_button => 1, 990 has_close_button => 1,
931 @_, 991 @_,
932 ); 992 );
933 993
934 Scalar::Util::weaken (my $this = $self); 994 CFPlus::weaken (my $this = $self);
935 995
936 $self->connect (delete => sub { $this->destroy; 1 }); 996 $self->connect (delete => sub { $this->destroy; 1 });
937 997
938 # better use a pane... 998 # better use a pane...
939 $self->add (my $hbox = new CFClient::UI::HBox); 999 $self->add (my $hbox = new CFPlus::UI::HBox);
940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1000 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
941 1001
942 $hbox->add (my $vbox = new CFClient::UI::VBox); 1002 $hbox->add (my $vbox = new CFPlus::UI::VBox);
943 1003
944 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1004 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
945 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1005 $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" 1006 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 { 1007 on_activate => sub {
952 my ($entry, $text) = @_; 1008 my ($entry, $text) = @_;
953 1009
954 return unless $text =~ /\S/; 1010 return unless $text =~ /\S/;
955 1011
… …
958 1014
959 0 1015 0
960 }, 1016 },
961 ); 1017 );
962 1018
963 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1019 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
964 1020
965 $self->{bye_button} = new CFClient::UI::Button 1021 $self->{bye_button} = new CFPlus::UI::Button
966 text => "Bye (close)", 1022 text => "Bye (close)",
967 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1023 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
968 on_activate => sub { $this->destroy; 1 }, 1024 on_activate => sub { $this->destroy; 1 },
969 ; 1025 ;
970 1026
971 $self->update_options; 1027 $self->update_options;
972 1028
973 $self->{token} = $self->{conn}->ext_token; 1029 $self->{id} = $self->{conn}->send_ext_req (
974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1030 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
975 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1031 sub { $this && $this->feed (@_) }
1032 );
976 1033
977 $self->{entry}->grab_focus; 1034 $self->{entry}->grab_focus;
978 1035
979 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1036 $self->{textview}->add_paragraph ({
1037 fg => [1, 1, 0, 1],
1038 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1039 });
980 1040
981 $self->show; 1041 $self->show;
982 $self 1042 $self
983}; 1043};
984 1044
985sub update_options { 1045sub update_options {
986 my ($self) = @_; 1046 my ($self) = @_;
987 1047
988 Scalar::Util::weaken $self; 1048 CFPlus::weaken $self;
989 1049
990 $self->{options}->clear; 1050 $self->{options}->clear;
991 $self->{options}->add ($self->{bye_button}); 1051 $self->{options}->add ($self->{bye_button});
992 1052
993 for my $kw (sort keys %{ $self->{kw} }) { 1053 for my $kw (sort keys %{ $self->{kw} }) {
994 $self->{options}->add (new CFClient::UI::Button 1054 $self->{options}->add (new CFPlus::UI::Button
995 text => $kw, 1055 text => $kw,
996 on_activate => sub { 1056 on_activate => sub {
997 $self->send ($kw); 1057 $self->send ($kw);
998 0 1058 0
999 }, 1059 },
1000 ); 1060 );
1001 } 1061 }
1002} 1062}
1003 1063
1004sub feed { 1064sub feed {
1005 my ($self, $data) = @_; 1065 my ($self, $msg) = @_;
1006 1066
1007 Scalar::Util::weaken $self; 1067 CFPlus::weaken $self;
1008 1068
1009 my ($type, $msg) = split / /, $data, 2; 1069 if ($msg->{msgtype} eq "reply") {
1070 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1071 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1010 1072
1011 if ($type eq "msg") { 1073 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} }; 1074 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1020 my @link; 1075 my @link;
1021 $msg =~ s{ 1076 $text =~ s{
1022 ($match) 1077 ($match)
1023 }{ 1078 }{
1024 my $kw = $1; 1079 my $kw = $1;
1025 1080
1026 push @link, new CFClient::UI::Label 1081 push @link, new CFPlus::UI::Label
1027 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1082 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1028 can_hover => 1, 1083 can_hover => 1,
1029 can_events => 1, 1084 can_events => 1,
1030 padding_x => 0, 1085 padding_x => 0,
1031 padding_y => 0, 1086 padding_y => 0,
1032 on_button_up => sub { 1087 on_button_up => sub {
1033 $self->send ($kw); 1088 $self->send ($kw);
1034 }; 1089 };
1035 1090
1036 chr 0xfffc 1091 "\x{fffc}"
1037 }giex; 1092 }giex;
1038 1093
1039 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1094 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1040 $self->{textview}->scroll_to_bottom; 1095 $self->{textview}->scroll_to_bottom;
1041 $self->update_options; 1096 $self->update_options;
1042 } else { 1097 } else {
1043 $self->destroy; 1098 $self->destroy;
1044 } 1099 }
… …
1047} 1102}
1048 1103
1049sub send { 1104sub send {
1050 my ($self, $msg) = @_; 1105 my ($self, $msg) = @_;
1051 1106
1052 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg); 1107 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1053 $self->{textview}->scroll_to_bottom; 1108 $self->{textview}->scroll_to_bottom;
1054 1109
1055 utf8::encode $msg; 1110 $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} 1111}
1058 1112
1059sub destroy { 1113sub destroy {
1060 my ($self) = @_; 1114 my ($self) = @_;
1061 1115
1062 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1116 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1063 1117
1118 if ($self->{conn}) {
1064 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1119 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1065 delete $self->{conn}{npc_dialog}; 1120 delete $self->{conn}{npc_dialog};
1066 $self->{conn}->disconnect_ext ($self->{token}); 1121 $self->{conn}->disconnect_ext ($self->{id});
1122 }
1067 1123
1068 $self->SUPER::destroy; 1124 $self->SUPER::destroy;
1069} 1125}
1070 1126
10711; 11271
1128

Diff Legend

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