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

Diff Legend

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