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

Diff Legend

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