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

Diff Legend

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