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.163 by root, Wed Aug 22 21:17:32 2007 UTC vs.
Revision 1.197 by root, Tue May 20 02:47:21 2008 UTC

1package CFPlus::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Deliantra::Protocol::Constants;
7 7
8use CFPlus; 8use DC;
9use CFPlus::DB; 9use DC::DB;
10use CFPlus::UI; 10use DC::UI;
11use CFPlus::Pod; 11use DC::Pod;
12use CFPlus::Macro; 12use DC::Macro;
13use CFPlus::Item; 13use DC::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 xwidget1 => 1,#d# 24 widget => 2,
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
32 30
33 my @cmd_help = map { 31 my @cmd_help = map {
34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
35 or die "unparseable command help: $_->{kw}[0]"; 33 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
36 34
37 my $cmd = $1; 35 my $cmd = $1;
38 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
39 @args = (".*") unless @args; 37 @args = (".*") unless @args;
40 38
41 my (undef, @par) = CFPlus::Pod::section_of $_; 39 my (undef, @par) = DC::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par; 40 my $text = DC::Pod::as_label @par;
43 41
44 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
45 for @args; 43 for @args;
46 44
47 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
49 @args 47 @args
50 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
51 CFPlus::Pod::find command => "*"; 49 DC::Pod::find command => "*";
52 50
53 $self->{json_coder} 51 $self->{json_coder}
54 ->convert_blessed 52 ->convert_blessed
55 ->filter_json_single_key_object (__w_ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
56 $self->{widget}{$_[0]} 54 $self->{widget}{$_[0]}
55 })
56 ->filter_json_single_key_object ("\fc" => sub {
57 my ($id) = @_;
58 sub {
59 $self->send_exti_msg (w_e => $id, @_);
60 }
57 }); 61 });
58 62
59 # destroy widgets on logout 63 # destroy widgets on logout
60 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
61 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
62 $_->destroy 66 $_->destroy
63 for values %{delete $ws->{w} || {}}; 67 for values %{delete $ws->{w} || {}};
64 } 68 }
69
70 delete $self->{items};
71 $::INV->clear;
72 $::INVR_HB->clear;
73 $::FLOORBOX->clear;
65 }); 74 });
66 75
67 $self->{map_widget}->add_command (@$_) 76 $self->{map_widget}->add_command (@$_)
68 for @cmd_help; 77 for @cmd_help;
69 78
70 { 79 {
71 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 80 $self->{dialogue} = my $tex = new_from_file DC::Texture
72 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 81 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
73 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 82 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
74 } 83 }
75 84
76 { 85 {
77 $self->{noface} = my $tex = new_from_file CFPlus::Texture 86 $self->{noface} = my $tex = new_from_file DC::Texture
78 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 87 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
79 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 88 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
80 } 89 }
81 90
82 $self->{open_container} = 0; 91 $self->{open_container} = 0;
83 92
… …
98} 107}
99 108
100sub ext_capabilities { 109sub ext_capabilities {
101 my ($self, %cap) = @_; 110 my ($self, %cap) = @_;
102 111
103 #$self->send ("setup sound 0"); # we use a different protocol
104 $self->update_fx_want; 112 $self->update_fx_want;
105 113
106 $self->send_exti_req (resource => "exp_table", sub { 114 $self->send_exti_req (resource => "exp_table", sub {
107 my ($exp_table) = @_; 115 my ($exp_table) = @_;
108 116
… …
138############################################################################# 146#############################################################################
139 147
140sub widget_associate { 148sub widget_associate {
141 my ($self, $ws, $id, $widget) = @_; 149 my ($self, $ws, $id, $widget) = @_;
142 150
143 if ($widget) { 151 $widget ||= new DC::UI::Bin;
152
144 $widget->{s_id} = $id; 153 $widget->{s_id} = $id;
145 $self->{widget}{$id} = $widget; 154 $self->{widget}{$id} = $widget;
146 155
147 if ($ws) { 156 if ($ws) {
148 $widget->{s_ws} = $ws; 157 $widget->{s_ws} = $ws;
149 $self->{widgetset}{$ws}{w}{$id} = $widget; 158 $self->{widgetset}{$ws}{w}{$id} = $widget;
150 } 159 }
151 160
152 $widget->connect (on_destroy => sub { 161 $widget->connect (on_destroy => sub {
153 my ($widget) = @_; 162 my ($widget) = @_;
154 163
155 delete $self->{widget}{$widget->{s_id}}; 164 delete $self->{widget}{$widget->{s_id}};
156 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} 165 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
157 if exists $widget->{s_ws}; 166 if exists $widget->{s_ws};
158 }); 167 });
159
160 1
161 } else {
162 $self->send_exti_msg (w_e => $id, undef);
163
164 0
165 }
166} 168}
167 169
168# widgetset new 170# widgetset new
169sub ext_ws_n { 171sub ext_ws_n {
170 my ($self, $id) = @_; 172 my ($self, $id) = @_;
… …
187 189
188# widgetset create 190# widgetset create
189sub ext_ws_c { 191sub ext_ws_c {
190 my ($self, $ws, $id, $class, $args) = @_; 192 my ($self, $ws, $id, $class, $args) = @_;
191 193
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 ( 194 $self->widget_associate (
203 $ws, $id => scalar eval { 195 $ws, $id => scalar eval {
204 local $SIG{__DIE__}; 196 local $SIG{__DIE__};
205 "CFPlus::UI::$class"->new (%$args) 197 "DC::UI::$class"->new (%$args)
198 }
199 );
200}
201
202# widgetset create template
203sub ext_ws_ct {
204 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
205
206 $done_cb ||= sub { };
207
208 my $parse_list; $parse_list = sub {
209 my ($list) = @_;
210 my @w;
211
212 while (@$list) {
213 my ($class, $args) = splice @$list, 0, 2;
214 my $name = delete $args->{s_id};
215 my $cl = delete $args->{s_cl};
216 my $cfg = delete $cfg->{$name};
217 my $id = delete $cfg->{id};
218 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
219 or next;
220
221 $self->widget_associate ($ws, $id, $w)
222 if $id;
223
224 $w->add ($parse_list->($cl))
225 if $cl;
226
227 push @w, $w;
228 }
229
230 @w
231 };
232
233 # either array reference, or face #
234 if ($type eq "inline") {
235 $done_cb->();
236 $parse_list->($template);
237 } elsif ($type eq "face") {
238 my $handler; $handler = $self->register_face_handler ($template, sub {
239 my ($face) = @_;
240
241 undef $handler;
242 $done_cb->();
243 $parse_list->($self->{json_coder}->decode ($face->{data}));
206 } 244 });
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; 245 } else {
246 $done_cb->(0);
247 }
208} 248}
209 249
210# widgetset associate 250# widgetset associate
211sub ext_ws_a { 251sub ext_ws_a {
212 my ($self, %ass) = @_; 252 my ($self, %ass) = @_;
213 253
214 # everything that has a name, wether conceivably useful or not 254 # everything that has a name, wether conceivably useful or not
215 my %wkw = ( 255 my %wkw = (
216 root => $CFPlus::UI::ROOT, 256 root => $DC::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP, 257 tooltip => $DC::UI::TOOLTIP,
218 258
219 mapwidget => $::MAPWIDGET, 259 mapwidget => $::MAPWIDGET,
220 buttonbar => $::BUTTONBAR, 260 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER, 261 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR, 262 buttonbar => $::BUTTONBAR,
… …
240 spell_list => $::SPELL_LIST, 280 spell_list => $::SPELL_LIST,
241 281
242 floorbox => $::FLOORBOX, 282 floorbox => $::FLOORBOX,
243 help_window => $::HELP_WINDOW, 283 help_window => $::HELP_WINDOW,
244 message_window => $::MESSAGE_WINDOW, 284 message_window => $::MESSAGE_WINDOW,
285 message_dist => $::MESSAGE_DIST,
245 statusbox => $::SDTATUSBOX, 286 statusbox => $::SDTATUSBOX,
246 287
247 inv => $::INV, 288 inv => $::INV,
248 invr => $::INVR, 289 invr => $::INVR,
249 invr_hb => $::INVR_HB, 290 invr_hb => $::INVR_HB,
250 ); 291 );
251 292
252 while (my ($id, $name) = each %ass) { 293 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name}) 294 $self->widget_associate (undef, $id => $wkw{$name});
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 } 295 }
256} 296}
257 297
258# widget call 298# widget call
259sub ext_w_c { 299sub ext_w_c {
260 my ($self, $id, $rid, $method, @args) = @_; 300 my ($self, $id, $rcb, $method, @args) = @_;
261 301
262 my $w = $self->{widget}{$id} 302 my $w = $self->{widget}{$id}
263 or return; 303 or return;
264 304
265 if ($rid) { 305 if ($rcb) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args)); 306 $rcb->($w->$method (@args));
267 } else { 307 } else {
268 $w->$method (@args); 308 $w->$method (@args);
269 } 309 }
270} 310}
271 311
… …
287 } 327 }
288} 328}
289 329
290# widget get 330# widget get
291sub ext_w_g { 331sub ext_w_g {
292 my ($self, $id, $rid, $attr) = @_; 332 my ($self, $id, $rid, @attr) = @_;
293 333
294 my $w = $self->{widget}{$id} 334 my $w = $self->{widget}{$id}
295 or return; 335 or return;
296 336
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 337 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
298} 338}
299 339
300# message window 340# message window
301sub ext_channel_info { 341sub ext_channel_info {
302 my ($self, $info) = @_; 342 my ($self, $info) = @_;
303 $self->{channels}->{$info->{id}} = $info; 343 $self->{channels}->{$info->{id}} = $info;
304 $::MESSAGE_WINDOW->add_channel ($info); 344 $::MESSAGE_DIST->add_channel ($info);
305} 345}
306 346
307############################################################################# 347#############################################################################
308 348
309sub logprint { 349sub logprint {
310 my ($self, @a) = @_; 350 my ($self, @a) = @_;
311 351
312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 352 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
313} 353}
314 354
315sub _stat_numdiff { 355sub _stat_numdiff {
316 my ($self, $name, $old, $new) = @_; 356 my ($self, $name, $old, $new) = @_;
317 357
… …
401 441
402 if ( 442 if (
403 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 443 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
404 ) { 444 ) {
405 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 445 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
406 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 446 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
407 } 447 }
408 448
409 $self->update_stats_window ($stats, $prev); 449 $self->update_stats_window ($stats, $prev);
410 450
411 $self->{prev_stats} = { %$stats }; 451 $self->{prev_stats} = { %$stats };
… …
489 $self->{stat_order} = join ",", map $_->[0], @order; 529 $self->{stat_order} = join ",", map $_->[0], @order;
490 530
491 $sktbl->clear; 531 $sktbl->clear;
492 532
493 my $sw = $self->{skillwid}{""} ||= [ 533 my $sw = $self->{skillwid}{""} ||= [
494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 534 0, 0, (new DC::UI::Label text => "Experience", align => 1),
495 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 535 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
496 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 536 2, 0, (new DC::UI::Label text => "Progress"),
497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 537 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 538 4, 0, (new DC::UI::Label text => "Experience", align => 1),
499 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 539 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
500 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 540 6, 0, (new DC::UI::Label text => "Progress"),
501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 541 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
502 ]; 542 ];
503 543
504 my @add = @$sw; 544 my @add = @$sw;
505 545
506 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 546 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
… …
518 if ($ev->{button} == 1) { 558 if ($ev->{button} == 1) {
519 $::CONN->user_send ("ready_skill $name"); 559 $::CONN->user_send ("ready_skill $name");
520 } elsif ($ev->{button} == 2) { 560 } elsif ($ev->{button} == 2) {
521 $::CONN->user_send ("use_skill $name"); 561 $::CONN->user_send ("use_skill $name");
522 } elsif ($ev->{button} == 3) { 562 } elsif ($ev->{button} == 3) {
523 my $shortname = CFPlus::shorten $name, 14; 563 my $shortname = DC::shorten $name, 14;
524 (new CFPlus::UI::Menu 564 (new DC::UI::Menu
525 items => [ 565 items => [
526 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 566 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
527 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 567 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
528 ], 568 ],
529 )->popup ($ev); 569 )->popup ($ev);
530 } else { 570 } else {
531 return 0; 571 return 0;
532 } 572 }
… …
534 1 574 1
535 }; 575 };
536 576
537 my $sw = $self->{skillwid}{$idx} ||= [ 577 my $sw = $self->{skillwid}{$idx} ||= [
538 # exp 578 # exp
539 (new CFPlus::UI::Label 579 (new DC::UI::Label
540 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 580 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
541 581
542 # level 582 # level
543 (new CFPlus::UI::Label 583 (new DC::UI::Label
544 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 584 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
545 585
546 # progress 586 # progress
547 (new CFPlus::UI::ExperienceProgress), 587 (new DC::UI::ExperienceProgress),
548 588
549 # label 589 # label
550 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 590 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
551 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 591 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
552 ]; 592 ];
553 593
554 push @add, 594 push @add,
555 $x * 4 + 0, $y, $sw->[0], 595 $x * 4 + 0, $y, $sw->[0],
556 $x * 4 + 1, $y, $sw->[1], 596 $x * 4 + 1, $y, $sw->[1],
… …
566 606
567 for (@order) { 607 for (@order) {
568 my ($idx, $name) = @$_; 608 my ($idx, $name) = @$_;
569 my $val = $stats->{$idx}; 609 my $val = $stats->{$idx};
570 610
571 next if $prev->{$idx}[1] == $val->[1]; 611 next if $prev->{$idx}[1] eq $val->[1];
572 612
573 my $sw = $self->{skillwid}{$idx}; 613 my $sw = $self->{skillwid}{$idx};
574 $sw->[0]->set_text (::formsep ($val->[1])); 614 $sw->[0]->set_text (::formsep ($val->[1]));
575 $sw->[1]->set_text ($val->[0] * 1); 615 $sw->[1]->set_text ($val->[0] * 1);
576 $sw->[2]->set_value (@$val); 616 $sw->[2]->set_value (@$val);
577 617
578 #$::GAUGES->{sklprg}->set_label ($name); 618 $::GAUGES->{sklprg}->set_label ("$name %d%%");
579 $::GAUGES->{sklprg}->set_value (@$val); 619 $::GAUGES->{sklprg}->set_value (@$val);
580 }
581}
582
583sub macro_send {
584 my ($self, $macro) = @_;
585
586 for my $cmd (@{ $macro->{action} }) {
587 $self->send_command ($cmd);
588 } 620 }
589} 621}
590 622
591sub user_send { 623sub user_send {
592 my ($self, $command) = @_; 624 my ($self, $command) = @_;
… …
594 $self->{record}->($command) 626 $self->{record}->($command)
595 if $self->{record}; 627 if $self->{record};
596 628
597 $self->logprint ("send: ", $command); 629 $self->logprint ("send: ", $command);
598 $self->send_command ($command); 630 $self->send_command ($command);
599 ::status ($command);
600} 631}
601 632
602sub record { 633sub record {
603 my ($self, $cb) = @_; 634 my ($self, $cb) = @_;
604 635
… …
635 } 666 }
636 } 667 }
637 668
638 if ($delay) { 669 if ($delay) {
639 # delay the map drawing a tiny bit in the hope of getting the missing fetched 670 # delay the map drawing a tiny bit in the hope of getting the missing fetched
640 Event->timer (after => 0.03, cb => sub { 671 EV::once undef, 0, 0.03, sub {
641 $_[0]->w->cancel;
642 $self->{map_widget}->update 672 $self->{map_widget}->update
643 if $self->{map_widget}; 673 if $self->{map_widget};
644 }); 674 };
645 } else { 675 } else {
646 $self->{map_widget}->update; 676 $self->{map_widget}->update;
647 } 677 }
648} 678}
649 679
… …
654} 684}
655 685
656sub flush_map { 686sub flush_map {
657 my ($self) = @_; 687 my ($self) = @_;
658 688
659 my $map_info = delete $self->{map_info} 689 return unless $self->{map_info};
660 or return;
661 690
691 for my $map_info (values %{ $self->{map_cache} || {} }) {
662 my ($hash, $x, $y, $w, $h) = @$map_info; 692 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
663 693
664 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 694 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
665 $self->{map_cache_new}{$hash} = \$data; 695
696 if ($data ne $$rdata) {
697 $map_info->[1] = \$data;
698 my $cdata = Compress::LZF::compress $data;
699 warn "db_put $hash $x $y ", length $data, " > ", length $cdata;
666 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 700 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
701 }
702 }
667} 703}
668 704
669sub map_clear { 705sub map_clear {
670 my ($self) = @_; 706 my ($self) = @_;
671 707
672 $self->flush_map; 708 $self->flush_map;
709 delete $self->{map_info};
673 delete $self->{neigh_map}; 710 delete $self->{neigh_map};
674 711
675 $self->{map}->clear; 712 $self->{map}->clear;
676 delete $self->{map_widget}{magicmap}; 713 delete $self->{map_widget}{magicmap};
677} 714}
… …
684 do { 721 do {
685 $tile = pop @{$self->{bg_fetch}} 722 $tile = pop @{$self->{bg_fetch}}
686 or return; 723 or return;
687 } while $self->{texture}[$tile]; 724 } while $self->{texture}[$tile];
688 725
689 CFPlus::DB::get tilecache => $tile, sub { 726 DC::DB::get tilecache => $tile, sub {
690 my ($data) = @_; 727 my ($data) = @_;
691 728
692 return unless $self->{map}; # stop when destroyed 729 return unless $self->{map}; # stop when destroyed
693 730
694 if (defined $data) { 731 if (defined $data) {
… …
698 735
699 $self->bg_fetch; 736 $self->bg_fetch;
700 }; 737 };
701} 738}
702 739
703sub load_map($$$) { 740sub load_map($$$$$$) {
704 my ($self, $hash, $x, $y) = @_; 741 my ($self, $hash, $x, $y, $w, $h) = @_;
705 742
706 my $gen = $self->{map_change_gen}; 743 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
707 744
708 my $cb = sub { 745 my $cb = sub {
709 return unless $gen == $self->{map_change_gen}; 746 $map_info->[1] = \$_[0];
710 747
711 my ($data) = @_; 748 return if 2505 == length $_[0];#d#
749 warn "map_cache $hash $x $y $w $h ", length $_[0];#d#
712 750
713 if (defined $data) {
714 $self->{map_cache_new}{$hash} = \$data;
715
716 my $data = Compress::LZF::decompress $data;
717
718 my $inprogress = @{ $self->{bg_fetch} || [] }; 751 my $inprogress = @{ $self->{bg_fetch} || [] };
719 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 752 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
720 $self->bg_fetch unless $inprogress; 753 $self->bg_fetch unless $inprogress;
721 }
722 }; 754 };
723 755
724 if (my $rdata = $self->{map_cache_old}{$hash}) { 756 if (my $map_info = $self->{map_cache_old}{$hash}) {
725 $cb->($$rdata); 757 $cb->(${ $map_info->[1] });
726 } else { 758 } else {
759 my $gen = $self->{map_change_gen};
760
727 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 761 DC::DB::get $self->{mapcache} => $hash, sub {
762 return unless $gen == $self->{map_change_gen};
763 return unless defined $_[0];
764 $cb->(Compress::LZF::decompress $_[0]);
765 };
728 } 766 }
729} 767}
730 768
731# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 769# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
732# (server resource,s latency, bandwidth), so this hack is warranted. 770# (server resources, latency, bandwidth), so this hack is warranted.
733# the right fix is to make real tiled maps with an overview file 771# the right fix is to make real tiled maps with an overview file
734sub send_mapinfo { 772sub send_mapinfo {
735 my ($self, $data, $cb) = @_; 773 my ($self, $data, $cb) = @_;
736 774
737 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 775 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
… …
762} 800}
763 801
764# this method does a "flood fill" into every tile direction 802# this method does a "flood fill" into every tile direction
765# it assumes that tiles are arranged in a rectangular grid, 803# it assumes that tiles are arranged in a rectangular grid,
766# i.e. a map is the same as the left of the right map etc. 804# i.e. a map is the same as the left of the right map etc.
767# failure to comply are harmless and result in display errors 805# failure to comply is harmless and results in display errors
768# at worst. 806# at worst.
769sub flood_fill { 807sub flood_fill {
770 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 808 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
771 809
772 # the server does not allow map paths > 6 810 # the server does not allow map paths > 6
… …
808 return if $mode ne "spatial"; 846 return if $mode ne "spatial";
809 847
810 $x += $self->{map}->ox; 848 $x += $self->{map}->ox;
811 $y += $self->{map}->oy; 849 $y += $self->{map}->oy;
812 850
813 $self->load_map ($hash, $x, $y) 851 $self->load_map ($hash, $x, $y, $w, $h)
814 unless $self->{neigh_map}{$hash}[5]++;#d# 852 unless $self->{neigh_map}{$hash}[5]++;#d#
815 853
816 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 854 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
817 855
818 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 856 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
826 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 864 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
827 865
828 $self->flush_map; 866 $self->flush_map;
829 867
830 ++$self->{map_change_gen}; 868 ++$self->{map_change_gen};
831 $self->{map_cache_old} = delete $self->{map_cache_new}; 869 $self->{map_cache_old} = delete $self->{map_cache};
832 870
833 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 871 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
834 872
835 my $mapmapw = $self->{mapmap}->{w}; 873 my $mapmapw = $self->{mapmap}->{w};
836 my $mapmaph = $self->{mapmap}->{h}; 874 my $mapmaph = $self->{mapmap}->{h};
… …
848 $self->{map_info} = [$hash, $x, $y, $w, $h]; 886 $self->{map_info} = [$hash, $x, $y, $w, $h];
849 887
850 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 888 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
851 $::STATWIDS->{map}->set_text ("Map: " . $map); 889 $::STATWIDS->{map}->set_text ("Map: " . $map);
852 890
853 $self->load_map ($hash, $x, $y); 891 $self->load_map ($hash, $x, $y, $w, $h);
854 $self->flood_fill (0, 0, 0, "", $hash, $flags); 892 $self->flood_fill (0, 0, 0, "", $hash, $flags);
855} 893}
856 894
857sub face_find { 895sub face_find {
858 my ($self, $facenum, $face, $cb) = @_; 896 my ($self, $facenum, $face, $cb) = @_;
859 897
860 if ($face->{type} == 0) { # FT_FACE 898 if ($face->{type} == 0) { # FT_FACE
861 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 899 my $id = DC::DB::get_tile_id_sync $face->{name};
862 900
863 $face->{id} = $id; 901 $face->{id} = $id;
864 $self->{map}->set_tileid ($facenum => $id); 902 $self->{map}->set_tileid ($facenum => $id);
865 903
866 CFPlus::DB::get tilecache => $id, $cb; 904 DC::DB::get tilecache => $id, $cb;
867 905
868 } elsif ($face->{type} & 1) { # with metadata 906 } elsif ($face->{type} & 1) { # with metadata
869 CFPlus::DB::get res_meta => $face->{name}, $cb; 907 DC::DB::get res_meta => $face->{name}, $cb;
870 908
871 } else { # no metadata 909 } else { # no metadata
872 CFPlus::DB::get res_data => $face->{name}, $cb; 910 DC::DB::get res_data => $face->{name}, $cb;
873 } 911 }
874} 912}
875 913
876sub face_update { 914sub face_update {
877 my ($self, $facenum, $face, $changed) = @_; 915 my ($self, $facenum, $face, $changed) = @_;
878 916
879 if ($face->{type} == 0) { 917 if ($face->{type} == 0) {
880 # image, FT_FACE 918 # image, FT_FACE
881 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 919 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
882 if $changed; 920 if $changed;
883 921
884 $self->have_tile ($face->{id}, delete $face->{data}); 922 $self->have_tile ($face->{id}, delete $face->{data});
885 923
886 } elsif ($face->{type} & 1) { 924 } elsif ($face->{type} & 1) {
887 # split metadata case, FT_MUSIC, FT_SOUND 925 # split metadata case, FT_MUSIC, FT_SOUND
888 if ($changed) { # new data 926 if ($changed) { # new data
889 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 927 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
890 $face->{data} = $meta; 928 $face->{data} = $meta;
891 929
930 # rely on strict ordering here and also on later fetch
892 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 931 DC::DB::put res_data => $face->{name} => $data, sub { };
893 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 932 DC::DB::put res_meta => $face->{name} => $meta, sub { };
894 } 933 }
895 934
896 $face->{data} = $self->{json_coder}->decode ($face->{data}); 935 $face->{data} = $self->{json_coder}->decode ($face->{data});
897
898 ::add_license ($face); 936 ::add_license ($face);
937 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
938 if $changed;
899 939
900 if ($face->{type} == 3) { # FT_MUSIC 940 if ($face->{type} == 3) { # FT_MUSIC
901 ::message ({ markup => "downloaded song #$facenum" })
902 if $changed;
903
904 &::audio_music_push ($facenum); 941 &::audio_music_push ($facenum);
905 } elsif ($face->{type} == 5) { # FT_SOUND 942 } elsif ($face->{type} == 5) { # FT_SOUND
906 ::message ({ markup => "downloaded sound #$facenum" })
907 if $changed;
908
909 &::audio_sound_push ($facenum); 943 &::audio_sound_push ($facenum);
910 } 944 }
911 945
912 } else { 946 } else {
913 # flat resource case, FT_RSRC 947 # flat resource case, FT_RSRC
914 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 948 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
915 if $changed; 949 if $changed;
916 } 950 }
917 951
918 if (my $cbs = $self->{face_cb}{$facenum}) { 952 if (my $cbs = $self->{face_cb}{$facenum}) {
919 $_->($face, $changed) for @$cbs; 953 $_->($face, $changed) for @$cbs;
… …
930 my ($self, $tile, $data) = @_; 964 my ($self, $tile, $data) = @_;
931 965
932 return unless $self->{map}; 966 return unless $self->{map};
933 967
934 my $tex = $self->{texture}[$tile] ||= 968 my $tex = $self->{texture}[$tile] ||=
935 new CFPlus::Texture 969 new DC::Texture
936 tile => $tile, 970 tile => $tile,
937 image => $data, delete_image => 1, 971 image => $data, delete_image => 1,
938 minify => 1, mipmap => 1; 972 minify => 1, mipmap => 1;
939 973
940 if (my $cbs = delete $self->{tile_cb}{$tile}) { 974 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
948 my ($self, $num, $cb) = @_; 982 my ($self, $num, $cb) = @_;
949 983
950 push @{$self->{face_cb}{$num}}, $cb; 984 push @{$self->{face_cb}{$num}}, $cb;
951 985
952 defined wantarray 986 defined wantarray
953 ? CFPlus::guard { 987 ? DC::guard {
954 @{$self->{face_cb}{$num}} 988 @{$self->{face_cb}{$num}}
955 = grep $_ != $cb, 989 = grep $_ != $cb,
956 @{$self->{face_cb}{$num}}; 990 @{$self->{face_cb}{$num}};
957 } 991 }
958 : () 992 : ()
… …
993 1027
994sub sanitise_xml($) { 1028sub sanitise_xml($) {
995 local $_ = shift; 1029 local $_ = shift;
996 1030
997 # we now weed out all tags we do not support 1031 # we now weed out all tags we do not support
998 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1032 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1033 }{
1034 "&lt;"
1035 }gex;
1036
999 # now all entities 1037 # now all entities
1000 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1038 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1001 1039
1002 # handle some elements 1040 # handle some elements
1003 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1041 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
1004 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1042 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1043
1044 s/\s+$//;
1005 1045
1006 $_ 1046 $_
1007} 1047}
1008 1048
1009our %NAME_TO_COLOR = ( 1049our %NAME_TO_COLOR = (
… …
1056 1096
1057 ## try to create single paragraphs of multiple lines sent by the server 1097 ## try to create single paragraphs of multiple lines sent by the server
1058 # no longer neecssary with TRT servers 1098 # no longer neecssary with TRT servers
1059 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1099 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1060 1100
1101 for (split /\n/, $text) {
1061 ::message ({ 1102 ::message ({
1062 fg => $fg, 1103 fg => $fg,
1063 markup => $_, 1104 markup => $_,
1064 type => $type, 1105 type => $type,
1065 extra => [@extra], 1106 extra => [@extra],
1066 color_flags => $color 1107 color_flags => $color, #d# ugly, kill
1067 }) for split /\n/, $text; 1108 });
1109
1110 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1111 # actually, this is an ugly design. _we_ should control the channels,
1112 # not some random other widget, as the channels are clearly protocol-specific.
1113 # then we could also react to flags such as CLEAR without resorting to
1114 # hacks such as color_flags, above.
1115 }
1068 1116
1069 $self->{statusbox}->add ($text, 1117 $self->{statusbox}->add ($text,
1070 group => $text, 1118 group => $text,
1071 fg => $fg, 1119 fg => $fg,
1072 timeout => $color >= 2 ? 180 : 10, 1120 timeout => $color >= 2 ? 180 : 10,
1073 tooltip_font => $::FONT_FIXED, 1121 tooltip_font => $::FONT_FIXED,
1074 ); 1122 ) if $type eq "info";
1075 } 1123 }
1076} 1124}
1077 1125
1078sub spell_add { 1126sub spell_add {
1079 my ($self, $spell) = @_; 1127 my ($self, $spell) = @_;
… …
1083 $spell->{message} =~ s/\n+$//; 1131 $spell->{message} =~ s/\n+$//;
1084 $spell->{message} ||= "Server did not provide a description for this spell."; 1132 $spell->{message} ||= "Server did not provide a description for this spell.";
1085 1133
1086 $::SPELL_LIST->add_spell ($spell); 1134 $::SPELL_LIST->add_spell ($spell);
1087 1135
1088 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1136 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
1089 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1137 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1090} 1138}
1091 1139
1092sub spell_delete { 1140sub spell_delete {
1093 my ($self, $spell) = @_; 1141 my ($self, $spell) = @_;
1094 1142
… …
1105sub addme_success { 1153sub addme_success {
1106 my ($self) = @_; 1154 my ($self) = @_;
1107 1155
1108 my %skill_help; 1156 my %skill_help;
1109 1157
1110 for my $node (CFPlus::Pod::find skill_description => "*") { 1158 for my $node (DC::Pod::find skill_description => "*") {
1111 my (undef, @par) = CFPlus::Pod::section_of $node; 1159 my (undef, @par) = DC::Pod::section_of $node;
1112 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1160 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1113 }; 1161 };
1114 1162
1115 for my $skill (values %{$self->{skill_info}}) { 1163 for my $skill (values %{$self->{skill_info}}) {
1116 $self->{map_widget}->add_command ("ready_skill $skill", 1164 $self->{map_widget}->add_command ("ready_skill $skill",
1117 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1165 (DC::asxml "Ready the skill '$skill'\n\n")
1118 . $skill_help{$skill}); 1166 . $skill_help{$skill});
1119 $self->{map_widget}->add_command ("use_skill $skill", 1167 $self->{map_widget}->add_command ("use_skill $skill",
1120 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1168 (DC::asxml "Immediately use the skill '$skill'\n\n")
1121 . $skill_help{$skill}); 1169 . $skill_help{$skill});
1122 } 1170 }
1123} 1171}
1124 1172
1125sub eof { 1173sub eof {
… …
1129 1177
1130 ::stop_game (); 1178 ::stop_game ();
1131} 1179}
1132 1180
1133sub update_floorbox { 1181sub update_floorbox {
1134 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1182 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1135 return unless $::CONN; 1183 return unless $::CONN;
1136 1184
1137 $::FLOORBOX->clear; 1185 $::FLOORBOX->clear;
1138 1186
1139 my @add; 1187 my @add;
1140 1188
1141 my $row; 1189 my $row;
1142 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1190 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1191 next if $_->{tag} & 0x80000000;
1143 if ($row < 6) { 1192 if ($row < 6) {
1144 local $_->{face_widget}; # hack to force recreation of widget 1193 local $_->{face_widget}; # hack to force recreation of widget
1145 local $_->{desc_widget}; # hack to force recreation of widget 1194 local $_->{desc_widget}; # hack to force recreation of widget
1146 CFPlus::Item::update_widgets $_; 1195 DC::Item::update_widgets $_;
1147 1196
1148 push @add, 1197 push @add,
1149 0, $row, $_->{face_widget}, 1198 0, $row, $_->{face_widget},
1150 1, $row, $_->{desc_widget}; 1199 1, $row, $_->{desc_widget};
1151 1200
1152 $row++; 1201 $row++;
1153 } else { 1202 } else {
1154 push @add, 1, $row, new CFPlus::UI::Button 1203 push @add, 1, $row, new DC::UI::Button
1155 text => "More...", 1204 text => "More...",
1156 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1205 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1157 ; 1206 ;
1158 last; 1207 last;
1159 } 1208 }
1160 } 1209 }
1161 if ($::CONN->{open_container}) { 1210 if ($::CONN->{open_container}) {
1162 push @add, 1, $row++, new CFPlus::UI::Button 1211 push @add, 1, $row++, new DC::UI::Button
1163 text => "Close container", 1212 text => "Close container",
1164 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1213 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1165 ; 1214 ;
1166 } 1215 }
1167 1216
1168 $::FLOORBOX->add_at (@add); 1217 $::FLOORBOX->add_at (@add);
1169 }); 1218 });
1170 1219
1171 $::WANT_REFRESH->start; 1220 $::WANT_REFRESH = 1;
1172} 1221}
1173 1222
1174sub set_opencont { 1223sub set_opencont {
1175 my ($conn, $tag, $name) = @_; 1224 my ($conn, $tag, $name) = @_;
1176 $conn->{open_container} = $tag; 1225 $conn->{open_container} = $tag;
1177 update_floorbox; 1226 update_floorbox;
1178 1227
1179 $::INVR_HB->clear (); 1228 $::INVR_HB->clear;
1180 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1229 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1181 1230
1182 if ($tag != 0) { # Floor isn't closable, is it? 1231 if ($tag != 0) { # Floor isn't closable, is it?
1183 $::INVR_HB->add (new CFPlus::UI::Button 1232 $::INVR_HB->add (new DC::UI::Button
1184 text => "Close container", 1233 text => "Close container",
1185 tooltip => "Close the currently open container (if one is open)", 1234 tooltip => "Close the currently open container (if one is open)",
1186 on_activate => sub { 1235 on_activate => sub {
1187 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1236 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1188 if $tag != 0; 1237 if $tag != 0;
… …
1195} 1244}
1196 1245
1197sub update_containers { 1246sub update_containers {
1198 my ($self) = @_; 1247 my ($self) = @_;
1199 1248
1200 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1249 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1201 my $todo = delete $self->{update_container} 1250 my $todo = delete $self->{update_container}
1202 or return; 1251 or return;
1203 1252
1204 for my $tag (keys %$todo) { 1253 for my $tag (keys %$todo) {
1205 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1254 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1240} 1289}
1241 1290
1242sub item_update { 1291sub item_update {
1243 my ($self, $item) = @_; 1292 my ($self, $item) = @_;
1244 1293
1245 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1294 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1246 1295
1247 CFPlus::Item::update_widgets $item; 1296 DC::Item::update_widgets $item;
1248 1297
1249 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1298 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1250 set_opencont ($::CONN, 0, "Floor"); 1299 set_opencont ($::CONN, 0, "Floor");
1251 1300
1252 } elsif ($item->{flags} & F_OPEN) { 1301 } elsif ($item->{flags} & F_OPEN) {
1253 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1302 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1254 1303
1255 } else { 1304 } else {
1256 $self->{update_container}{$item->{container}}++; 1305 $self->{update_container}{$item->{container}}++;
1257 $self->update_containers; 1306 $self->update_containers;
1258 } 1307 }
… …
1269 1318
1270 my $weight = .001 * $self->{player}{weight}; 1319 my $weight = .001 * $self->{player}{weight};
1271 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1320 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1272 1321
1273 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1322 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1274 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1323 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1275 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1324 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1276} 1325}
1277 1326
1278sub update_server_info { 1327sub update_server_info {
1279 my ($self) = @_; 1328 my ($self) = @_;
… …
1287 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1336 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1288 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1337 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1289 . "editing support $yesno[!!$self->{editor_support}]\n" 1338 . "editing support $yesno[!!$self->{editor_support}]\n"
1290 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1339 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1291 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1340 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1292 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1341 . "client support $yesno[$self->{cfplus_ext} > 0]"
1293 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1342 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1294 . "map size $self->{mapw}×$self->{maph}\n" 1343 . "map size $self->{mapw}×$self->{maph}\n"
1295 ); 1344 );
1296 1345
1297} 1346}
… …
1317 0 1366 0
1318 }); 1367 });
1319 1368
1320 $self->update_server_info; 1369 $self->update_server_info;
1321 1370
1322 $self->send_command ("output-sync $::CFG->{output_sync}");
1323 $self->send_command ("output-count $::CFG->{output_count}");
1324 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1371 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1325 $self->send_command ("pickup $::CFG->{pickup}"); 1372 $self->send_command ("pickup $::CFG->{pickup}");
1326} 1373}
1327 1374
1328sub lookat { 1375sub lookat {
… …
1332 $self->send_ext_req (lookat => $x, $y, sub { 1379 $self->send_ext_req (lookat => $x, $y, sub {
1333 my (%msg) = @_; 1380 my (%msg) = @_;
1334 1381
1335 if (exists $msg{npc_dialog}) { 1382 if (exists $msg{npc_dialog}) {
1336 # start npc chat dialog 1383 # start npc chat dialog
1337 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1384 $self->{npc_dialog} = new DC::NPCDialog::
1338 token => $msg{npc_dialog}, 1385 token => $msg{npc_dialog},
1339 title => "$msg{npc_dialog}[0] (NPC)", 1386 title => "$msg{npc_dialog}[0] (NPC)",
1340 conn => $self, 1387 conn => $self,
1341 ; 1388 ;
1342 } 1389 }
… …
1355 $self->SUPER::destroy; 1402 $self->SUPER::destroy;
1356 1403
1357 %$self = (); 1404 %$self = ();
1358} 1405}
1359 1406
1360package CFPlus::NPCDialog; 1407package DC::NPCDialog;
1361 1408
1362our @ISA = 'CFPlus::UI::Toplevel'; 1409our @ISA = 'DC::UI::Toplevel';
1363 1410
1364sub new { 1411sub new {
1365 my $class = shift; 1412 my $class = shift;
1366 1413
1367 my $self = $class->SUPER::new ( 1414 my $self = $class->SUPER::new (
… …
1374 kw => { hi => 0, yes => 0, no => 0 }, 1421 kw => { hi => 0, yes => 0, no => 0 },
1375 has_close_button => 1, 1422 has_close_button => 1,
1376 @_, 1423 @_,
1377 ); 1424 );
1378 1425
1379 CFPlus::weaken (my $this = $self); 1426 DC::weaken (my $this = $self);
1380 1427
1381 $self->connect (delete => sub { $this->destroy; 1 }); 1428 $self->connect (delete => sub { $this->destroy; 1 });
1382 1429
1383 # better use a pane... 1430 # better use a pane...
1384 $self->add (my $hbox = new CFPlus::UI::HBox); 1431 $self->add (my $hbox = new DC::UI::HBox);
1385 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1432 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1386 1433
1387 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1434 $hbox->add (my $vbox = new DC::UI::VBox);
1388 1435
1389 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1436 $vbox->add (new DC::UI::Label text => "Message Entry:");
1390 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1437 $vbox->add ($self->{entry} = new DC::UI::Entry
1391 tooltip => "#npc_message_entry", 1438 tooltip => "#npc_message_entry",
1392 on_activate => sub { 1439 on_activate => sub {
1393 my ($entry, $text) = @_; 1440 my ($entry, $text) = @_;
1394 1441
1395 return unless $text =~ /\S/; 1442 return unless $text =~ /\S/;
… …
1399 1446
1400 0 1447 0
1401 }, 1448 },
1402 ); 1449 );
1403 1450
1404 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1451 $vbox->add ($self->{options} = new DC::UI::VBox);
1405 1452
1406 $self->{bye_button} = new CFPlus::UI::Button 1453 $self->{bye_button} = new DC::UI::Button
1407 text => "Bye (close)", 1454 text => "Bye (close)",
1408 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1455 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1409 on_activate => sub { $this->destroy; 1 }, 1456 on_activate => sub { $this->destroy; 1 },
1410 ; 1457 ;
1411 1458
… …
1430}; 1477};
1431 1478
1432sub update_options { 1479sub update_options {
1433 my ($self) = @_; 1480 my ($self) = @_;
1434 1481
1435 CFPlus::weaken $self; 1482 DC::weaken $self;
1436 1483
1437 $self->{options}->clear; 1484 $self->{options}->clear;
1438 $self->{options}->add ($self->{bye_button}); 1485 $self->{options}->add ($self->{bye_button});
1439 1486
1440 for my $kw (sort keys %{ $self->{kw} }) { 1487 for my $kw (sort keys %{ $self->{kw} }) {
1441 $self->{options}->add (new CFPlus::UI::Button 1488 $self->{options}->add (new DC::UI::Button
1442 text => $kw, 1489 text => $kw,
1443 on_activate => sub { 1490 on_activate => sub {
1444 $self->send ($kw); 1491 $self->send ($kw);
1445 0 1492 0
1446 }, 1493 },
… …
1449} 1496}
1450 1497
1451sub feed { 1498sub feed {
1452 my ($self, $type, @arg) = @_; 1499 my ($self, $type, @arg) = @_;
1453 1500
1454 CFPlus::weaken $self; 1501 DC::weaken $self;
1455 1502
1456 if ($type eq "update") { 1503 if ($type eq "update") {
1457 my (%info) = @arg; 1504 my (%info) = @arg;
1458 1505
1459 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1506 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1460 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1507 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1461 1508
1462 if (exists $info{msg}) { 1509 if (exists $info{msg}) {
1463 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1510 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1464 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1511 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1465 my @link; 1512 my @link;
1466 $text =~ s{ 1513 $text =~ s{
1467 ($match) 1514 ($match)
1468 }{ 1515 }{
1469 my $kw = $1; 1516 my $kw = $1;
1470 1517
1471 push @link, new CFPlus::UI::Label 1518 push @link, new DC::UI::Label
1472 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1519 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1473 can_hover => 1, 1520 can_hover => 1,
1474 can_events => 1, 1521 can_events => 1,
1475 padding_x => 0, 1522 padding_x => 0,
1476 padding_y => 0, 1523 padding_y => 0,
… …
1494} 1541}
1495 1542
1496sub send { 1543sub send {
1497 my ($self, $msg) = @_; 1544 my ($self, $msg) = @_;
1498 1545
1499 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1546 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1500 $self->{textview}->scroll_to_bottom; 1547 $self->{textview}->scroll_to_bottom;
1501 1548
1502 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1549 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1503} 1550}
1504 1551

Diff Legend

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