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

Diff Legend

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