1 | package CFClient::Protocol; |
1 | package CFPlus::Protocol; |
2 | |
2 | |
3 | use utf8; |
3 | use utf8; |
4 | use strict; |
4 | use strict; |
5 | |
5 | |
6 | use Crossfire::Protocol::Constants; |
6 | use Crossfire::Protocol::Constants; |
7 | |
7 | |
8 | use CFClient; |
8 | use CFPlus; |
9 | use CFClient::UI; |
9 | use CFPlus::UI; |
10 | use CFClient::Pod; |
10 | use CFPlus::Pod; |
11 | |
11 | |
12 | use base 'Crossfire::Protocol::Base'; |
12 | use base 'Crossfire::Protocol::Base'; |
13 | |
13 | |
14 | sub new { |
14 | sub new { |
15 | my $class = shift; |
15 | my $class = shift; |
16 | |
16 | |
17 | my $self = $class->SUPER::new (@_); |
17 | my $self = $class->SUPER::new (@_); |
18 | |
18 | |
19 | $self->{map_widget}->clr_commands; |
19 | $self->{map_widget}->clr_commands; |
20 | |
20 | |
21 | my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { |
21 | 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 |
22 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
28 | or next; |
23 | or die "unparseable command help: $_->{kw}[0]"; |
29 | |
24 | |
30 | my $cmd = $1; |
25 | my $cmd = $1; |
31 | my @args = split /\|/, $2; |
26 | my @args = split /\|/, $2; |
32 | @args = (".*") unless @args; |
27 | @args = (".*") unless @args; |
33 | |
28 | |
|
|
29 | my (undef, @par) = CFPlus::Pod::section_of $_; |
|
|
30 | my $text = CFPlus::Pod::as_label @par; |
|
|
31 | |
34 | $_ = $_ eq ".*" ? "" : " $_" |
32 | $_ = $_ eq ".*" ? "" : " $_" |
35 | for @args; |
33 | for @args; |
36 | |
34 | |
37 | my $text = CFClient::Pod::as_xml $head2->content; |
35 | map ["$cmd$_", $text], |
38 | |
|
|
39 | push @cmd_help, ["$cmd$_", $text] |
|
|
40 | for sort { (length $a) <=> (length $b) } |
36 | sort { (length $a) <=> (length $b) } |
41 | @args; |
37 | @args |
42 | } |
38 | } sort { $a->{par} <=> $b->{par} } |
|
|
39 | CFPlus::Pod::find command => "*"; |
43 | |
40 | |
44 | \@cmd_help |
|
|
45 | }; |
|
|
46 | |
|
|
47 | $self->{map_widget}->add_command (@$_) |
41 | $self->{map_widget}->add_command (@$_) |
48 | for @$cmd_help; |
42 | for @cmd_help; |
49 | |
43 | |
50 | $self->{noface} = new_from_file CFClient::Texture |
44 | $self->{noface} = new_from_file CFPlus::Texture |
51 | CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; |
45 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
52 | |
46 | |
53 | $self->{open_container} = 0; |
47 | $self->{open_container} = 0; |
54 | |
48 | |
55 | # "global" |
49 | # "global" |
56 | $self->{tilecache} = CFClient::db_table "tilecache"; |
50 | $self->{tilecache} = CFPlus::db_table "tilecache"; |
57 | $self->{facemap} = CFClient::db_table "facemap"; |
51 | $self->{facemap} = CFPlus::db_table "facemap"; |
58 | |
52 | |
59 | # per server |
53 | # per server |
60 | $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; |
54 | $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; |
61 | |
55 | |
62 | $self |
56 | $self |
63 | } |
57 | } |
64 | |
58 | |
65 | sub logprint { |
59 | sub logprint { |
66 | my ($self, @a) = @_; |
60 | my ($self, @a) = @_; |
67 | |
61 | |
|
|
62 | return; |
68 | $self->{log_fh} ||= do { |
63 | $self->{log_fh} ||= do { |
69 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
64 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
70 | |
65 | |
71 | open my $fh, ">>:utf8", $path |
66 | open my $fh, ">>:utf8", $path |
72 | or die "Couldn't open logfile $path: $!"; |
67 | or die "Couldn't open logfile $path: $!"; |
… | |
… | |
254 | my @skills = keys %{ $self->{skill_info} }; |
249 | my @skills = keys %{ $self->{skill_info} }; |
255 | |
250 | |
256 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
251 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
257 | $sktbl->clear; |
252 | $sktbl->clear; |
258 | |
253 | |
259 | $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); |
254 | $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); |
255 | $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); |
256 | $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); |
257 | $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); |
258 | $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); |
259 | $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
|
|
260 | |
|
|
261 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
|
|
262 | |
|
|
263 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
|
|
264 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
265 | |
265 | |
266 | my ($x, $y) = (0, 1); |
266 | my ($x, $y) = (0, 1); |
267 | for ( |
267 | for ( |
268 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
268 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
269 | map [$_, $self->{skill_info}{$_}], |
269 | map [$_, $self->{skill_info}{$_}], |
270 | grep exists $stats->{$_}, |
270 | grep exists $stats->{$_}, |
271 | @skills |
271 | @skills |
272 | ) { |
272 | ) { |
273 | my ($idx, $name) = @$_; |
273 | my ($idx, $name) = @$_; |
274 | |
274 | |
|
|
275 | my $spell_cb = sub { |
|
|
276 | my ($widget, $ev) = @_; |
|
|
277 | |
|
|
278 | if ($ev->{button} == 1) { |
|
|
279 | $::CONN->user_send ("ready_skill $name"); |
|
|
280 | } elsif ($ev->{button} == 2) { |
|
|
281 | $::CONN->user_send ("use_skill $name"); |
|
|
282 | } elsif ($ev->{button} == 3) { |
|
|
283 | (new CFPlus::UI::Menu |
|
|
284 | items => [ |
|
|
285 | ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], |
|
|
286 | ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], |
|
|
287 | ], |
|
|
288 | )->popup ($ev); |
|
|
289 | } else { |
|
|
290 | return 0; |
|
|
291 | } |
|
|
292 | |
|
|
293 | 1 |
|
|
294 | }; |
|
|
295 | |
275 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label |
296 | $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]); |
297 | 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 |
298 | $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); |
299 | 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); |
300 | $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
301 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); |
280 | |
302 | |
281 | $x++ and ($x, $y) = (0, $y + 1); |
303 | $x++ and ($x, $y) = (0, $y + 1); |
282 | } |
304 | } |
283 | } |
305 | } |
284 | |
306 | |
… | |
… | |
498 | |
520 | |
499 | unless ($id) { |
521 | unless ($id) { |
500 | # create new id for face |
522 | # create new id for face |
501 | # I love transactions |
523 | # I love transactions |
502 | for (1..100) { |
524 | for (1..100) { |
503 | my $txn = $CFClient::DB_ENV->txn_begin; |
525 | my $txn = $CFPlus::DB_ENV->txn_begin; |
504 | my $status = $self->{facemap}->db_get (id => $id); |
526 | my $status = $self->{facemap}->db_get (id => $id); |
505 | if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { |
527 | if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { |
506 | $id = ($id || 64) + 1; |
528 | $id = ($id || 64) + 1; |
507 | if ($self->{facemap}->put (id => $id) == 0 |
529 | if ($self->{facemap}->put (id => $id) == 0 |
508 | && $self->{facemap}->put ($hash => $id) == 0) { |
530 | && $self->{facemap}->put ($hash => $id) == 0) { |
… | |
… | |
512 | } |
534 | } |
513 | } |
535 | } |
514 | $txn->txn_abort; |
536 | $txn->txn_abort; |
515 | } |
537 | } |
516 | |
538 | |
517 | CFClient::fatal "maximum number of transaction retries reached - database problems?"; |
539 | CFPlus::fatal "maximum number of transaction retries reached - database problems?"; |
518 | } |
540 | } |
519 | |
541 | |
520 | gotid: |
542 | gotid: |
521 | $face->{id} = $id; |
543 | $face->{id} = $id; |
522 | $self->{map}->set_face ($facenum => $id); |
544 | $self->{map}->set_face ($facenum => $id); |
… | |
… | |
545 | sub set_texture { |
567 | sub set_texture { |
546 | my ($self, $id, $data) = @_; |
568 | my ($self, $id, $data) = @_; |
547 | |
569 | |
548 | $self->{texture}[$id] ||= do { |
570 | $self->{texture}[$id] ||= do { |
549 | my $tex = |
571 | my $tex = |
550 | new_from_image CFClient::Texture |
572 | new_from_image CFPlus::Texture |
551 | $data, minify => 1, mipmap => 1; |
573 | $data, minify => 1, mipmap => 1; |
552 | |
574 | |
553 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
575 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
554 | $self->{map_widget}->update; |
576 | $self->{map_widget}->update; |
555 | |
577 | |
… | |
… | |
598 | my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; |
620 | my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; |
599 | |
621 | |
600 | # try to create single paragraphs of multiple lines sent by the server |
622 | # try to create single paragraphs of multiple lines sent by the server |
601 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
623 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
602 | |
624 | |
603 | $text = CFClient::asxml $text; |
625 | $text = CFPlus::asxml $text; |
604 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
626 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
605 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
627 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
606 | |
628 | |
607 | $self->{logview}->add_paragraph ($color[$color], $_) |
629 | $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) |
608 | for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; |
630 | for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; |
609 | $self->{logview}->scroll_to_bottom; |
631 | $self->{logview}->scroll_to_bottom; |
610 | |
632 | |
611 | $self->{statusbox}->add ($text, |
633 | $self->{statusbox}->add ($text, |
612 | group => $text, |
634 | group => $text, |
613 | fg => $color[$color], |
635 | fg => $color[$color], |
614 | timeout => $color >= 2 ? 60 : 10, |
636 | timeout => $color >= 2 ? 180 : 10, |
615 | tooltip_font => $::FONT_FIXED, |
637 | tooltip_font => $::FONT_FIXED, |
616 | ); |
638 | ); |
617 | } |
639 | } |
618 | |
640 | |
619 | sub drawextinfo { |
641 | sub drawextinfo { |
… | |
… | |
623 | } |
645 | } |
624 | |
646 | |
625 | sub spell_add { |
647 | sub spell_add { |
626 | my ($self, $spell) = @_; |
648 | my ($self, $spell) = @_; |
627 | |
649 | |
628 | # try to create single paragraphs of multiple lines sent by the server |
650 | # try to create single paragraphs out of the multiple lines sent by the server |
629 | $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; |
651 | $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; |
630 | $spell->{message} =~ s/\n+$//; |
652 | $spell->{message} =~ s/\n+$//; |
631 | $spell->{message} ||= "Server did not provide a description for this spell."; |
653 | $spell->{message} ||= "Server did not provide a description for this spell."; |
632 | |
654 | |
633 | $::SPELL_PAGE->add_spell ($spell); |
655 | $::SPELL_PAGE->add_spell ($spell); |
634 | |
656 | |
635 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); |
657 | $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}); |
658 | $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); |
637 | } |
659 | } |
638 | |
660 | |
639 | sub spell_delete { |
661 | sub spell_delete { |
640 | my ($self, $spell) = @_; |
662 | my ($self, $spell) = @_; |
641 | |
663 | |
… | |
… | |
643 | } |
665 | } |
644 | |
666 | |
645 | sub addme_success { |
667 | sub addme_success { |
646 | my ($self) = @_; |
668 | my ($self) = @_; |
647 | |
669 | |
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; |
670 | my %skill_help; |
652 | |
671 | |
653 | for my $head2 ($pom->head1->[3]->head2) { |
672 | for my $node (CFPlus::Pod::find skill_description => "*") { |
654 | $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content; |
673 | my (undef, @par) = CFPlus::Pod::section_of $node; |
655 | } |
674 | $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; |
656 | |
|
|
657 | \%skill_help |
|
|
658 | }; |
675 | }; |
659 | |
676 | |
660 | for my $skill (values %{$self->{skill_info}}) { |
677 | for my $skill (values %{$self->{skill_info}}) { |
661 | $self->{map_widget}->add_command ("ready_skill $skill", |
678 | $self->{map_widget}->add_command ("ready_skill $skill", |
662 | (CFClient::asxml "Ready the skill '$skill'\n\n") |
679 | (CFPlus::asxml "Ready the skill '$skill'\n\n") |
663 | . $skill_help->{$skill}); |
680 | . $skill_help{$skill}); |
664 | $self->{map_widget}->add_command ("use_skill $skill", |
681 | $self->{map_widget}->add_command ("use_skill $skill", |
665 | (CFClient::asxml "Immediately use the skill '$skill'\n\n") |
682 | (CFPlus::asxml "Immediately use the skill '$skill'\n\n") |
666 | . $skill_help->{$skill}); |
683 | . $skill_help{$skill}); |
667 | } |
684 | } |
668 | } |
685 | } |
669 | |
686 | |
670 | sub eof { |
687 | sub eof { |
671 | my ($self) = @_; |
688 | my ($self) = @_; |
… | |
… | |
695 | |
712 | |
696 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
713 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
697 | |
714 | |
698 | $self->send ("requestinfo image_sums $face $face"); |
715 | $self->send ("requestinfo image_sums $face $face"); |
699 | |
716 | |
700 | $self->{statusbox}->add (CFClient::asxml "prefetching $todo", |
717 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
701 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
718 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
702 | } elsif (!exists $self->{num_faces}) { |
719 | } elsif (!exists $self->{num_faces}) { |
703 | $self->send ("requestinfo image_info"); |
720 | $self->send ("requestinfo image_info"); |
704 | |
721 | |
705 | $self->{num_faces} = 0; |
722 | $self->{num_faces} = 0; |
706 | |
723 | |
707 | $self->{statusbox}->add (CFClient::asxml "starting to prefetch", |
724 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
708 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
725 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
709 | } |
726 | } |
710 | } |
727 | } |
711 | |
728 | |
712 | sub update_floorbox { |
729 | sub update_floorbox { |
713 | $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
730 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
714 | return unless $::CONN; |
731 | return unless $::CONN; |
715 | |
732 | |
716 | $::FLOORBOX->clear; |
733 | $::FLOORBOX->clear; |
717 | |
734 | |
718 | my $row; |
735 | my $row; |
719 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
736 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
720 | if ($row < 6) { |
737 | if ($row < 6) { |
721 | local $_->{face_widget}; # hack to force recreation of widget |
738 | local $_->{face_widget}; # hack to force recreation of widget |
722 | local $_->{desc_widget}; # hack to force recreation of widget |
739 | local $_->{desc_widget}; # hack to force recreation of widget |
723 | CFClient::Item::update_widgets $_; |
740 | CFPlus::Item::update_widgets $_; |
724 | |
741 | |
725 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
742 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
726 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
743 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
727 | |
744 | |
728 | $row++; |
745 | $row++; |
729 | } else { |
746 | } else { |
730 | $::FLOORBOX->add (1, $row, new CFClient::UI::Button |
747 | $::FLOORBOX->add (1, $row, new CFPlus::UI::Button |
731 | text => "More...", |
748 | text => "More...", |
732 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
749 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
733 | ); |
750 | ); |
734 | last; |
751 | last; |
735 | } |
752 | } |
736 | } |
753 | } |
737 | if ($::CONN->{open_container}) { |
754 | if ($::CONN->{open_container}) { |
738 | $::FLOORBOX->add (1, $row++, new CFClient::UI::Button |
755 | $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button |
739 | text => "Close container", |
756 | text => "Close container", |
740 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
757 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
741 | ); |
758 | ); |
742 | } |
759 | } |
743 | }); |
760 | }); |
… | |
… | |
749 | my ($conn, $tag, $name) = @_; |
766 | my ($conn, $tag, $name) = @_; |
750 | $conn->{open_container} = $tag; |
767 | $conn->{open_container} = $tag; |
751 | update_floorbox; |
768 | update_floorbox; |
752 | |
769 | |
753 | $::INV_RIGHT_HB->clear (); |
770 | $::INV_RIGHT_HB->clear (); |
754 | $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); |
771 | $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
755 | |
772 | |
756 | if ($tag != 0) { # Floor isn't closable, is it? |
773 | if ($tag != 0) { # Floor isn't closable, is it? |
757 | $::INV_RIGHT_HB->add (new CFClient::UI::Button |
774 | $::INV_RIGHT_HB->add (new CFPlus::UI::Button |
758 | text => "Close container", |
775 | text => "Close container", |
759 | tooltip => "Close the currently open container (if one is open)", |
776 | tooltip => "Close the currently open container (if one is open)", |
760 | on_activate => sub { |
777 | on_activate => sub { |
761 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
778 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
762 | if $tag != 0; |
779 | if $tag != 0; |
… | |
… | |
770 | } |
787 | } |
771 | |
788 | |
772 | sub update_containers { |
789 | sub update_containers { |
773 | my ($self) = @_; |
790 | my ($self) = @_; |
774 | |
791 | |
775 | $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
792 | $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
776 | my $todo = delete $self->{update_container} |
793 | my $todo = delete $self->{update_container} |
777 | or return; |
794 | or return; |
778 | |
795 | |
779 | for my $tag (keys %$todo) { |
796 | for my $tag (keys %$todo) { |
780 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
797 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
… | |
… | |
817 | sub item_update { |
834 | sub item_update { |
818 | my ($self, $item) = @_; |
835 | my ($self, $item) = @_; |
819 | |
836 | |
820 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
837 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
821 | |
838 | |
822 | CFClient::Item::update_widgets $item; |
839 | CFPlus::Item::update_widgets $item; |
823 | |
840 | |
824 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
841 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
825 | set_opencont ($::CONN, 0, "Floor"); |
842 | set_opencont ($::CONN, 0, "Floor"); |
826 | |
843 | |
827 | } elsif ($item->{flags} & F_OPEN) { |
844 | } elsif ($item->{flags} & F_OPEN) { |
828 | set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); |
845 | set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); |
829 | |
846 | |
830 | } else { |
847 | } else { |
831 | $self->{update_container}{$item->{container}}++; |
848 | $self->{update_container}{$item->{container}}++; |
832 | $self->update_containers; |
849 | $self->update_containers; |
833 | } |
850 | } |
… | |
… | |
867 | } |
884 | } |
868 | |
885 | |
869 | sub logged_in { |
886 | sub logged_in { |
870 | my ($self) = @_; |
887 | my ($self) = @_; |
871 | |
888 | |
872 | $self->send_ext_req (cfplus_support => "1", sub { |
889 | $self->send_ext_req (cfplus_support => version => 1, sub { |
873 | $self->{cfplus_ext} = $_[0]; |
890 | $self->{cfplus_ext} = $_[0]{version}; |
874 | $self->update_server_info; |
891 | $self->update_server_info; |
|
|
892 | |
|
|
893 | 0 |
875 | }); |
894 | }); |
876 | |
895 | |
877 | $self->update_server_info; |
896 | $self->update_server_info; |
878 | |
897 | |
879 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
898 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
… | |
… | |
883 | |
902 | |
884 | sub lookat { |
903 | sub lookat { |
885 | my ($self, $x, $y) = @_; |
904 | my ($self, $x, $y) = @_; |
886 | |
905 | |
887 | if ($self->{cfplus_ext}) { |
906 | if ($self->{cfplus_ext}) { |
888 | $self->send_ext_req (lookat => "$x $y", sub { |
907 | $self->send_ext_req (lookat => dx => $x, dy => $y, sub { |
889 | my %res = split /\x00/, $_[0]; |
908 | my ($msg) = @_; |
890 | |
909 | |
891 | if (exists $res{npc_dialog}) { |
910 | if (exists $msg->{npc_dialog}) { |
892 | # start npc chat dialog |
911 | # start npc chat dialog |
893 | $self->{npc_dialog} = new CFClient::NPCDialog:: |
912 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
894 | dx => $x, |
913 | dx => $x, |
895 | dy => $y, |
914 | dy => $y, |
896 | title => "$res{npc_dialog} (NPC)", |
915 | title => "$msg->{npc_dialog} (NPC)", |
897 | conn => $self, |
916 | conn => $self, |
898 | ; |
917 | ; |
899 | } |
918 | } |
900 | }); |
919 | }); |
901 | } |
920 | } |
… | |
… | |
910 | if $self->{npc_dialog}; |
929 | if $self->{npc_dialog}; |
911 | |
930 | |
912 | $self->SUPER::destroy; |
931 | $self->SUPER::destroy; |
913 | } |
932 | } |
914 | |
933 | |
915 | package CFClient::NPCDialog; |
934 | package CFPlus::NPCDialog; |
916 | |
935 | |
917 | our @ISA = 'CFClient::UI::FancyFrame'; |
936 | our @ISA = 'CFPlus::UI::Toplevel'; |
918 | |
937 | |
919 | sub new { |
938 | sub new { |
920 | my $class = shift; |
939 | my $class = shift; |
921 | |
940 | |
922 | my $self = $class->SUPER::new ( |
941 | my $self = $class->SUPER::new ( |
… | |
… | |
934 | Scalar::Util::weaken (my $this = $self); |
953 | Scalar::Util::weaken (my $this = $self); |
935 | |
954 | |
936 | $self->connect (delete => sub { $this->destroy; 1 }); |
955 | $self->connect (delete => sub { $this->destroy; 1 }); |
937 | |
956 | |
938 | # better use a pane... |
957 | # better use a pane... |
939 | $self->add (my $hbox = new CFClient::UI::HBox); |
958 | $self->add (my $hbox = new CFPlus::UI::HBox); |
940 | $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); |
959 | $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); |
941 | |
960 | |
942 | $hbox->add (my $vbox = new CFClient::UI::VBox); |
961 | $hbox->add (my $vbox = new CFPlus::UI::VBox); |
943 | |
962 | |
944 | $vbox->add (new CFClient::UI::Label text => "Message Entry:"); |
963 | $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); |
945 | $vbox->add ($self->{entry} = new CFClient::UI::Entry |
964 | $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" |
965 | 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 { |
966 | on_activate => sub { |
952 | my ($entry, $text) = @_; |
967 | my ($entry, $text) = @_; |
953 | |
968 | |
954 | return unless $text =~ /\S/; |
969 | return unless $text =~ /\S/; |
955 | |
970 | |
… | |
… | |
958 | |
973 | |
959 | 0 |
974 | 0 |
960 | }, |
975 | }, |
961 | ); |
976 | ); |
962 | |
977 | |
963 | $vbox->add ($self->{options} = new CFClient::UI::VBox); |
978 | $vbox->add ($self->{options} = new CFPlus::UI::VBox); |
964 | |
979 | |
965 | $self->{bye_button} = new CFClient::UI::Button |
980 | $self->{bye_button} = new CFPlus::UI::Button |
966 | text => "Bye (close)", |
981 | text => "Bye (close)", |
967 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
982 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
968 | on_activate => sub { $this->destroy; 1 }, |
983 | on_activate => sub { $this->destroy; 1 }, |
969 | ; |
984 | ; |
970 | |
985 | |
971 | $self->update_options; |
986 | $self->update_options; |
972 | |
987 | |
973 | $self->{token} = $self->{conn}->ext_token; |
988 | $self->{id} = $self->{conn}->send_ext_req ( |
974 | $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); |
989 | npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, |
975 | $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); |
990 | sub { $this && $this->feed (@_) } |
|
|
991 | ); |
976 | |
992 | |
977 | $self->{entry}->grab_focus; |
993 | $self->{entry}->grab_focus; |
978 | |
994 | |
979 | $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); |
995 | $self->{textview}->add_paragraph ({ |
|
|
996 | fg => [1, 1, 0, 1], |
|
|
997 | markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n", |
|
|
998 | }); |
980 | |
999 | |
981 | $self->show; |
1000 | $self->show; |
982 | $self |
1001 | $self |
983 | }; |
1002 | }; |
984 | |
1003 | |
… | |
… | |
989 | |
1008 | |
990 | $self->{options}->clear; |
1009 | $self->{options}->clear; |
991 | $self->{options}->add ($self->{bye_button}); |
1010 | $self->{options}->add ($self->{bye_button}); |
992 | |
1011 | |
993 | for my $kw (sort keys %{ $self->{kw} }) { |
1012 | for my $kw (sort keys %{ $self->{kw} }) { |
994 | $self->{options}->add (new CFClient::UI::Button |
1013 | $self->{options}->add (new CFPlus::UI::Button |
995 | text => $kw, |
1014 | text => $kw, |
996 | on_activate => sub { |
1015 | on_activate => sub { |
997 | $self->send ($kw); |
1016 | $self->send ($kw); |
998 | 0 |
1017 | 0 |
999 | }, |
1018 | }, |
1000 | ); |
1019 | ); |
1001 | } |
1020 | } |
1002 | } |
1021 | } |
1003 | |
1022 | |
1004 | sub feed { |
1023 | sub feed { |
1005 | my ($self, $data) = @_; |
1024 | my ($self, $msg) = @_; |
1006 | |
1025 | |
1007 | Scalar::Util::weaken $self; |
1026 | Scalar::Util::weaken $self; |
1008 | |
1027 | |
1009 | my ($type, $msg) = split / /, $data, 2; |
1028 | if ($msg->{msgtype} eq "reply") { |
|
|
1029 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
|
|
1030 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1010 | |
1031 | |
1011 | if ($type eq "msg") { |
1032 | 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} }; |
1033 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1020 | my @link; |
1034 | my @link; |
1021 | $msg =~ s{ |
1035 | $text =~ s{ |
1022 | ($match) |
1036 | ($match) |
1023 | }{ |
1037 | }{ |
1024 | my $kw = $1; |
1038 | my $kw = $1; |
1025 | |
1039 | |
1026 | push @link, new CFClient::UI::Label |
1040 | push @link, new CFPlus::UI::Label |
1027 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1041 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1028 | can_hover => 1, |
1042 | can_hover => 1, |
1029 | can_events => 1, |
1043 | can_events => 1, |
1030 | padding_x => 0, |
1044 | padding_x => 0, |
1031 | padding_y => 0, |
1045 | padding_y => 0, |
1032 | on_button_up => sub { |
1046 | on_button_up => sub { |
1033 | $self->send ($kw); |
1047 | $self->send ($kw); |
1034 | }; |
1048 | }; |
1035 | |
1049 | |
1036 | chr 0xfffc |
1050 | "\x{fffc}" |
1037 | }giex; |
1051 | }giex; |
1038 | |
1052 | |
1039 | $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); |
1053 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1040 | $self->{textview}->scroll_to_bottom; |
1054 | $self->{textview}->scroll_to_bottom; |
1041 | $self->update_options; |
1055 | $self->update_options; |
1042 | } else { |
1056 | } else { |
1043 | $self->destroy; |
1057 | $self->destroy; |
1044 | } |
1058 | } |
… | |
… | |
1047 | } |
1061 | } |
1048 | |
1062 | |
1049 | sub send { |
1063 | sub send { |
1050 | my ($self, $msg) = @_; |
1064 | my ($self, $msg) = @_; |
1051 | |
1065 | |
1052 | $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg); |
1066 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1053 | $self->{textview}->scroll_to_bottom; |
1067 | $self->{textview}->scroll_to_bottom; |
1054 | |
1068 | |
1055 | utf8::encode $msg; |
1069 | $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 | } |
1070 | } |
1058 | |
1071 | |
1059 | sub destroy { |
1072 | sub destroy { |
1060 | my ($self) = @_; |
1073 | my ($self) = @_; |
1061 | |
1074 | |
1062 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1075 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1063 | |
1076 | |
|
|
1077 | if ($self->{conn}) { |
1064 | $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; |
1078 | $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; |
1065 | delete $self->{conn}{npc_dialog}; |
1079 | delete $self->{conn}{npc_dialog}; |
1066 | $self->{conn}->disconnect_ext ($self->{token}); |
1080 | $self->{conn}->disconnect_ext ($self->{id}); |
|
|
1081 | } |
1067 | |
1082 | |
1068 | $self->SUPER::destroy; |
1083 | $self->SUPER::destroy; |
1069 | } |
1084 | } |
1070 | |
1085 | |
1071 | 1; |
1086 | 1 |