ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

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

Diff Legend

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