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

Diff Legend

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