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

Diff Legend

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