ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.146 by root, Mon Aug 6 05:06:33 2007 UTC vs.
Revision 1.229 by root, Mon Nov 26 13:02:28 2012 UTC

1package CFPlus::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
5use Guard ();
6
6use Crossfire::Protocol::Constants; 7use Deliantra::Protocol::Constants;
7 8
8use CFPlus; 9use DC;
9use CFPlus::DB; 10use DC::DB;
10use CFPlus::UI; 11use DC::UI;
11use CFPlus::Pod;
12use CFPlus::Macro; 12use DC::Macro;
13use CFPlus::Item; 13use DC::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
16
17our $TEX_DIALOGUE = new_from_resource DC::Texture
18 "dialogue.png", minify => 1, mipmap => 1;
19
20our $TEX_NOFACE = new_from_resource DC::Texture
21 "noface.png", minify => 1, mipmap => 1, wrap => 1;
22
23sub MIN_TEXTURE_UNUSED() { 1 }#d#
18 24
19sub new { 25sub new {
20 my ($class, %arg) = @_; 26 my ($class, %arg) = @_;
21 27
22 my $self = $class->SUPER::new (%arg, 28 my $self = $class->SUPER::new (%arg,
23 setup_req => { 29 setup_req => {
24 extmap => 1, 30 extmap => 1,
25 excmd => 1,
26 ywidget => 1,#d# 31 widget => 2,
27 %{$arg{setup_req} || {}}, 32 %{$arg{setup_req} || {}},
28 }, 33 },
29 ); 34 );
30 35
31 $self->{map_widget}->clr_commands; 36 $self->update_fx_want;
32 37
33 my @cmd_help = map { 38 my $exp_guard = $self->addme_guard;
34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 39 my $skl_guard = $self->addme_guard;
35 or die "unparseable command help: $_->{kw}[0]"; 40 my $spl_guard = $self->addme_guard;
41 $self->send_exti_req (resource => qw(exp_table skill_info spell_paths), sub {
42 my ($exp, $skl, $spl) = @_;
36 43
37 my $cmd = $1; 44 $self->register_face_handler ($exp, sub {
38 my @args = split /\|/, $2;
39 @args = (".*") unless @args;
40
41 my (undef, @par) = CFPlus::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par;
43
44 $_ = $_ eq ".*" ? "" : " $_"
45 for @args;
46
47 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) }
49 @args
50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*";
52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_; 45 my ($face) = @_;
55 &::audio_music_set_ambient ($songs); 46
47 undef $exp_guard;
48 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
49 $_->() for values %{ $self->{on_exp_update} };
50 });
51
52 $self->register_face_handler ($skl, sub {
53 my ($face) = @_;
54
55 undef $skl_guard;
56 my $info = $self->{json_coder}->decode (delete $face->{data});
57 $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info };
58 });
59
60 $self->register_face_handler ($spl, sub {
61 my ($face) = @_;
62
63 undef $spl_guard;
64 my $info = $self->{json_coder}->decode (delete $face->{data});
65 $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info };
66 });
67
68 ()
56 }); 69 });
57 70
58 $self->connect_ext (capabilities => sub { 71 $::COMPLETER->reset;
59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
68 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default;
71 $self->{tilesize} = $default->[3];
72 $self->setup_req (tileset => $default->[0]);
73
74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
75 my $h = int $self->{maph} * 32 / $self->{tilesize};
76
77 $self->setup_req (mapsize => "${w}x${h}");
78 }
79 }
80 });
81 72
82 $self->{json_coder} 73 $self->{json_coder}
83 ->convert_blessed 74 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub { 75 ->filter_json_single_key_object ("\fw" => sub {
85 $self->{widget}{$_[0]} 76 $self->{widget}{$_[0]}
77 })
78 ->filter_json_single_key_object ("\fc" => sub {
79 my ($id) = @_;
80 sub {
81 $self->send_exti_msg (w_e => $id, @_);
82 }
86 }); 83 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196 84
197 # destroy widgets on logout 85 # destroy widgets on logout
198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 86 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199 for my $ws (values %{delete $self->{widgetset} || {}}) { 87 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy 88 $_->destroy
201 for values %{delete $ws->{w} || {}}; 89 for values %{delete $ws->{w} || {}};
202 } 90 }
91
92 delete $self->{items};
93 $::INV->clear;
94 $::INVR->clear;
95 $::INVR_HB->clear;
96 $::FLOORBOX->clear;
203 }); 97 });
204 98
205 $self->{map_widget}->add_command (@$_)
206 for @cmd_help;
207
208 { 99 {
209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 100 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
210 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
211 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 101 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
212 } 102 }
213 103
214 { 104 {
215 $self->{noface} = my $tex = new_from_file CFPlus::Texture 105 $self->{noface} = my $tex = $TEX_NOFACE;
216 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
217 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 106 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
218 } 107 }
108
109# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
110# $self->{expire_w} = AE::timer 1, 1, sub {
111# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
112#
113# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
114# warn DC::SvREFCNT $self->{texture}[$_];
115# $self->{texture}[$_]->unload;
116# warn "expire texture $_\n";#d#
117# }
118#
119# ($self->{expire_count} += $count) < @{ $self->{texture} }
120# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
121# warn "count is $count\n";#d#
122# };
219 123
220 $self->{open_container} = 0; 124 $self->{open_container} = 0;
221 125
222 # per server 126 # per server
223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 127 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224 128
225 $self 129 $self
226} 130}
227 131
132 #$self->send_exti_req (nickmon => 1, sub { use Data::Dump; ddx \@_ });#d#
133#sub ext_nicklist { shift; use Data::Dump; ddx \@_; } #d#
134
135sub update_fx_want {
136 my ($self) = @_;
137
138 $self->send_exti_msg (fx_want => {
139 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
140 5 => !!$::CFG->{audio_enable}, # FT_SOUND
141 6 => 1, # FT_RSRC
142 });
143}
144
145sub ext_capabilities {
146 my ($self, %cap) = @_;
147
148 if (my $ts = $cap{tileset}) {
149 if (my ($default) = grep $_->[2] & 1, @$ts) {
150 $self->{tileset} = $default;
151 $self->{tilesize} = $default->[3];
152 $self->setup_req (tileset => $default->[0]);
153
154 my $w = int $self->{mapw} * 32 / $self->{tilesize};
155 my $h = int $self->{maph} * 32 / $self->{tilesize};
156
157 $self->setup_req (mapsize => "${w}x${h}");
158 }
159 }
160}
161
162sub ext_ambient_music {
163 my ($self, $songs) = @_;
164 &::audio_music_set_ambient ($songs);
165}
166
167sub ext_command_list {
168 my ($self, @faces) = @_;
169
170 my $handler = $self->{command_facehandler} = {};
171 my $commands = $::COMPLETER->{command_list} = {};
172
173 $::COMPLETER->{command_lists} = \@faces;
174
175 for my $idx (@faces) {
176 $handler->{$idx} = $self->register_face_handler ($idx, sub {
177 my ($face) = @_;
178
179 $commands->{$idx} =
180 $face->{cache} ||= $self->{json_coder}->decode ($face->{data});
181 });
182 }
183}
184
185#############################################################################
186
187sub widget_associate {
188 my ($self, $ws, $id, $widget) = @_;
189
190 $widget ||= new DC::UI::Bin;
191
192 $widget->{s_id} = $id;
193 $self->{widget}{$id} = $widget;
194
195 if ($ws) {
196 $widget->{s_ws} = $ws;
197 $self->{widgetset}{$ws}{w}{$id} = $widget;
198 }
199
200 $widget->connect (on_destroy => sub {
201 my ($widget) = @_;
202
203 delete $self->{widget}{$widget->{s_id}};
204 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
205 if exists $widget->{s_ws};
206 });
207}
208
209# widgetset new
210sub ext_ws_n {
211 my ($self, $id) = @_;
212
213 $self->{widgetset}{$id} = {
214 w => {},
215 };
216}
217
218# widgetset destroy
219sub ext_ws_d {
220 my ($self, $id) = @_;
221
222 my $ws = delete $self->{widgetset}{$id}
223 or return;
224
225 $_->destroy
226 for values %{$ws->{w}};
227}
228
229# widgetset create
230sub ext_ws_c {
231 my ($self, $ws, $id, $class, $args) = @_;
232
233 $self->widget_associate (
234 $ws, $id => scalar eval {
235 local $SIG{__DIE__};
236 "DC::UI::$class"->new (%$args)
237 }
238 );
239}
240
241# widgetset create template
242sub ext_ws_ct {
243 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
244
245 $done_cb ||= sub { };
246
247 my $parse_list; $parse_list = sub {
248 my ($list) = @_;
249 my @w;
250
251 while (@$list) {
252 my ($class, $args) = splice @$list, 0, 2;
253 my $name = delete $args->{s_id};
254 my $cl = delete $args->{s_cl};
255 my $cfg = delete $cfg->{$name};
256 my $id = delete $cfg->{id};
257 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
258 or next;
259
260 $self->widget_associate ($ws, $id, $w)
261 if $id;
262
263 $w->add ($parse_list->($cl))
264 if $cl;
265
266 push @w, $w;
267 }
268
269 @w
270 };
271
272 # either array reference, or face #
273 if ($type eq "inline") {
274 $done_cb->();
275 $parse_list->($template);
276 } elsif ($type eq "face") {
277 my $handler; $handler = $self->register_face_handler ($template, sub {
278 my ($face) = @_;
279
280 undef $handler;
281 $done_cb->();
282 $parse_list->($self->{json_coder}->decode ($face->{data}));
283 });
284 } else {
285 $done_cb->(0);
286 }
287}
288
289# widgetset associate
290sub ext_ws_a {
291 my ($self, %ass) = @_;
292
293 # everything that has a name, wether conceivably useful or not
294 my %wkw = (
295 root => $DC::UI::ROOT,
296 tooltip => $DC::UI::TOOLTIP,
297
298 mapwidget => $::MAPWIDGET,
299 menubar => $::MENUBAR,
300 menupopup => $::MENUPOPUP,
301 pickup_enable => $::PICKUP_ENABLE,
302 buttonbar => $::BUTTONBAR,
303 metaserver => $::METASERVER,
304 buttonbar => $::BUTTONBAR,
305 login_button => $::LOGIN_BUTTON,
306 quit_dialog => $::QUIT_DIALOG,
307 host_entry => $::HOST_ENTRY,
308 metaserver => $::METASERVER,
309 server_info => $::SERVER_INFO,
310
311 setup_dialog => $::SETUP_DIALOG,
312 setup_notebook => $::SETUP_NOTEBOOK,
313 setup_server => $::SETUP_SERVER,
314 setup_keyboard => $::SETUP_KEYBOARD,
315
316 pl_notebook => $::PL_NOTEBOOK,
317 pl_window => $::PL_WINDOW,
318 inventory_page => $::INVENTORY_PAGE,
319 stats_page => $::STATS_PAGE,
320 skill_page => $::SKILL_PAGE,
321 spell_page => $::SPELL_PAGE,
322 spell_list => $::SPELL_LIST,
323
324 floorbox => $::FLOORBOX,
325 help_window => $::HELP_WINDOW,
326 message_window => $::MESSAGE_WINDOW,
327 message_dist => $::MESSAGE_DIST,
328 statusbox => $::STATUSBOX,
329
330 inv => $::INV,
331 invr => $::INVR,
332 invr_hb => $::INVR_HB,
333 );
334
335 while (my ($id, $name) = each %ass) {
336 $self->widget_associate (undef, $id => $wkw{$name});
337 }
338}
339
340# widget call
341sub ext_w_c {
342 my ($self, $id, $rcb, $method, @args) = @_;
343
344 my $w = $self->{widget}{$id}
345 or return;
346
347 if ($rcb) {
348 $rcb->($w->$method (@args));
349 } else {
350 $w->$method (@args);
351 }
352}
353
354# widget set
355sub ext_w_s {
356 my ($self, $id, $attr) = @_;
357
358 my $w = $self->{widget}{$id}
359 or return;
360
361 for (my $i = 0; $i < $#$attr; $i += 2) {
362 my ($member, $value) = @$attr[$i, $i+1];
363 if (defined $value) {
364 $w->{$member} = $value;
365 } else {
366 delete $w->{$member};
367 }
368 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
369 }
370}
371
372# widget get
373sub ext_w_g {
374 my ($self, $id, $rid, @attr) = @_;
375
376 my $w = $self->{widget}{$id}
377 or return;
378
379 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
380}
381
382# message window
383sub ext_channel_info {
384 my ($self, $info) = @_;
385 $self->{channels}->{$info->{id}} = $info;
386 $::MESSAGE_DIST->add_channel ($info);
387}
388
389#############################################################################
390
228sub logprint { 391sub logprint {
229 my ($self, @a) = @_; 392 my ($self, @a) = @_;
230 393
231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 394 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
232} 395}
233 396
234sub _stat_numdiff { 397sub _stat_numdiff {
235 my ($self, $name, $old, $new) = @_; 398 my ($self, $name, $old, $new) = @_;
236 399
… …
254 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 417 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
255 : () 418 : ()
256 } 419 }
257 sort { $a <=> $b } keys %{$self->{spell_paths}}; 420 sort { $a <=> $b } keys %{$self->{spell_paths}};
258 421
259 join "", @diff 422 "\u$name: " . (join ", ", @diff)
260} 423}
261 424
262# all stats that are chacked against changes 425# all stats that are chacked against changes
263my @statchange = ( 426my @statchange = (
264 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 427 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
307 470
308 if (my @diffs = 471 if (my @diffs =
309 ( 472 (
310 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), 473 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
311 map { 474 map {
312 $stats->{$_} && $prev->{$_} 475 $stats->{$_} && $prev->{$_}
313 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 476 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
314 } sort { $a <=> $b } keys %{$self->{skill_info}} 477 } sort { $a <=> $b } keys %{$self->{skill_info}}
315 ) 478 )
316 ) { 479 ) {
317 my $msg = join " ", @diffs; 480 my $msg = join " ", @diffs;
… …
319 } 482 }
320 483
321 if ( 484 if (
322 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 485 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
323 ) { 486 ) {
324 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 487 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
325 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 488 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
326 } 489 }
327 490
328 $self->update_stats_window ($stats, $prev); 491 $self->update_stats_window ($stats, $prev);
329 492
330 $self->{prev_stats} = { %$stats }; 493 $self->{prev_stats} = { %$stats };
… …
367 530
368 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 531 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
369 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 532 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
370 $::GAUGES->{food} ->set_value ($fo, $fo_m); 533 $::GAUGES->{food} ->set_value ($fo, $fo_m);
371 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 534 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
372 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 535 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
373 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 536 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
537 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
374 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 538 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
375 my $title = $stats->{+CS_STAT_TITLE}; 539 my $title = $stats->{+CS_STAT_TITLE};
376 $title =~ s/^Player: //; 540 $title =~ s/^Player: //;
377 $::STATWIDS->{title} ->set_text ("Title: " . $title); 541 $::STATWIDS->{title} ->set_text ("Title: " . $title);
378 542
… …
390 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 554 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
391 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 555 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
392 556
393 $self->update_weight; 557 $self->update_weight;
394 558
395 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 559 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
396 for keys %RES_TBL; 560 for keys %RES_TBL;
397 561
398 my $sktbl = $::STATWIDS->{skill_tbl}; 562 my $sktbl = $::STATWIDS->{skill_tbl};
399 my @skills = keys %{ $self->{skill_info} }; 563 my @skills = keys %{ $self->{skill_info} };
400 564
401 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 565 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
566 map [$_, $self->{skill_info}{$_}],
567 grep exists $stats->{$_},
568 @skills;
569
570 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
571 $self->{stat_order} = join ",", map $_->[0], @order;
572
402 $sktbl->clear; 573 $sktbl->clear;
403 574
404 my @add; 575 my $sw = $self->{skillwid}{""} ||= [
405
406 push @add,
407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 576 0, 0, (new DC::UI::Label text => "Experience", align => 1),
408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 577 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
578 2, 0, (new DC::UI::Label text => "Progress"),
409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 579 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 580 4, 0, (new DC::UI::Label text => "Experience", align => 1),
411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 581 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
582 6, 0, (new DC::UI::Label text => "Progress"),
412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 583 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
413 ; 584 ];
414 585
586 my @add = @$sw;
587
415 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 588 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
416 589
417 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 590 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
418 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 591 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
419 592
420 my ($x, $y) = (0, 1); 593 my ($x, $y) = (0, 1);
421 for ( 594 for (@order) {
422 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
423 map [$_, $self->{skill_info}{$_}],
424 grep exists $stats->{$_},
425 @skills
426 ) {
427 my ($idx, $name) = @$_; 595 my ($idx, $name) = @$_;
428 596
429 my $spell_cb = sub { 597 my $spell_cb = sub {
430 my ($widget, $ev) = @_; 598 my ($widget, $ev) = @_;
431 599
432 if ($ev->{button} == 1) { 600 if ($ev->{button} == 1) {
433 $::CONN->user_send ("ready_skill $name"); 601 $::CONN->user_send ("ready_skill $name");
434 } elsif ($ev->{button} == 2) { 602 } elsif ($ev->{button} == 2) {
435 $::CONN->user_send ("use_skill $name"); 603 $::CONN->user_send ("use_skill $name");
436 } elsif ($ev->{button} == 3) { 604 } elsif ($ev->{button} == 3) {
437 my $shortname = CFPlus::shorten $name, 14; 605 my $shortname = DC::shorten $name, 14;
438 (new CFPlus::UI::Menu 606 (new DC::UI::Menu
439 items => [ 607 items => [
440 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 608 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
441 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 609 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
442 ], 610 ],
443 )->popup ($ev); 611 )->popup ($ev);
444 } else { 612 } else {
445 return 0; 613 return 0;
446 } 614 }
447 615
448 1 616 1
449 }; 617 };
450 618
619 my $sw = $self->{skillwid}{$idx} ||= [
620 # exp
621 (new DC::UI::Label
622 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
623
624 # level
625 (new DC::UI::Label
626 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
627
628 # progress
629 (new DC::UI::ExperienceProgress),
630
631 # label
632 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
633 can_events => 1, can_hover => 1, tooltip => "#(skill/$name)$TOOLTIP_ALL"),
634 ];
635
451 push @add, 636 push @add,
452 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 637 $x * 4 + 0, $y, $sw->[0],
453 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 638 $x * 4 + 1, $y, $sw->[1],
454 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 639 $x * 4 + 2, $y, $sw->[2],
455 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 640 $x * 4 + 3, $y, $sw->[3],
456 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
457 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458 ; 641 ;
459 642
460 $x++ and ($x, $y) = (0, $y + 1); 643 $x++ and ($x, $y) = (0, $y + 1);
461 } 644 }
462 645
463 $sktbl->add_at (@add); 646 $sktbl->add_at (@add);
464 } 647 }
465 648
466 for (grep exists $stats->{$_}, @skills) { 649 for (@order) {
467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 650 my ($idx, $name) = @$_;
468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 651 my $val = $stats->{$idx};
469 }
470}
471 652
472sub macro_send { 653 next if $prev->{$idx}[1] eq $val->[1];
473 my ($self, $macro) = @_;
474 654
475 for my $cmd (@{ $macro->{action} }) { 655 my $sw = $self->{skillwid}{$idx};
476 $self->send_command ($cmd); 656 $sw->[0]->set_text (::formsep ($val->[1]));
657 $sw->[1]->set_text ($val->[0] * 1);
658 $sw->[2]->set_value (@$val);
659
660 $::GAUGES->{skillexp}->set_label ("$name %d%%");
661 $::GAUGES->{skillexp}->set_value (@$val);
477 } 662 }
478} 663}
479 664
480sub user_send { 665sub user_send {
481 my ($self, $command) = @_; 666 my ($self, $command) = @_;
… …
483 $self->{record}->($command) 668 $self->{record}->($command)
484 if $self->{record}; 669 if $self->{record};
485 670
486 $self->logprint ("send: ", $command); 671 $self->logprint ("send: ", $command);
487 $self->send_command ($command); 672 $self->send_command ($command);
488 ::status ($command);
489} 673}
490 674
491sub record { 675sub record {
492 my ($self, $cb) = @_; 676 my ($self, $cb) = @_;
493 677
… …
495} 679}
496 680
497sub map_scroll { 681sub map_scroll {
498 my ($self, $dx, $dy) = @_; 682 my ($self, $dx, $dy) = @_;
499 683
500 $self->{map}->scroll ($dx, $dy); 684 $self->{map_widget}->scroll ($dx, $dy);
501} 685}
502 686
503sub feed_map1a { 687sub feed_map1a {
504 my ($self, $data) = @_; 688 my ($self, $data) = @_;
505 689
506 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 690 my $missing = $self->{map}->map1a_update ($data);
691 my $delay;
692
693 for my $tile (@$missing) {
694 next if $self->{delay}{$tile};
695
696 $delay = 1;
697
698 if (my $tex = $self->{texture}[$tile]) {
699 $tex->upload;
700 } else {
701 $self->{delay}{$tile} = 1;
702
703 # we assume the face is in-flight and will eventually arrive
704 push @{$self->{tile_cb}{$tile}}, sub {
705 delete $self->{delay}{$tile};
706 $_[0]->upload;
707 };
708 }
709 }
710
711 if ($delay) {
712 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
713 EV::once undef, 0, 0.03, sub {
714 $self->{map_widget}->update
715 if $self->{map_widget};
716 };
717 } else {
507 $self->{map_widget}->update; 718 $self->{map_widget}->update;
719 }
508} 720}
509 721
510sub magicmap { 722sub magicmap {
511 my ($self, $w, $h, $x, $y, $data) = @_; 723 my ($self, $w, $h, $x, $y, $data) = @_;
512 724
… …
514} 726}
515 727
516sub flush_map { 728sub flush_map {
517 my ($self) = @_; 729 my ($self) = @_;
518 730
519 my $map_info = delete $self->{map_info} 731 return unless $self->{map_info};
520 or return;
521 732
733 for my $map_info (values %{ $self->{map_cache} || {} }) {
522 my ($hash, $x, $y, $w, $h) = @$map_info; 734 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
523 735
524 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 736 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
737
738 if ($data ne $$rdata) {
739 $map_info->[1] = \$data;
740 my $cdata = Compress::LZF::compress $data;
525 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 741 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
526 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 742 }
743 }
527} 744}
528 745
529sub map_clear { 746sub map_clear {
530 my ($self) = @_; 747 my ($self) = @_;
531 748
532 $self->flush_map; 749 $self->flush_map;
750 delete $self->{map_info};
533 delete $self->{neigh_map}; 751 delete $self->{neigh_map};
534 752
535 $self->{map}->clear; 753 $self->{map}->clear;
536 delete $self->{map_widget}{magicmap}; 754 delete $self->{map_widget}{magicmap};
537} 755}
538 756
539sub bg_fetch { 757sub bg_fetch {
540 my ($self) = @_; 758 my ($self) = @_;
541 759
542 my $id; 760 my $tile;
543 761
544 do { 762 do {
545 $id = pop @{$self->{bg_fetch}} 763 $tile = pop @{$self->{bg_fetch}}
546 or return; 764 or return;
547 } while $self->{texture}[$id]; 765 } while $self->{texture}[$tile];
548 766
549 CFPlus::DB::exists tilecache => $id, sub { 767 DC::DB::get tilecache => $tile, sub {
550 my ($exists) = @_; 768 my ($data) = @_;
551 769
552 return unless $self->{map}; # stop when destroyed 770 return unless $self->{map}; # stop when destroyed
553 771
772 if (defined $data) {
554 $self->have_tile ($id) 773 $self->have_tile ($tile, $data);
555 if $exists; 774 $self->{texture}[$tile]->upload;
775 }
556 776
557 $self->bg_fetch; 777 $self->bg_fetch;
558 }; 778 };
559} 779}
560 780
561sub load_map($$$) { 781sub load_map($$$$$$) {
562 my ($self, $hash, $x, $y) = @_; 782 my ($self, $hash, $x, $y, $w, $h) = @_;
563 783
564 my $gen = $self->{map_change_gen}; 784 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
565 785
566 CFPlus::DB::get $self->{mapcache} => $hash, sub { 786 my $cb = sub {
567 return unless $gen == $self->{map_change_gen}; 787 $map_info->[1] = \$_[0];
568 788
569 my ($data) = @_;
570
571 if (defined $data) {
572 $data = Compress::LZF::decompress $data;
573 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
574
575 my $inprogress = @{ $self->{bg_fetch} || [] }; 789 my $inprogress = @{ $self->{bg_fetch} || [] };
576 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 790 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
577 $self->bg_fetch unless $inprogress; 791 $self->bg_fetch unless $inprogress;
578 }
579 }; 792 };
793
794 if (my $map_info = $self->{map_cache_old}{$hash}) {
795 $cb->(${ $map_info->[1] });
796 } else {
797 my $gen = $self->{map_change_gen};
798
799 DC::DB::get $self->{mapcache} => $hash, sub {
800 return unless $gen == $self->{map_change_gen};
801 return unless defined $_[0];
802 $cb->(Compress::LZF::decompress $_[0]);
803 };
804 }
580} 805}
581 806
582# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 807# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
583# (server resource,s latency, bandwidth), so this hack is warranted. 808# (server resources, latency, bandwidth), so this hack is warranted.
584# the right fix is to make real tiled maps with an overview file 809# the right fix is to make real tiled maps with an overview file
585sub send_mapinfo { 810sub send_mapinfo {
586 my ($self, $data, $cb) = @_; 811 my ($self, $data, $cb) = @_;
587 812
588 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 813 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
… …
613} 838}
614 839
615# this method does a "flood fill" into every tile direction 840# this method does a "flood fill" into every tile direction
616# it assumes that tiles are arranged in a rectangular grid, 841# it assumes that tiles are arranged in a rectangular grid,
617# i.e. a map is the same as the left of the right map etc. 842# i.e. a map is the same as the left of the right map etc.
618# failure to comply are harmless and result in display errors 843# failure to comply is harmless and results in display errors
619# at worst. 844# at worst.
620sub flood_fill { 845sub flood_fill {
621 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 846 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
622 847
623 # the server does not allow map paths > 6 848 # the server does not allow map paths > 6
… …
659 return if $mode ne "spatial"; 884 return if $mode ne "spatial";
660 885
661 $x += $self->{map}->ox; 886 $x += $self->{map}->ox;
662 $y += $self->{map}->oy; 887 $y += $self->{map}->oy;
663 888
664 $self->load_map ($hash, $x, $y) 889 $self->load_map ($hash, $x, $y, $w, $h)
665 unless $self->{neigh_map}{$hash}[5]++;#d# 890 unless $self->{neigh_map}{$hash}[5]++;#d#
666 891
667 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 892 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
668 893
669 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 894 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
677 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 902 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
678 903
679 $self->flush_map; 904 $self->flush_map;
680 905
681 ++$self->{map_change_gen}; 906 ++$self->{map_change_gen};
907 $self->{map_cache_old} = delete $self->{map_cache};
682 908
683 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 909 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
684 910
685 my $mapmapw = $self->{mapmap}->{w}; 911 my $mapmapw = $self->{mapmap}->{w};
686 my $mapmaph = $self->{mapmap}->{h}; 912 my $mapmaph = $self->{mapmap}->{h};
… …
698 $self->{map_info} = [$hash, $x, $y, $w, $h]; 924 $self->{map_info} = [$hash, $x, $y, $w, $h];
699 925
700 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 926 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
701 $::STATWIDS->{map}->set_text ("Map: " . $map); 927 $::STATWIDS->{map}->set_text ("Map: " . $map);
702 928
703 $self->load_map ($hash, $x, $y); 929 $self->load_map ($hash, $x, $y, $w, $h);
704 $self->flood_fill (0, 0, 0, "", $hash, $flags); 930 $self->flood_fill (0, 0, 0, "", $hash, $flags);
705} 931}
706 932
707sub face_find { 933sub face_find {
708 my ($self, $facenum, $face, $cb) = @_; 934 my ($self, $facenum, $face, $cb) = @_;
709 935
710 if ($face->{type} == 0) { # FT_FACE 936 if ($face->{type} == 0) { # FT_FACE
711 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 937 my $id = DC::DB::get_tile_id_sync $face->{name};
712 938
713 $face->{id} = $id; 939 $face->{id} = $id;
714 $self->{faceid}[$facenum] = $id;
715
716 $self->{map}->set_tileid ($facenum => $id); 940 $self->{map}->set_tileid ($facenum => $id);
717 941
718 CFPlus::DB::get tilecache => $id, $cb; 942 DC::DB::get tilecache => $id, $cb;
719 943
720 } elsif ($face->{type} & 1) { # with metadata 944 } elsif ($face->{type} & 1) { # with metadata
721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
722 CFPlus::DB::get res_meta => $face->{name}, $cb; 945 DC::DB::get res_meta => $face->{name}, $cb;
946
947 } else { # no metadata
948 DC::DB::get res_data => $face->{name}, $cb;
723 } 949 }
724} 950}
725 951
726sub face_update { 952sub face_update {
727 my ($self, $facenum, $face, $changed) = @_; 953 my ($self, $facenum, $face, $changed) = @_;
728 954
729 if ($face->{type} == 0) { # FT_FACE 955 if ($face->{type} == 0) {
956 # image, FT_FACE
730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 957 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
731 if $changed; 958 if $changed;
732 959
733 $self->have_tile ($face->{id}); 960 $self->have_tile ($face->{id}, delete $face->{data});
734 961
735 } elsif ($face->{type} & 1) { # split metadata 962 } elsif ($face->{type} & 1) {
736 my $cb = sub { }; 963 # split metadata case, FT_MUSIC, FT_SOUND
964 if ($changed) { # new data
965 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
966 $face->{data} = $meta;
967
968 # rely on strict ordering here and also on later fetch
969 DC::DB::put res_data => $face->{name} => $data, sub { };
970 DC::DB::put res_meta => $face->{name} => $meta, sub { };
971 }
972
973 $face->{data} = $self->{json_coder}->decode ($face->{data});
974 ::add_license ($face);
975 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
976 if $changed;
737 977
738 if ($face->{type} == 3) { # FT_MUSIC 978 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed;
744
745 &::audio_music_push ($facenum); 979 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND 980 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed;
753
754 &::audio_sound_push ($facenum); 981 &::audio_sound_push ($facenum);
755 }; 982 }
756 }
757 983
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
764 ::add_license ($face);
765 $cb->();
766 };
767
768 } else { 984 } else {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 985 # flat resource case, FT_RSRC
770 ::add_license ($face); 986 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
771 $cb->(); 987 if $changed;
772 } 988 }
989
990 if (my $cbs = $self->{face_cb}{$facenum}) {
991 $_->($face, $changed) for @$cbs;
773 } 992 }
774} 993}
775 994
776sub smooth_update { 995sub smooth_update {
777 my ($self, $facenum, $face) = @_; 996 my ($self, $facenum, $face) = @_;
778 997
779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 998 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
780} 999}
781 1000
782sub have_tile { 1001sub have_tile {
783 my ($self, $tile) = @_; 1002 my ($self, $tile, $data) = @_;
784 1003
785 return unless $self->{map}; 1004 return unless $self->{map};
786 1005
787 $self->{texture}[$tile] ||= my $tex = 1006 my $tex = $self->{texture}[$tile] ||=
788 new CFPlus::Texture 1007 new DC::Texture
789 tile => $tile, minify => 1, mipmap => 1, delay => 1; 1008 tile => $tile,
1009 image => $data, delete_image => 1,
1010 minify => 1;
790 1011
791 $_->() for @{(delete $self->{face_cb}{$tile}) || []}; 1012 if (my $cbs = delete $self->{tile_cb}{$tile}) {
1013 $_->($tex) for @$cbs;
1014 }
792} 1015}
793 1016
794sub connect_face_update { 1017# call in non-void context registers a temporary
1018# hook with handle, otherwise its permanent
1019sub on_face_change {
795 my ($self, $id, $cb) = @_; 1020 my ($self, $num, $cb) = @_;
796 1021
797 push @{$self->{face_cb}{$id}}, $cb; 1022 push @{$self->{face_cb}{$num}}, $cb;
798 1023
799 CFPlus::guard { 1024 defined wantarray
1025 ? Guard::guard {
800 @{$self->{face_cb}{$id}} 1026 @{$self->{face_cb}{$num}}
801 = grep $_ != $cb, 1027 = grep $_ != $cb,
802 @{$self->{face_cb}{$id}}; 1028 @{$self->{face_cb}{$num}};
803 } 1029 }
1030 : ()
1031}
1032
1033# call in non-void context registers a temporary
1034# hook with handle, otherwise its permanent
1035sub register_face_handler {
1036 my ($self, $num, $cb) = @_;
1037
1038 return unless $num;
1039
1040 # invoke if available right now
1041 $cb->($self->{face}[$num], 0)
1042 unless exists $self->{face}[$num]{loading};
1043
1044 # future changes
1045 $self->on_face_change ($num => $cb)
804} 1046}
805 1047
806sub sound_play { 1048sub sound_play {
807 my ($self, $type, $face, $dx, $dy, $vol) = @_; 1049 my ($self, $type, $face, $dx, $dy, $vol) = @_;
808 1050
… …
816 my ($self, $flags, $prompt) = @_; 1058 my ($self, $flags, $prompt) = @_;
817 1059
818 $prompt = $LAST_QUERY unless length $prompt; 1060 $prompt = $LAST_QUERY unless length $prompt;
819 $LAST_QUERY = $prompt; 1061 $LAST_QUERY = $prompt;
820 1062
821 $self->{query}-> ($self, $flags, $prompt); 1063 $self->{query}->($self, $flags, $prompt);
822}
823
824sub sanitise_xml($) {
825 local $_ = shift;
826
827 # we now weed out all tags we do not support
828 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
829 # now all entities
830 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
831
832 # handle some elements
833 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
834 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
835
836 $_
837} 1064}
838 1065
839our %NAME_TO_COLOR = ( 1066our %NAME_TO_COLOR = (
840 black => 0, 1067 black => 0,
841 white => 1, 1068 white => 1,
… …
852 tan => 12, 1079 tan => 12,
853); 1080);
854 1081
855our @CF_COLOR = ( 1082our @CF_COLOR = (
856 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1083 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
857 [1.00, 1.00, 1.00], 1084 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
858 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1085 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55],
859 [1.00, 0.00, 0.00], 1086 [1.00, 0.00, 0.00],
860 [1.00, 0.54, 0.00], 1087 [1.00, 0.54, 0.00],
861 [0.11, 0.56, 1.00], 1088 [0.11, 0.56, 1.00],
862 [0.93, 0.46, 0.00], 1089 [0.93, 0.46, 0.00],
863 [0.18, 0.54, 0.34], 1090 [0.18, 0.54, 0.34],
… …
869); 1096);
870 1097
871sub msg { 1098sub msg {
872 my ($self, $color, $type, $text, @extra) = @_; 1099 my ($self, $color, $type, $text, @extra) = @_;
873 1100
874 $text = sanitise_xml $text; 1101 $text = DC::sanitise_cfxml $text;
875 1102
876 if (my $cb = $self->{cb_msg}{$type}) { 1103 if (my $cb = $self->{cb_msg}{$type}) {
877 $_->($self, $color, $type, $text, @extra) for values %$cb; 1104 $_->($self, $color, $type, $text, @extra) for values %$cb;
878 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 1105 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
879 $type =~ s/-/_/g; 1106 $type =~ s/-/_/g;
880 $self->{$type} = $text; 1107 $self->{$type} = $text;
881 } else { 1108 } else {
882 $self->logprint ("msg: ", $text); 1109 $self->logprint ("msg: ", $text);
883 return if $color < 0; # negative color == ignore if not understood 1110 return if $color < 0; # negative color == ignore if not understood
884 1111
885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; 1112 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
886 1113
887 ## try to create single paragraphs of multiple lines sent by the server 1114 ::message ({
888 # no longer neecssary with TRT servers 1115 fg => $fg,
889 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1116 markup => $text,
1117 type => $type,
1118 extra => [@extra],
1119 color_flags => $color, #d# ugly, kill
1120 });
890 1121
891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) 1122# $color &= ~NDI_CLEAR; # only clear once for multiline messages
892 for split /\n/, $text; 1123# # actually, this is an ugly design. _we_ should control the channels,
1124# # not some random other widget, as the channels are clearly protocol-specific.
1125# # then we could also react to flags such as CLEAR without resorting to
1126# # hacks such as color_flags, above.
893 1127
894 $self->{statusbox}->add ($text, 1128 $self->{statusbox}->add ($text,
895 group => $text, 1129 group => $text,
896 fg => $fg, 1130 fg => $fg,
897 timeout => $color >= 2 ? 180 : 10, 1131 timeout => $color >= 2 ? 180 : 10,
898 tooltip_font => $::FONT_FIXED, 1132 tooltip_font => $::FONT_FIXED,
899 ); 1133 ) if $type eq "info";
900 } 1134 }
901} 1135}
902 1136
903sub spell_add { 1137sub spell_add {
904 my ($self, $spell) = @_; 1138 my ($self, $spell) = @_;
905 1139
906 # try to create single paragraphs out of the multiple lines sent by the server
907 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
908 $spell->{message} =~ s/\n+$//;
909 $spell->{message} ||= "Server did not provide a description for this spell.";
910
911 $::SPELL_LIST->add_spell ($spell); 1140 $::SPELL_LIST->add_spell ($spell);
912 1141 delete $::COMPLETER->{command_list}{spells};
913 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
914 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
915} 1142}
916 1143
917sub spell_delete { 1144sub spell_delete {
918 my ($self, $spell) = @_; 1145 my ($self, $spell) = @_;
919 1146
920 $::SPELL_LIST->remove_spell ($spell); 1147 $::SPELL_LIST->remove_spell ($spell);
1148 delete $::COMPLETER->{command_list}{spells};
921} 1149}
922 1150
923sub setup { 1151sub setup {
924 my ($self, $setup) = @_; 1152 my ($self, $setup) = @_;
925 1153
926 $self->{map_widget}->set_tilesize ($self->{tilesize}); 1154 $self->{map_widget}->set_tilesize ($self->{tilesize});
927 $::MAP->resize ($self->{mapw}, $self->{maph}); 1155 $::MAP->resize ($self->{mapw}, $self->{maph});
928} 1156}
929 1157
930sub addme_success {
931 my ($self) = @_;
932
933 my %skill_help;
934
935 for my $node (CFPlus::Pod::find skill_description => "*") {
936 my (undef, @par) = CFPlus::Pod::section_of $node;
937 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
938 };
939
940 for my $skill (values %{$self->{skill_info}}) {
941 $self->{map_widget}->add_command ("ready_skill $skill",
942 (CFPlus::asxml "Ready the skill '$skill'\n\n")
943 . $skill_help{$skill});
944 $self->{map_widget}->add_command ("use_skill $skill",
945 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
946 . $skill_help{$skill});
947 }
948}
949
950sub eof { 1158sub eof {
951 my ($self) = @_; 1159 my ($self) = @_;
952 1160
953 $self->{map_widget}->clr_commands; 1161 $::COMPLETER->reset;
954 1162
955 ::stop_game (); 1163 ::stop_game ();
956} 1164}
957 1165
958sub update_floorbox { 1166sub update_floorbox {
959 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1167 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
960 return unless $::CONN; 1168 return unless $::CONN;
961 1169
962 $::FLOORBOX->clear; 1170 $::FLOORBOX->clear;
963 1171
964 my @add; 1172 my @add;
965 1173
966 my $row; 1174 my $row;
967 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1175 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1176 next if $_->{tag} & 0x80000000;
968 if ($row < 6) { 1177 if ($row < 6) {
969 local $_->{face_widget}; # hack to force recreation of widget 1178 local $_->{face_widget}; # hack to force recreation of widget
970 local $_->{desc_widget}; # hack to force recreation of widget 1179 local $_->{desc_widget}; # hack to force recreation of widget
971 CFPlus::Item::update_widgets $_; 1180 DC::Item::update_widgets $_;
972 1181
973 push @add, 1182 push @add,
974 0, $row, $_->{face_widget}, 1183 0, $row, $_->{face_widget},
975 1, $row, $_->{desc_widget}; 1184 1, $row, $_->{desc_widget};
976 1185
977 $row++; 1186 $row++;
978 } else { 1187 } else {
979 push @add, 1, $row, new CFPlus::UI::Button 1188 push @add, 1, $row, new DC::UI::Button
980 text => "More...", 1189 text => "More...",
981 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1190 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
982 ; 1191 ;
983 last; 1192 last;
984 } 1193 }
985 } 1194 }
986 if ($::CONN->{open_container}) { 1195 if ($::CONN->{open_container}) {
987 push @add, 1, $row++, new CFPlus::UI::Button 1196 push @add, 1, $row++, new DC::UI::Button
988 text => "Close container", 1197 text => "Close container",
989 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1198 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
990 ; 1199 ;
991 } 1200 }
992 1201
993 $::FLOORBOX->add_at (@add); 1202 $::FLOORBOX->add_at (@add);
994 }); 1203 });
995 1204
996 $::WANT_REFRESH++; 1205 $::WANT_REFRESH = 1;
997} 1206}
998 1207
999sub set_opencont { 1208sub set_opencont {
1000 my ($conn, $tag, $name) = @_; 1209 my ($conn, $tag, $name) = @_;
1001 $conn->{open_container} = $tag; 1210 $conn->{open_container} = $tag;
1002 update_floorbox; 1211 update_floorbox;
1003 1212
1004 $::INV_RIGHT_HB->clear (); 1213 $::INVR_HB->clear;
1005 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1214 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1006 1215
1007 if ($tag != 0) { # Floor isn't closable, is it? 1216 if ($tag != 0) { # Floor isn't closable, is it?
1008 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1217 $::INVR_HB->add (new DC::UI::Button
1009 text => "Close container", 1218 text => "Close container",
1010 tooltip => "Close the currently open container (if one is open)", 1219 tooltip => "Close the currently open container (if one is open)",
1011 on_activate => sub { 1220 on_activate => sub {
1012 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1221 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1013 if $tag != 0; 1222 if $tag != 0;
1014 #if $CONN->{open_container} != 0;
1015 0 1223 0
1016 }, 1224 },
1017 ); 1225 );
1018 } 1226 }
1019 1227
… …
1021} 1229}
1022 1230
1023sub update_containers { 1231sub update_containers {
1024 my ($self) = @_; 1232 my ($self) = @_;
1025 1233
1026 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1234 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1027 my $todo = delete $self->{update_container} 1235 my $todo = delete $self->{update_container}
1028 or return; 1236 or return;
1029 1237
1030 for my $tag (keys %$todo) { 1238 for my $tag (keys %$todo) {
1031 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1239 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1066} 1274}
1067 1275
1068sub item_update { 1276sub item_update {
1069 my ($self, $item) = @_; 1277 my ($self, $item) = @_;
1070 1278
1071 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1279 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1072 1280
1073 CFPlus::Item::update_widgets $item; 1281 DC::Item::update_widgets $item;
1074 1282
1075 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1283 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1076 set_opencont ($::CONN, 0, "Floor"); 1284 set_opencont ($::CONN, 0, "Floor");
1077 1285
1078 } elsif ($item->{flags} & F_OPEN) { 1286 } elsif ($item->{flags} & F_OPEN) {
1079 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1287 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1080 1288
1081 } else { 1289 } else {
1082 $self->{update_container}{$item->{container}}++; 1290 $self->{update_container}{$item->{container}}++;
1083 $self->update_containers; 1291 $self->update_containers;
1084 } 1292 }
… …
1095 1303
1096 my $weight = .001 * $self->{player}{weight}; 1304 my $weight = .001 * $self->{player}{weight};
1097 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1305 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1098 1306
1099 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1307 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1100 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1308 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1101 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1309 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1102} 1310}
1103 1311
1104sub update_server_info { 1312sub update_server_info {
1105 my ($self) = @_; 1313 my ($self) = @_;
1106 1314
1107 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1315 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1108 1316
1317 my $version = JSON::XS->new->encode ($self->{s_version});
1318
1109 $::SERVER_INFO->set_markup ( 1319 $::SERVER_INFO->set_markup (
1110 "server <tt>$self->{host}:$self->{port}</tt>\n" 1320 "server <tt>$self->{host}:$self->{port}</tt>\n"
1111 . "protocol version <tt>$self->{version}</tt>\n" 1321 . "protocol version <tt>$version</tt>\n"
1112 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1113 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1114 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1115 . "editing support $yesno[!!$self->{editor_support}]\n" 1322 . "editing support $yesno[!!$self->{editor_support}]\n"
1116 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1117 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1118 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1323 . "client support $yesno[$self->{cfplus_ext} > 0]"
1119 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1324 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1120 . "map size $self->{mapw}×$self->{maph}\n" 1325 . "map size $self->{mapw}×$self->{maph}\n"
1121 ); 1326 );
1122 1327
1123} 1328}
… …
1143 0 1348 0
1144 }); 1349 });
1145 1350
1146 $self->update_server_info; 1351 $self->update_server_info;
1147 1352
1148 $self->send_command ("output-sync $::CFG->{output_sync}");
1149 $self->send_command ("output-count $::CFG->{output_count}");
1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1353 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1151 $self->send_command ("pickup $::CFG->{pickup}"); 1354 $self->send_pickup ($::CFG->{pickup});
1152} 1355}
1153 1356
1154sub lookat { 1357sub lookat {
1155 my ($self, $x, $y) = @_; 1358 my ($self, $x, $y) = @_;
1156 1359
… …
1158 $self->send_ext_req (lookat => $x, $y, sub { 1361 $self->send_ext_req (lookat => $x, $y, sub {
1159 my (%msg) = @_; 1362 my (%msg) = @_;
1160 1363
1161 if (exists $msg{npc_dialog}) { 1364 if (exists $msg{npc_dialog}) {
1162 # start npc chat dialog 1365 # start npc chat dialog
1163 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1366 $self->{w}{npc_dialog} = new DC::NPCDialog::
1164 token => $msg{npc_dialog}, 1367 token => $msg{npc_dialog},
1165 title => "$msg{npc_dialog}[0] (NPC)", 1368 title => "$msg{npc_dialog}[0] (NPC)",
1166 conn => $self, 1369 conn => $self,
1167 ; 1370 ;
1168 } 1371 }
… …
1173} 1376}
1174 1377
1175sub destroy { 1378sub destroy {
1176 my ($self) = @_; 1379 my ($self) = @_;
1177 1380
1178 (delete $self->{npc_dialog})->destroy 1381 $_->destroy
1179 if $self->{npc_dialog}; 1382 for values %{ $self->{w} };
1180 1383
1181 $self->SUPER::destroy; 1384 $self->SUPER::destroy;
1182 1385
1183 %$self = (); 1386 %$self = ();
1184} 1387}
1185 1388
1186package CFPlus::NPCDialog; 1389package DC::NPCDialog;
1187 1390
1188our @ISA = 'CFPlus::UI::Toplevel'; 1391our @ISA = 'DC::UI::Toplevel';
1189 1392
1190sub new { 1393sub new {
1191 my $class = shift; 1394 my $class = shift;
1192 1395
1193 my $self = $class->SUPER::new ( 1396 my $self = $class->SUPER::new (
… …
1200 kw => { hi => 0, yes => 0, no => 0 }, 1403 kw => { hi => 0, yes => 0, no => 0 },
1201 has_close_button => 1, 1404 has_close_button => 1,
1202 @_, 1405 @_,
1203 ); 1406 );
1204 1407
1205 CFPlus::weaken (my $this = $self); 1408 DC::weaken (my $this = $self);
1206 1409
1207 $self->connect (delete => sub { $this->destroy; 1 }); 1410 $self->connect (delete => sub { $this->destroy; 1 });
1208 1411
1209 # better use a pane... 1412 # better use a pane...
1210 $self->add (my $hbox = new CFPlus::UI::HBox); 1413 $self->add (my $hbox = new DC::UI::HBox);
1211 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1414 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1212 1415
1213 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1416 $hbox->add (my $vbox = new DC::UI::VBox);
1214 1417
1215 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1418 $vbox->add (new DC::UI::Label text => "Message Entry:");
1216 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1419 $vbox->add ($self->{entry} = new DC::UI::Entry
1217 tooltip => "#npc_message_entry", 1420 tooltip => "#npc_message_entry",
1218 on_activate => sub { 1421 on_activate => sub {
1219 my ($entry, $text) = @_; 1422 my ($entry, $text) = @_;
1220 1423
1221 return unless $text =~ /\S/; 1424 return unless $text =~ /\S/;
… …
1225 1428
1226 0 1429 0
1227 }, 1430 },
1228 ); 1431 );
1229 1432
1230 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1433 $vbox->add ($self->{options} = new DC::UI::VBox);
1231 1434
1232 $self->{bye_button} = new CFPlus::UI::Button 1435 $self->{bye_button} = new DC::UI::Button
1233 text => "Bye (close)", 1436 text => "Bye (close)",
1234 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1437 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1235 on_activate => sub { $this->destroy; 1 }, 1438 on_activate => sub { $this->destroy; 1 },
1236 ; 1439 ;
1237 1440
… …
1256}; 1459};
1257 1460
1258sub update_options { 1461sub update_options {
1259 my ($self) = @_; 1462 my ($self) = @_;
1260 1463
1261 CFPlus::weaken $self; 1464 DC::weaken $self;
1262 1465
1263 $self->{options}->clear; 1466 $self->{options}->clear;
1264 $self->{options}->add ($self->{bye_button}); 1467 $self->{options}->add ($self->{bye_button});
1265 1468
1266 for my $kw (sort keys %{ $self->{kw} }) { 1469 for my $kw (sort keys %{ $self->{kw} }) {
1267 $self->{options}->add (new CFPlus::UI::Button 1470 $self->{options}->add (new DC::UI::Button
1268 text => $kw, 1471 text => $kw,
1269 on_activate => sub { 1472 on_activate => sub {
1270 $self->send ($kw); 1473 $self->send ($kw);
1271 0 1474 0
1272 }, 1475 },
… …
1275} 1478}
1276 1479
1277sub feed { 1480sub feed {
1278 my ($self, $type, @arg) = @_; 1481 my ($self, $type, @arg) = @_;
1279 1482
1280 CFPlus::weaken $self; 1483 DC::weaken $self;
1281 1484
1282 if ($type eq "update") { 1485 if ($type eq "update") {
1283 my (%info) = @arg; 1486 my (%info) = @arg;
1284 1487
1285 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1488 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1286 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1489 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1287 1490
1288 if (exists $info{msg}) { 1491 if (exists $info{msg}) {
1289 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1492 my $text = "\n" . DC::sanitise_cfxml $info{msg};
1290 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1493 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1291 my @link; 1494 my @link;
1292 $text =~ s{ 1495 $text =~ s{
1293 ($match) 1496 ($match)
1294 }{ 1497 }{
1295 my $kw = $1; 1498 my $kw = $1;
1296 1499
1297 push @link, new CFPlus::UI::Label 1500 push @link, new DC::UI::Label
1298 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1501 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1299 can_hover => 1, 1502 can_hover => 1,
1300 can_events => 1, 1503 can_events => 1,
1301 padding_x => 0, 1504 padding_x => 0,
1302 padding_y => 0, 1505 padding_y => 0,
… …
1320} 1523}
1321 1524
1322sub send { 1525sub send {
1323 my ($self, $msg) = @_; 1526 my ($self, $msg) = @_;
1324 1527
1325 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1528 $self->{textview}->add_paragraph ({
1529 markup =>
1530 "\n<span foreground='#ffff00'><b>"
1531 . (DC::asxml $msg)
1532 . "</b></span>"
1533 });
1326 $self->{textview}->scroll_to_bottom; 1534 $self->{textview}->scroll_to_bottom;
1327 1535
1328 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1536 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1329} 1537}
1330 1538
… …
1333 1541
1334 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1542 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1335 1543
1336 if ($self->{conn}) { 1544 if ($self->{conn}) {
1337 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; 1545 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1338 delete $self->{conn}{npc_dialog}; 1546 delete $self->{conn}{w}{npc_dialog};
1339 $self->{conn}->disconnect_ext ($self->{id}); 1547 $self->{conn}->disconnect_ext ($self->{id});
1340 } 1548 }
1341 1549
1342 $self->SUPER::destroy; 1550 $self->SUPER::destroy;
1343} 1551}

Diff Legend

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