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

Diff Legend

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