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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines