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

Diff Legend

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