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

Diff Legend

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