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

Diff Legend

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