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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines