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

Diff Legend

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