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.113 by root, Thu Jul 12 17:56:51 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 my $pri = -100;
63 for my $face (@$faces) {
64 if (defined (my $chksum = $ev->{chksum}{$face})) {
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." });
71 $self->ask_face ($face, $pri, undef, sub {
72 my $num = $_[0];
73 my $len = length $_[1];
74 my ($meta, $data) = unpack "(w/a*)*", $_[1];
75
76 CFPlus::DB::write_file $chksum, $data, sub { };
77 CFPlus::DB::put resmap => $chksum => $meta, sub { };
78
79 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
80 ::message ({ markup => "downloaded song #$face, size $len octets" });
81
82 &::audio_music_set ($self->{songs});
83 });
84 }
85
86 push @songs, $self->{music_map}{$face};
87 --$pri;
88 } 50 });
89 51
90 &::audio_music_set ($self->{songs} = \@songs); 52 $self->register_face_handler ($skl, sub {
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 };
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 ()
91 }); 69 });
92 70
93 $self->connect_ext (event_capabilities => sub { 71 $::COMPLETER->reset;
94 my ($cap) = @_;
95
96 if (my $ts = $cap->{tileset}) {
97 if (my ($default) = grep $_->[2] & 1, @$ts) {
98 $self->{tileset} = $default;
99 $self->{tilesize} = $default->[3];
100 $self->setup_req (tileset => $default->[0]);
101
102 my $w = int $self->{mapw} * 32 / $self->{tilesize};
103 my $h = int $self->{maph} * 32 / $self->{tilesize};
104
105 $self->setup_req (mapsize => "${w}x${h}");
106 }
107 }
108 });
109 72
110 $self->{json_coder} 73 $self->{json_coder}
111 ->convert_blessed 74 ->convert_blessed
112 ->filter_json_single_key_object (__widget_ref__ => sub { 75 ->filter_json_single_key_object ("\fw" => sub {
113 $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 }
114 }); 83 });
115 84
116 $self->connect_ext (ws_n => sub { 85 # destroy widgets on logout
117 my ($arg) = @_;
118
119 $self->{widgetset}{$arg{id}} = {
120 w => {},
121 };
122 });
123
124 $self->connect_ext (ws_d => sub {
125 my ($arg) = @_;
126
127 my $ws = delete $self->{widgetset}{$arg{id}}
128 or return;
129
130 $_->destroy
131 for values %{$ws->{w}};
132 });
133
134 $self->connect_ext (ws_c => sub {
135 my ($arg) = @_;
136
137 my $args = $arg->{args} || {};
138
139 for my $ev (grep /^on_/, keys %$args) {
140 $args->{$ev} = sub {
141 my $id = shift->{s_id};
142 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
143
144 1
145 };
146 }
147
148 if (my $widget = eval {
149 local $SIG{__DIE__};
150 "CFPlus::UI::$arg->{class}"->new (
151 %$args,
152 s_ws => $arg->{ws},
153 s_id => $arg->{id},
154 )
155 }
156 ) {
157 $self->{widget}{$arg->{id}}
158 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
159 = $widget;
160
161 $widget->connect (on_destroy => sub {
162 my ($widget) = @_;
163
164 delete $self->{widget}{$widget->{s_id}};
165 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
166 });
167 } else {
168 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
169 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
170 }
171 });
172
173 $self->connect_ext (w_c => sub {
174 my ($arg) = @_;
175
176 my $w = $self->{widget}{$arg->{id}}
177 or return;
178 my $m = $arg->{name};
179
180 my $a = $arg->{args} || [];
181
182 if (exists $arg->{rid}) {
183 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
184 } else {
185 $w->$m (@$a);
186 }
187 });
188
189 $self->connect_ext (w_s => sub {
190 my ($arg) = @_;
191
192 my $w = $self->{widget}{$arg->{id}}
193 or return;
194
195 $w->{$arg->{name}} = $arg->{value};
196 });
197
198 $self->connect_ext (w_g => sub {
199 my ($arg) = @_;
200
201 my $w = $self->{widget}{$arg->{id}}
202 or return;
203
204 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
205 });
206
207 $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 {
208 for my $ws (values %{delete $self->{widgetset} || {}}) { 87 for my $ws (values %{delete $self->{widgetset} || {}}) {
209 $_->destroy 88 $_->destroy
210 for values %{delete $ws->{w} || {}}; 89 for values %{delete $ws->{w} || {}};
211 } 90 }
91
92 delete $self->{items};
93 $::INV->clear;
94 $::INVR->clear;
95 $::INVR_HB->clear;
96 $::FLOORBOX->clear;
212 }); 97 });
213 98
214 $self->{map_widget}->add_command (@$_)
215 for @cmd_help;
216
217 { 99 {
218 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 100 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
219 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
220 $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}});
221 } 102 }
222 103
223 { 104 {
224 $self->{noface} = my $tex = new_from_file CFPlus::Texture 105 $self->{noface} = my $tex = $TEX_NOFACE;
225 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
226 $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}});
227 } 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# };
228 123
229 $self->{open_container} = 0; 124 $self->{open_container} = 0;
230 125
231 # per server 126 # per server
232 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 127 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
233 128
234 $self 129 $self
235} 130}
236 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
237sub logprint { 391sub logprint {
238 my ($self, @a) = @_; 392 my ($self, @a) = @_;
239 393
240 $self->{log_fh} ||= do { 394 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
241 my $path = "$Crossfire::VARDIR/log.$self->{host}";
242
243 open my $fh, ">>:utf8", $path
244 or die "Couldn't open logfile $path: $!";
245
246 $fh->autoflush (1);
247
248 $fh;
249 };
250
251 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
252
253 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
254 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
255
256 print {$self->{log_fh}} "$ts ", @a, "\n";
257} 395}
258 396
259sub _stat_numdiff { 397sub _stat_numdiff {
260 my ($self, $name, $old, $new) = @_; 398 my ($self, $name, $old, $new) = @_;
261 399
… …
279 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 417 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
280 : () 418 : ()
281 } 419 }
282 sort { $a <=> $b } keys %{$self->{spell_paths}}; 420 sort { $a <=> $b } keys %{$self->{spell_paths}};
283 421
284 join "", @diff 422 "\u$name: " . (join ", ", @diff)
285} 423}
286 424
287# all stats that are chacked against changes 425# all stats that are chacked against changes
288my @statchange = ( 426my @statchange = (
289 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 427 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
332 470
333 if (my @diffs = 471 if (my @diffs =
334 ( 472 (
335 ($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" : ()),
336 map { 474 map {
337 $stats->{$_} && $prev->{$_} 475 $stats->{$_} && $prev->{$_}
338 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 476 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
339 } sort { $a <=> $b } keys %{$self->{skill_info}} 477 } sort { $a <=> $b } keys %{$self->{skill_info}}
340 ) 478 )
341 ) { 479 ) {
342 my $msg = join " ", @diffs; 480 my $msg = join " ", @diffs;
… …
344 } 482 }
345 483
346 if ( 484 if (
347 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 485 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
348 ) { 486 ) {
349 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 487 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
350 $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);
351 } 489 }
352 490
353 $self->update_stats_window ($stats, $prev); 491 $self->update_stats_window ($stats, $prev);
354 492
355 $self->{prev_stats} = { %$stats }; 493 $self->{prev_stats} = { %$stats };
… …
392 530
393 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 531 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
394 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 532 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
395 $::GAUGES->{food} ->set_value ($fo, $fo_m); 533 $::GAUGES->{food} ->set_value ($fo, $fo_m);
396 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 534 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
397 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 535 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
398 . " (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});
399 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 538 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
400 my $title = $stats->{+CS_STAT_TITLE}; 539 my $title = $stats->{+CS_STAT_TITLE};
401 $title =~ s/^Player: //; 540 $title =~ s/^Player: //;
402 $::STATWIDS->{title} ->set_text ("Title: " . $title); 541 $::STATWIDS->{title} ->set_text ("Title: " . $title);
403 542
… …
415 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 554 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
416 $::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});
417 556
418 $self->update_weight; 557 $self->update_weight;
419 558
420 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 559 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
421 for keys %RES_TBL; 560 for keys %RES_TBL;
422 561
423 my $sktbl = $::STATWIDS->{skill_tbl}; 562 my $sktbl = $::STATWIDS->{skill_tbl};
424 my @skills = keys %{ $self->{skill_info} }; 563 my @skills = keys %{ $self->{skill_info} };
425 564
426 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
427 $sktbl->clear; 573 $sktbl->clear;
428 574
575 my $sw = $self->{skillwid}{""} ||= [
429 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 576 0, 0, (new DC::UI::Label text => "Experience", align => 1),
430 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 577 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
431 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 578 2, 0, (new DC::UI::Label text => "Progress"),
579 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
432 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 580 4, 0, (new DC::UI::Label text => "Experience", align => 1),
433 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 581 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
434 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 582 6, 0, (new DC::UI::Label text => "Progress"),
583 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
584 ];
435 585
586 my @add = @$sw;
587
436 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>";
437 589
438 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);
439 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);
440 592
441 my ($x, $y) = (0, 1); 593 my ($x, $y) = (0, 1);
442 for ( 594 for (@order) {
443 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
444 map [$_, $self->{skill_info}{$_}],
445 grep exists $stats->{$_},
446 @skills
447 ) {
448 my ($idx, $name) = @$_; 595 my ($idx, $name) = @$_;
449 596
450 my $spell_cb = sub { 597 my $spell_cb = sub {
451 my ($widget, $ev) = @_; 598 my ($widget, $ev) = @_;
452 599
453 if ($ev->{button} == 1) { 600 if ($ev->{button} == 1) {
454 $::CONN->user_send ("ready_skill $name"); 601 $::CONN->user_send ("ready_skill $name");
455 } elsif ($ev->{button} == 2) { 602 } elsif ($ev->{button} == 2) {
456 $::CONN->user_send ("use_skill $name"); 603 $::CONN->user_send ("use_skill $name");
457 } elsif ($ev->{button} == 3) { 604 } elsif ($ev->{button} == 3) {
458 my $shortname = CFPlus::shorten $name, 14; 605 my $shortname = DC::shorten $name, 14;
459 (new CFPlus::UI::Menu 606 (new DC::UI::Menu
460 items => [ 607 items => [
461 ["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"] }],
462 ["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"] }],
463 ], 610 ],
464 )->popup ($ev); 611 )->popup ($ev);
465 } else { 612 } else {
466 return 0; 613 return 0;
467 } 614 }
468 615
469 1 616 1
470 }; 617 };
471 618
472 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 619 my $sw = $self->{skillwid}{$idx} ||= [
620 # exp
621 (new DC::UI::Label
473 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 622 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
474 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 623
624 # level
625 (new DC::UI::Label
475 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 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
476 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 632 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
477 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 633 can_events => 1, can_hover => 1, tooltip => "#(skill/$name)$TOOLTIP_ALL"),
634 ];
635
636 push @add,
637 $x * 4 + 0, $y, $sw->[0],
638 $x * 4 + 1, $y, $sw->[1],
639 $x * 4 + 2, $y, $sw->[2],
640 $x * 4 + 3, $y, $sw->[3],
641 ;
478 642
479 $x++ and ($x, $y) = (0, $y + 1); 643 $x++ and ($x, $y) = (0, $y + 1);
480 } 644 }
481 }
482 645
483 for (grep exists $stats->{$_}, @skills) { 646 $sktbl->add_at (@add);
484 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
485 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
486 } 647 }
487}
488 648
489sub macro_send { 649 for (@order) {
490 my ($self, $macro) = @_; 650 my ($idx, $name) = @$_;
651 my $val = $stats->{$idx};
491 652
492 for my $cmd (@{ $macro->{action} }) { 653 next if $prev->{$idx}[1] eq $val->[1];
493 $self->send_command ($cmd); 654
655 my $sw = $self->{skillwid}{$idx};
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);
494 } 662 }
495} 663}
496 664
497sub user_send { 665sub user_send {
498 my ($self, $command) = @_; 666 my ($self, $command) = @_;
… …
500 $self->{record}->($command) 668 $self->{record}->($command)
501 if $self->{record}; 669 if $self->{record};
502 670
503 $self->logprint ("send: ", $command); 671 $self->logprint ("send: ", $command);
504 $self->send_command ($command); 672 $self->send_command ($command);
505 ::status ($command);
506} 673}
507 674
508sub record { 675sub record {
509 my ($self, $cb) = @_; 676 my ($self, $cb) = @_;
510 677
… …
512} 679}
513 680
514sub map_scroll { 681sub map_scroll {
515 my ($self, $dx, $dy) = @_; 682 my ($self, $dx, $dy) = @_;
516 683
517 $self->{map}->scroll ($dx, $dy); 684 $self->{map_widget}->scroll ($dx, $dy);
518} 685}
519 686
520sub feed_map1a { 687sub feed_map1a {
521 my ($self, $data) = @_; 688 my ($self, $data) = @_;
522 689
523 $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 {
524 $self->{map_widget}->update; 718 $self->{map_widget}->update;
719 }
525} 720}
526 721
527sub magicmap { 722sub magicmap {
528 my ($self, $w, $h, $x, $y, $data) = @_; 723 my ($self, $w, $h, $x, $y, $data) = @_;
529 724
… …
531} 726}
532 727
533sub flush_map { 728sub flush_map {
534 my ($self) = @_; 729 my ($self) = @_;
535 730
536 my $map_info = delete $self->{map_info} 731 return unless $self->{map_info};
537 or return;
538 732
733 for my $map_info (values %{ $self->{map_cache} || {} }) {
539 my ($hash, $x, $y, $w, $h) = @$map_info; 734 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
540 735
541 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;
542 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 741 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
543 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 742 }
743 }
544} 744}
545 745
546sub map_clear { 746sub map_clear {
547 my ($self) = @_; 747 my ($self) = @_;
548 748
549 $self->flush_map; 749 $self->flush_map;
750 delete $self->{map_info};
550 delete $self->{neigh_map}; 751 delete $self->{neigh_map};
551 752
552 $self->{map}->clear; 753 $self->{map}->clear;
553 delete $self->{map_widget}{magicmap}; 754 delete $self->{map_widget}{magicmap};
554} 755}
555 756
556sub bg_fetch { 757sub bg_fetch {
557 my ($self) = @_; 758 my ($self) = @_;
558 759
559 my $id; 760 my $tile;
560 761
561 do { 762 do {
562 $id = pop @{$self->{bg_fetch}} 763 $tile = pop @{$self->{bg_fetch}}
563 or return; 764 or return;
564 } while $self->{texture}[$id]; 765 } while $self->{texture}[$tile];
565 766
566 CFPlus::DB::get tilecache => $id, sub { 767 DC::DB::get tilecache => $tile, sub {
567 my ($data) = @_; 768 my ($data) = @_;
568 769
569 return unless $self->{map}; # stop when destroyed 770 return unless $self->{map}; # stop when destroyed
570 771
571 $self->set_texture ($id => $data)
572 if defined $data; 772 if (defined $data) {
773 $self->have_tile ($tile, $data);
774 $self->{texture}[$tile]->upload;
775 }
573 776
574 $self->bg_fetch; 777 $self->bg_fetch;
575 }; 778 };
576} 779}
577 780
578sub load_map($$$) { 781sub load_map($$$$$$) {
579 my ($self, $hash, $x, $y) = @_; 782 my ($self, $hash, $x, $y, $w, $h) = @_;
580 783
581 my $gen = $self->{map_change_gen}; 784 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
582 785
583 CFPlus::DB::get $self->{mapcache} => $hash, sub { 786 my $cb = sub {
584 return unless $gen == $self->{map_change_gen}; 787 $map_info->[1] = \$_[0];
585 788
586 my ($data) = @_;
587
588 if (defined $data) {
589 $data = Compress::LZF::decompress $data;
590 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
591
592 my $inprogress = @{ $self->{bg_fetch} || [] }; 789 my $inprogress = @{ $self->{bg_fetch} || [] };
593 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 790 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
594 $self->bg_fetch unless $inprogress; 791 $self->bg_fetch unless $inprogress;
595 }
596 }; 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 }
597} 805}
598 806
599# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 807# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
600# (server resource,s latency, bandwidth), so this hack is warranted. 808# (server resources, latency, bandwidth), so this hack is warranted.
601# 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
602sub send_mapinfo { 810sub send_mapinfo {
603 my ($self, $data, $cb) = @_; 811 my ($self, $data, $cb) = @_;
604 812
605 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)$%) {
… …
630} 838}
631 839
632# this method does a "flood fill" into every tile direction 840# this method does a "flood fill" into every tile direction
633# it assumes that tiles are arranged in a rectangular grid, 841# it assumes that tiles are arranged in a rectangular grid,
634# 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.
635# failure to comply are harmless and result in display errors 843# failure to comply is harmless and results in display errors
636# at worst. 844# at worst.
637sub flood_fill { 845sub flood_fill {
638 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 846 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
639 847
640 # the server does not allow map paths > 6 848 # the server does not allow map paths > 6
… …
676 return if $mode ne "spatial"; 884 return if $mode ne "spatial";
677 885
678 $x += $self->{map}->ox; 886 $x += $self->{map}->ox;
679 $y += $self->{map}->oy; 887 $y += $self->{map}->oy;
680 888
681 $self->load_map ($hash, $x, $y) 889 $self->load_map ($hash, $x, $y, $w, $h)
682 unless $self->{neigh_map}{$hash}[5]++;#d# 890 unless $self->{neigh_map}{$hash}[5]++;#d#
683 891
684 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 892 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
685 893
686 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 894 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
694 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 902 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
695 903
696 $self->flush_map; 904 $self->flush_map;
697 905
698 ++$self->{map_change_gen}; 906 ++$self->{map_change_gen};
907 $self->{map_cache_old} = delete $self->{map_cache};
699 908
700 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 909 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
701 910
702 my $mapmapw = $self->{mapmap}->{w}; 911 my $mapmapw = $self->{mapmap}->{w};
703 my $mapmaph = $self->{mapmap}->{h}; 912 my $mapmaph = $self->{mapmap}->{h};
… …
715 $self->{map_info} = [$hash, $x, $y, $w, $h]; 924 $self->{map_info} = [$hash, $x, $y, $w, $h];
716 925
717 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 926 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
718 $::STATWIDS->{map}->set_text ("Map: " . $map); 927 $::STATWIDS->{map}->set_text ("Map: " . $map);
719 928
720 $self->load_map ($hash, $x, $y); 929 $self->load_map ($hash, $x, $y, $w, $h);
721 $self->flood_fill (0, 0, 0, "", $hash, $flags); 930 $self->flood_fill (0, 0, 0, "", $hash, $flags);
722} 931}
723 932
724sub face_find { 933sub face_find {
725 my ($self, $facenum, $face, $cb) = @_; 934 my ($self, $facenum, $face, $cb) = @_;
726 935
727 my $hash = "$face->{chksum},$face->{name}"; 936 if ($face->{type} == 0) { # FT_FACE
728
729 my $id = CFPlus::DB::get_tile_id_sync $hash; 937 my $id = DC::DB::get_tile_id_sync $face->{name};
730 938
731 $face->{id} = $id; 939 $face->{id} = $id;
732 $self->{faceid}[$facenum] = $id;
733
734 $self->{map}->set_tileid ($facenum => $id); 940 $self->{map}->set_tileid ($facenum => $id);
735 941
736 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 }
737} 950}
738 951
739sub face_update { 952sub face_update {
740 my ($self, $facenum, $face, $changed) = @_; 953 my ($self, $facenum, $face, $changed) = @_;
741 954
955 if ($face->{type} == 0) {
956 # image, FT_FACE
742 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 957 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
743 if $changed; 958 if $changed;
744 959
745 $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 }
746} 993}
747 994
748sub smooth_update { 995sub smooth_update {
749 my ($self, $facenum, $face) = @_; 996 my ($self, $facenum, $face) = @_;
750 997
751 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 998 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
752} 999}
753 1000
754sub set_texture { 1001sub have_tile {
755 my ($self, $id, $data) = @_; 1002 my ($self, $tile, $data) = @_;
756 1003
757 $self->{texture}[$id] = my $tex = 1004 return unless $self->{map};
758 new_from_image CFPlus::Texture
759 $data, minify => 1, mipmap => 1;
760 1005
761 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 1006 my $tex = $self->{texture}[$tile] ||=
762 $self->{map_widget}->update; 1007 new DC::Texture
1008 tile => $tile,
1009 image => $data, delete_image => 1,
1010 minify => 1;
1011
1012 if (my $cbs = delete $self->{tile_cb}{$tile}) {
1013 $_->($tex) for @$cbs;
1014 }
1015}
1016
1017# call in non-void context registers a temporary
1018# hook with handle, otherwise its permanent
1019sub on_face_change {
1020 my ($self, $num, $cb) = @_;
1021
1022 push @{$self->{face_cb}{$num}}, $cb;
1023
1024 defined wantarray
1025 ? Guard::guard {
1026 @{$self->{face_cb}{$num}}
1027 = grep $_ != $cb,
1028 @{$self->{face_cb}{$num}};
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)
763} 1046}
764 1047
765sub sound_play { 1048sub sound_play {
766 my ($self, $x, $y, $soundnum, $type) = @_; 1049 my ($self, $type, $face, $dx, $dy, $vol) = @_;
767 1050
768 $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
769} 1053}
770 1054
771my $LAST_QUERY; # server is stupid, stupid, stupid 1055my $LAST_QUERY; # server is stupid, stupid, stupid
772 1056
773sub query { 1057sub query {
774 my ($self, $flags, $prompt) = @_; 1058 my ($self, $flags, $prompt) = @_;
775 1059
776 $prompt = $LAST_QUERY unless length $prompt; 1060 $prompt = $LAST_QUERY unless length $prompt;
777 $LAST_QUERY = $prompt; 1061 $LAST_QUERY = $prompt;
778 1062
779 $self->{query}-> ($self, $flags, $prompt); 1063 $self->{query}->($self, $flags, $prompt);
780}
781
782sub sanitise_xml($) {
783 local $_ = shift;
784
785 # we now weed out all tags we do not support
786 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
787 # now all entities
788 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
789
790 # handle some elements
791 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
792 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
793
794 $_
795} 1064}
796 1065
797our %NAME_TO_COLOR = ( 1066our %NAME_TO_COLOR = (
798 black => 0, 1067 black => 0,
799 white => 1, 1068 white => 1,
… …
810 tan => 12, 1079 tan => 12,
811); 1080);
812 1081
813our @CF_COLOR = ( 1082our @CF_COLOR = (
814 [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],
815 [1.00, 1.00, 1.00], 1084 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
816 [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],
817 [1.00, 0.00, 0.00], 1086 [1.00, 0.00, 0.00],
818 [1.00, 0.54, 0.00], 1087 [1.00, 0.54, 0.00],
819 [0.11, 0.56, 1.00], 1088 [0.11, 0.56, 1.00],
820 [0.93, 0.46, 0.00], 1089 [0.93, 0.46, 0.00],
821 [0.18, 0.54, 0.34], 1090 [0.18, 0.54, 0.34],
… …
827); 1096);
828 1097
829sub msg { 1098sub msg {
830 my ($self, $color, $type, $text, @extra) = @_; 1099 my ($self, $color, $type, $text, @extra) = @_;
831 1100
832 $text = sanitise_xml $text; 1101 $text = DC::sanitise_cfxml $text;
833 1102
834 if (my $cb = $self->{cb_msg}{$type}) { 1103 if (my $cb = $self->{cb_msg}{$type}) {
835 $_->($self, $color, $type, $text, @extra) for values %$cb; 1104 $_->($self, $color, $type, $text, @extra) for values %$cb;
836 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 1105 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
837 $type =~ s/-/_/g; 1106 $type =~ s/-/_/g;
838 $self->{$type} = $text; 1107 $self->{$type} = $text;
839 } else { 1108 } else {
840 $self->logprint ("msg: ", $text); 1109 $self->logprint ("msg: ", $text);
841 return if $color < 0; # negative color == ignore if not understood 1110 return if $color < 0; # negative color == ignore if not understood
842 1111
843 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1112 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
844 1113
845 ## try to create single paragraphs of multiple lines sent by the server 1114 ::message ({
846 # no longer neecssary with TRT servers 1115 fg => $fg,
847 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1116 markup => $text,
1117 type => $type,
1118 extra => [@extra],
1119 color_flags => $color, #d# ugly, kill
1120 });
848 1121
849 ::message ({ fg => $fg, markup => $_ }) 1122# $color &= ~NDI_CLEAR; # only clear once for multiline messages
850 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.
851 1127
852 $self->{statusbox}->add ($text, 1128 $self->{statusbox}->add ($text,
853 group => $text, 1129 group => $text,
854 fg => $fg, 1130 fg => $fg,
855 timeout => $color >= 2 ? 180 : 10, 1131 timeout => $color >= 2 ? 180 : 10,
856 tooltip_font => $::FONT_FIXED, 1132 tooltip_font => $::FONT_FIXED,
857 ); 1133 ) if $type eq "info";
858 } 1134 }
859} 1135}
860 1136
861sub spell_add { 1137sub spell_add {
862 my ($self, $spell) = @_; 1138 my ($self, $spell) = @_;
863 1139
864 # try to create single paragraphs out of the multiple lines sent by the server
865 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
866 $spell->{message} =~ s/\n+$//;
867 $spell->{message} ||= "Server did not provide a description for this spell.";
868
869 $::SPELL_LIST->add_spell ($spell); 1140 $::SPELL_LIST->add_spell ($spell);
870 1141 delete $::COMPLETER->{command_list}{spells};
871 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
872 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
873} 1142}
874 1143
875sub spell_delete { 1144sub spell_delete {
876 my ($self, $spell) = @_; 1145 my ($self, $spell) = @_;
877 1146
878 $::SPELL_LIST->remove_spell ($spell); 1147 $::SPELL_LIST->remove_spell ($spell);
1148 delete $::COMPLETER->{command_list}{spells};
879} 1149}
880 1150
881sub setup { 1151sub setup {
882 my ($self, $setup) = @_; 1152 my ($self, $setup) = @_;
883 1153
884 $self->{map_widget}->set_tilesize ($self->{tilesize}); 1154 $self->{map_widget}->set_tilesize ($self->{tilesize});
885 $::MAP->resize ($self->{mapw}, $self->{maph}); 1155 $::MAP->resize ($self->{mapw}, $self->{maph});
886} 1156}
887 1157
888sub addme_success {
889 my ($self) = @_;
890
891 my %skill_help;
892
893 for my $node (CFPlus::Pod::find skill_description => "*") {
894 my (undef, @par) = CFPlus::Pod::section_of $node;
895 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
896 };
897
898 for my $skill (values %{$self->{skill_info}}) {
899 $self->{map_widget}->add_command ("ready_skill $skill",
900 (CFPlus::asxml "Ready the skill '$skill'\n\n")
901 . $skill_help{$skill});
902 $self->{map_widget}->add_command ("use_skill $skill",
903 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
904 . $skill_help{$skill});
905 }
906}
907
908sub eof { 1158sub eof {
909 my ($self) = @_; 1159 my ($self) = @_;
910 1160
911 $self->{map_widget}->clr_commands; 1161 $::COMPLETER->reset;
912 1162
913 ::stop_game (); 1163 ::stop_game ();
914} 1164}
915 1165
916sub image_info {
917 my ($self, $numfaces) = @_;
918
919 $self->{num_faces} = $numfaces;
920 $self->{face_prefetch} = [1 .. $numfaces];
921 $self->face_prefetch;
922}
923
924sub face_prefetch {
925 my ($self) = @_;
926
927 return unless $::CFG->{face_prefetch};
928
929 if ($self->{num_faces}) {
930 return if @{ $self->{send_queue} || [] };
931 my $todo = @{ $self->{face_prefetch} }
932 or return;
933
934 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
935
936 $self->send ("requestinfo image_sums $face $face");
937
938 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
939 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
940 } elsif (!exists $self->{num_faces}) {
941 $self->send ("requestinfo image_info");
942
943 $self->{num_faces} = 0;
944
945 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
946 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
947 }
948}
949
950sub update_floorbox { 1166sub update_floorbox {
951 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1167 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
952 return unless $::CONN; 1168 return unless $::CONN;
953 1169
954 $::FLOORBOX->clear; 1170 $::FLOORBOX->clear;
955 1171
1172 my @add;
1173
956 my $row; 1174 my $row;
957 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;
958 if ($row < 6) { 1177 if ($row < 6) {
959 local $_->{face_widget}; # hack to force recreation of widget 1178 local $_->{face_widget}; # hack to force recreation of widget
960 local $_->{desc_widget}; # hack to force recreation of widget 1179 local $_->{desc_widget}; # hack to force recreation of widget
961 CFPlus::Item::update_widgets $_; 1180 DC::Item::update_widgets $_;
962 1181
1182 push @add,
963 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1183 0, $row, $_->{face_widget},
964 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1184 1, $row, $_->{desc_widget};
965 1185
966 $row++; 1186 $row++;
967 } else { 1187 } else {
968 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1188 push @add, 1, $row, new DC::UI::Button
969 text => "More...", 1189 text => "More...",
970 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1190 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
971 ); 1191 ;
972 last; 1192 last;
973 } 1193 }
974 } 1194 }
975 if ($::CONN->{open_container}) { 1195 if ($::CONN->{open_container}) {
976 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1196 push @add, 1, $row++, new DC::UI::Button
977 text => "Close container", 1197 text => "Close container",
978 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1198 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
979 ); 1199 ;
980 } 1200 }
1201
1202 $::FLOORBOX->add_at (@add);
981 }); 1203 });
982 1204
983 $::WANT_REFRESH++; 1205 $::WANT_REFRESH = 1;
984} 1206}
985 1207
986sub set_opencont { 1208sub set_opencont {
987 my ($conn, $tag, $name) = @_; 1209 my ($conn, $tag, $name) = @_;
988 $conn->{open_container} = $tag; 1210 $conn->{open_container} = $tag;
989 update_floorbox; 1211 update_floorbox;
990 1212
991 $::INV_RIGHT_HB->clear (); 1213 $::INVR_HB->clear;
992 $::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);
993 1215
994 if ($tag != 0) { # Floor isn't closable, is it? 1216 if ($tag != 0) { # Floor isn't closable, is it?
995 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1217 $::INVR_HB->add (new DC::UI::Button
996 text => "Close container", 1218 text => "Close container",
997 tooltip => "Close the currently open container (if one is open)", 1219 tooltip => "Close the currently open container (if one is open)",
998 on_activate => sub { 1220 on_activate => sub {
999 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1221 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1000 if $tag != 0; 1222 if $tag != 0;
1001 #if $CONN->{open_container} != 0;
1002 0 1223 0
1003 }, 1224 },
1004 ); 1225 );
1005 } 1226 }
1006 1227
… …
1008} 1229}
1009 1230
1010sub update_containers { 1231sub update_containers {
1011 my ($self) = @_; 1232 my ($self) = @_;
1012 1233
1013 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1234 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1014 my $todo = delete $self->{update_container} 1235 my $todo = delete $self->{update_container}
1015 or return; 1236 or return;
1016 1237
1017 for my $tag (keys %$todo) { 1238 for my $tag (keys %$todo) {
1018 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1239 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1053} 1274}
1054 1275
1055sub item_update { 1276sub item_update {
1056 my ($self, $item) = @_; 1277 my ($self, $item) = @_;
1057 1278
1058 #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";
1059 1280
1060 CFPlus::Item::update_widgets $item; 1281 DC::Item::update_widgets $item;
1061 1282
1062 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1283 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1063 set_opencont ($::CONN, 0, "Floor"); 1284 set_opencont ($::CONN, 0, "Floor");
1064 1285
1065 } elsif ($item->{flags} & F_OPEN) { 1286 } elsif ($item->{flags} & F_OPEN) {
1066 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1287 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1067 1288
1068 } else { 1289 } else {
1069 $self->{update_container}{$item->{container}}++; 1290 $self->{update_container}{$item->{container}}++;
1070 $self->update_containers; 1291 $self->update_containers;
1071 } 1292 }
… …
1082 1303
1083 my $weight = .001 * $self->{player}{weight}; 1304 my $weight = .001 * $self->{player}{weight};
1084 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1305 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1085 1306
1086 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1307 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1087 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1308 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1088 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1309 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1089} 1310}
1090 1311
1091sub update_server_info { 1312sub update_server_info {
1092 my ($self) = @_; 1313 my ($self) = @_;
1093 1314
1094 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>");
1095 1316
1317 my $version = JSON::XS->new->encode ($self->{s_version});
1318
1096 $::SERVER_INFO->set_markup ( 1319 $::SERVER_INFO->set_markup (
1097 "server <tt>$self->{host}:$self->{port}</tt>\n" 1320 "server <tt>$self->{host}:$self->{port}</tt>\n"
1098 . "protocol version <tt>$self->{version}</tt>\n" 1321 . "protocol version <tt>$version</tt>\n"
1099 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1100 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1101 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1102 . "editing support $yesno[!!$self->{editor_support}]\n" 1322 . "editing support $yesno[!!$self->{editor_support}]\n"
1103 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1104 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1105 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1323 . "client support $yesno[$self->{cfplus_ext} > 0]"
1106 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1324 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1107 . "map size $self->{mapw}×$self->{maph}\n" 1325 . "map size $self->{mapw}×$self->{maph}\n"
1108 ); 1326 );
1109 1327
1110 ::setup_build_button ($self->{editor_support}->{builder_ui});
1111} 1328}
1112 1329
1113sub logged_in { 1330sub logged_in {
1114 my ($self) = @_; 1331 my ($self) = @_;
1115 1332
1116 $self->send_ext_req (cfplus_support => version => 1, sub { 1333 $self->send_ext_req (cfplus_support => version => 2, sub {
1334 my (%msg) = @_;
1335
1117 $self->{cfplus_ext} = $_[0]{version}; 1336 $self->{cfplus_ext} = $msg{version};
1118 $self->update_server_info; 1337 $self->update_server_info;
1119 1338
1120 if ($self->{cfplus_ext} >= 2) { 1339 if ($self->{cfplus_ext} >= 2) {
1121 $self->send_ext_req ("editor_support", sub { 1340 $self->send_ext_req ("editor_support", sub {
1122 $self->{editor_support} = $_[0]; 1341 $self->{editor_support} = { @_ };
1123 $self->update_server_info; 1342 $self->update_server_info;
1124 1343
1125 0 1344 0
1126 }); 1345 });
1127 } 1346 }
… …
1129 0 1348 0
1130 }); 1349 });
1131 1350
1132 $self->update_server_info; 1351 $self->update_server_info;
1133 1352
1134 $self->send_command ("output-sync $::CFG->{output_sync}");
1135 $self->send_command ("output-count $::CFG->{output_count}");
1136 $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;
1137 $self->send_command ("pickup $::CFG->{pickup}"); 1354 $self->send_pickup ($::CFG->{pickup});
1138}
1139
1140sub buildat {
1141 my ($self, $builditem, $x, $y) = @_;
1142
1143 if ($self->{cfplus_ext}) {
1144 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1145 }
1146} 1355}
1147 1356
1148sub lookat { 1357sub lookat {
1149 my ($self, $x, $y) = @_; 1358 my ($self, $x, $y) = @_;
1150 1359
1151 if ($self->{cfplus_ext}) { 1360 if ($self->{cfplus_ext}) {
1152 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1361 $self->send_ext_req (lookat => $x, $y, sub {
1153 my ($msg) = @_; 1362 my (%msg) = @_;
1154 1363
1155 if (exists $msg->{npc_dialog}) { 1364 if (exists $msg{npc_dialog}) {
1156 # start npc chat dialog 1365 # start npc chat dialog
1157 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1366 $self->{w}{npc_dialog} = new DC::NPCDialog::
1158 dx => $x, 1367 token => $msg{npc_dialog},
1159 dy => $y,
1160 title => "$msg->{npc_dialog} (NPC)", 1368 title => "$msg{npc_dialog}[0] (NPC)",
1161 conn => $self, 1369 conn => $self,
1162 ; 1370 ;
1163 } 1371 }
1164 }); 1372 });
1165 } 1373 }
… …
1168} 1376}
1169 1377
1170sub destroy { 1378sub destroy {
1171 my ($self) = @_; 1379 my ($self) = @_;
1172 1380
1173 (delete $self->{npc_dialog})->destroy 1381 $_->destroy
1174 if $self->{npc_dialog}; 1382 for values %{ $self->{w} };
1175 1383
1176 $self->SUPER::destroy; 1384 $self->SUPER::destroy;
1177 1385
1178 %$self = (); 1386 %$self = ();
1179} 1387}
1180 1388
1181package CFPlus::NPCDialog; 1389package DC::NPCDialog;
1182 1390
1183our @ISA = 'CFPlus::UI::Toplevel'; 1391our @ISA = 'DC::UI::Toplevel';
1184 1392
1185sub new { 1393sub new {
1186 my $class = shift; 1394 my $class = shift;
1187 1395
1188 my $self = $class->SUPER::new ( 1396 my $self = $class->SUPER::new (
… …
1195 kw => { hi => 0, yes => 0, no => 0 }, 1403 kw => { hi => 0, yes => 0, no => 0 },
1196 has_close_button => 1, 1404 has_close_button => 1,
1197 @_, 1405 @_,
1198 ); 1406 );
1199 1407
1200 CFPlus::weaken (my $this = $self); 1408 DC::weaken (my $this = $self);
1201 1409
1202 $self->connect (delete => sub { $this->destroy; 1 }); 1410 $self->connect (delete => sub { $this->destroy; 1 });
1203 1411
1204 # better use a pane... 1412 # better use a pane...
1205 $self->add (my $hbox = new CFPlus::UI::HBox); 1413 $self->add (my $hbox = new DC::UI::HBox);
1206 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1414 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1207 1415
1208 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1416 $hbox->add (my $vbox = new DC::UI::VBox);
1209 1417
1210 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1418 $vbox->add (new DC::UI::Label text => "Message Entry:");
1211 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1419 $vbox->add ($self->{entry} = new DC::UI::Entry
1212 tooltip => "#npc_message_entry", 1420 tooltip => "#npc_message_entry",
1213 on_activate => sub { 1421 on_activate => sub {
1214 my ($entry, $text) = @_; 1422 my ($entry, $text) = @_;
1215 1423
1216 return unless $text =~ /\S/; 1424 return unless $text =~ /\S/;
… …
1220 1428
1221 0 1429 0
1222 }, 1430 },
1223 ); 1431 );
1224 1432
1225 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1433 $vbox->add ($self->{options} = new DC::UI::VBox);
1226 1434
1227 $self->{bye_button} = new CFPlus::UI::Button 1435 $self->{bye_button} = new DC::UI::Button
1228 text => "Bye (close)", 1436 text => "Bye (close)",
1229 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.",
1230 on_activate => sub { $this->destroy; 1 }, 1438 on_activate => sub { $this->destroy; 1 },
1231 ; 1439 ;
1232 1440
1233 $self->update_options; 1441 $self->update_options;
1234 1442
1235 $self->{id} = $self->{conn}->send_ext_req ( 1443 $self->{id} = "npc-channel-" . $self->{conn}->token;
1236 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1444 $self->{conn}->connect_ext ($self->{id} => sub {
1237 sub { $this && $this->feed (@_) } 1445 $this->feed (@_) if $this;
1238 ); 1446 });
1447
1448 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1239 1449
1240 $self->{entry}->grab_focus; 1450 $self->{entry}->grab_focus;
1241 1451
1242 $self->{textview}->add_paragraph ({ 1452 $self->{textview}->add_paragraph ({
1243 fg => [1, 1, 0, 1], 1453 fg => [1, 1, 0, 1],
… …
1249}; 1459};
1250 1460
1251sub update_options { 1461sub update_options {
1252 my ($self) = @_; 1462 my ($self) = @_;
1253 1463
1254 CFPlus::weaken $self; 1464 DC::weaken $self;
1255 1465
1256 $self->{options}->clear; 1466 $self->{options}->clear;
1257 $self->{options}->add ($self->{bye_button}); 1467 $self->{options}->add ($self->{bye_button});
1258 1468
1259 for my $kw (sort keys %{ $self->{kw} }) { 1469 for my $kw (sort keys %{ $self->{kw} }) {
1260 $self->{options}->add (new CFPlus::UI::Button 1470 $self->{options}->add (new DC::UI::Button
1261 text => $kw, 1471 text => $kw,
1262 on_activate => sub { 1472 on_activate => sub {
1263 $self->send ($kw); 1473 $self->send ($kw);
1264 0 1474 0
1265 }, 1475 },
1266 ); 1476 );
1267 } 1477 }
1268} 1478}
1269 1479
1270sub feed { 1480sub feed {
1271 my ($self, $msg) = @_; 1481 my ($self, $type, @arg) = @_;
1272 1482
1273 CFPlus::weaken $self; 1483 DC::weaken $self;
1274 1484
1275 if ($msg->{msgtype} eq "reply") { 1485 if ($type eq "update") {
1486 my (%info) = @arg;
1487
1276 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1488 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1277 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1489 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1278
1279 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1280 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1281 my @link;
1282 $text =~ s{
1283 ($match)
1284 }{
1285 my $kw = $1;
1286
1287 push @link, new CFPlus::UI::Label
1288 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1289 can_hover => 1,
1290 can_events => 1,
1291 padding_x => 0,
1292 padding_y => 0,
1293 on_button_up => sub {
1294 $self->send ($kw);
1295 };
1296
1297 "\x{fffc}"
1298 }giex;
1299 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
1300 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1513 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1301 $self->{textview}->scroll_to_bottom; 1514 $self->{textview}->scroll_to_bottom;
1515 }
1516
1302 $self->update_options; 1517 $self->update_options;
1303 } else { 1518 } else {
1304 $self->destroy; 1519 $self->destroy;
1305 } 1520 }
1306 1521
… …
1308} 1523}
1309 1524
1310sub send { 1525sub send {
1311 my ($self, $msg) = @_; 1526 my ($self, $msg) = @_;
1312 1527
1313 $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 });
1314 $self->{textview}->scroll_to_bottom; 1534 $self->{textview}->scroll_to_bottom;
1315 1535
1316 $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);
1317} 1537}
1318 1538
1319sub destroy { 1539sub destroy {
1320 my ($self) = @_; 1540 my ($self) = @_;
1321 1541
1322 #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
1323 1543
1324 if ($self->{conn}) { 1544 if ($self->{conn}) {
1325 $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};
1326 delete $self->{conn}{npc_dialog}; 1546 delete $self->{conn}{w}{npc_dialog};
1327 $self->{conn}->disconnect_ext ($self->{id}); 1547 $self->{conn}->disconnect_ext ($self->{id});
1328 } 1548 }
1329 1549
1330 $self->SUPER::destroy; 1550 $self->SUPER::destroy;
1331} 1551}

Diff Legend

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