1 | package CFPlus::Protocol; |
1 | package DC::Protocol; |
2 | |
2 | |
3 | use utf8; |
3 | use utf8; |
4 | use strict; |
4 | use strict; |
5 | |
5 | |
6 | use Crossfire::Protocol::Constants; |
6 | use Deliantra::Protocol::Constants; |
7 | |
7 | |
8 | use CFPlus; |
8 | use DC; |
9 | use CFPlus::DB; |
9 | use DC::DB; |
10 | use CFPlus::UI; |
10 | use DC::UI; |
11 | use CFPlus::Pod; |
11 | use DC::Pod; |
12 | use CFPlus::Macro; |
12 | use DC::Macro; |
13 | use CFPlus::Item; |
13 | use DC::Item; |
14 | |
14 | |
15 | use Crossfire::Protocol::Base 0.95; |
|
|
16 | |
|
|
17 | use base 'Crossfire::Protocol::Base'; |
15 | use base 'Deliantra::Protocol::Base'; |
18 | |
16 | |
19 | sub new { |
17 | sub new { |
20 | my ($class, %arg) = @_; |
18 | my ($class, %arg) = @_; |
21 | |
19 | |
22 | my $self = $class->SUPER::new (%arg, |
20 | my $self = $class->SUPER::new (%arg, |
23 | setup_req => { |
21 | setup_req => { |
24 | extmap => 1, |
22 | extmap => 1, |
25 | excmd => 1, |
23 | excmd => 1, |
26 | xwidget2 => 1,#d# |
24 | widget => 2, |
27 | %{$arg{setup_req} || {}}, |
25 | %{$arg{setup_req} || {}}, |
28 | }, |
26 | }, |
29 | ); |
27 | ); |
30 | |
28 | |
31 | $self->{map_widget}->clr_commands; |
29 | $self->{map_widget}->clr_commands; |
32 | |
30 | |
33 | my @cmd_help = map { |
31 | my @cmd_help = map { |
34 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
32 | $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
35 | or die "unparseable command help: $_->{kw}[0]"; |
33 | or die "unparseable command help: $_->[DC::Pod::N_KW][0]"; |
36 | |
34 | |
37 | my $cmd = $1; |
35 | my $cmd = $1; |
38 | my @args = split /\|/, $2; |
36 | my @args = split /\|/, $2; |
39 | @args = (".*") unless @args; |
37 | @args = (".*") unless @args; |
40 | |
38 | |
41 | my (undef, @par) = CFPlus::Pod::section_of $_; |
39 | my (undef, @par) = DC::Pod::section_of $_; |
42 | my $text = CFPlus::Pod::as_label @par; |
40 | my $text = DC::Pod::as_label @par; |
43 | |
41 | |
44 | $_ = $_ eq ".*" ? "" : " $_" |
42 | $_ = $_ eq ".*" ? "" : " $_" |
45 | for @args; |
43 | for @args; |
46 | |
44 | |
47 | map ["$cmd$_", $text], |
45 | map ["$cmd$_", $text], |
48 | sort { (length $a) <=> (length $b) } |
46 | sort { (length $a) <=> (length $b) } |
49 | @args |
47 | @args |
50 | } sort { $a->{par} <=> $b->{par} } |
48 | } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] } |
51 | CFPlus::Pod::find command => "*"; |
49 | DC::Pod::find command => "*"; |
52 | |
50 | |
53 | $self->{json_coder} |
51 | $self->{json_coder} |
54 | ->convert_blessed |
52 | ->convert_blessed |
55 | ->filter_json_single_key_object ("\fw" => sub { |
53 | ->filter_json_single_key_object ("\fw" => sub { |
56 | $self->{widget}{$_[0]} |
54 | $self->{widget}{$_[0]} |
… | |
… | |
72 | |
70 | |
73 | $self->{map_widget}->add_command (@$_) |
71 | $self->{map_widget}->add_command (@$_) |
74 | for @cmd_help; |
72 | for @cmd_help; |
75 | |
73 | |
76 | { |
74 | { |
77 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
75 | $self->{dialogue} = my $tex = new_from_file DC::Texture |
78 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
76 | DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
79 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
77 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
80 | } |
78 | } |
81 | |
79 | |
82 | { |
80 | { |
83 | $self->{noface} = my $tex = new_from_file CFPlus::Texture |
81 | $self->{noface} = my $tex = new_from_file DC::Texture |
84 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
82 | DC::find_rcfile "noface.png", minify => 1, mipmap => 1; |
85 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
83 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
86 | } |
84 | } |
87 | |
85 | |
88 | $self->{open_container} = 0; |
86 | $self->{open_container} = 0; |
89 | |
87 | |
… | |
… | |
104 | } |
102 | } |
105 | |
103 | |
106 | sub ext_capabilities { |
104 | sub ext_capabilities { |
107 | my ($self, %cap) = @_; |
105 | my ($self, %cap) = @_; |
108 | |
106 | |
109 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
110 | $self->update_fx_want; |
107 | $self->update_fx_want; |
111 | |
108 | |
112 | $self->send_exti_req (resource => "exp_table", sub { |
109 | $self->send_exti_req (resource => "exp_table", sub { |
113 | my ($exp_table) = @_; |
110 | my ($exp_table) = @_; |
114 | |
111 | |
… | |
… | |
144 | ############################################################################# |
141 | ############################################################################# |
145 | |
142 | |
146 | sub widget_associate { |
143 | sub widget_associate { |
147 | my ($self, $ws, $id, $widget) = @_; |
144 | my ($self, $ws, $id, $widget) = @_; |
148 | |
145 | |
149 | $widget ||= new CFPlus::UI::Bin; |
146 | $widget ||= new DC::UI::Bin; |
150 | |
147 | |
151 | $widget->{s_id} = $id; |
148 | $widget->{s_id} = $id; |
152 | $self->{widget}{$id} = $widget; |
149 | $self->{widget}{$id} = $widget; |
153 | |
150 | |
154 | if ($ws) { |
151 | if ($ws) { |
… | |
… | |
190 | my ($self, $ws, $id, $class, $args) = @_; |
187 | my ($self, $ws, $id, $class, $args) = @_; |
191 | |
188 | |
192 | $self->widget_associate ( |
189 | $self->widget_associate ( |
193 | $ws, $id => scalar eval { |
190 | $ws, $id => scalar eval { |
194 | local $SIG{__DIE__}; |
191 | local $SIG{__DIE__}; |
195 | "CFPlus::UI::$class"->new (%$args) |
192 | "DC::UI::$class"->new (%$args) |
196 | } |
193 | } |
197 | ); |
194 | ); |
|
|
195 | } |
|
|
196 | |
|
|
197 | # widgetset create template |
|
|
198 | sub ext_ws_ct { |
|
|
199 | my ($self, $ws, $type, $template, $done_cb, $cfg) = @_; |
|
|
200 | |
|
|
201 | $done_cb ||= sub { }; |
|
|
202 | |
|
|
203 | my $parse_list; $parse_list = sub { |
|
|
204 | my ($list) = @_; |
|
|
205 | my @w; |
|
|
206 | |
|
|
207 | while (@$list) { |
|
|
208 | my ($class, $args) = splice @$list, 0, 2; |
|
|
209 | my $name = delete $args->{s_id}; |
|
|
210 | my $cl = delete $args->{s_cl}; |
|
|
211 | my $cfg = delete $cfg->{$name}; |
|
|
212 | my $id = delete $cfg->{id}; |
|
|
213 | my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) } |
|
|
214 | or next; |
|
|
215 | |
|
|
216 | $self->widget_associate ($ws, $id, $w) |
|
|
217 | if $id; |
|
|
218 | |
|
|
219 | $w->add ($parse_list->($cl)) |
|
|
220 | if $cl; |
|
|
221 | |
|
|
222 | push @w, $w; |
|
|
223 | } |
|
|
224 | |
|
|
225 | @w |
|
|
226 | }; |
|
|
227 | |
|
|
228 | # either array reference, or face # |
|
|
229 | if ($type eq "inline") { |
|
|
230 | $done_cb->(); |
|
|
231 | $parse_list->($template); |
|
|
232 | } elsif ($type eq "face") { |
|
|
233 | my $handler; $handler = $self->register_face_handler ($template, sub { |
|
|
234 | my ($face) = @_; |
|
|
235 | |
|
|
236 | undef $handler; |
|
|
237 | $done_cb->(); |
|
|
238 | $parse_list->($self->{json_coder}->decode ($face->{data})); |
|
|
239 | }); |
|
|
240 | } else { |
|
|
241 | $done_cb->(0); |
|
|
242 | } |
198 | } |
243 | } |
199 | |
244 | |
200 | # widgetset associate |
245 | # widgetset associate |
201 | sub ext_ws_a { |
246 | sub ext_ws_a { |
202 | my ($self, %ass) = @_; |
247 | my ($self, %ass) = @_; |
203 | |
248 | |
204 | # everything that has a name, wether conceivably useful or not |
249 | # everything that has a name, wether conceivably useful or not |
205 | my %wkw = ( |
250 | my %wkw = ( |
206 | root => $CFPlus::UI::ROOT, |
251 | root => $DC::UI::ROOT, |
207 | tooltip => $CFPlus::UI::TOOLTIP, |
252 | tooltip => $DC::UI::TOOLTIP, |
208 | |
253 | |
209 | mapwidget => $::MAPWIDGET, |
254 | mapwidget => $::MAPWIDGET, |
210 | buttonbar => $::BUTTONBAR, |
255 | buttonbar => $::BUTTONBAR, |
211 | metaserver => $::METASERVER, |
256 | metaserver => $::METASERVER, |
212 | buttonbar => $::BUTTONBAR, |
257 | buttonbar => $::BUTTONBAR, |
… | |
… | |
230 | spell_list => $::SPELL_LIST, |
275 | spell_list => $::SPELL_LIST, |
231 | |
276 | |
232 | floorbox => $::FLOORBOX, |
277 | floorbox => $::FLOORBOX, |
233 | help_window => $::HELP_WINDOW, |
278 | help_window => $::HELP_WINDOW, |
234 | message_window => $::MESSAGE_WINDOW, |
279 | message_window => $::MESSAGE_WINDOW, |
|
|
280 | message_dist => $::MESSAGE_DIST, |
235 | statusbox => $::SDTATUSBOX, |
281 | statusbox => $::SDTATUSBOX, |
236 | |
282 | |
237 | inv => $::INV, |
283 | inv => $::INV, |
238 | invr => $::INVR, |
284 | invr => $::INVR, |
239 | invr_hb => $::INVR_HB, |
285 | invr_hb => $::INVR_HB, |
… | |
… | |
288 | |
334 | |
289 | # message window |
335 | # message window |
290 | sub ext_channel_info { |
336 | sub ext_channel_info { |
291 | my ($self, $info) = @_; |
337 | my ($self, $info) = @_; |
292 | $self->{channels}->{$info->{id}} = $info; |
338 | $self->{channels}->{$info->{id}} = $info; |
293 | $::MESSAGE_WINDOW->add_channel ($info); |
339 | $::MESSAGE_DIST->add_channel ($info); |
294 | } |
340 | } |
295 | |
341 | |
296 | ############################################################################# |
342 | ############################################################################# |
297 | |
343 | |
298 | sub logprint { |
344 | sub logprint { |
299 | my ($self, @a) = @_; |
345 | my ($self, @a) = @_; |
300 | |
346 | |
301 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
347 | DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
302 | } |
348 | } |
303 | |
349 | |
304 | sub _stat_numdiff { |
350 | sub _stat_numdiff { |
305 | my ($self, $name, $old, $new) = @_; |
351 | my ($self, $name, $old, $new) = @_; |
306 | |
352 | |
… | |
… | |
478 | $self->{stat_order} = join ",", map $_->[0], @order; |
524 | $self->{stat_order} = join ",", map $_->[0], @order; |
479 | |
525 | |
480 | $sktbl->clear; |
526 | $sktbl->clear; |
481 | |
527 | |
482 | my $sw = $self->{skillwid}{""} ||= [ |
528 | my $sw = $self->{skillwid}{""} ||= [ |
483 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
529 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
484 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
530 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
485 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
531 | 2, 0, (new DC::UI::Label text => "Progress"), |
486 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
532 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
487 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
533 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
488 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
534 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
489 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
535 | 6, 0, (new DC::UI::Label text => "Progress"), |
490 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
536 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
491 | ]; |
537 | ]; |
492 | |
538 | |
493 | my @add = @$sw; |
539 | my @add = @$sw; |
494 | |
540 | |
495 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
541 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
… | |
… | |
507 | if ($ev->{button} == 1) { |
553 | if ($ev->{button} == 1) { |
508 | $::CONN->user_send ("ready_skill $name"); |
554 | $::CONN->user_send ("ready_skill $name"); |
509 | } elsif ($ev->{button} == 2) { |
555 | } elsif ($ev->{button} == 2) { |
510 | $::CONN->user_send ("use_skill $name"); |
556 | $::CONN->user_send ("use_skill $name"); |
511 | } elsif ($ev->{button} == 3) { |
557 | } elsif ($ev->{button} == 3) { |
512 | my $shortname = CFPlus::shorten $name, 14; |
558 | my $shortname = DC::shorten $name, 14; |
513 | (new CFPlus::UI::Menu |
559 | (new DC::UI::Menu |
514 | items => [ |
560 | items => [ |
515 | ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], |
561 | ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }], |
516 | ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], |
562 | ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }], |
517 | ], |
563 | ], |
518 | )->popup ($ev); |
564 | )->popup ($ev); |
519 | } else { |
565 | } else { |
520 | return 0; |
566 | return 0; |
521 | } |
567 | } |
… | |
… | |
523 | 1 |
569 | 1 |
524 | }; |
570 | }; |
525 | |
571 | |
526 | my $sw = $self->{skillwid}{$idx} ||= [ |
572 | my $sw = $self->{skillwid}{$idx} ||= [ |
527 | # exp |
573 | # exp |
528 | (new CFPlus::UI::Label |
574 | (new DC::UI::Label |
529 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
575 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
530 | |
576 | |
531 | # level |
577 | # level |
532 | (new CFPlus::UI::Label |
578 | (new DC::UI::Label |
533 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
579 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
534 | |
580 | |
535 | # progress |
581 | # progress |
536 | (new CFPlus::UI::ExperienceProgress), |
582 | (new DC::UI::ExperienceProgress), |
537 | |
583 | |
538 | # label |
584 | # label |
539 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
585 | (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0, |
540 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
586 | can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
541 | ]; |
587 | ]; |
542 | |
588 | |
543 | push @add, |
589 | push @add, |
544 | $x * 4 + 0, $y, $sw->[0], |
590 | $x * 4 + 0, $y, $sw->[0], |
545 | $x * 4 + 1, $y, $sw->[1], |
591 | $x * 4 + 1, $y, $sw->[1], |
… | |
… | |
615 | } |
661 | } |
616 | } |
662 | } |
617 | |
663 | |
618 | if ($delay) { |
664 | if ($delay) { |
619 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
665 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
620 | Event->timer (after => 0.03, cb => sub { |
666 | EV::once undef, 0, 0.03, sub { |
621 | $_[0]->w->cancel; |
|
|
622 | $self->{map_widget}->update |
667 | $self->{map_widget}->update |
623 | if $self->{map_widget}; |
668 | if $self->{map_widget}; |
624 | }); |
669 | }; |
625 | } else { |
670 | } else { |
626 | $self->{map_widget}->update; |
671 | $self->{map_widget}->update; |
627 | } |
672 | } |
628 | } |
673 | } |
629 | |
674 | |
… | |
… | |
641 | |
686 | |
642 | my ($hash, $x, $y, $w, $h) = @$map_info; |
687 | my ($hash, $x, $y, $w, $h) = @$map_info; |
643 | |
688 | |
644 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
689 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
645 | $self->{map_cache_new}{$hash} = \$data; |
690 | $self->{map_cache_new}{$hash} = \$data; |
646 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
691 | DC::DB::put $self->{mapcache} => $hash => $data, sub { }; |
647 | } |
692 | } |
648 | |
693 | |
649 | sub map_clear { |
694 | sub map_clear { |
650 | my ($self) = @_; |
695 | my ($self) = @_; |
651 | |
696 | |
… | |
… | |
664 | do { |
709 | do { |
665 | $tile = pop @{$self->{bg_fetch}} |
710 | $tile = pop @{$self->{bg_fetch}} |
666 | or return; |
711 | or return; |
667 | } while $self->{texture}[$tile]; |
712 | } while $self->{texture}[$tile]; |
668 | |
713 | |
669 | CFPlus::DB::get tilecache => $tile, sub { |
714 | DC::DB::get tilecache => $tile, sub { |
670 | my ($data) = @_; |
715 | my ($data) = @_; |
671 | |
716 | |
672 | return unless $self->{map}; # stop when destroyed |
717 | return unless $self->{map}; # stop when destroyed |
673 | |
718 | |
674 | if (defined $data) { |
719 | if (defined $data) { |
… | |
… | |
702 | }; |
747 | }; |
703 | |
748 | |
704 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
749 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
705 | $cb->($$rdata); |
750 | $cb->($$rdata); |
706 | } else { |
751 | } else { |
707 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
752 | DC::DB::get $self->{mapcache} => $hash, $cb; |
708 | } |
753 | } |
709 | } |
754 | } |
710 | |
755 | |
711 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
756 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
712 | # (server resource,s latency, bandwidth), so this hack is warranted. |
757 | # (server resource,s latency, bandwidth), so this hack is warranted. |
… | |
… | |
836 | |
881 | |
837 | sub face_find { |
882 | sub face_find { |
838 | my ($self, $facenum, $face, $cb) = @_; |
883 | my ($self, $facenum, $face, $cb) = @_; |
839 | |
884 | |
840 | if ($face->{type} == 0) { # FT_FACE |
885 | if ($face->{type} == 0) { # FT_FACE |
841 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
886 | my $id = DC::DB::get_tile_id_sync $face->{name}; |
842 | |
887 | |
843 | $face->{id} = $id; |
888 | $face->{id} = $id; |
844 | $self->{map}->set_tileid ($facenum => $id); |
889 | $self->{map}->set_tileid ($facenum => $id); |
845 | |
890 | |
846 | CFPlus::DB::get tilecache => $id, $cb; |
891 | DC::DB::get tilecache => $id, $cb; |
847 | |
892 | |
848 | } elsif ($face->{type} & 1) { # with metadata |
893 | } elsif ($face->{type} & 1) { # with metadata |
849 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
894 | DC::DB::get res_meta => $face->{name}, $cb; |
850 | |
895 | |
851 | } else { # no metadata |
896 | } else { # no metadata |
852 | CFPlus::DB::get res_data => $face->{name}, $cb; |
897 | DC::DB::get res_data => $face->{name}, $cb; |
853 | } |
898 | } |
854 | } |
899 | } |
855 | |
900 | |
856 | sub face_update { |
901 | sub face_update { |
857 | my ($self, $facenum, $face, $changed) = @_; |
902 | my ($self, $facenum, $face, $changed) = @_; |
858 | |
903 | |
859 | if ($face->{type} == 0) { |
904 | if ($face->{type} == 0) { |
860 | # image, FT_FACE |
905 | # image, FT_FACE |
861 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
906 | DC::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
862 | if $changed; |
907 | if $changed; |
863 | |
908 | |
864 | $self->have_tile ($face->{id}, delete $face->{data}); |
909 | $self->have_tile ($face->{id}, delete $face->{data}); |
865 | |
910 | |
866 | } elsif ($face->{type} & 1) { |
911 | } elsif ($face->{type} & 1) { |
… | |
… | |
868 | if ($changed) { # new data |
913 | if ($changed) { # new data |
869 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
914 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
870 | $face->{data} = $meta; |
915 | $face->{data} = $meta; |
871 | |
916 | |
872 | # rely on strict ordering here and also on later fetch |
917 | # rely on strict ordering here and also on later fetch |
873 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
918 | DC::DB::put res_data => $face->{name} => $data, sub { }; |
874 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
919 | DC::DB::put res_meta => $face->{name} => $meta, sub { }; |
875 | } |
920 | } |
876 | |
921 | |
877 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
922 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
878 | ::add_license ($face); |
923 | ::add_license ($face); |
879 | ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
924 | ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
880 | if $changed; |
925 | if $changed; |
881 | |
926 | |
882 | if ($face->{type} == 3) { # FT_MUSIC |
927 | if ($face->{type} == 3) { # FT_MUSIC |
883 | &::audio_music_push ($facenum); |
928 | &::audio_music_push ($facenum); |
884 | } elsif ($face->{type} == 5) { # FT_SOUND |
929 | } elsif ($face->{type} == 5) { # FT_SOUND |
885 | &::audio_sound_push ($facenum); |
930 | &::audio_sound_push ($facenum); |
886 | } |
931 | } |
887 | |
932 | |
888 | } else { |
933 | } else { |
889 | # flat resource case, FT_RSRC |
934 | # flat resource case, FT_RSRC |
890 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
935 | DC::DB::put res_data => $face->{name} => $face->{data}, sub { } |
891 | if $changed; |
936 | if $changed; |
892 | } |
937 | } |
893 | |
938 | |
894 | if (my $cbs = $self->{face_cb}{$facenum}) { |
939 | if (my $cbs = $self->{face_cb}{$facenum}) { |
895 | $_->($face, $changed) for @$cbs; |
940 | $_->($face, $changed) for @$cbs; |
… | |
… | |
906 | my ($self, $tile, $data) = @_; |
951 | my ($self, $tile, $data) = @_; |
907 | |
952 | |
908 | return unless $self->{map}; |
953 | return unless $self->{map}; |
909 | |
954 | |
910 | my $tex = $self->{texture}[$tile] ||= |
955 | my $tex = $self->{texture}[$tile] ||= |
911 | new CFPlus::Texture |
956 | new DC::Texture |
912 | tile => $tile, |
957 | tile => $tile, |
913 | image => $data, delete_image => 1, |
958 | image => $data, delete_image => 1, |
914 | minify => 1, mipmap => 1; |
959 | minify => 1, mipmap => 1; |
915 | |
960 | |
916 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
961 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
… | |
… | |
924 | my ($self, $num, $cb) = @_; |
969 | my ($self, $num, $cb) = @_; |
925 | |
970 | |
926 | push @{$self->{face_cb}{$num}}, $cb; |
971 | push @{$self->{face_cb}{$num}}, $cb; |
927 | |
972 | |
928 | defined wantarray |
973 | defined wantarray |
929 | ? CFPlus::guard { |
974 | ? DC::guard { |
930 | @{$self->{face_cb}{$num}} |
975 | @{$self->{face_cb}{$num}} |
931 | = grep $_ != $cb, |
976 | = grep $_ != $cb, |
932 | @{$self->{face_cb}{$num}}; |
977 | @{$self->{face_cb}{$num}}; |
933 | } |
978 | } |
934 | : () |
979 | : () |
… | |
… | |
969 | |
1014 | |
970 | sub sanitise_xml($) { |
1015 | sub sanitise_xml($) { |
971 | local $_ = shift; |
1016 | local $_ = shift; |
972 | |
1017 | |
973 | # we now weed out all tags we do not support |
1018 | # we now weed out all tags we do not support |
974 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
1019 | s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) |
|
|
1020 | }{ |
|
|
1021 | "<" |
|
|
1022 | }gex; |
|
|
1023 | |
975 | # now all entities |
1024 | # now all entities |
976 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
1025 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
977 | |
1026 | |
978 | # handle some elements |
1027 | # handle some elements |
979 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
1028 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
… | |
… | |
1038 | ::message ({ |
1087 | ::message ({ |
1039 | fg => $fg, |
1088 | fg => $fg, |
1040 | markup => $_, |
1089 | markup => $_, |
1041 | type => $type, |
1090 | type => $type, |
1042 | extra => [@extra], |
1091 | extra => [@extra], |
1043 | color_flags => $color, #d# ugly, kill |
1092 | color_flags => $color, #d# ugly, kill |
1044 | }); |
1093 | }); |
1045 | |
1094 | |
1046 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
1095 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
1047 | # actually, this is an ugly design. _we_ should control the channels, |
1096 | # actually, this is an ugly design. _we_ should control the channels, |
1048 | # not some random other widget, as the channels are clearly protocol-specific. |
1097 | # not some random other widget, as the channels are clearly protocol-specific. |
… | |
… | |
1053 | $self->{statusbox}->add ($text, |
1102 | $self->{statusbox}->add ($text, |
1054 | group => $text, |
1103 | group => $text, |
1055 | fg => $fg, |
1104 | fg => $fg, |
1056 | timeout => $color >= 2 ? 180 : 10, |
1105 | timeout => $color >= 2 ? 180 : 10, |
1057 | tooltip_font => $::FONT_FIXED, |
1106 | tooltip_font => $::FONT_FIXED, |
1058 | ); |
1107 | ) if $type eq "info"; |
1059 | } |
1108 | } |
1060 | } |
1109 | } |
1061 | |
1110 | |
1062 | sub spell_add { |
1111 | sub spell_add { |
1063 | my ($self, $spell) = @_; |
1112 | my ($self, $spell) = @_; |
… | |
… | |
1067 | $spell->{message} =~ s/\n+$//; |
1116 | $spell->{message} =~ s/\n+$//; |
1068 | $spell->{message} ||= "Server did not provide a description for this spell."; |
1117 | $spell->{message} ||= "Server did not provide a description for this spell."; |
1069 | |
1118 | |
1070 | $::SPELL_LIST->add_spell ($spell); |
1119 | $::SPELL_LIST->add_spell ($spell); |
1071 | |
1120 | |
1072 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); |
1121 | $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message}); |
1073 | $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); |
1122 | $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message}); |
1074 | } |
1123 | } |
1075 | |
1124 | |
1076 | sub spell_delete { |
1125 | sub spell_delete { |
1077 | my ($self, $spell) = @_; |
1126 | my ($self, $spell) = @_; |
1078 | |
1127 | |
… | |
… | |
1089 | sub addme_success { |
1138 | sub addme_success { |
1090 | my ($self) = @_; |
1139 | my ($self) = @_; |
1091 | |
1140 | |
1092 | my %skill_help; |
1141 | my %skill_help; |
1093 | |
1142 | |
1094 | for my $node (CFPlus::Pod::find skill_description => "*") { |
1143 | for my $node (DC::Pod::find skill_description => "*") { |
1095 | my (undef, @par) = CFPlus::Pod::section_of $node; |
1144 | my (undef, @par) = DC::Pod::section_of $node; |
1096 | $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; |
1145 | $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par; |
1097 | }; |
1146 | }; |
1098 | |
1147 | |
1099 | for my $skill (values %{$self->{skill_info}}) { |
1148 | for my $skill (values %{$self->{skill_info}}) { |
1100 | $self->{map_widget}->add_command ("ready_skill $skill", |
1149 | $self->{map_widget}->add_command ("ready_skill $skill", |
1101 | (CFPlus::asxml "Ready the skill '$skill'\n\n") |
1150 | (DC::asxml "Ready the skill '$skill'\n\n") |
1102 | . $skill_help{$skill}); |
1151 | . $skill_help{$skill}); |
1103 | $self->{map_widget}->add_command ("use_skill $skill", |
1152 | $self->{map_widget}->add_command ("use_skill $skill", |
1104 | (CFPlus::asxml "Immediately use the skill '$skill'\n\n") |
1153 | (DC::asxml "Immediately use the skill '$skill'\n\n") |
1105 | . $skill_help{$skill}); |
1154 | . $skill_help{$skill}); |
1106 | } |
1155 | } |
1107 | } |
1156 | } |
1108 | |
1157 | |
1109 | sub eof { |
1158 | sub eof { |
… | |
… | |
1113 | |
1162 | |
1114 | ::stop_game (); |
1163 | ::stop_game (); |
1115 | } |
1164 | } |
1116 | |
1165 | |
1117 | sub update_floorbox { |
1166 | sub update_floorbox { |
1118 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1167 | $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1119 | return unless $::CONN; |
1168 | return unless $::CONN; |
1120 | |
1169 | |
1121 | $::FLOORBOX->clear; |
1170 | $::FLOORBOX->clear; |
1122 | |
1171 | |
1123 | my @add; |
1172 | my @add; |
… | |
… | |
1125 | my $row; |
1174 | my $row; |
1126 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1175 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1127 | if ($row < 6) { |
1176 | if ($row < 6) { |
1128 | local $_->{face_widget}; # hack to force recreation of widget |
1177 | local $_->{face_widget}; # hack to force recreation of widget |
1129 | local $_->{desc_widget}; # hack to force recreation of widget |
1178 | local $_->{desc_widget}; # hack to force recreation of widget |
1130 | CFPlus::Item::update_widgets $_; |
1179 | DC::Item::update_widgets $_; |
1131 | |
1180 | |
1132 | push @add, |
1181 | push @add, |
1133 | 0, $row, $_->{face_widget}, |
1182 | 0, $row, $_->{face_widget}, |
1134 | 1, $row, $_->{desc_widget}; |
1183 | 1, $row, $_->{desc_widget}; |
1135 | |
1184 | |
1136 | $row++; |
1185 | $row++; |
1137 | } else { |
1186 | } else { |
1138 | push @add, 1, $row, new CFPlus::UI::Button |
1187 | push @add, 1, $row, new DC::UI::Button |
1139 | text => "More...", |
1188 | text => "More...", |
1140 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1189 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1141 | ; |
1190 | ; |
1142 | last; |
1191 | last; |
1143 | } |
1192 | } |
1144 | } |
1193 | } |
1145 | if ($::CONN->{open_container}) { |
1194 | if ($::CONN->{open_container}) { |
1146 | push @add, 1, $row++, new CFPlus::UI::Button |
1195 | push @add, 1, $row++, new DC::UI::Button |
1147 | text => "Close container", |
1196 | text => "Close container", |
1148 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1197 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1149 | ; |
1198 | ; |
1150 | } |
1199 | } |
1151 | |
1200 | |
1152 | $::FLOORBOX->add_at (@add); |
1201 | $::FLOORBOX->add_at (@add); |
1153 | }); |
1202 | }); |
1154 | |
1203 | |
1155 | $::WANT_REFRESH->start; |
1204 | $::WANT_REFRESH = 1; |
1156 | } |
1205 | } |
1157 | |
1206 | |
1158 | sub set_opencont { |
1207 | sub set_opencont { |
1159 | my ($conn, $tag, $name) = @_; |
1208 | my ($conn, $tag, $name) = @_; |
1160 | $conn->{open_container} = $tag; |
1209 | $conn->{open_container} = $tag; |
1161 | update_floorbox; |
1210 | update_floorbox; |
1162 | |
1211 | |
1163 | $::INVR_HB->clear (); |
1212 | $::INVR_HB->clear (); |
1164 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1213 | $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); |
1165 | |
1214 | |
1166 | if ($tag != 0) { # Floor isn't closable, is it? |
1215 | if ($tag != 0) { # Floor isn't closable, is it? |
1167 | $::INVR_HB->add (new CFPlus::UI::Button |
1216 | $::INVR_HB->add (new DC::UI::Button |
1168 | text => "Close container", |
1217 | text => "Close container", |
1169 | tooltip => "Close the currently open container (if one is open)", |
1218 | tooltip => "Close the currently open container (if one is open)", |
1170 | on_activate => sub { |
1219 | on_activate => sub { |
1171 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1220 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1172 | if $tag != 0; |
1221 | if $tag != 0; |
… | |
… | |
1179 | } |
1228 | } |
1180 | |
1229 | |
1181 | sub update_containers { |
1230 | sub update_containers { |
1182 | my ($self) = @_; |
1231 | my ($self) = @_; |
1183 | |
1232 | |
1184 | $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1233 | $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1185 | my $todo = delete $self->{update_container} |
1234 | my $todo = delete $self->{update_container} |
1186 | or return; |
1235 | or return; |
1187 | |
1236 | |
1188 | for my $tag (keys %$todo) { |
1237 | for my $tag (keys %$todo) { |
1189 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
1238 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
… | |
… | |
1224 | } |
1273 | } |
1225 | |
1274 | |
1226 | sub item_update { |
1275 | sub item_update { |
1227 | my ($self, $item) = @_; |
1276 | my ($self, $item) = @_; |
1228 | |
1277 | |
1229 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1278 | #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n"; |
1230 | |
1279 | |
1231 | CFPlus::Item::update_widgets $item; |
1280 | DC::Item::update_widgets $item; |
1232 | |
1281 | |
1233 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1282 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1234 | set_opencont ($::CONN, 0, "Floor"); |
1283 | set_opencont ($::CONN, 0, "Floor"); |
1235 | |
1284 | |
1236 | } elsif ($item->{flags} & F_OPEN) { |
1285 | } elsif ($item->{flags} & F_OPEN) { |
1237 | set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); |
1286 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
1238 | |
1287 | |
1239 | } else { |
1288 | } else { |
1240 | $self->{update_container}{$item->{container}}++; |
1289 | $self->{update_container}{$item->{container}}++; |
1241 | $self->update_containers; |
1290 | $self->update_containers; |
1242 | } |
1291 | } |
… | |
… | |
1253 | |
1302 | |
1254 | my $weight = .001 * $self->{player}{weight}; |
1303 | my $weight = .001 * $self->{player}{weight}; |
1255 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1304 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1256 | |
1305 | |
1257 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1306 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1258 | $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); |
1307 | $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit); |
1259 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1308 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1260 | } |
1309 | } |
1261 | |
1310 | |
1262 | sub update_server_info { |
1311 | sub update_server_info { |
1263 | my ($self) = @_; |
1312 | my ($self) = @_; |
… | |
… | |
1271 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1320 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1272 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
1321 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
1273 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1322 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1274 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1323 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1275 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
1324 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
1276 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1325 | . "client support $yesno[$self->{cfplus_ext} > 0]" |
1277 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1326 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1278 | . "map size $self->{mapw}×$self->{maph}\n" |
1327 | . "map size $self->{mapw}×$self->{maph}\n" |
1279 | ); |
1328 | ); |
1280 | |
1329 | |
1281 | } |
1330 | } |
… | |
… | |
1301 | 0 |
1350 | 0 |
1302 | }); |
1351 | }); |
1303 | |
1352 | |
1304 | $self->update_server_info; |
1353 | $self->update_server_info; |
1305 | |
1354 | |
1306 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
|
|
1307 | $self->send_command ("output-count $::CFG->{output_count}"); |
|
|
1308 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1355 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1309 | $self->send_command ("pickup $::CFG->{pickup}"); |
1356 | $self->send_command ("pickup $::CFG->{pickup}"); |
1310 | } |
1357 | } |
1311 | |
1358 | |
1312 | sub lookat { |
1359 | sub lookat { |
… | |
… | |
1316 | $self->send_ext_req (lookat => $x, $y, sub { |
1363 | $self->send_ext_req (lookat => $x, $y, sub { |
1317 | my (%msg) = @_; |
1364 | my (%msg) = @_; |
1318 | |
1365 | |
1319 | if (exists $msg{npc_dialog}) { |
1366 | if (exists $msg{npc_dialog}) { |
1320 | # start npc chat dialog |
1367 | # start npc chat dialog |
1321 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1368 | $self->{npc_dialog} = new DC::NPCDialog:: |
1322 | token => $msg{npc_dialog}, |
1369 | token => $msg{npc_dialog}, |
1323 | title => "$msg{npc_dialog}[0] (NPC)", |
1370 | title => "$msg{npc_dialog}[0] (NPC)", |
1324 | conn => $self, |
1371 | conn => $self, |
1325 | ; |
1372 | ; |
1326 | } |
1373 | } |
… | |
… | |
1339 | $self->SUPER::destroy; |
1386 | $self->SUPER::destroy; |
1340 | |
1387 | |
1341 | %$self = (); |
1388 | %$self = (); |
1342 | } |
1389 | } |
1343 | |
1390 | |
1344 | package CFPlus::NPCDialog; |
1391 | package DC::NPCDialog; |
1345 | |
1392 | |
1346 | our @ISA = 'CFPlus::UI::Toplevel'; |
1393 | our @ISA = 'DC::UI::Toplevel'; |
1347 | |
1394 | |
1348 | sub new { |
1395 | sub new { |
1349 | my $class = shift; |
1396 | my $class = shift; |
1350 | |
1397 | |
1351 | my $self = $class->SUPER::new ( |
1398 | my $self = $class->SUPER::new ( |
… | |
… | |
1358 | kw => { hi => 0, yes => 0, no => 0 }, |
1405 | kw => { hi => 0, yes => 0, no => 0 }, |
1359 | has_close_button => 1, |
1406 | has_close_button => 1, |
1360 | @_, |
1407 | @_, |
1361 | ); |
1408 | ); |
1362 | |
1409 | |
1363 | CFPlus::weaken (my $this = $self); |
1410 | DC::weaken (my $this = $self); |
1364 | |
1411 | |
1365 | $self->connect (delete => sub { $this->destroy; 1 }); |
1412 | $self->connect (delete => sub { $this->destroy; 1 }); |
1366 | |
1413 | |
1367 | # better use a pane... |
1414 | # better use a pane... |
1368 | $self->add (my $hbox = new CFPlus::UI::HBox); |
1415 | $self->add (my $hbox = new DC::UI::HBox); |
1369 | $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); |
1416 | $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1); |
1370 | |
1417 | |
1371 | $hbox->add (my $vbox = new CFPlus::UI::VBox); |
1418 | $hbox->add (my $vbox = new DC::UI::VBox); |
1372 | |
1419 | |
1373 | $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); |
1420 | $vbox->add (new DC::UI::Label text => "Message Entry:"); |
1374 | $vbox->add ($self->{entry} = new CFPlus::UI::Entry |
1421 | $vbox->add ($self->{entry} = new DC::UI::Entry |
1375 | tooltip => "#npc_message_entry", |
1422 | tooltip => "#npc_message_entry", |
1376 | on_activate => sub { |
1423 | on_activate => sub { |
1377 | my ($entry, $text) = @_; |
1424 | my ($entry, $text) = @_; |
1378 | |
1425 | |
1379 | return unless $text =~ /\S/; |
1426 | return unless $text =~ /\S/; |
… | |
… | |
1383 | |
1430 | |
1384 | 0 |
1431 | 0 |
1385 | }, |
1432 | }, |
1386 | ); |
1433 | ); |
1387 | |
1434 | |
1388 | $vbox->add ($self->{options} = new CFPlus::UI::VBox); |
1435 | $vbox->add ($self->{options} = new DC::UI::VBox); |
1389 | |
1436 | |
1390 | $self->{bye_button} = new CFPlus::UI::Button |
1437 | $self->{bye_button} = new DC::UI::Button |
1391 | text => "Bye (close)", |
1438 | text => "Bye (close)", |
1392 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1439 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1393 | on_activate => sub { $this->destroy; 1 }, |
1440 | on_activate => sub { $this->destroy; 1 }, |
1394 | ; |
1441 | ; |
1395 | |
1442 | |
… | |
… | |
1414 | }; |
1461 | }; |
1415 | |
1462 | |
1416 | sub update_options { |
1463 | sub update_options { |
1417 | my ($self) = @_; |
1464 | my ($self) = @_; |
1418 | |
1465 | |
1419 | CFPlus::weaken $self; |
1466 | DC::weaken $self; |
1420 | |
1467 | |
1421 | $self->{options}->clear; |
1468 | $self->{options}->clear; |
1422 | $self->{options}->add ($self->{bye_button}); |
1469 | $self->{options}->add ($self->{bye_button}); |
1423 | |
1470 | |
1424 | for my $kw (sort keys %{ $self->{kw} }) { |
1471 | for my $kw (sort keys %{ $self->{kw} }) { |
1425 | $self->{options}->add (new CFPlus::UI::Button |
1472 | $self->{options}->add (new DC::UI::Button |
1426 | text => $kw, |
1473 | text => $kw, |
1427 | on_activate => sub { |
1474 | on_activate => sub { |
1428 | $self->send ($kw); |
1475 | $self->send ($kw); |
1429 | 0 |
1476 | 0 |
1430 | }, |
1477 | }, |
… | |
… | |
1433 | } |
1480 | } |
1434 | |
1481 | |
1435 | sub feed { |
1482 | sub feed { |
1436 | my ($self, $type, @arg) = @_; |
1483 | my ($self, $type, @arg) = @_; |
1437 | |
1484 | |
1438 | CFPlus::weaken $self; |
1485 | DC::weaken $self; |
1439 | |
1486 | |
1440 | if ($type eq "update") { |
1487 | if ($type eq "update") { |
1441 | my (%info) = @arg; |
1488 | my (%info) = @arg; |
1442 | |
1489 | |
1443 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1490 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1444 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1491 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1445 | |
1492 | |
1446 | if (exists $info{msg}) { |
1493 | if (exists $info{msg}) { |
1447 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
1494 | my $text = "\n" . DC::Protocol::sanitise_xml $info{msg}; |
1448 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1495 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1449 | my @link; |
1496 | my @link; |
1450 | $text =~ s{ |
1497 | $text =~ s{ |
1451 | ($match) |
1498 | ($match) |
1452 | }{ |
1499 | }{ |
1453 | my $kw = $1; |
1500 | my $kw = $1; |
1454 | |
1501 | |
1455 | push @link, new CFPlus::UI::Label |
1502 | push @link, new DC::UI::Label |
1456 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1503 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1457 | can_hover => 1, |
1504 | can_hover => 1, |
1458 | can_events => 1, |
1505 | can_events => 1, |
1459 | padding_x => 0, |
1506 | padding_x => 0, |
1460 | padding_y => 0, |
1507 | padding_y => 0, |
… | |
… | |
1478 | } |
1525 | } |
1479 | |
1526 | |
1480 | sub send { |
1527 | sub send { |
1481 | my ($self, $msg) = @_; |
1528 | my ($self, $msg) = @_; |
1482 | |
1529 | |
1483 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1530 | $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); |
1484 | $self->{textview}->scroll_to_bottom; |
1531 | $self->{textview}->scroll_to_bottom; |
1485 | |
1532 | |
1486 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1533 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1487 | } |
1534 | } |
1488 | |
1535 | |