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.115 by root, Thu Jul 12 19:10:52 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, 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 (event_music => sub {
54 my ($ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get resmap => $chksum, sub {
72 my ($meta) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put resmap => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs});
89 });
90 }
91 }
92 }
93 }
94
95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 use Data::Dumper;
98 warn Dumper $self->{songs};#d#
99 }
100 });
101
102 $self->connect_ext (event_capabilities => sub {
103 my ($cap) = @_;
104
105 if (my $ts = $cap->{tileset}) {
106 if (my ($default) = grep $_->[2] & 1, @$ts) {
107 $self->{tileset} = $default;
108 $self->{tilesize} = $default->[3];
109 $self->setup_req (tileset => $default->[0]);
110
111 my $w = int $self->{mapw} * 32 / $self->{tilesize};
112 my $h = int $self->{maph} * 32 / $self->{tilesize};
113
114 $self->setup_req (mapsize => "${w}x${h}");
115 }
116 }
117 });
118 93
119 $self->{json_coder} 94 $self->{json_coder}
120 ->convert_blessed 95 ->convert_blessed
121 ->filter_json_single_key_object (__widget_ref__ => sub { 96 ->filter_json_single_key_object ("\fw" => sub {
122 $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 }
123 }); 104 });
124 105
125 $self->connect_ext (ws_n => sub { 106 # destroy widgets on logout
126 my ($arg) = @_;
127
128 $self->{widgetset}{$arg{id}} = {
129 w => {},
130 };
131 });
132
133 $self->connect_ext (ws_d => sub {
134 my ($arg) = @_;
135
136 my $ws = delete $self->{widgetset}{$arg{id}}
137 or return;
138
139 $_->destroy
140 for values %{$ws->{w}};
141 });
142
143 $self->connect_ext (ws_c => sub {
144 my ($arg) = @_;
145
146 my $args = $arg->{args} || {};
147
148 for my $ev (grep /^on_/, keys %$args) {
149 $args->{$ev} = sub {
150 my $id = shift->{s_id};
151 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
152
153 1
154 };
155 }
156
157 if (my $widget = eval {
158 local $SIG{__DIE__};
159 "CFPlus::UI::$arg->{class}"->new (
160 %$args,
161 s_ws => $arg->{ws},
162 s_id => $arg->{id},
163 )
164 }
165 ) {
166 $self->{widget}{$arg->{id}}
167 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
168 = $widget;
169
170 $widget->connect (on_destroy => sub {
171 my ($widget) = @_;
172
173 delete $self->{widget}{$widget->{s_id}};
174 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
175 });
176 } else {
177 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
178 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
179 }
180 });
181
182 $self->connect_ext (w_c => sub {
183 my ($arg) = @_;
184
185 my $w = $self->{widget}{$arg->{id}}
186 or return;
187 my $m = $arg->{name};
188
189 my $a = $arg->{args} || [];
190
191 if (exists $arg->{rid}) {
192 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
193 } else {
194 $w->$m (@$a);
195 }
196 });
197
198 $self->connect_ext (w_s => sub {
199 my ($arg) = @_;
200
201 my $w = $self->{widget}{$arg->{id}}
202 or return;
203
204 $w->{$arg->{name}} = $arg->{value};
205 });
206
207 $self->connect_ext (w_g => sub {
208 my ($arg) = @_;
209
210 my $w = $self->{widget}{$arg->{id}}
211 or return;
212
213 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
214 });
215
216 $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 {
217 for my $ws (values %{delete $self->{widgetset} || {}}) { 108 for my $ws (values %{delete $self->{widgetset} || {}}) {
218 $_->destroy 109 $_->destroy
219 for values %{delete $ws->{w} || {}}; 110 for values %{delete $ws->{w} || {}};
220 } 111 }
112
113 delete $self->{items};
114 $::INV->clear;
115 $::INVR->clear;
116 $::INVR_HB->clear;
117 $::FLOORBOX->clear;
221 }); 118 });
222 119
223 $self->{map_widget}->add_command (@$_) 120 $self->{map_widget}->add_command (@$_)
224 for @cmd_help; 121 for @cmd_help;
225 122
226 { 123 {
227 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 124 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
228 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
229 $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}});
230 } 126 }
231 127
232 { 128 {
233 $self->{noface} = my $tex = new_from_file CFPlus::Texture 129 $self->{noface} = my $tex = $TEX_NOFACE;
234 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
235 $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}});
236 } 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# };
237 147
238 $self->{open_container} = 0; 148 $self->{open_container} = 0;
239 149
240 # per server 150 # per server
241 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 151 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
242 152
243 $self 153 $self
244} 154}
245 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
246sub logprint { 397sub logprint {
247 my ($self, @a) = @_; 398 my ($self, @a) = @_;
248 399
249 $self->{log_fh} ||= do { 400 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
250 my $path = "$Crossfire::VARDIR/log.$self->{host}";
251
252 open my $fh, ">>:utf8", $path
253 or die "Couldn't open logfile $path: $!";
254
255 $fh->autoflush (1);
256
257 $fh;
258 };
259
260 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
261
262 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
263 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
264
265 print {$self->{log_fh}} "$ts ", @a, "\n";
266} 401}
267 402
268sub _stat_numdiff { 403sub _stat_numdiff {
269 my ($self, $name, $old, $new) = @_; 404 my ($self, $name, $old, $new) = @_;
270 405
… …
288 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 423 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
289 : () 424 : ()
290 } 425 }
291 sort { $a <=> $b } keys %{$self->{spell_paths}}; 426 sort { $a <=> $b } keys %{$self->{spell_paths}};
292 427
293 join "", @diff 428 "\u$name: " . (join ", ", @diff)
294} 429}
295 430
296# all stats that are chacked against changes 431# all stats that are chacked against changes
297my @statchange = ( 432my @statchange = (
298 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 433 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
341 476
342 if (my @diffs = 477 if (my @diffs =
343 ( 478 (
344 ($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" : ()),
345 map { 480 map {
346 $stats->{$_} && $prev->{$_} 481 $stats->{$_} && $prev->{$_}
347 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 482 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
348 } sort { $a <=> $b } keys %{$self->{skill_info}} 483 } sort { $a <=> $b } keys %{$self->{skill_info}}
349 ) 484 )
350 ) { 485 ) {
351 my $msg = join " ", @diffs; 486 my $msg = join " ", @diffs;
… …
353 } 488 }
354 489
355 if ( 490 if (
356 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 491 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
357 ) { 492 ) {
358 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 493 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
359 $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);
360 } 495 }
361 496
362 $self->update_stats_window ($stats, $prev); 497 $self->update_stats_window ($stats, $prev);
363 498
364 $self->{prev_stats} = { %$stats }; 499 $self->{prev_stats} = { %$stats };
… …
401 536
402 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 537 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
403 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 538 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
404 $::GAUGES->{food} ->set_value ($fo, $fo_m); 539 $::GAUGES->{food} ->set_value ($fo, $fo_m);
405 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 540 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
406 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 541 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
407 . " (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});
408 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 544 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
409 my $title = $stats->{+CS_STAT_TITLE}; 545 my $title = $stats->{+CS_STAT_TITLE};
410 $title =~ s/^Player: //; 546 $title =~ s/^Player: //;
411 $::STATWIDS->{title} ->set_text ("Title: " . $title); 547 $::STATWIDS->{title} ->set_text ("Title: " . $title);
412 548
… …
424 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 560 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
425 $::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});
426 562
427 $self->update_weight; 563 $self->update_weight;
428 564
429 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 565 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
430 for keys %RES_TBL; 566 for keys %RES_TBL;
431 567
432 my $sktbl = $::STATWIDS->{skill_tbl}; 568 my $sktbl = $::STATWIDS->{skill_tbl};
433 my @skills = keys %{ $self->{skill_info} }; 569 my @skills = keys %{ $self->{skill_info} };
434 570
435 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
436 $sktbl->clear; 579 $sktbl->clear;
437 580
581 my $sw = $self->{skillwid}{""} ||= [
438 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 582 0, 0, (new DC::UI::Label text => "Experience", align => 1),
439 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 583 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
440 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 584 2, 0, (new DC::UI::Label text => "Progress"),
585 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
441 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 586 4, 0, (new DC::UI::Label text => "Experience", align => 1),
442 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 587 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
443 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 588 6, 0, (new DC::UI::Label text => "Progress"),
589 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
590 ];
444 591
592 my @add = @$sw;
593
445 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>";
446 595
447 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);
448 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);
449 598
450 my ($x, $y) = (0, 1); 599 my ($x, $y) = (0, 1);
451 for ( 600 for (@order) {
452 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
453 map [$_, $self->{skill_info}{$_}],
454 grep exists $stats->{$_},
455 @skills
456 ) {
457 my ($idx, $name) = @$_; 601 my ($idx, $name) = @$_;
458 602
459 my $spell_cb = sub { 603 my $spell_cb = sub {
460 my ($widget, $ev) = @_; 604 my ($widget, $ev) = @_;
461 605
462 if ($ev->{button} == 1) { 606 if ($ev->{button} == 1) {
463 $::CONN->user_send ("ready_skill $name"); 607 $::CONN->user_send ("ready_skill $name");
464 } elsif ($ev->{button} == 2) { 608 } elsif ($ev->{button} == 2) {
465 $::CONN->user_send ("use_skill $name"); 609 $::CONN->user_send ("use_skill $name");
466 } elsif ($ev->{button} == 3) { 610 } elsif ($ev->{button} == 3) {
467 my $shortname = CFPlus::shorten $name, 14; 611 my $shortname = DC::shorten $name, 14;
468 (new CFPlus::UI::Menu 612 (new DC::UI::Menu
469 items => [ 613 items => [
470 ["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"] }],
471 ["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"] }],
472 ], 616 ],
473 )->popup ($ev); 617 )->popup ($ev);
474 } else { 618 } else {
475 return 0; 619 return 0;
476 } 620 }
477 621
478 1 622 1
479 }; 623 };
480 624
481 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 625 my $sw = $self->{skillwid}{$idx} ||= [
626 # exp
627 (new DC::UI::Label
482 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 628 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
483 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 629
630 # level
631 (new DC::UI::Label
484 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 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
485 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 638 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
486 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 639 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
640 ];
641
642 push @add,
643 $x * 4 + 0, $y, $sw->[0],
644 $x * 4 + 1, $y, $sw->[1],
645 $x * 4 + 2, $y, $sw->[2],
646 $x * 4 + 3, $y, $sw->[3],
647 ;
487 648
488 $x++ and ($x, $y) = (0, $y + 1); 649 $x++ and ($x, $y) = (0, $y + 1);
489 } 650 }
490 }
491 651
492 for (grep exists $stats->{$_}, @skills) { 652 $sktbl->add_at (@add);
493 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
494 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
495 } 653 }
496}
497 654
498sub macro_send { 655 for (@order) {
499 my ($self, $macro) = @_; 656 my ($idx, $name) = @$_;
657 my $val = $stats->{$idx};
500 658
501 for my $cmd (@{ $macro->{action} }) { 659 next if $prev->{$idx}[1] eq $val->[1];
502 $self->send_command ($cmd); 660
661 my $sw = $self->{skillwid}{$idx};
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);
503 } 668 }
504} 669}
505 670
506sub user_send { 671sub user_send {
507 my ($self, $command) = @_; 672 my ($self, $command) = @_;
… …
509 $self->{record}->($command) 674 $self->{record}->($command)
510 if $self->{record}; 675 if $self->{record};
511 676
512 $self->logprint ("send: ", $command); 677 $self->logprint ("send: ", $command);
513 $self->send_command ($command); 678 $self->send_command ($command);
514 ::status ($command);
515} 679}
516 680
517sub record { 681sub record {
518 my ($self, $cb) = @_; 682 my ($self, $cb) = @_;
519 683
… …
521} 685}
522 686
523sub map_scroll { 687sub map_scroll {
524 my ($self, $dx, $dy) = @_; 688 my ($self, $dx, $dy) = @_;
525 689
526 $self->{map}->scroll ($dx, $dy); 690 $self->{map_widget}->scroll ($dx, $dy);
527} 691}
528 692
529sub feed_map1a { 693sub feed_map1a {
530 my ($self, $data) = @_; 694 my ($self, $data) = @_;
531 695
532 $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 {
533 $self->{map_widget}->update; 724 $self->{map_widget}->update;
725 }
534} 726}
535 727
536sub magicmap { 728sub magicmap {
537 my ($self, $w, $h, $x, $y, $data) = @_; 729 my ($self, $w, $h, $x, $y, $data) = @_;
538 730
… …
540} 732}
541 733
542sub flush_map { 734sub flush_map {
543 my ($self) = @_; 735 my ($self) = @_;
544 736
545 my $map_info = delete $self->{map_info} 737 return unless $self->{map_info};
546 or return;
547 738
739 for my $map_info (values %{ $self->{map_cache} || {} }) {
548 my ($hash, $x, $y, $w, $h) = @$map_info; 740 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
549 741
550 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;
551 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 747 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
552 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 748 }
749 }
553} 750}
554 751
555sub map_clear { 752sub map_clear {
556 my ($self) = @_; 753 my ($self) = @_;
557 754
558 $self->flush_map; 755 $self->flush_map;
756 delete $self->{map_info};
559 delete $self->{neigh_map}; 757 delete $self->{neigh_map};
560 758
561 $self->{map}->clear; 759 $self->{map}->clear;
562 delete $self->{map_widget}{magicmap}; 760 delete $self->{map_widget}{magicmap};
563} 761}
564 762
565sub bg_fetch { 763sub bg_fetch {
566 my ($self) = @_; 764 my ($self) = @_;
567 765
568 my $id; 766 my $tile;
569 767
570 do { 768 do {
571 $id = pop @{$self->{bg_fetch}} 769 $tile = pop @{$self->{bg_fetch}}
572 or return; 770 or return;
573 } while $self->{texture}[$id]; 771 } while $self->{texture}[$tile];
574 772
575 CFPlus::DB::get tilecache => $id, sub { 773 DC::DB::get tilecache => $tile, sub {
576 my ($data) = @_; 774 my ($data) = @_;
577 775
578 return unless $self->{map}; # stop when destroyed 776 return unless $self->{map}; # stop when destroyed
579 777
580 $self->set_texture ($id => $data)
581 if defined $data; 778 if (defined $data) {
779 $self->have_tile ($tile, $data);
780 $self->{texture}[$tile]->upload;
781 }
582 782
583 $self->bg_fetch; 783 $self->bg_fetch;
584 }; 784 };
585} 785}
586 786
587sub load_map($$$) { 787sub load_map($$$$$$) {
588 my ($self, $hash, $x, $y) = @_; 788 my ($self, $hash, $x, $y, $w, $h) = @_;
589 789
590 my $gen = $self->{map_change_gen}; 790 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
591 791
592 CFPlus::DB::get $self->{mapcache} => $hash, sub { 792 my $cb = sub {
593 return unless $gen == $self->{map_change_gen}; 793 $map_info->[1] = \$_[0];
594 794
595 my ($data) = @_;
596
597 if (defined $data) {
598 $data = Compress::LZF::decompress $data;
599 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
600
601 my $inprogress = @{ $self->{bg_fetch} || [] }; 795 my $inprogress = @{ $self->{bg_fetch} || [] };
602 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 796 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
603 $self->bg_fetch unless $inprogress; 797 $self->bg_fetch unless $inprogress;
604 }
605 }; 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 }
606} 811}
607 812
608# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 813# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
609# (server resource,s latency, bandwidth), so this hack is warranted. 814# (server resources, latency, bandwidth), so this hack is warranted.
610# 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
611sub send_mapinfo { 816sub send_mapinfo {
612 my ($self, $data, $cb) = @_; 817 my ($self, $data, $cb) = @_;
613 818
614 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)$%) {
… …
639} 844}
640 845
641# this method does a "flood fill" into every tile direction 846# this method does a "flood fill" into every tile direction
642# it assumes that tiles are arranged in a rectangular grid, 847# it assumes that tiles are arranged in a rectangular grid,
643# 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.
644# failure to comply are harmless and result in display errors 849# failure to comply is harmless and results in display errors
645# at worst. 850# at worst.
646sub flood_fill { 851sub flood_fill {
647 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 852 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
648 853
649 # the server does not allow map paths > 6 854 # the server does not allow map paths > 6
… …
685 return if $mode ne "spatial"; 890 return if $mode ne "spatial";
686 891
687 $x += $self->{map}->ox; 892 $x += $self->{map}->ox;
688 $y += $self->{map}->oy; 893 $y += $self->{map}->oy;
689 894
690 $self->load_map ($hash, $x, $y) 895 $self->load_map ($hash, $x, $y, $w, $h)
691 unless $self->{neigh_map}{$hash}[5]++;#d# 896 unless $self->{neigh_map}{$hash}[5]++;#d#
692 897
693 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 898 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
694 899
695 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 900 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
703 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 908 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
704 909
705 $self->flush_map; 910 $self->flush_map;
706 911
707 ++$self->{map_change_gen}; 912 ++$self->{map_change_gen};
913 $self->{map_cache_old} = delete $self->{map_cache};
708 914
709 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 915 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
710 916
711 my $mapmapw = $self->{mapmap}->{w}; 917 my $mapmapw = $self->{mapmap}->{w};
712 my $mapmaph = $self->{mapmap}->{h}; 918 my $mapmaph = $self->{mapmap}->{h};
… …
724 $self->{map_info} = [$hash, $x, $y, $w, $h]; 930 $self->{map_info} = [$hash, $x, $y, $w, $h];
725 931
726 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 932 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
727 $::STATWIDS->{map}->set_text ("Map: " . $map); 933 $::STATWIDS->{map}->set_text ("Map: " . $map);
728 934
729 $self->load_map ($hash, $x, $y); 935 $self->load_map ($hash, $x, $y, $w, $h);
730 $self->flood_fill (0, 0, 0, "", $hash, $flags); 936 $self->flood_fill (0, 0, 0, "", $hash, $flags);
731} 937}
732 938
733sub face_find { 939sub face_find {
734 my ($self, $facenum, $face, $cb) = @_; 940 my ($self, $facenum, $face, $cb) = @_;
735 941
736 my $hash = "$face->{chksum},$face->{name}"; 942 if ($face->{type} == 0) { # FT_FACE
737
738 my $id = CFPlus::DB::get_tile_id_sync $hash; 943 my $id = DC::DB::get_tile_id_sync $face->{name};
739 944
740 $face->{id} = $id; 945 $face->{id} = $id;
741 $self->{faceid}[$facenum] = $id;
742
743 $self->{map}->set_tileid ($facenum => $id); 946 $self->{map}->set_tileid ($facenum => $id);
744 947
745 CFPlus::DB::get tilecache => $id, $cb; 948 DC::DB::get tilecache => $id, $cb;
949
950 } elsif ($face->{type} & 1) { # with metadata
951 DC::DB::get res_meta => $face->{name}, $cb;
952
953 } else { # no metadata
954 DC::DB::get res_data => $face->{name}, $cb;
955 }
746} 956}
747 957
748sub face_update { 958sub face_update {
749 my ($self, $facenum, $face, $changed) = @_; 959 my ($self, $facenum, $face, $changed) = @_;
750 960
961 if ($face->{type} == 0) {
962 # image, FT_FACE
751 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 963 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
752 if $changed; 964 if $changed;
753 965
754 $self->set_texture ($face->{id} => delete $face->{image}); 966 $self->have_tile ($face->{id}, delete $face->{data});
967
968 } elsif ($face->{type} & 1) {
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;
983
984 if ($face->{type} == 3) { # FT_MUSIC
985 &::audio_music_push ($facenum);
986 } elsif ($face->{type} == 5) { # FT_SOUND
987 &::audio_sound_push ($facenum);
988 }
989
990 } else {
991 # flat resource case, FT_RSRC
992 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
993 if $changed;
994 }
995
996 if (my $cbs = $self->{face_cb}{$facenum}) {
997 $_->($face, $changed) for @$cbs;
998 }
755} 999}
756 1000
757sub smooth_update { 1001sub smooth_update {
758 my ($self, $facenum, $face) = @_; 1002 my ($self, $facenum, $face) = @_;
759 1003
760 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 1004 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
761} 1005}
762 1006
763sub set_texture { 1007sub have_tile {
764 my ($self, $id, $data) = @_; 1008 my ($self, $tile, $data) = @_;
765 1009
766 $self->{texture}[$id] = my $tex = 1010 return unless $self->{map};
767 new_from_image CFPlus::Texture
768 $data, minify => 1, mipmap => 1;
769 1011
770 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 1012 my $tex = $self->{texture}[$tile] ||=
771 $self->{map_widget}->update; 1013 new DC::Texture
1014 tile => $tile,
1015 image => $data, delete_image => 1,
1016 minify => 1;
1017
1018 if (my $cbs = delete $self->{tile_cb}{$tile}) {
1019 $_->($tex) for @$cbs;
1020 }
1021}
1022
1023# call in non-void context registers a temporary
1024# hook with handle, otherwise its permanent
1025sub on_face_change {
1026 my ($self, $num, $cb) = @_;
1027
1028 push @{$self->{face_cb}{$num}}, $cb;
1029
1030 defined wantarray
1031 ? Guard::guard {
1032 @{$self->{face_cb}{$num}}
1033 = grep $_ != $cb,
1034 @{$self->{face_cb}{$num}};
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)
772} 1052}
773 1053
774sub sound_play { 1054sub sound_play {
775 my ($self, $x, $y, $soundnum, $type) = @_; 1055 my ($self, $type, $face, $dx, $dy, $vol) = @_;
776 1056
777 $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
778} 1059}
779 1060
780my $LAST_QUERY; # server is stupid, stupid, stupid 1061my $LAST_QUERY; # server is stupid, stupid, stupid
781 1062
782sub query { 1063sub query {
783 my ($self, $flags, $prompt) = @_; 1064 my ($self, $flags, $prompt) = @_;
784 1065
785 $prompt = $LAST_QUERY unless length $prompt; 1066 $prompt = $LAST_QUERY unless length $prompt;
786 $LAST_QUERY = $prompt; 1067 $LAST_QUERY = $prompt;
787 1068
788 $self->{query}-> ($self, $flags, $prompt); 1069 $self->{query}->($self, $flags, $prompt);
789} 1070}
790 1071
791sub sanitise_xml($) { 1072sub sanitise_xml($) {
792 local $_ = shift; 1073 local $_ = shift;
793 1074
794 # we now weed out all tags we do not support 1075 # we now weed out all tags we do not support
795 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
796 # now all entities 1081 # now all entities
797 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;
798 1083
799 # handle some elements 1084 # handle some elements
800 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1085 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
801 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+$//;
802 1089
803 $_ 1090 $_
804} 1091}
805 1092
806our %NAME_TO_COLOR = ( 1093our %NAME_TO_COLOR = (
… …
819 tan => 12, 1106 tan => 12,
820); 1107);
821 1108
822our @CF_COLOR = ( 1109our @CF_COLOR = (
823 [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],
824 [1.00, 1.00, 1.00], 1111 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
825 [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],
826 [1.00, 0.00, 0.00], 1113 [1.00, 0.00, 0.00],
827 [1.00, 0.54, 0.00], 1114 [1.00, 0.54, 0.00],
828 [0.11, 0.56, 1.00], 1115 [0.11, 0.56, 1.00],
829 [0.93, 0.46, 0.00], 1116 [0.93, 0.46, 0.00],
830 [0.18, 0.54, 0.34], 1117 [0.18, 0.54, 0.34],
… …
847 $self->{$type} = $text; 1134 $self->{$type} = $text;
848 } else { 1135 } else {
849 $self->logprint ("msg: ", $text); 1136 $self->logprint ("msg: ", $text);
850 return if $color < 0; # negative color == ignore if not understood 1137 return if $color < 0; # negative color == ignore if not understood
851 1138
852 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1139 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
853 1140
854 ## try to create single paragraphs of multiple lines sent by the server 1141 ::message ({
855 # no longer neecssary with TRT servers 1142 fg => $fg,
856 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1143 markup => $text,
1144 type => $type,
1145 extra => [@extra],
1146 color_flags => $color, #d# ugly, kill
1147 });
857 1148
858 ::message ({ fg => $fg, markup => $_ }) 1149# $color &= ~NDI_CLEAR; # only clear once for multiline messages
859 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.
860 1154
861 $self->{statusbox}->add ($text, 1155 $self->{statusbox}->add ($text,
862 group => $text, 1156 group => $text,
863 fg => $fg, 1157 fg => $fg,
864 timeout => $color >= 2 ? 180 : 10, 1158 timeout => $color >= 2 ? 180 : 10,
865 tooltip_font => $::FONT_FIXED, 1159 tooltip_font => $::FONT_FIXED,
866 ); 1160 ) if $type eq "info";
867 } 1161 }
868} 1162}
869 1163
870sub spell_add { 1164sub spell_add {
871 my ($self, $spell) = @_; 1165 my ($self, $spell) = @_;
… …
875 $spell->{message} =~ s/\n+$//; 1169 $spell->{message} =~ s/\n+$//;
876 $spell->{message} ||= "Server did not provide a description for this spell."; 1170 $spell->{message} ||= "Server did not provide a description for this spell.";
877 1171
878 $::SPELL_LIST->add_spell ($spell); 1172 $::SPELL_LIST->add_spell ($spell);
879 1173
880 $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});
881 $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});
882} 1176}
883 1177
884sub spell_delete { 1178sub spell_delete {
885 my ($self, $spell) = @_; 1179 my ($self, $spell) = @_;
886 1180
… …
897sub addme_success { 1191sub addme_success {
898 my ($self) = @_; 1192 my ($self) = @_;
899 1193
900 my %skill_help; 1194 my %skill_help;
901 1195
902 for my $node (CFPlus::Pod::find skill_description => "*") { 1196 for my $node (DC::Pod::find skill_description => "*") {
903 my (undef, @par) = CFPlus::Pod::section_of $node; 1197 my (undef, @par) = DC::Pod::section_of $node;
904 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1198 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
905 }; 1199 };
906 1200
907 for my $skill (values %{$self->{skill_info}}) { 1201 for my $skill (values %{$self->{skill_info}}) {
908 $self->{map_widget}->add_command ("ready_skill $skill", 1202 $self->{map_widget}->add_command ("ready_skill $skill",
909 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1203 (DC::asxml "Ready the skill '$skill'\n\n")
910 . $skill_help{$skill}); 1204 . $skill_help{$skill});
911 $self->{map_widget}->add_command ("use_skill $skill", 1205 $self->{map_widget}->add_command ("use_skill $skill",
912 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1206 (DC::asxml "Immediately use the skill '$skill'\n\n")
913 . $skill_help{$skill}); 1207 . $skill_help{$skill});
914 } 1208 }
915} 1209}
916 1210
917sub eof { 1211sub eof {
… …
920 $self->{map_widget}->clr_commands; 1214 $self->{map_widget}->clr_commands;
921 1215
922 ::stop_game (); 1216 ::stop_game ();
923} 1217}
924 1218
925sub image_info {
926 my ($self, $numfaces) = @_;
927
928 $self->{num_faces} = $numfaces;
929 $self->{face_prefetch} = [1 .. $numfaces];
930 $self->face_prefetch;
931}
932
933sub face_prefetch {
934 my ($self) = @_;
935
936 return unless $::CFG->{face_prefetch};
937
938 if ($self->{num_faces}) {
939 return if @{ $self->{send_queue} || [] };
940 my $todo = @{ $self->{face_prefetch} }
941 or return;
942
943 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
944
945 $self->send ("requestinfo image_sums $face $face");
946
947 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
948 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
949 } elsif (!exists $self->{num_faces}) {
950 $self->send ("requestinfo image_info");
951
952 $self->{num_faces} = 0;
953
954 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
955 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
956 }
957}
958
959sub update_floorbox { 1219sub update_floorbox {
960 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1220 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
961 return unless $::CONN; 1221 return unless $::CONN;
962 1222
963 $::FLOORBOX->clear; 1223 $::FLOORBOX->clear;
964 1224
1225 my @add;
1226
965 my $row; 1227 my $row;
966 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;
967 if ($row < 6) { 1230 if ($row < 6) {
968 local $_->{face_widget}; # hack to force recreation of widget 1231 local $_->{face_widget}; # hack to force recreation of widget
969 local $_->{desc_widget}; # hack to force recreation of widget 1232 local $_->{desc_widget}; # hack to force recreation of widget
970 CFPlus::Item::update_widgets $_; 1233 DC::Item::update_widgets $_;
971 1234
1235 push @add,
972 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1236 0, $row, $_->{face_widget},
973 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1237 1, $row, $_->{desc_widget};
974 1238
975 $row++; 1239 $row++;
976 } else { 1240 } else {
977 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1241 push @add, 1, $row, new DC::UI::Button
978 text => "More...", 1242 text => "More...",
979 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1243 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
980 ); 1244 ;
981 last; 1245 last;
982 } 1246 }
983 } 1247 }
984 if ($::CONN->{open_container}) { 1248 if ($::CONN->{open_container}) {
985 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1249 push @add, 1, $row++, new DC::UI::Button
986 text => "Close container", 1250 text => "Close container",
987 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1251 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
988 ); 1252 ;
989 } 1253 }
1254
1255 $::FLOORBOX->add_at (@add);
990 }); 1256 });
991 1257
992 $::WANT_REFRESH++; 1258 $::WANT_REFRESH = 1;
993} 1259}
994 1260
995sub set_opencont { 1261sub set_opencont {
996 my ($conn, $tag, $name) = @_; 1262 my ($conn, $tag, $name) = @_;
997 $conn->{open_container} = $tag; 1263 $conn->{open_container} = $tag;
998 update_floorbox; 1264 update_floorbox;
999 1265
1000 $::INV_RIGHT_HB->clear (); 1266 $::INVR_HB->clear;
1001 $::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);
1002 1268
1003 if ($tag != 0) { # Floor isn't closable, is it? 1269 if ($tag != 0) { # Floor isn't closable, is it?
1004 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1270 $::INVR_HB->add (new DC::UI::Button
1005 text => "Close container", 1271 text => "Close container",
1006 tooltip => "Close the currently open container (if one is open)", 1272 tooltip => "Close the currently open container (if one is open)",
1007 on_activate => sub { 1273 on_activate => sub {
1008 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1274 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1009 if $tag != 0; 1275 if $tag != 0;
1010 #if $CONN->{open_container} != 0;
1011 0 1276 0
1012 }, 1277 },
1013 ); 1278 );
1014 } 1279 }
1015 1280
… …
1017} 1282}
1018 1283
1019sub update_containers { 1284sub update_containers {
1020 my ($self) = @_; 1285 my ($self) = @_;
1021 1286
1022 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1287 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1023 my $todo = delete $self->{update_container} 1288 my $todo = delete $self->{update_container}
1024 or return; 1289 or return;
1025 1290
1026 for my $tag (keys %$todo) { 1291 for my $tag (keys %$todo) {
1027 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1292 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1062} 1327}
1063 1328
1064sub item_update { 1329sub item_update {
1065 my ($self, $item) = @_; 1330 my ($self, $item) = @_;
1066 1331
1067 #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";
1068 1333
1069 CFPlus::Item::update_widgets $item; 1334 DC::Item::update_widgets $item;
1070 1335
1071 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1336 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1072 set_opencont ($::CONN, 0, "Floor"); 1337 set_opencont ($::CONN, 0, "Floor");
1073 1338
1074 } elsif ($item->{flags} & F_OPEN) { 1339 } elsif ($item->{flags} & F_OPEN) {
1075 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1340 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1076 1341
1077 } else { 1342 } else {
1078 $self->{update_container}{$item->{container}}++; 1343 $self->{update_container}{$item->{container}}++;
1079 $self->update_containers; 1344 $self->update_containers;
1080 } 1345 }
… …
1091 1356
1092 my $weight = .001 * $self->{player}{weight}; 1357 my $weight = .001 * $self->{player}{weight};
1093 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1358 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1094 1359
1095 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1360 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1096 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1361 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1097 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1362 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1098} 1363}
1099 1364
1100sub update_server_info { 1365sub update_server_info {
1101 my ($self) = @_; 1366 my ($self) = @_;
1102 1367
1103 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>");
1104 1369
1370 my $version = JSON::XS->new->encode ($self->{s_version});
1371
1105 $::SERVER_INFO->set_markup ( 1372 $::SERVER_INFO->set_markup (
1106 "server <tt>$self->{host}:$self->{port}</tt>\n" 1373 "server <tt>$self->{host}:$self->{port}</tt>\n"
1107 . "protocol version <tt>$self->{version}</tt>\n" 1374 . "protocol version <tt>$version</tt>\n"
1108 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1109 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1110 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1111 . "editing support $yesno[!!$self->{editor_support}]\n" 1375 . "editing support $yesno[!!$self->{editor_support}]\n"
1112 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1113 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1376 . "client support $yesno[$self->{cfplus_ext} > 0]"
1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1377 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1116 . "map size $self->{mapw}×$self->{maph}\n" 1378 . "map size $self->{mapw}×$self->{maph}\n"
1117 ); 1379 );
1118 1380
1119 ::setup_build_button ($self->{editor_support}->{builder_ui});
1120} 1381}
1121 1382
1122sub logged_in { 1383sub logged_in {
1123 my ($self) = @_; 1384 my ($self) = @_;
1124 1385
1125 $self->send_ext_req (cfplus_support => version => 1, sub { 1386 $self->send_ext_req (cfplus_support => version => 2, sub {
1387 my (%msg) = @_;
1388
1126 $self->{cfplus_ext} = $_[0]{version}; 1389 $self->{cfplus_ext} = $msg{version};
1127 $self->update_server_info; 1390 $self->update_server_info;
1128 1391
1129 if ($self->{cfplus_ext} >= 2) { 1392 if ($self->{cfplus_ext} >= 2) {
1130 $self->send_ext_req ("editor_support", sub { 1393 $self->send_ext_req ("editor_support", sub {
1131 $self->{editor_support} = $_[0]; 1394 $self->{editor_support} = { @_ };
1132 $self->update_server_info; 1395 $self->update_server_info;
1133 1396
1134 0 1397 0
1135 }); 1398 });
1136 } 1399 }
… …
1138 0 1401 0
1139 }); 1402 });
1140 1403
1141 $self->update_server_info; 1404 $self->update_server_info;
1142 1405
1143 $self->send_command ("output-sync $::CFG->{output_sync}");
1144 $self->send_command ("output-count $::CFG->{output_count}");
1145 $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;
1146 $self->send_command ("pickup $::CFG->{pickup}"); 1407 $self->send_pickup ($::CFG->{pickup});
1147}
1148
1149sub buildat {
1150 my ($self, $builditem, $x, $y) = @_;
1151
1152 if ($self->{cfplus_ext}) {
1153 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1154 }
1155} 1408}
1156 1409
1157sub lookat { 1410sub lookat {
1158 my ($self, $x, $y) = @_; 1411 my ($self, $x, $y) = @_;
1159 1412
1160 if ($self->{cfplus_ext}) { 1413 if ($self->{cfplus_ext}) {
1161 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1414 $self->send_ext_req (lookat => $x, $y, sub {
1162 my ($msg) = @_; 1415 my (%msg) = @_;
1163 1416
1164 if (exists $msg->{npc_dialog}) { 1417 if (exists $msg{npc_dialog}) {
1165 # start npc chat dialog 1418 # start npc chat dialog
1166 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1419 $self->{w}{npc_dialog} = new DC::NPCDialog::
1167 dx => $x, 1420 token => $msg{npc_dialog},
1168 dy => $y,
1169 title => "$msg->{npc_dialog} (NPC)", 1421 title => "$msg{npc_dialog}[0] (NPC)",
1170 conn => $self, 1422 conn => $self,
1171 ; 1423 ;
1172 } 1424 }
1173 }); 1425 });
1174 } 1426 }
… …
1177} 1429}
1178 1430
1179sub destroy { 1431sub destroy {
1180 my ($self) = @_; 1432 my ($self) = @_;
1181 1433
1182 (delete $self->{npc_dialog})->destroy 1434 $_->destroy
1183 if $self->{npc_dialog}; 1435 for values %{ $self->{w} };
1184 1436
1185 $self->SUPER::destroy; 1437 $self->SUPER::destroy;
1186 1438
1187 %$self = (); 1439 %$self = ();
1188} 1440}
1189 1441
1190package CFPlus::NPCDialog; 1442package DC::NPCDialog;
1191 1443
1192our @ISA = 'CFPlus::UI::Toplevel'; 1444our @ISA = 'DC::UI::Toplevel';
1193 1445
1194sub new { 1446sub new {
1195 my $class = shift; 1447 my $class = shift;
1196 1448
1197 my $self = $class->SUPER::new ( 1449 my $self = $class->SUPER::new (
… …
1204 kw => { hi => 0, yes => 0, no => 0 }, 1456 kw => { hi => 0, yes => 0, no => 0 },
1205 has_close_button => 1, 1457 has_close_button => 1,
1206 @_, 1458 @_,
1207 ); 1459 );
1208 1460
1209 CFPlus::weaken (my $this = $self); 1461 DC::weaken (my $this = $self);
1210 1462
1211 $self->connect (delete => sub { $this->destroy; 1 }); 1463 $self->connect (delete => sub { $this->destroy; 1 });
1212 1464
1213 # better use a pane... 1465 # better use a pane...
1214 $self->add (my $hbox = new CFPlus::UI::HBox); 1466 $self->add (my $hbox = new DC::UI::HBox);
1215 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1467 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1216 1468
1217 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1469 $hbox->add (my $vbox = new DC::UI::VBox);
1218 1470
1219 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1471 $vbox->add (new DC::UI::Label text => "Message Entry:");
1220 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1472 $vbox->add ($self->{entry} = new DC::UI::Entry
1221 tooltip => "#npc_message_entry", 1473 tooltip => "#npc_message_entry",
1222 on_activate => sub { 1474 on_activate => sub {
1223 my ($entry, $text) = @_; 1475 my ($entry, $text) = @_;
1224 1476
1225 return unless $text =~ /\S/; 1477 return unless $text =~ /\S/;
… …
1229 1481
1230 0 1482 0
1231 }, 1483 },
1232 ); 1484 );
1233 1485
1234 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1486 $vbox->add ($self->{options} = new DC::UI::VBox);
1235 1487
1236 $self->{bye_button} = new CFPlus::UI::Button 1488 $self->{bye_button} = new DC::UI::Button
1237 text => "Bye (close)", 1489 text => "Bye (close)",
1238 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.",
1239 on_activate => sub { $this->destroy; 1 }, 1491 on_activate => sub { $this->destroy; 1 },
1240 ; 1492 ;
1241 1493
1242 $self->update_options; 1494 $self->update_options;
1243 1495
1244 $self->{id} = $self->{conn}->send_ext_req ( 1496 $self->{id} = "npc-channel-" . $self->{conn}->token;
1245 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1497 $self->{conn}->connect_ext ($self->{id} => sub {
1246 sub { $this && $this->feed (@_) } 1498 $this->feed (@_) if $this;
1247 ); 1499 });
1500
1501 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1248 1502
1249 $self->{entry}->grab_focus; 1503 $self->{entry}->grab_focus;
1250 1504
1251 $self->{textview}->add_paragraph ({ 1505 $self->{textview}->add_paragraph ({
1252 fg => [1, 1, 0, 1], 1506 fg => [1, 1, 0, 1],
… …
1258}; 1512};
1259 1513
1260sub update_options { 1514sub update_options {
1261 my ($self) = @_; 1515 my ($self) = @_;
1262 1516
1263 CFPlus::weaken $self; 1517 DC::weaken $self;
1264 1518
1265 $self->{options}->clear; 1519 $self->{options}->clear;
1266 $self->{options}->add ($self->{bye_button}); 1520 $self->{options}->add ($self->{bye_button});
1267 1521
1268 for my $kw (sort keys %{ $self->{kw} }) { 1522 for my $kw (sort keys %{ $self->{kw} }) {
1269 $self->{options}->add (new CFPlus::UI::Button 1523 $self->{options}->add (new DC::UI::Button
1270 text => $kw, 1524 text => $kw,
1271 on_activate => sub { 1525 on_activate => sub {
1272 $self->send ($kw); 1526 $self->send ($kw);
1273 0 1527 0
1274 }, 1528 },
1275 ); 1529 );
1276 } 1530 }
1277} 1531}
1278 1532
1279sub feed { 1533sub feed {
1280 my ($self, $msg) = @_; 1534 my ($self, $type, @arg) = @_;
1281 1535
1282 CFPlus::weaken $self; 1536 DC::weaken $self;
1283 1537
1284 if ($msg->{msgtype} eq "reply") { 1538 if ($type eq "update") {
1539 my (%info) = @arg;
1540
1285 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1541 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1286 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1542 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1287
1288 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1289 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1290 my @link;
1291 $text =~ s{
1292 ($match)
1293 }{
1294 my $kw = $1;
1295
1296 push @link, new CFPlus::UI::Label
1297 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1298 can_hover => 1,
1299 can_events => 1,
1300 padding_x => 0,
1301 padding_y => 0,
1302 on_button_up => sub {
1303 $self->send ($kw);
1304 };
1305
1306 "\x{fffc}"
1307 }giex;
1308 1543
1544 if (exists $info{msg}) {
1545 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1546 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1547 my @link;
1548 $text =~ s{
1549 ($match)
1550 }{
1551 my $kw = $1;
1552
1553 push @link, new DC::UI::Label
1554 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1555 can_hover => 1,
1556 can_events => 1,
1557 padding_x => 0,
1558 padding_y => 0,
1559 on_button_up => sub {
1560 $self->send ($kw);
1561 };
1562
1563 "\x{fffc}"
1564 }giex;
1565
1309 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1566 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1310 $self->{textview}->scroll_to_bottom; 1567 $self->{textview}->scroll_to_bottom;
1568 }
1569
1311 $self->update_options; 1570 $self->update_options;
1312 } else { 1571 } else {
1313 $self->destroy; 1572 $self->destroy;
1314 } 1573 }
1315 1574
… …
1317} 1576}
1318 1577
1319sub send { 1578sub send {
1320 my ($self, $msg) = @_; 1579 my ($self, $msg) = @_;
1321 1580
1322 $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 });
1323 $self->{textview}->scroll_to_bottom; 1587 $self->{textview}->scroll_to_bottom;
1324 1588
1325 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1589 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1326} 1590}
1327 1591
1328sub destroy { 1592sub destroy {
1329 my ($self) = @_; 1593 my ($self) = @_;
1330 1594
1331 #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
1332 1596
1333 if ($self->{conn}) { 1597 if ($self->{conn}) {
1334 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1598 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1335 delete $self->{conn}{npc_dialog}; 1599 delete $self->{conn}{w}{npc_dialog};
1336 $self->{conn}->disconnect_ext ($self->{id}); 1600 $self->{conn}->disconnect_ext ($self->{id});
1337 } 1601 }
1338 1602
1339 $self->SUPER::destroy; 1603 $self->SUPER::destroy;
1340} 1604}

Diff Legend

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