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

Diff Legend

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