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

Diff Legend

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