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.102 by root, Wed Apr 18 18:16:16 2007 UTC vs.
Revision 1.226 by root, Thu Nov 15 03:07:46 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines