| 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 Guard (); |
|
|
7 | |
| 6 | use Crossfire::Protocol::Constants; |
8 | use Deliantra::Protocol::Constants; |
| 7 | |
9 | |
| 8 | use CFPlus; |
10 | use DC; |
| 9 | use CFPlus::DB; |
11 | use DC::DB; |
| 10 | use CFPlus::UI; |
12 | use DC::UI; |
| 11 | use CFPlus::Pod; |
13 | use DC::Pod; |
| 12 | use CFPlus::Macro; |
14 | use DC::Macro; |
| 13 | use CFPlus::Item; |
15 | use DC::Item; |
| 14 | |
16 | |
| 15 | use Crossfire::Protocol::Base 0.95; |
|
|
| 16 | |
|
|
| 17 | use base 'Crossfire::Protocol::Base'; |
17 | use base 'Deliantra::Protocol::Base'; |
|
|
18 | |
|
|
19 | our $TEX_DIALOGUE = new_from_resource DC::Texture |
|
|
20 | "dialogue.png", minify => 1, mipmap => 1; |
|
|
21 | |
|
|
22 | our $TEX_NOFACE = new_from_resource DC::Texture |
|
|
23 | "noface.png", minify => 1, mipmap => 1; |
|
|
24 | |
|
|
25 | our $TEX_HIDDEN = new_from_resource DC::Texture |
|
|
26 | "hidden.png", minify => 1, mipmap => 1; |
|
|
27 | |
|
|
28 | sub MIN_TEXTURE_UNUSED() { 1 }#d# |
| 18 | |
29 | |
| 19 | sub new { |
30 | sub new { |
| 20 | my ($class, %arg) = @_; |
31 | my ($class, %arg) = @_; |
| 21 | |
32 | |
| 22 | my $self = $class->SUPER::new (%arg, |
33 | my $self = $class->SUPER::new (%arg, |
| 23 | setup_req => { |
34 | setup_req => { |
| 24 | extmap => 1, |
35 | extmap => 1, |
| 25 | excmd => 1, |
36 | excmd => 1, |
| 26 | xwidget2 => 1,#d# |
37 | widget => 2, |
| 27 | %{$arg{setup_req} || {}}, |
38 | %{$arg{setup_req} || {}}, |
| 28 | }, |
39 | }, |
| 29 | ); |
40 | ); |
| 30 | |
41 | |
| 31 | $self->{map_widget}->clr_commands; |
42 | $self->{map_widget}->clr_commands; |
| 32 | |
43 | |
| 33 | my @cmd_help = map { |
44 | my @cmd_help = map { |
| 34 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
45 | $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
| 35 | or die "unparseable command help: $_->{kw}[0]"; |
46 | or die "unparseable command help: $_->[DC::Pod::N_KW][0]"; |
| 36 | |
47 | |
| 37 | my $cmd = $1; |
48 | my $cmd = $1; |
| 38 | my @args = split /\|/, $2; |
49 | my @args = split /\|/, $2; |
| 39 | @args = (".*") unless @args; |
50 | @args = (".*") unless @args; |
| 40 | |
51 | |
| 41 | my (undef, @par) = CFPlus::Pod::section_of $_; |
52 | my (undef, @par) = DC::Pod::section_of $_; |
| 42 | my $text = CFPlus::Pod::as_label @par; |
53 | my $text = DC::Pod::as_label @par; |
| 43 | |
54 | |
| 44 | $_ = $_ eq ".*" ? "" : " $_" |
55 | $_ = $_ eq ".*" ? "" : " $_" |
| 45 | for @args; |
56 | for @args; |
| 46 | |
57 | |
| 47 | map ["$cmd$_", $text], |
58 | map ["$cmd$_", $text], |
| 48 | sort { (length $a) <=> (length $b) } |
59 | sort { (length $a) <=> (length $b) } |
| 49 | @args |
60 | @args |
| 50 | } sort { $a->{par} <=> $b->{par} } |
61 | } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] } |
| 51 | CFPlus::Pod::find command => "*"; |
62 | DC::Pod::find command => "*"; |
| 52 | |
63 | |
| 53 | $self->{json_coder} |
64 | $self->{json_coder} |
| 54 | ->convert_blessed |
65 | ->convert_blessed |
| 55 | ->filter_json_single_key_object ("\fw" => sub { |
66 | ->filter_json_single_key_object ("\fw" => sub { |
| 56 | $self->{widget}{$_[0]} |
67 | $self->{widget}{$_[0]} |
| … | |
… | |
| 66 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
77 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
| 67 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
78 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
| 68 | $_->destroy |
79 | $_->destroy |
| 69 | for values %{delete $ws->{w} || {}}; |
80 | for values %{delete $ws->{w} || {}}; |
| 70 | } |
81 | } |
|
|
82 | |
|
|
83 | delete $self->{items}; |
|
|
84 | $::INV->clear; |
|
|
85 | $::INVR->clear; |
|
|
86 | $::INVR_HB->clear; |
|
|
87 | $::FLOORBOX->clear; |
| 71 | }); |
88 | }); |
| 72 | |
89 | |
| 73 | $self->{map_widget}->add_command (@$_) |
90 | $self->{map_widget}->add_command (@$_) |
| 74 | for @cmd_help; |
91 | for @cmd_help; |
| 75 | |
92 | |
| 76 | { |
93 | { |
| 77 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
94 | $self->{dialogue} = my $tex = $TEX_DIALOGUE; |
| 78 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
|
|
| 79 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
95 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 80 | } |
96 | } |
| 81 | |
97 | |
| 82 | { |
98 | { |
| 83 | $self->{noface} = my $tex = new_from_file CFPlus::Texture |
99 | $self->{noface} = my $tex = $TEX_NOFACE; |
| 84 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
|
|
| 85 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
100 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 86 | } |
101 | } |
|
|
102 | |
|
|
103 | { |
|
|
104 | $self->{hidden} = my $tex = $TEX_HIDDEN; |
|
|
105 | $self->{map}->set_texture (3, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
106 | } |
|
|
107 | |
|
|
108 | # $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id |
|
|
109 | # $self->{expire_w} = EV::timer 1, 1, sub { |
|
|
110 | # my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1; |
|
|
111 | # |
|
|
112 | # for ($self->{map}->expire_textures ($self->{expire_count}, $count)) { |
|
|
113 | # warn DC::SvREFCNT $self->{texture}[$_]; |
|
|
114 | # $self->{texture}[$_]->unload; |
|
|
115 | # warn "expire texture $_\n";#d# |
|
|
116 | # } |
|
|
117 | # |
|
|
118 | # ($self->{expire_count} += $count) < @{ $self->{texture} } |
|
|
119 | # or $self->{expire_count} = DC::DB::FIRST_TILE_ID; |
|
|
120 | # warn "count is $count\n";#d# |
|
|
121 | # }; |
| 87 | |
122 | |
| 88 | $self->{open_container} = 0; |
123 | $self->{open_container} = 0; |
| 89 | |
124 | |
| 90 | # per server |
125 | # per server |
| 91 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
126 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
| … | |
… | |
| 104 | } |
139 | } |
| 105 | |
140 | |
| 106 | sub ext_capabilities { |
141 | sub ext_capabilities { |
| 107 | my ($self, %cap) = @_; |
142 | my ($self, %cap) = @_; |
| 108 | |
143 | |
| 109 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
| 110 | $self->update_fx_want; |
144 | $self->update_fx_want; |
| 111 | |
145 | |
| 112 | $self->send_exti_req (resource => "exp_table", sub { |
146 | $self->send_exti_req (resource => "exp_table", sub { |
| 113 | my ($exp_table) = @_; |
147 | my ($exp_table) = @_; |
| 114 | |
148 | |
| … | |
… | |
| 144 | ############################################################################# |
178 | ############################################################################# |
| 145 | |
179 | |
| 146 | sub widget_associate { |
180 | sub widget_associate { |
| 147 | my ($self, $ws, $id, $widget) = @_; |
181 | my ($self, $ws, $id, $widget) = @_; |
| 148 | |
182 | |
| 149 | $widget ||= new CFPlus::UI::Bin; |
183 | $widget ||= new DC::UI::Bin; |
| 150 | |
184 | |
| 151 | $widget->{s_id} = $id; |
185 | $widget->{s_id} = $id; |
| 152 | $self->{widget}{$id} = $widget; |
186 | $self->{widget}{$id} = $widget; |
| 153 | |
187 | |
| 154 | if ($ws) { |
188 | if ($ws) { |
| … | |
… | |
| 190 | my ($self, $ws, $id, $class, $args) = @_; |
224 | my ($self, $ws, $id, $class, $args) = @_; |
| 191 | |
225 | |
| 192 | $self->widget_associate ( |
226 | $self->widget_associate ( |
| 193 | $ws, $id => scalar eval { |
227 | $ws, $id => scalar eval { |
| 194 | local $SIG{__DIE__}; |
228 | local $SIG{__DIE__}; |
| 195 | "CFPlus::UI::$class"->new (%$args) |
229 | "DC::UI::$class"->new (%$args) |
| 196 | } |
230 | } |
| 197 | ); |
231 | ); |
|
|
232 | } |
|
|
233 | |
|
|
234 | # widgetset create template |
|
|
235 | sub ext_ws_ct { |
|
|
236 | my ($self, $ws, $type, $template, $done_cb, $cfg) = @_; |
|
|
237 | |
|
|
238 | $done_cb ||= sub { }; |
|
|
239 | |
|
|
240 | my $parse_list; $parse_list = sub { |
|
|
241 | my ($list) = @_; |
|
|
242 | my @w; |
|
|
243 | |
|
|
244 | while (@$list) { |
|
|
245 | my ($class, $args) = splice @$list, 0, 2; |
|
|
246 | my $name = delete $args->{s_id}; |
|
|
247 | my $cl = delete $args->{s_cl}; |
|
|
248 | my $cfg = delete $cfg->{$name}; |
|
|
249 | my $id = delete $cfg->{id}; |
|
|
250 | my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) } |
|
|
251 | or next; |
|
|
252 | |
|
|
253 | $self->widget_associate ($ws, $id, $w) |
|
|
254 | if $id; |
|
|
255 | |
|
|
256 | $w->add ($parse_list->($cl)) |
|
|
257 | if $cl; |
|
|
258 | |
|
|
259 | push @w, $w; |
|
|
260 | } |
|
|
261 | |
|
|
262 | @w |
|
|
263 | }; |
|
|
264 | |
|
|
265 | # either array reference, or face # |
|
|
266 | if ($type eq "inline") { |
|
|
267 | $done_cb->(); |
|
|
268 | $parse_list->($template); |
|
|
269 | } elsif ($type eq "face") { |
|
|
270 | my $handler; $handler = $self->register_face_handler ($template, sub { |
|
|
271 | my ($face) = @_; |
|
|
272 | |
|
|
273 | undef $handler; |
|
|
274 | $done_cb->(); |
|
|
275 | $parse_list->($self->{json_coder}->decode ($face->{data})); |
|
|
276 | }); |
|
|
277 | } else { |
|
|
278 | $done_cb->(0); |
|
|
279 | } |
| 198 | } |
280 | } |
| 199 | |
281 | |
| 200 | # widgetset associate |
282 | # widgetset associate |
| 201 | sub ext_ws_a { |
283 | sub ext_ws_a { |
| 202 | my ($self, %ass) = @_; |
284 | my ($self, %ass) = @_; |
| 203 | |
285 | |
| 204 | # everything that has a name, wether conceivably useful or not |
286 | # everything that has a name, wether conceivably useful or not |
| 205 | my %wkw = ( |
287 | my %wkw = ( |
| 206 | root => $CFPlus::UI::ROOT, |
288 | root => $DC::UI::ROOT, |
| 207 | tooltip => $CFPlus::UI::TOOLTIP, |
289 | tooltip => $DC::UI::TOOLTIP, |
| 208 | |
290 | |
| 209 | mapwidget => $::MAPWIDGET, |
291 | mapwidget => $::MAPWIDGET, |
|
|
292 | menubar => $::MENUBAR, |
|
|
293 | menupopup => $::MENUPOPUP, |
|
|
294 | pickup_enable => $::PICKUP_ENABLE, |
| 210 | buttonbar => $::BUTTONBAR, |
295 | buttonbar => $::BUTTONBAR, |
| 211 | metaserver => $::METASERVER, |
296 | metaserver => $::METASERVER, |
| 212 | buttonbar => $::BUTTONBAR, |
297 | buttonbar => $::BUTTONBAR, |
| 213 | login_button => $::LOGIN_BUTTON, |
298 | login_button => $::LOGIN_BUTTON, |
| 214 | quit_dialog => $::QUIT_DIALOG, |
299 | quit_dialog => $::QUIT_DIALOG, |
| … | |
… | |
| 230 | spell_list => $::SPELL_LIST, |
315 | spell_list => $::SPELL_LIST, |
| 231 | |
316 | |
| 232 | floorbox => $::FLOORBOX, |
317 | floorbox => $::FLOORBOX, |
| 233 | help_window => $::HELP_WINDOW, |
318 | help_window => $::HELP_WINDOW, |
| 234 | message_window => $::MESSAGE_WINDOW, |
319 | message_window => $::MESSAGE_WINDOW, |
|
|
320 | message_dist => $::MESSAGE_DIST, |
| 235 | statusbox => $::SDTATUSBOX, |
321 | statusbox => $::STATUSBOX, |
| 236 | |
322 | |
| 237 | inv => $::INV, |
323 | inv => $::INV, |
| 238 | invr => $::INVR, |
324 | invr => $::INVR, |
| 239 | invr_hb => $::INVR_HB, |
325 | invr_hb => $::INVR_HB, |
| 240 | ); |
326 | ); |
| … | |
… | |
| 288 | |
374 | |
| 289 | # message window |
375 | # message window |
| 290 | sub ext_channel_info { |
376 | sub ext_channel_info { |
| 291 | my ($self, $info) = @_; |
377 | my ($self, $info) = @_; |
| 292 | $self->{channels}->{$info->{id}} = $info; |
378 | $self->{channels}->{$info->{id}} = $info; |
| 293 | $::MESSAGE_WINDOW->add_channel ($info); |
379 | $::MESSAGE_DIST->add_channel ($info); |
| 294 | } |
380 | } |
| 295 | |
381 | |
| 296 | ############################################################################# |
382 | ############################################################################# |
| 297 | |
383 | |
| 298 | sub logprint { |
384 | sub logprint { |
| 299 | my ($self, @a) = @_; |
385 | my ($self, @a) = @_; |
| 300 | |
386 | |
| 301 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
387 | DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
| 302 | } |
388 | } |
| 303 | |
389 | |
| 304 | sub _stat_numdiff { |
390 | sub _stat_numdiff { |
| 305 | my ($self, $name, $old, $new) = @_; |
391 | my ($self, $name, $old, $new) = @_; |
| 306 | |
392 | |
| … | |
… | |
| 437 | |
523 | |
| 438 | $::GAUGES->{hp} ->set_value ($hp, $hp_m); |
524 | $::GAUGES->{hp} ->set_value ($hp, $hp_m); |
| 439 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
525 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
| 440 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
526 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
| 441 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
527 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
| 442 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
528 | $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d# |
| 443 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
529 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
| 444 | $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
530 | $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
| 445 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
531 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
| 446 | my $title = $stats->{+CS_STAT_TITLE}; |
532 | my $title = $stats->{+CS_STAT_TITLE}; |
| 447 | $title =~ s/^Player: //; |
533 | $title =~ s/^Player: //; |
| 448 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
534 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
| 449 | |
535 | |
| … | |
… | |
| 478 | $self->{stat_order} = join ",", map $_->[0], @order; |
564 | $self->{stat_order} = join ",", map $_->[0], @order; |
| 479 | |
565 | |
| 480 | $sktbl->clear; |
566 | $sktbl->clear; |
| 481 | |
567 | |
| 482 | my $sw = $self->{skillwid}{""} ||= [ |
568 | my $sw = $self->{skillwid}{""} ||= [ |
| 483 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
569 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
| 484 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
570 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
| 485 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
571 | 2, 0, (new DC::UI::Label text => "Progress"), |
| 486 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
572 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 487 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
573 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
| 488 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
574 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
| 489 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
575 | 6, 0, (new DC::UI::Label text => "Progress"), |
| 490 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
576 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 491 | ]; |
577 | ]; |
| 492 | |
578 | |
| 493 | my @add = @$sw; |
579 | my @add = @$sw; |
| 494 | |
580 | |
| 495 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
581 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>"; |
| 496 | |
582 | |
| 497 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
583 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
| 498 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
584 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
| 499 | |
585 | |
| 500 | my ($x, $y) = (0, 1); |
586 | my ($x, $y) = (0, 1); |
| … | |
… | |
| 507 | if ($ev->{button} == 1) { |
593 | if ($ev->{button} == 1) { |
| 508 | $::CONN->user_send ("ready_skill $name"); |
594 | $::CONN->user_send ("ready_skill $name"); |
| 509 | } elsif ($ev->{button} == 2) { |
595 | } elsif ($ev->{button} == 2) { |
| 510 | $::CONN->user_send ("use_skill $name"); |
596 | $::CONN->user_send ("use_skill $name"); |
| 511 | } elsif ($ev->{button} == 3) { |
597 | } elsif ($ev->{button} == 3) { |
| 512 | my $shortname = CFPlus::shorten $name, 14; |
598 | my $shortname = DC::shorten $name, 14; |
| 513 | (new CFPlus::UI::Menu |
599 | (new DC::UI::Menu |
| 514 | items => [ |
600 | items => [ |
| 515 | ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], |
601 | ["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"] }], |
602 | ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }], |
| 517 | ], |
603 | ], |
| 518 | )->popup ($ev); |
604 | )->popup ($ev); |
| 519 | } else { |
605 | } else { |
| 520 | return 0; |
606 | return 0; |
| 521 | } |
607 | } |
| … | |
… | |
| 523 | 1 |
609 | 1 |
| 524 | }; |
610 | }; |
| 525 | |
611 | |
| 526 | my $sw = $self->{skillwid}{$idx} ||= [ |
612 | my $sw = $self->{skillwid}{$idx} ||= [ |
| 527 | # exp |
613 | # exp |
| 528 | (new CFPlus::UI::Label |
614 | (new DC::UI::Label |
| 529 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
615 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
| 530 | |
616 | |
| 531 | # level |
617 | # level |
| 532 | (new CFPlus::UI::Label |
618 | (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), |
619 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
| 534 | |
620 | |
| 535 | # progress |
621 | # progress |
| 536 | (new CFPlus::UI::ExperienceProgress), |
622 | (new DC::UI::ExperienceProgress), |
| 537 | |
623 | |
| 538 | # label |
624 | # label |
| 539 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
625 | (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), |
626 | can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
| 541 | ]; |
627 | ]; |
| 542 | |
628 | |
| 543 | push @add, |
629 | push @add, |
| 544 | $x * 4 + 0, $y, $sw->[0], |
630 | $x * 4 + 0, $y, $sw->[0], |
| 545 | $x * 4 + 1, $y, $sw->[1], |
631 | $x * 4 + 1, $y, $sw->[1], |
| … | |
… | |
| 562 | my $sw = $self->{skillwid}{$idx}; |
648 | my $sw = $self->{skillwid}{$idx}; |
| 563 | $sw->[0]->set_text (::formsep ($val->[1])); |
649 | $sw->[0]->set_text (::formsep ($val->[1])); |
| 564 | $sw->[1]->set_text ($val->[0] * 1); |
650 | $sw->[1]->set_text ($val->[0] * 1); |
| 565 | $sw->[2]->set_value (@$val); |
651 | $sw->[2]->set_value (@$val); |
| 566 | |
652 | |
| 567 | $::GAUGES->{sklprg}->set_label ("$name %d%%"); |
653 | $::GAUGES->{skillexp}->set_label ("$name %d%%"); |
| 568 | $::GAUGES->{sklprg}->set_value (@$val); |
654 | $::GAUGES->{skillexp}->set_value (@$val); |
| 569 | } |
655 | } |
| 570 | } |
656 | } |
| 571 | |
657 | |
| 572 | sub user_send { |
658 | sub user_send { |
| 573 | my ($self, $command) = @_; |
659 | my ($self, $command) = @_; |
| … | |
… | |
| 586 | } |
672 | } |
| 587 | |
673 | |
| 588 | sub map_scroll { |
674 | sub map_scroll { |
| 589 | my ($self, $dx, $dy) = @_; |
675 | my ($self, $dx, $dy) = @_; |
| 590 | |
676 | |
| 591 | $self->{map}->scroll ($dx, $dy); |
677 | $self->{map_widget}->scroll ($dx, $dy); |
| 592 | } |
678 | } |
| 593 | |
679 | |
| 594 | sub feed_map1a { |
680 | sub feed_map1a { |
| 595 | my ($self, $data) = @_; |
681 | my ($self, $data) = @_; |
| 596 | |
682 | |
| … | |
… | |
| 600 | for my $tile (@$missing) { |
686 | for my $tile (@$missing) { |
| 601 | next if $self->{delay}{$tile}; |
687 | next if $self->{delay}{$tile}; |
| 602 | |
688 | |
| 603 | $delay = 1; |
689 | $delay = 1; |
| 604 | |
690 | |
| 605 | if (my $tex = $::CONN->{texture}[$tile]) { |
691 | if (my $tex = $self->{texture}[$tile]) { |
| 606 | $tex->upload; |
692 | $tex->upload; |
| 607 | } else { |
693 | } else { |
| 608 | $self->{delay}{$tile} = 1; |
694 | $self->{delay}{$tile} = 1; |
| 609 | |
695 | |
| 610 | # we assume the face is in-flight and will eventually come |
696 | # we assume the face is in-flight and will eventually arrive |
| 611 | push @{$self->{tile_cb}{$tile}}, sub { |
697 | push @{$self->{tile_cb}{$tile}}, sub { |
| 612 | delete $self->{delay}{$tile}; |
698 | delete $self->{delay}{$tile}; |
| 613 | $_[0]->upload; |
699 | $_[0]->upload; |
| 614 | }; |
700 | }; |
| 615 | } |
701 | } |
| 616 | } |
702 | } |
| 617 | |
703 | |
| 618 | if ($delay) { |
704 | if ($delay) { |
| 619 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
705 | # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched |
| 620 | Event->timer (after => 0.03, cb => sub { |
706 | EV::once undef, 0, 0.03, sub { |
| 621 | $_[0]->w->cancel; |
|
|
| 622 | $self->{map_widget}->update |
707 | $self->{map_widget}->update |
| 623 | if $self->{map_widget}; |
708 | if $self->{map_widget}; |
| 624 | }); |
709 | }; |
| 625 | } else { |
710 | } else { |
| 626 | $self->{map_widget}->update; |
711 | $self->{map_widget}->update; |
| 627 | } |
712 | } |
| 628 | } |
713 | } |
| 629 | |
714 | |
| … | |
… | |
| 634 | } |
719 | } |
| 635 | |
720 | |
| 636 | sub flush_map { |
721 | sub flush_map { |
| 637 | my ($self) = @_; |
722 | my ($self) = @_; |
| 638 | |
723 | |
| 639 | my $map_info = delete $self->{map_info} |
724 | return unless $self->{map_info}; |
| 640 | or return; |
|
|
| 641 | |
725 | |
|
|
726 | for my $map_info (values %{ $self->{map_cache} || {} }) { |
| 642 | my ($hash, $x, $y, $w, $h) = @$map_info; |
727 | my ($hash, $rdata, $x, $y, $w, $h) = @$map_info; |
| 643 | |
728 | |
| 644 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
729 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
| 645 | $self->{map_cache_new}{$hash} = \$data; |
730 | |
|
|
731 | if ($data ne $$rdata) { |
|
|
732 | $map_info->[1] = \$data; |
|
|
733 | my $cdata = Compress::LZF::compress $data; |
| 646 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
734 | DC::DB::put $self->{mapcache} => $hash => $cdata, sub { }; |
|
|
735 | } |
|
|
736 | } |
| 647 | } |
737 | } |
| 648 | |
738 | |
| 649 | sub map_clear { |
739 | sub map_clear { |
| 650 | my ($self) = @_; |
740 | my ($self) = @_; |
| 651 | |
741 | |
| 652 | $self->flush_map; |
742 | $self->flush_map; |
|
|
743 | delete $self->{map_info}; |
| 653 | delete $self->{neigh_map}; |
744 | delete $self->{neigh_map}; |
| 654 | |
745 | |
| 655 | $self->{map}->clear; |
746 | $self->{map}->clear; |
| 656 | delete $self->{map_widget}{magicmap}; |
747 | delete $self->{map_widget}{magicmap}; |
| 657 | } |
748 | } |
| … | |
… | |
| 664 | do { |
755 | do { |
| 665 | $tile = pop @{$self->{bg_fetch}} |
756 | $tile = pop @{$self->{bg_fetch}} |
| 666 | or return; |
757 | or return; |
| 667 | } while $self->{texture}[$tile]; |
758 | } while $self->{texture}[$tile]; |
| 668 | |
759 | |
| 669 | CFPlus::DB::get tilecache => $tile, sub { |
760 | DC::DB::get tilecache => $tile, sub { |
| 670 | my ($data) = @_; |
761 | my ($data) = @_; |
| 671 | |
762 | |
| 672 | return unless $self->{map}; # stop when destroyed |
763 | return unless $self->{map}; # stop when destroyed |
| 673 | |
764 | |
| 674 | if (defined $data) { |
765 | if (defined $data) { |
| … | |
… | |
| 678 | |
769 | |
| 679 | $self->bg_fetch; |
770 | $self->bg_fetch; |
| 680 | }; |
771 | }; |
| 681 | } |
772 | } |
| 682 | |
773 | |
| 683 | sub load_map($$$) { |
774 | sub load_map($$$$$$) { |
| 684 | my ($self, $hash, $x, $y) = @_; |
775 | my ($self, $hash, $x, $y, $w, $h) = @_; |
| 685 | |
776 | |
| 686 | my $gen = $self->{map_change_gen}; |
777 | my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h]; |
| 687 | |
778 | |
| 688 | my $cb = sub { |
779 | my $cb = sub { |
| 689 | return unless $gen == $self->{map_change_gen}; |
780 | $map_info->[1] = \$_[0]; |
| 690 | |
781 | |
| 691 | my ($data) = @_; |
|
|
| 692 | |
|
|
| 693 | if (defined $data) { |
|
|
| 694 | $self->{map_cache_new}{$hash} = \$data; |
|
|
| 695 | |
|
|
| 696 | my $data = Compress::LZF::decompress $data; |
|
|
| 697 | |
|
|
| 698 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
782 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
| 699 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
783 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]); |
| 700 | $self->bg_fetch unless $inprogress; |
784 | $self->bg_fetch unless $inprogress; |
| 701 | } |
|
|
| 702 | }; |
785 | }; |
| 703 | |
786 | |
| 704 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
787 | if (my $map_info = $self->{map_cache_old}{$hash}) { |
| 705 | $cb->($$rdata); |
788 | $cb->(${ $map_info->[1] }); |
| 706 | } else { |
789 | } else { |
|
|
790 | my $gen = $self->{map_change_gen}; |
|
|
791 | |
| 707 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
792 | DC::DB::get $self->{mapcache} => $hash, sub { |
|
|
793 | return unless $gen == $self->{map_change_gen}; |
|
|
794 | return unless defined $_[0]; |
|
|
795 | $cb->(Compress::LZF::decompress $_[0]); |
|
|
796 | }; |
| 708 | } |
797 | } |
| 709 | } |
798 | } |
| 710 | |
799 | |
| 711 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
800 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
| 712 | # (server resource,s latency, bandwidth), so this hack is warranted. |
801 | # (server resources, latency, bandwidth), so this hack is warranted. |
| 713 | # the right fix is to make real tiled maps with an overview file |
802 | # the right fix is to make real tiled maps with an overview file |
| 714 | sub send_mapinfo { |
803 | sub send_mapinfo { |
| 715 | my ($self, $data, $cb) = @_; |
804 | my ($self, $data, $cb) = @_; |
| 716 | |
805 | |
| 717 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
806 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
| … | |
… | |
| 742 | } |
831 | } |
| 743 | |
832 | |
| 744 | # this method does a "flood fill" into every tile direction |
833 | # this method does a "flood fill" into every tile direction |
| 745 | # it assumes that tiles are arranged in a rectangular grid, |
834 | # it assumes that tiles are arranged in a rectangular grid, |
| 746 | # i.e. a map is the same as the left of the right map etc. |
835 | # i.e. a map is the same as the left of the right map etc. |
| 747 | # failure to comply are harmless and result in display errors |
836 | # failure to comply is harmless and results in display errors |
| 748 | # at worst. |
837 | # at worst. |
| 749 | sub flood_fill { |
838 | sub flood_fill { |
| 750 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
839 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
| 751 | |
840 | |
| 752 | # the server does not allow map paths > 6 |
841 | # the server does not allow map paths > 6 |
| … | |
… | |
| 788 | return if $mode ne "spatial"; |
877 | return if $mode ne "spatial"; |
| 789 | |
878 | |
| 790 | $x += $self->{map}->ox; |
879 | $x += $self->{map}->ox; |
| 791 | $y += $self->{map}->oy; |
880 | $y += $self->{map}->oy; |
| 792 | |
881 | |
| 793 | $self->load_map ($hash, $x, $y) |
882 | $self->load_map ($hash, $x, $y, $w, $h) |
| 794 | unless $self->{neigh_map}{$hash}[5]++;#d# |
883 | unless $self->{neigh_map}{$hash}[5]++;#d# |
| 795 | |
884 | |
| 796 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
885 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
| 797 | |
886 | |
| 798 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
887 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
| … | |
… | |
| 806 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
895 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 807 | |
896 | |
| 808 | $self->flush_map; |
897 | $self->flush_map; |
| 809 | |
898 | |
| 810 | ++$self->{map_change_gen}; |
899 | ++$self->{map_change_gen}; |
| 811 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
900 | $self->{map_cache_old} = delete $self->{map_cache}; |
| 812 | |
901 | |
| 813 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
902 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
| 814 | |
903 | |
| 815 | my $mapmapw = $self->{mapmap}->{w}; |
904 | my $mapmapw = $self->{mapmap}->{w}; |
| 816 | my $mapmaph = $self->{mapmap}->{h}; |
905 | my $mapmaph = $self->{mapmap}->{h}; |
| … | |
… | |
| 828 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
917 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
| 829 | |
918 | |
| 830 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
919 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
| 831 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
920 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
| 832 | |
921 | |
| 833 | $self->load_map ($hash, $x, $y); |
922 | $self->load_map ($hash, $x, $y, $w, $h); |
| 834 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
923 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
| 835 | } |
924 | } |
| 836 | |
925 | |
| 837 | sub face_find { |
926 | sub face_find { |
| 838 | my ($self, $facenum, $face, $cb) = @_; |
927 | my ($self, $facenum, $face, $cb) = @_; |
| 839 | |
928 | |
| 840 | if ($face->{type} == 0) { # FT_FACE |
929 | if ($face->{type} == 0) { # FT_FACE |
| 841 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
930 | my $id = DC::DB::get_tile_id_sync $face->{name}; |
| 842 | |
931 | |
| 843 | $face->{id} = $id; |
932 | $face->{id} = $id; |
| 844 | $self->{map}->set_tileid ($facenum => $id); |
933 | $self->{map}->set_tileid ($facenum => $id); |
| 845 | |
934 | |
| 846 | CFPlus::DB::get tilecache => $id, $cb; |
935 | DC::DB::get tilecache => $id, $cb; |
| 847 | |
936 | |
| 848 | } elsif ($face->{type} & 1) { # with metadata |
937 | } elsif ($face->{type} & 1) { # with metadata |
| 849 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
938 | DC::DB::get res_meta => $face->{name}, $cb; |
| 850 | |
939 | |
| 851 | } else { # no metadata |
940 | } else { # no metadata |
| 852 | CFPlus::DB::get res_data => $face->{name}, $cb; |
941 | DC::DB::get res_data => $face->{name}, $cb; |
| 853 | } |
942 | } |
| 854 | } |
943 | } |
| 855 | |
944 | |
| 856 | sub face_update { |
945 | sub face_update { |
| 857 | my ($self, $facenum, $face, $changed) = @_; |
946 | my ($self, $facenum, $face, $changed) = @_; |
| 858 | |
947 | |
| 859 | if ($face->{type} == 0) { |
948 | if ($face->{type} == 0) { |
| 860 | # image, FT_FACE |
949 | # image, FT_FACE |
| 861 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
950 | DC::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
| 862 | if $changed; |
951 | if $changed; |
| 863 | |
952 | |
| 864 | $self->have_tile ($face->{id}, delete $face->{data}); |
953 | $self->have_tile ($face->{id}, delete $face->{data}); |
| 865 | |
954 | |
| 866 | } elsif ($face->{type} & 1) { |
955 | } elsif ($face->{type} & 1) { |
| … | |
… | |
| 868 | if ($changed) { # new data |
957 | if ($changed) { # new data |
| 869 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
958 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
| 870 | $face->{data} = $meta; |
959 | $face->{data} = $meta; |
| 871 | |
960 | |
| 872 | # rely on strict ordering here and also on later fetch |
961 | # rely on strict ordering here and also on later fetch |
| 873 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
962 | DC::DB::put res_data => $face->{name} => $data, sub { }; |
| 874 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
963 | DC::DB::put res_meta => $face->{name} => $meta, sub { }; |
| 875 | } |
964 | } |
| 876 | |
965 | |
| 877 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
966 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
| 878 | ::add_license ($face); |
967 | ::add_license ($face); |
| 879 | ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
968 | ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
| 880 | if $changed; |
969 | if $changed; |
| 881 | |
970 | |
| 882 | if ($face->{type} == 3) { # FT_MUSIC |
971 | if ($face->{type} == 3) { # FT_MUSIC |
| 883 | &::audio_music_push ($facenum); |
972 | &::audio_music_push ($facenum); |
| 884 | } elsif ($face->{type} == 5) { # FT_SOUND |
973 | } elsif ($face->{type} == 5) { # FT_SOUND |
| 885 | &::audio_sound_push ($facenum); |
974 | &::audio_sound_push ($facenum); |
| 886 | } |
975 | } |
| 887 | |
976 | |
| 888 | } else { |
977 | } else { |
| 889 | # flat resource case, FT_RSRC |
978 | # flat resource case, FT_RSRC |
| 890 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
979 | DC::DB::put res_data => $face->{name} => $face->{data}, sub { } |
| 891 | if $changed; |
980 | if $changed; |
| 892 | } |
981 | } |
| 893 | |
982 | |
| 894 | if (my $cbs = $self->{face_cb}{$facenum}) { |
983 | if (my $cbs = $self->{face_cb}{$facenum}) { |
| 895 | $_->($face, $changed) for @$cbs; |
984 | $_->($face, $changed) for @$cbs; |
| … | |
… | |
| 906 | my ($self, $tile, $data) = @_; |
995 | my ($self, $tile, $data) = @_; |
| 907 | |
996 | |
| 908 | return unless $self->{map}; |
997 | return unless $self->{map}; |
| 909 | |
998 | |
| 910 | my $tex = $self->{texture}[$tile] ||= |
999 | my $tex = $self->{texture}[$tile] ||= |
| 911 | new CFPlus::Texture |
1000 | new DC::Texture |
| 912 | tile => $tile, |
1001 | tile => $tile, |
| 913 | image => $data, delete_image => 1, |
1002 | image => $data, delete_image => 1, |
| 914 | minify => 1, mipmap => 1; |
1003 | minify => 1, mipmap => 1; |
| 915 | |
1004 | |
| 916 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
1005 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
| … | |
… | |
| 924 | my ($self, $num, $cb) = @_; |
1013 | my ($self, $num, $cb) = @_; |
| 925 | |
1014 | |
| 926 | push @{$self->{face_cb}{$num}}, $cb; |
1015 | push @{$self->{face_cb}{$num}}, $cb; |
| 927 | |
1016 | |
| 928 | defined wantarray |
1017 | defined wantarray |
| 929 | ? CFPlus::guard { |
1018 | ? Guard::guard { |
| 930 | @{$self->{face_cb}{$num}} |
1019 | @{$self->{face_cb}{$num}} |
| 931 | = grep $_ != $cb, |
1020 | = grep $_ != $cb, |
| 932 | @{$self->{face_cb}{$num}}; |
1021 | @{$self->{face_cb}{$num}}; |
| 933 | } |
1022 | } |
| 934 | : () |
1023 | : () |
| … | |
… | |
| 969 | |
1058 | |
| 970 | sub sanitise_xml($) { |
1059 | sub sanitise_xml($) { |
| 971 | local $_ = shift; |
1060 | local $_ = shift; |
| 972 | |
1061 | |
| 973 | # we now weed out all tags we do not support |
1062 | # we now weed out all tags we do not support |
| 974 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
1063 | s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) |
|
|
1064 | }{ |
|
|
1065 | "<" |
|
|
1066 | }gex; |
|
|
1067 | |
| 975 | # now all entities |
1068 | # now all entities |
| 976 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
1069 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
| 977 | |
1070 | |
| 978 | # handle some elements |
1071 | # handle some elements |
| 979 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
1072 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
| 980 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
1073 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
1074 | |
|
|
1075 | s/\s+$//; |
| 981 | |
1076 | |
| 982 | $_ |
1077 | $_ |
| 983 | } |
1078 | } |
| 984 | |
1079 | |
| 985 | our %NAME_TO_COLOR = ( |
1080 | our %NAME_TO_COLOR = ( |
| … | |
… | |
| 1032 | |
1127 | |
| 1033 | ## try to create single paragraphs of multiple lines sent by the server |
1128 | ## try to create single paragraphs of multiple lines sent by the server |
| 1034 | # no longer neecssary with TRT servers |
1129 | # no longer neecssary with TRT servers |
| 1035 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1130 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
| 1036 | |
1131 | |
| 1037 | for (split /\n/, $text) { |
|
|
| 1038 | ::message ({ |
1132 | ::message ({ |
| 1039 | fg => $fg, |
1133 | fg => $fg, |
| 1040 | markup => $_, |
1134 | markup => $text, |
| 1041 | type => $type, |
1135 | type => $type, |
| 1042 | extra => [@extra], |
1136 | extra => [@extra], |
| 1043 | color_flags => $color |
1137 | color_flags => $color, #d# ugly, kill |
| 1044 | }); |
1138 | }); |
| 1045 | |
1139 | |
| 1046 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
1140 | # $color &= ~NDI_CLEAR; # only clear once for multiline messages |
| 1047 | } |
1141 | # # actually, this is an ugly design. _we_ should control the channels, |
|
|
1142 | # # not some random other widget, as the channels are clearly protocol-specific. |
|
|
1143 | # # then we could also react to flags such as CLEAR without resorting to |
|
|
1144 | # # hacks such as color_flags, above. |
| 1048 | |
1145 | |
| 1049 | $self->{statusbox}->add ($text, |
1146 | $self->{statusbox}->add ($text, |
| 1050 | group => $text, |
1147 | group => $text, |
| 1051 | fg => $fg, |
1148 | fg => $fg, |
| 1052 | timeout => $color >= 2 ? 180 : 10, |
1149 | timeout => $color >= 2 ? 180 : 10, |
| 1053 | tooltip_font => $::FONT_FIXED, |
1150 | tooltip_font => $::FONT_FIXED, |
| 1054 | ); |
1151 | ) if $type eq "info"; |
| 1055 | } |
1152 | } |
| 1056 | } |
1153 | } |
| 1057 | |
1154 | |
| 1058 | sub spell_add { |
1155 | sub spell_add { |
| 1059 | my ($self, $spell) = @_; |
1156 | my ($self, $spell) = @_; |
| … | |
… | |
| 1063 | $spell->{message} =~ s/\n+$//; |
1160 | $spell->{message} =~ s/\n+$//; |
| 1064 | $spell->{message} ||= "Server did not provide a description for this spell."; |
1161 | $spell->{message} ||= "Server did not provide a description for this spell."; |
| 1065 | |
1162 | |
| 1066 | $::SPELL_LIST->add_spell ($spell); |
1163 | $::SPELL_LIST->add_spell ($spell); |
| 1067 | |
1164 | |
| 1068 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); |
1165 | $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message}); |
| 1069 | $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); |
1166 | $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message}); |
| 1070 | } |
1167 | } |
| 1071 | |
1168 | |
| 1072 | sub spell_delete { |
1169 | sub spell_delete { |
| 1073 | my ($self, $spell) = @_; |
1170 | my ($self, $spell) = @_; |
| 1074 | |
1171 | |
| … | |
… | |
| 1085 | sub addme_success { |
1182 | sub addme_success { |
| 1086 | my ($self) = @_; |
1183 | my ($self) = @_; |
| 1087 | |
1184 | |
| 1088 | my %skill_help; |
1185 | my %skill_help; |
| 1089 | |
1186 | |
| 1090 | for my $node (CFPlus::Pod::find skill_description => "*") { |
1187 | for my $node (DC::Pod::find skill_description => "*") { |
| 1091 | my (undef, @par) = CFPlus::Pod::section_of $node; |
1188 | my (undef, @par) = DC::Pod::section_of $node; |
| 1092 | $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; |
1189 | $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par; |
| 1093 | }; |
1190 | }; |
| 1094 | |
1191 | |
| 1095 | for my $skill (values %{$self->{skill_info}}) { |
1192 | for my $skill (values %{$self->{skill_info}}) { |
| 1096 | $self->{map_widget}->add_command ("ready_skill $skill", |
1193 | $self->{map_widget}->add_command ("ready_skill $skill", |
| 1097 | (CFPlus::asxml "Ready the skill '$skill'\n\n") |
1194 | (DC::asxml "Ready the skill '$skill'\n\n") |
| 1098 | . $skill_help{$skill}); |
1195 | . $skill_help{$skill}); |
| 1099 | $self->{map_widget}->add_command ("use_skill $skill", |
1196 | $self->{map_widget}->add_command ("use_skill $skill", |
| 1100 | (CFPlus::asxml "Immediately use the skill '$skill'\n\n") |
1197 | (DC::asxml "Immediately use the skill '$skill'\n\n") |
| 1101 | . $skill_help{$skill}); |
1198 | . $skill_help{$skill}); |
| 1102 | } |
1199 | } |
| 1103 | } |
1200 | } |
| 1104 | |
1201 | |
| 1105 | sub eof { |
1202 | sub eof { |
| … | |
… | |
| 1109 | |
1206 | |
| 1110 | ::stop_game (); |
1207 | ::stop_game (); |
| 1111 | } |
1208 | } |
| 1112 | |
1209 | |
| 1113 | sub update_floorbox { |
1210 | sub update_floorbox { |
| 1114 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1211 | $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
| 1115 | return unless $::CONN; |
1212 | return unless $::CONN; |
| 1116 | |
1213 | |
| 1117 | $::FLOORBOX->clear; |
1214 | $::FLOORBOX->clear; |
| 1118 | |
1215 | |
| 1119 | my @add; |
1216 | my @add; |
| 1120 | |
1217 | |
| 1121 | my $row; |
1218 | my $row; |
| 1122 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1219 | for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
|
|
1220 | next if $_->{tag} & 0x80000000; |
| 1123 | if ($row < 6) { |
1221 | if ($row < 6) { |
| 1124 | local $_->{face_widget}; # hack to force recreation of widget |
1222 | local $_->{face_widget}; # hack to force recreation of widget |
| 1125 | local $_->{desc_widget}; # hack to force recreation of widget |
1223 | local $_->{desc_widget}; # hack to force recreation of widget |
| 1126 | CFPlus::Item::update_widgets $_; |
1224 | DC::Item::update_widgets $_; |
| 1127 | |
1225 | |
| 1128 | push @add, |
1226 | push @add, |
| 1129 | 0, $row, $_->{face_widget}, |
1227 | 0, $row, $_->{face_widget}, |
| 1130 | 1, $row, $_->{desc_widget}; |
1228 | 1, $row, $_->{desc_widget}; |
| 1131 | |
1229 | |
| 1132 | $row++; |
1230 | $row++; |
| 1133 | } else { |
1231 | } else { |
| 1134 | push @add, 1, $row, new CFPlus::UI::Button |
1232 | push @add, 1, $row, new DC::UI::Button |
| 1135 | text => "More...", |
1233 | text => "More...", |
| 1136 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1234 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
| 1137 | ; |
1235 | ; |
| 1138 | last; |
1236 | last; |
| 1139 | } |
1237 | } |
| 1140 | } |
1238 | } |
| 1141 | if ($::CONN->{open_container}) { |
1239 | if ($::CONN->{open_container}) { |
| 1142 | push @add, 1, $row++, new CFPlus::UI::Button |
1240 | push @add, 1, $row++, new DC::UI::Button |
| 1143 | text => "Close container", |
1241 | text => "Close container", |
| 1144 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1242 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
| 1145 | ; |
1243 | ; |
| 1146 | } |
1244 | } |
| 1147 | |
1245 | |
| 1148 | $::FLOORBOX->add_at (@add); |
1246 | $::FLOORBOX->add_at (@add); |
| 1149 | }); |
1247 | }); |
| 1150 | |
1248 | |
| 1151 | $::WANT_REFRESH->start; |
1249 | $::WANT_REFRESH = 1; |
| 1152 | } |
1250 | } |
| 1153 | |
1251 | |
| 1154 | sub set_opencont { |
1252 | sub set_opencont { |
| 1155 | my ($conn, $tag, $name) = @_; |
1253 | my ($conn, $tag, $name) = @_; |
| 1156 | $conn->{open_container} = $tag; |
1254 | $conn->{open_container} = $tag; |
| 1157 | update_floorbox; |
1255 | update_floorbox; |
| 1158 | |
1256 | |
| 1159 | $::INVR_HB->clear (); |
1257 | $::INVR_HB->clear; |
| 1160 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1258 | $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); |
| 1161 | |
1259 | |
| 1162 | if ($tag != 0) { # Floor isn't closable, is it? |
1260 | if ($tag != 0) { # Floor isn't closable, is it? |
| 1163 | $::INVR_HB->add (new CFPlus::UI::Button |
1261 | $::INVR_HB->add (new DC::UI::Button |
| 1164 | text => "Close container", |
1262 | text => "Close container", |
| 1165 | tooltip => "Close the currently open container (if one is open)", |
1263 | tooltip => "Close the currently open container (if one is open)", |
| 1166 | on_activate => sub { |
1264 | on_activate => sub { |
| 1167 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1265 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
| 1168 | if $tag != 0; |
1266 | if $tag != 0; |
| … | |
… | |
| 1175 | } |
1273 | } |
| 1176 | |
1274 | |
| 1177 | sub update_containers { |
1275 | sub update_containers { |
| 1178 | my ($self) = @_; |
1276 | my ($self) = @_; |
| 1179 | |
1277 | |
| 1180 | $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1278 | $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
| 1181 | my $todo = delete $self->{update_container} |
1279 | my $todo = delete $self->{update_container} |
| 1182 | or return; |
1280 | or return; |
| 1183 | |
1281 | |
| 1184 | for my $tag (keys %$todo) { |
1282 | for my $tag (keys %$todo) { |
| 1185 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
1283 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
| … | |
… | |
| 1220 | } |
1318 | } |
| 1221 | |
1319 | |
| 1222 | sub item_update { |
1320 | sub item_update { |
| 1223 | my ($self, $item) = @_; |
1321 | my ($self, $item) = @_; |
| 1224 | |
1322 | |
| 1225 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1323 | #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n"; |
| 1226 | |
1324 | |
| 1227 | CFPlus::Item::update_widgets $item; |
1325 | DC::Item::update_widgets $item; |
| 1228 | |
1326 | |
| 1229 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1327 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
| 1230 | set_opencont ($::CONN, 0, "Floor"); |
1328 | set_opencont ($::CONN, 0, "Floor"); |
| 1231 | |
1329 | |
| 1232 | } elsif ($item->{flags} & F_OPEN) { |
1330 | } elsif ($item->{flags} & F_OPEN) { |
| 1233 | set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); |
1331 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
| 1234 | |
1332 | |
| 1235 | } else { |
1333 | } else { |
| 1236 | $self->{update_container}{$item->{container}}++; |
1334 | $self->{update_container}{$item->{container}}++; |
| 1237 | $self->update_containers; |
1335 | $self->update_containers; |
| 1238 | } |
1336 | } |
| … | |
… | |
| 1249 | |
1347 | |
| 1250 | my $weight = .001 * $self->{player}{weight}; |
1348 | my $weight = .001 * $self->{player}{weight}; |
| 1251 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1349 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
| 1252 | |
1350 | |
| 1253 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1351 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
| 1254 | $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); |
1352 | $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit); |
| 1255 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1353 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
| 1256 | } |
1354 | } |
| 1257 | |
1355 | |
| 1258 | sub update_server_info { |
1356 | sub update_server_info { |
| 1259 | my ($self) = @_; |
1357 | my ($self) = @_; |
| … | |
… | |
| 1267 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1365 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
| 1268 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
1366 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
| 1269 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1367 | . "editing support $yesno[!!$self->{editor_support}]\n" |
| 1270 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1368 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
| 1271 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
1369 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
| 1272 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1370 | . "client support $yesno[$self->{cfplus_ext} > 0]" |
| 1273 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1371 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
| 1274 | . "map size $self->{mapw}×$self->{maph}\n" |
1372 | . "map size $self->{mapw}×$self->{maph}\n" |
| 1275 | ); |
1373 | ); |
| 1276 | |
1374 | |
| 1277 | } |
1375 | } |
| … | |
… | |
| 1297 | 0 |
1395 | 0 |
| 1298 | }); |
1396 | }); |
| 1299 | |
1397 | |
| 1300 | $self->update_server_info; |
1398 | $self->update_server_info; |
| 1301 | |
1399 | |
| 1302 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
|
|
| 1303 | $self->send_command ("output-count $::CFG->{output_count}"); |
|
|
| 1304 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1400 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
| 1305 | $self->send_command ("pickup $::CFG->{pickup}"); |
1401 | $self->send_pickup ($::CFG->{pickup}); |
|
|
1402 | |
|
|
1403 | $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]", |
|
|
1404 | DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d# |
| 1306 | } |
1405 | } |
| 1307 | |
1406 | |
| 1308 | sub lookat { |
1407 | sub lookat { |
| 1309 | my ($self, $x, $y) = @_; |
1408 | my ($self, $x, $y) = @_; |
| 1310 | |
1409 | |
| … | |
… | |
| 1312 | $self->send_ext_req (lookat => $x, $y, sub { |
1411 | $self->send_ext_req (lookat => $x, $y, sub { |
| 1313 | my (%msg) = @_; |
1412 | my (%msg) = @_; |
| 1314 | |
1413 | |
| 1315 | if (exists $msg{npc_dialog}) { |
1414 | if (exists $msg{npc_dialog}) { |
| 1316 | # start npc chat dialog |
1415 | # start npc chat dialog |
| 1317 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1416 | $self->{npc_dialog} = new DC::NPCDialog:: |
| 1318 | token => $msg{npc_dialog}, |
1417 | token => $msg{npc_dialog}, |
| 1319 | title => "$msg{npc_dialog}[0] (NPC)", |
1418 | title => "$msg{npc_dialog}[0] (NPC)", |
| 1320 | conn => $self, |
1419 | conn => $self, |
| 1321 | ; |
1420 | ; |
| 1322 | } |
1421 | } |
| … | |
… | |
| 1335 | $self->SUPER::destroy; |
1434 | $self->SUPER::destroy; |
| 1336 | |
1435 | |
| 1337 | %$self = (); |
1436 | %$self = (); |
| 1338 | } |
1437 | } |
| 1339 | |
1438 | |
| 1340 | package CFPlus::NPCDialog; |
1439 | package DC::NPCDialog; |
| 1341 | |
1440 | |
| 1342 | our @ISA = 'CFPlus::UI::Toplevel'; |
1441 | our @ISA = 'DC::UI::Toplevel'; |
| 1343 | |
1442 | |
| 1344 | sub new { |
1443 | sub new { |
| 1345 | my $class = shift; |
1444 | my $class = shift; |
| 1346 | |
1445 | |
| 1347 | my $self = $class->SUPER::new ( |
1446 | my $self = $class->SUPER::new ( |
| … | |
… | |
| 1354 | kw => { hi => 0, yes => 0, no => 0 }, |
1453 | kw => { hi => 0, yes => 0, no => 0 }, |
| 1355 | has_close_button => 1, |
1454 | has_close_button => 1, |
| 1356 | @_, |
1455 | @_, |
| 1357 | ); |
1456 | ); |
| 1358 | |
1457 | |
| 1359 | CFPlus::weaken (my $this = $self); |
1458 | DC::weaken (my $this = $self); |
| 1360 | |
1459 | |
| 1361 | $self->connect (delete => sub { $this->destroy; 1 }); |
1460 | $self->connect (delete => sub { $this->destroy; 1 }); |
| 1362 | |
1461 | |
| 1363 | # better use a pane... |
1462 | # better use a pane... |
| 1364 | $self->add (my $hbox = new CFPlus::UI::HBox); |
1463 | $self->add (my $hbox = new DC::UI::HBox); |
| 1365 | $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); |
1464 | $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1); |
| 1366 | |
1465 | |
| 1367 | $hbox->add (my $vbox = new CFPlus::UI::VBox); |
1466 | $hbox->add (my $vbox = new DC::UI::VBox); |
| 1368 | |
1467 | |
| 1369 | $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); |
1468 | $vbox->add (new DC::UI::Label text => "Message Entry:"); |
| 1370 | $vbox->add ($self->{entry} = new CFPlus::UI::Entry |
1469 | $vbox->add ($self->{entry} = new DC::UI::Entry |
| 1371 | tooltip => "#npc_message_entry", |
1470 | tooltip => "#npc_message_entry", |
| 1372 | on_activate => sub { |
1471 | on_activate => sub { |
| 1373 | my ($entry, $text) = @_; |
1472 | my ($entry, $text) = @_; |
| 1374 | |
1473 | |
| 1375 | return unless $text =~ /\S/; |
1474 | return unless $text =~ /\S/; |
| … | |
… | |
| 1379 | |
1478 | |
| 1380 | 0 |
1479 | 0 |
| 1381 | }, |
1480 | }, |
| 1382 | ); |
1481 | ); |
| 1383 | |
1482 | |
| 1384 | $vbox->add ($self->{options} = new CFPlus::UI::VBox); |
1483 | $vbox->add ($self->{options} = new DC::UI::VBox); |
| 1385 | |
1484 | |
| 1386 | $self->{bye_button} = new CFPlus::UI::Button |
1485 | $self->{bye_button} = new DC::UI::Button |
| 1387 | text => "Bye (close)", |
1486 | text => "Bye (close)", |
| 1388 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1487 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
| 1389 | on_activate => sub { $this->destroy; 1 }, |
1488 | on_activate => sub { $this->destroy; 1 }, |
| 1390 | ; |
1489 | ; |
| 1391 | |
1490 | |
| … | |
… | |
| 1410 | }; |
1509 | }; |
| 1411 | |
1510 | |
| 1412 | sub update_options { |
1511 | sub update_options { |
| 1413 | my ($self) = @_; |
1512 | my ($self) = @_; |
| 1414 | |
1513 | |
| 1415 | CFPlus::weaken $self; |
1514 | DC::weaken $self; |
| 1416 | |
1515 | |
| 1417 | $self->{options}->clear; |
1516 | $self->{options}->clear; |
| 1418 | $self->{options}->add ($self->{bye_button}); |
1517 | $self->{options}->add ($self->{bye_button}); |
| 1419 | |
1518 | |
| 1420 | for my $kw (sort keys %{ $self->{kw} }) { |
1519 | for my $kw (sort keys %{ $self->{kw} }) { |
| 1421 | $self->{options}->add (new CFPlus::UI::Button |
1520 | $self->{options}->add (new DC::UI::Button |
| 1422 | text => $kw, |
1521 | text => $kw, |
| 1423 | on_activate => sub { |
1522 | on_activate => sub { |
| 1424 | $self->send ($kw); |
1523 | $self->send ($kw); |
| 1425 | 0 |
1524 | 0 |
| 1426 | }, |
1525 | }, |
| … | |
… | |
| 1429 | } |
1528 | } |
| 1430 | |
1529 | |
| 1431 | sub feed { |
1530 | sub feed { |
| 1432 | my ($self, $type, @arg) = @_; |
1531 | my ($self, $type, @arg) = @_; |
| 1433 | |
1532 | |
| 1434 | CFPlus::weaken $self; |
1533 | DC::weaken $self; |
| 1435 | |
1534 | |
| 1436 | if ($type eq "update") { |
1535 | if ($type eq "update") { |
| 1437 | my (%info) = @arg; |
1536 | my (%info) = @arg; |
| 1438 | |
1537 | |
| 1439 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1538 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
| 1440 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1539 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
| 1441 | |
1540 | |
| 1442 | if (exists $info{msg}) { |
1541 | if (exists $info{msg}) { |
| 1443 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
1542 | my $text = "\n" . DC::Protocol::sanitise_xml $info{msg}; |
| 1444 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1543 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
| 1445 | my @link; |
1544 | my @link; |
| 1446 | $text =~ s{ |
1545 | $text =~ s{ |
| 1447 | ($match) |
1546 | ($match) |
| 1448 | }{ |
1547 | }{ |
| 1449 | my $kw = $1; |
1548 | my $kw = $1; |
| 1450 | |
1549 | |
| 1451 | push @link, new CFPlus::UI::Label |
1550 | push @link, new DC::UI::Label |
| 1452 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1551 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
| 1453 | can_hover => 1, |
1552 | can_hover => 1, |
| 1454 | can_events => 1, |
1553 | can_events => 1, |
| 1455 | padding_x => 0, |
1554 | padding_x => 0, |
| 1456 | padding_y => 0, |
1555 | padding_y => 0, |
| … | |
… | |
| 1474 | } |
1573 | } |
| 1475 | |
1574 | |
| 1476 | sub send { |
1575 | sub send { |
| 1477 | my ($self, $msg) = @_; |
1576 | my ($self, $msg) = @_; |
| 1478 | |
1577 | |
| 1479 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1578 | $self->{textview}->add_paragraph ({ |
|
|
1579 | markup => |
|
|
1580 | "\n<span foreground='#ffff00'><b>" |
|
|
1581 | . (DC::asxml $msg) |
|
|
1582 | . "</b></span>" |
|
|
1583 | }); |
| 1480 | $self->{textview}->scroll_to_bottom; |
1584 | $self->{textview}->scroll_to_bottom; |
| 1481 | |
1585 | |
| 1482 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1586 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
| 1483 | } |
1587 | } |
| 1484 | |
1588 | |
