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

Diff Legend

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