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.183 by root, Wed Dec 26 21:03:21 2007 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 => 1,
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;
… …
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->{par} <=> $b->{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} || {}}) {
… …
66 70
67 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
68 for @cmd_help; 72 for @cmd_help;
69 73
70 { 74 {
71 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
72 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
73 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
74 } 78 }
75 79
76 { 80 {
77 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
78 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
79 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
80 } 84 }
81 85
82 $self->{open_container} = 0; 86 $self->{open_container} = 0;
83 87
… …
138############################################################################# 142#############################################################################
139 143
140sub widget_associate { 144sub widget_associate {
141 my ($self, $ws, $id, $widget) = @_; 145 my ($self, $ws, $id, $widget) = @_;
142 146
143 if ($widget) { 147 $widget ||= new DC::UI::Bin;
148
144 $widget->{s_id} = $id; 149 $widget->{s_id} = $id;
145 $self->{widget}{$id} = $widget; 150 $self->{widget}{$id} = $widget;
146 151
147 if ($ws) { 152 if ($ws) {
148 $widget->{s_ws} = $ws; 153 $widget->{s_ws} = $ws;
149 $self->{widgetset}{$ws}{w}{$id} = $widget; 154 $self->{widgetset}{$ws}{w}{$id} = $widget;
150 } 155 }
151 156
152 $widget->connect (on_destroy => sub { 157 $widget->connect (on_destroy => sub {
153 my ($widget) = @_; 158 my ($widget) = @_;
154 159
155 delete $self->{widget}{$widget->{s_id}}; 160 delete $self->{widget}{$widget->{s_id}};
156 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} 161 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
157 if exists $widget->{s_ws}; 162 if exists $widget->{s_ws};
158 }); 163 });
159
160 1
161 } else {
162 $self->send_exti_msg (w_e => $id, undef);
163
164 0
165 }
166} 164}
167 165
168# widgetset new 166# widgetset new
169sub ext_ws_n { 167sub ext_ws_n {
170 my ($self, $id) = @_; 168 my ($self, $id) = @_;
… …
187 185
188# widgetset create 186# widgetset create
189sub ext_ws_c { 187sub ext_ws_c {
190 my ($self, $ws, $id, $class, $args) = @_; 188 my ($self, $ws, $id, $class, $args) = @_;
191 189
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 ( 190 $self->widget_associate (
203 $ws, $id => scalar eval { 191 $ws, $id => scalar eval {
204 local $SIG{__DIE__}; 192 local $SIG{__DIE__};
205 "CFPlus::UI::$class"->new (%$args) 193 "DC::UI::$class"->new (%$args)
206 } 194 }
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; 195 );
208} 196}
209 197
210# widgetset associate 198# widgetset associate
211sub ext_ws_a { 199sub ext_ws_a {
212 my ($self, %ass) = @_; 200 my ($self, %ass) = @_;
213 201
214 # everything that has a name, wether conceivably useful or not 202 # everything that has a name, wether conceivably useful or not
215 my %wkw = ( 203 my %wkw = (
216 root => $CFPlus::UI::ROOT, 204 root => $DC::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP, 205 tooltip => $DC::UI::TOOLTIP,
218 206
219 mapwidget => $::MAPWIDGET, 207 mapwidget => $::MAPWIDGET,
220 buttonbar => $::BUTTONBAR, 208 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER, 209 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR, 210 buttonbar => $::BUTTONBAR,
… …
248 invr => $::INVR, 236 invr => $::INVR,
249 invr_hb => $::INVR_HB, 237 invr_hb => $::INVR_HB,
250 ); 238 );
251 239
252 while (my ($id, $name) = each %ass) { 240 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name}) 241 $self->widget_associate (undef, $id => $wkw{$name});
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 } 242 }
256} 243}
257 244
258# widget call 245# widget call
259sub ext_w_c { 246sub ext_w_c {
260 my ($self, $id, $rid, $method, @args) = @_; 247 my ($self, $id, $rcb, $method, @args) = @_;
261 248
262 my $w = $self->{widget}{$id} 249 my $w = $self->{widget}{$id}
263 or return; 250 or return;
264 251
265 if ($rid) { 252 if ($rcb) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args)); 253 $rcb->($w->$method (@args));
267 } else { 254 } else {
268 $w->$method (@args); 255 $w->$method (@args);
269 } 256 }
270} 257}
271 258
… …
287 } 274 }
288} 275}
289 276
290# widget get 277# widget get
291sub ext_w_g { 278sub ext_w_g {
292 my ($self, $id, $rid, $attr) = @_; 279 my ($self, $id, $rid, @attr) = @_;
293 280
294 my $w = $self->{widget}{$id} 281 my $w = $self->{widget}{$id}
295 or return; 282 or return;
296 283
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 284 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
298} 285}
299 286
300# message window 287# message window
301sub ext_channel_info { 288sub ext_channel_info {
302 my ($self, $info) = @_; 289 my ($self, $info) = @_;
… …
307############################################################################# 294#############################################################################
308 295
309sub logprint { 296sub logprint {
310 my ($self, @a) = @_; 297 my ($self, @a) = @_;
311 298
312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 299 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
313} 300}
314 301
315sub _stat_numdiff { 302sub _stat_numdiff {
316 my ($self, $name, $old, $new) = @_; 303 my ($self, $name, $old, $new) = @_;
317 304
… …
401 388
402 if ( 389 if (
403 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
404 ) { 391 ) {
405 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 392 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); 393 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
407 } 394 }
408 395
409 $self->update_stats_window ($stats, $prev); 396 $self->update_stats_window ($stats, $prev);
410 397
411 $self->{prev_stats} = { %$stats }; 398 $self->{prev_stats} = { %$stats };
… …
489 $self->{stat_order} = join ",", map $_->[0], @order; 476 $self->{stat_order} = join ",", map $_->[0], @order;
490 477
491 $sktbl->clear; 478 $sktbl->clear;
492 479
493 my $sw = $self->{skillwid}{""} ||= [ 480 my $sw = $self->{skillwid}{""} ||= [
494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 481 0, 0, (new DC::UI::Label text => "Experience", align => 1),
495 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 482 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
496 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 483 2, 0, (new DC::UI::Label text => "Progress", align => 0),
497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 484 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 485 4, 0, (new DC::UI::Label text => "Experience", align => 1),
499 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 486 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
500 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 487 6, 0, (new DC::UI::Label text => "Progress", align => 0),
501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 488 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
502 ]; 489 ];
503 490
504 my @add = @$sw; 491 my @add = @$sw;
505 492
506 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 493 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
… …
518 if ($ev->{button} == 1) { 505 if ($ev->{button} == 1) {
519 $::CONN->user_send ("ready_skill $name"); 506 $::CONN->user_send ("ready_skill $name");
520 } elsif ($ev->{button} == 2) { 507 } elsif ($ev->{button} == 2) {
521 $::CONN->user_send ("use_skill $name"); 508 $::CONN->user_send ("use_skill $name");
522 } elsif ($ev->{button} == 3) { 509 } elsif ($ev->{button} == 3) {
523 my $shortname = CFPlus::shorten $name, 14; 510 my $shortname = DC::shorten $name, 14;
524 (new CFPlus::UI::Menu 511 (new DC::UI::Menu
525 items => [ 512 items => [
526 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 513 ["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"] }], 514 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
528 ], 515 ],
529 )->popup ($ev); 516 )->popup ($ev);
530 } else { 517 } else {
531 return 0; 518 return 0;
532 } 519 }
… …
534 1 521 1
535 }; 522 };
536 523
537 my $sw = $self->{skillwid}{$idx} ||= [ 524 my $sw = $self->{skillwid}{$idx} ||= [
538 # exp 525 # exp
539 (new CFPlus::UI::Label 526 (new DC::UI::Label
540 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 527 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
541 528
542 # level 529 # level
543 (new CFPlus::UI::Label 530 (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), 531 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
545 532
546 # progress 533 # progress
547 (new CFPlus::UI::ExperienceProgress), 534 (new DC::UI::ExperienceProgress),
548 535
549 # label 536 # label
550 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 537 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
551 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 538 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
552 ]; 539 ];
553 540
554 push @add, 541 push @add,
555 $x * 4 + 0, $y, $sw->[0], 542 $x * 4 + 0, $y, $sw->[0],
556 $x * 4 + 1, $y, $sw->[1], 543 $x * 4 + 1, $y, $sw->[1],
… …
566 553
567 for (@order) { 554 for (@order) {
568 my ($idx, $name) = @$_; 555 my ($idx, $name) = @$_;
569 my $val = $stats->{$idx}; 556 my $val = $stats->{$idx};
570 557
571 next if $prev->{$idx}[1] == $val->[1]; 558 next if $prev->{$idx}[1] eq $val->[1];
572 559
573 my $sw = $self->{skillwid}{$idx}; 560 my $sw = $self->{skillwid}{$idx};
574 $sw->[0]->set_text (::formsep ($val->[1])); 561 $sw->[0]->set_text (::formsep ($val->[1]));
575 $sw->[1]->set_text ($val->[0] * 1); 562 $sw->[1]->set_text ($val->[0] * 1);
576 $sw->[2]->set_value (@$val); 563 $sw->[2]->set_value (@$val);
577 564
578 #$::GAUGES->{sklprg}->set_label ($name); 565 $::GAUGES->{sklprg}->set_label ("$name %d%%");
579 $::GAUGES->{sklprg}->set_value (@$val); 566 $::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 } 567 }
589} 568}
590 569
591sub user_send { 570sub user_send {
592 my ($self, $command) = @_; 571 my ($self, $command) = @_;
… …
594 $self->{record}->($command) 573 $self->{record}->($command)
595 if $self->{record}; 574 if $self->{record};
596 575
597 $self->logprint ("send: ", $command); 576 $self->logprint ("send: ", $command);
598 $self->send_command ($command); 577 $self->send_command ($command);
599 ::status ($command);
600} 578}
601 579
602sub record { 580sub record {
603 my ($self, $cb) = @_; 581 my ($self, $cb) = @_;
604 582
… …
635 } 613 }
636 } 614 }
637 615
638 if ($delay) { 616 if ($delay) {
639 # delay the map drawing a tiny bit in the hope of getting the missing fetched 617 # delay the map drawing a tiny bit in the hope of getting the missing fetched
640 Event->timer (after => 0.03, cb => sub { 618 EV::once undef, 0, 0.03, sub {
641 $_[0]->w->cancel;
642 $self->{map_widget}->update 619 $self->{map_widget}->update
643 if $self->{map_widget}; 620 if $self->{map_widget};
644 }); 621 };
645 } else { 622 } else {
646 $self->{map_widget}->update; 623 $self->{map_widget}->update;
647 } 624 }
648} 625}
649 626
… …
661 638
662 my ($hash, $x, $y, $w, $h) = @$map_info; 639 my ($hash, $x, $y, $w, $h) = @$map_info;
663 640
664 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 641 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
665 $self->{map_cache_new}{$hash} = \$data; 642 $self->{map_cache_new}{$hash} = \$data;
666 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 643 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
667} 644}
668 645
669sub map_clear { 646sub map_clear {
670 my ($self) = @_; 647 my ($self) = @_;
671 648
… …
684 do { 661 do {
685 $tile = pop @{$self->{bg_fetch}} 662 $tile = pop @{$self->{bg_fetch}}
686 or return; 663 or return;
687 } while $self->{texture}[$tile]; 664 } while $self->{texture}[$tile];
688 665
689 CFPlus::DB::get tilecache => $tile, sub { 666 DC::DB::get tilecache => $tile, sub {
690 my ($data) = @_; 667 my ($data) = @_;
691 668
692 return unless $self->{map}; # stop when destroyed 669 return unless $self->{map}; # stop when destroyed
693 670
694 if (defined $data) { 671 if (defined $data) {
… …
722 }; 699 };
723 700
724 if (my $rdata = $self->{map_cache_old}{$hash}) { 701 if (my $rdata = $self->{map_cache_old}{$hash}) {
725 $cb->($$rdata); 702 $cb->($$rdata);
726 } else { 703 } else {
727 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 704 DC::DB::get $self->{mapcache} => $hash, $cb;
728 } 705 }
729} 706}
730 707
731# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 708# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
732# (server resource,s latency, bandwidth), so this hack is warranted. 709# (server resource,s latency, bandwidth), so this hack is warranted.
… …
856 833
857sub face_find { 834sub face_find {
858 my ($self, $facenum, $face, $cb) = @_; 835 my ($self, $facenum, $face, $cb) = @_;
859 836
860 if ($face->{type} == 0) { # FT_FACE 837 if ($face->{type} == 0) { # FT_FACE
861 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 838 my $id = DC::DB::get_tile_id_sync $face->{name};
862 839
863 $face->{id} = $id; 840 $face->{id} = $id;
864 $self->{map}->set_tileid ($facenum => $id); 841 $self->{map}->set_tileid ($facenum => $id);
865 842
866 CFPlus::DB::get tilecache => $id, $cb; 843 DC::DB::get tilecache => $id, $cb;
867 844
868 } elsif ($face->{type} & 1) { # with metadata 845 } elsif ($face->{type} & 1) { # with metadata
869 CFPlus::DB::get res_meta => $face->{name}, $cb; 846 DC::DB::get res_meta => $face->{name}, $cb;
870 847
871 } else { # no metadata 848 } else { # no metadata
872 CFPlus::DB::get res_data => $face->{name}, $cb; 849 DC::DB::get res_data => $face->{name}, $cb;
873 } 850 }
874} 851}
875 852
876sub face_update { 853sub face_update {
877 my ($self, $facenum, $face, $changed) = @_; 854 my ($self, $facenum, $face, $changed) = @_;
878 855
879 if ($face->{type} == 0) { 856 if ($face->{type} == 0) {
880 # image, FT_FACE 857 # image, FT_FACE
881 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 858 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
882 if $changed; 859 if $changed;
883 860
884 $self->have_tile ($face->{id}, delete $face->{data}); 861 $self->have_tile ($face->{id}, delete $face->{data});
885 862
886 } elsif ($face->{type} & 1) { 863 } elsif ($face->{type} & 1) {
887 # split metadata case, FT_MUSIC, FT_SOUND 864 # split metadata case, FT_MUSIC, FT_SOUND
888 if ($changed) { # new data 865 if ($changed) { # new data
889 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 866 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
890 $face->{data} = $meta; 867 $face->{data} = $meta;
891 868
869 # rely on strict ordering here and also on later fetch
892 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 870 DC::DB::put res_data => $face->{name} => $data, sub { };
893 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 871 DC::DB::put res_meta => $face->{name} => $meta, sub { };
894 } 872 }
895 873
896 $face->{data} = $self->{json_coder}->decode ($face->{data}); 874 $face->{data} = $self->{json_coder}->decode ($face->{data});
897
898 ::add_license ($face); 875 ::add_license ($face);
876 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
877 if $changed;
899 878
900 if ($face->{type} == 3) { # FT_MUSIC 879 if ($face->{type} == 3) { # FT_MUSIC
901 ::message ({ markup => "downloaded song #$facenum" })
902 if $changed;
903
904 &::audio_music_push ($facenum); 880 &::audio_music_push ($facenum);
905 } elsif ($face->{type} == 5) { # FT_SOUND 881 } elsif ($face->{type} == 5) { # FT_SOUND
906 ::message ({ markup => "downloaded sound #$facenum" })
907 if $changed;
908
909 &::audio_sound_push ($facenum); 882 &::audio_sound_push ($facenum);
910 } 883 }
911 884
912 } else { 885 } else {
913 # flat resource case, FT_RSRC 886 # flat resource case, FT_RSRC
914 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 887 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
915 if $changed; 888 if $changed;
916 } 889 }
917 890
918 if (my $cbs = $self->{face_cb}{$facenum}) { 891 if (my $cbs = $self->{face_cb}{$facenum}) {
919 $_->($face, $changed) for @$cbs; 892 $_->($face, $changed) for @$cbs;
… …
930 my ($self, $tile, $data) = @_; 903 my ($self, $tile, $data) = @_;
931 904
932 return unless $self->{map}; 905 return unless $self->{map};
933 906
934 my $tex = $self->{texture}[$tile] ||= 907 my $tex = $self->{texture}[$tile] ||=
935 new CFPlus::Texture 908 new DC::Texture
936 tile => $tile, 909 tile => $tile,
937 image => $data, delete_image => 1, 910 image => $data, delete_image => 1,
938 minify => 1, mipmap => 1; 911 minify => 1, mipmap => 1;
939 912
940 if (my $cbs = delete $self->{tile_cb}{$tile}) { 913 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
948 my ($self, $num, $cb) = @_; 921 my ($self, $num, $cb) = @_;
949 922
950 push @{$self->{face_cb}{$num}}, $cb; 923 push @{$self->{face_cb}{$num}}, $cb;
951 924
952 defined wantarray 925 defined wantarray
953 ? CFPlus::guard { 926 ? DC::guard {
954 @{$self->{face_cb}{$num}} 927 @{$self->{face_cb}{$num}}
955 = grep $_ != $cb, 928 = grep $_ != $cb,
956 @{$self->{face_cb}{$num}}; 929 @{$self->{face_cb}{$num}};
957 } 930 }
958 : () 931 : ()
… …
993 966
994sub sanitise_xml($) { 967sub sanitise_xml($) {
995 local $_ = shift; 968 local $_ = shift;
996 969
997 # we now weed out all tags we do not support 970 # we now weed out all tags we do not support
998 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 971 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
972 }{
973 "&lt;"
974 }gex;
975
999 # now all entities 976 # now all entities
1000 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 977 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1001 978
1002 # handle some elements 979 # handle some elements
1003 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 980 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1056 1033
1057 ## try to create single paragraphs of multiple lines sent by the server 1034 ## try to create single paragraphs of multiple lines sent by the server
1058 # no longer neecssary with TRT servers 1035 # no longer neecssary with TRT servers
1059 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1036 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1060 1037
1038 for (split /\n/, $text) {
1061 ::message ({ 1039 ::message ({
1062 fg => $fg, 1040 fg => $fg,
1063 markup => $_, 1041 markup => $_,
1064 type => $type, 1042 type => $type,
1065 extra => [@extra], 1043 extra => [@extra],
1066 color_flags => $color 1044 color_flags => $color, #d# ugly, kill
1067 }) for split /\n/, $text; 1045 });
1046
1047 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1048 # actually, this is an ugly design. _we_ should control the channels,
1049 # not some random other widget, as the channels are clearly protocol-specific.
1050 # then we could also react to flags such as CLEAR without resorting to
1051 # hacks such as color_flags, above.
1052 }
1068 1053
1069 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
1070 group => $text, 1055 group => $text,
1071 fg => $fg, 1056 fg => $fg,
1072 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
1073 tooltip_font => $::FONT_FIXED, 1058 tooltip_font => $::FONT_FIXED,
1074 ); 1059 ) if $type eq "info";
1075 } 1060 }
1076} 1061}
1077 1062
1078sub spell_add { 1063sub spell_add {
1079 my ($self, $spell) = @_; 1064 my ($self, $spell) = @_;
… …
1083 $spell->{message} =~ s/\n+$//; 1068 $spell->{message} =~ s/\n+$//;
1084 $spell->{message} ||= "Server did not provide a description for this spell."; 1069 $spell->{message} ||= "Server did not provide a description for this spell.";
1085 1070
1086 $::SPELL_LIST->add_spell ($spell); 1071 $::SPELL_LIST->add_spell ($spell);
1087 1072
1088 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1073 $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}); 1074 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1090} 1075}
1091 1076
1092sub spell_delete { 1077sub spell_delete {
1093 my ($self, $spell) = @_; 1078 my ($self, $spell) = @_;
1094 1079
… …
1105sub addme_success { 1090sub addme_success {
1106 my ($self) = @_; 1091 my ($self) = @_;
1107 1092
1108 my %skill_help; 1093 my %skill_help;
1109 1094
1110 for my $node (CFPlus::Pod::find skill_description => "*") { 1095 for my $node (DC::Pod::find skill_description => "*") {
1111 my (undef, @par) = CFPlus::Pod::section_of $node; 1096 my (undef, @par) = DC::Pod::section_of $node;
1112 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1097 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
1113 }; 1098 };
1114 1099
1115 for my $skill (values %{$self->{skill_info}}) { 1100 for my $skill (values %{$self->{skill_info}}) {
1116 $self->{map_widget}->add_command ("ready_skill $skill", 1101 $self->{map_widget}->add_command ("ready_skill $skill",
1117 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1102 (DC::asxml "Ready the skill '$skill'\n\n")
1118 . $skill_help{$skill}); 1103 . $skill_help{$skill});
1119 $self->{map_widget}->add_command ("use_skill $skill", 1104 $self->{map_widget}->add_command ("use_skill $skill",
1120 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1105 (DC::asxml "Immediately use the skill '$skill'\n\n")
1121 . $skill_help{$skill}); 1106 . $skill_help{$skill});
1122 } 1107 }
1123} 1108}
1124 1109
1125sub eof { 1110sub eof {
… …
1129 1114
1130 ::stop_game (); 1115 ::stop_game ();
1131} 1116}
1132 1117
1133sub update_floorbox { 1118sub update_floorbox {
1134 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1135 return unless $::CONN; 1120 return unless $::CONN;
1136 1121
1137 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
1138 1123
1139 my @add; 1124 my @add;
… …
1141 my $row; 1126 my $row;
1142 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1143 if ($row < 6) { 1128 if ($row < 6) {
1144 local $_->{face_widget}; # hack to force recreation of widget 1129 local $_->{face_widget}; # hack to force recreation of widget
1145 local $_->{desc_widget}; # hack to force recreation of widget 1130 local $_->{desc_widget}; # hack to force recreation of widget
1146 CFPlus::Item::update_widgets $_; 1131 DC::Item::update_widgets $_;
1147 1132
1148 push @add, 1133 push @add,
1149 0, $row, $_->{face_widget}, 1134 0, $row, $_->{face_widget},
1150 1, $row, $_->{desc_widget}; 1135 1, $row, $_->{desc_widget};
1151 1136
1152 $row++; 1137 $row++;
1153 } else { 1138 } else {
1154 push @add, 1, $row, new CFPlus::UI::Button 1139 push @add, 1, $row, new DC::UI::Button
1155 text => "More...", 1140 text => "More...",
1156 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1157 ; 1142 ;
1158 last; 1143 last;
1159 } 1144 }
1160 } 1145 }
1161 if ($::CONN->{open_container}) { 1146 if ($::CONN->{open_container}) {
1162 push @add, 1, $row++, new CFPlus::UI::Button 1147 push @add, 1, $row++, new DC::UI::Button
1163 text => "Close container", 1148 text => "Close container",
1164 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1165 ; 1150 ;
1166 } 1151 }
1167 1152
1168 $::FLOORBOX->add_at (@add); 1153 $::FLOORBOX->add_at (@add);
1169 }); 1154 });
1170 1155
1171 $::WANT_REFRESH->start; 1156 $::WANT_REFRESH = 1;
1172} 1157}
1173 1158
1174sub set_opencont { 1159sub set_opencont {
1175 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
1176 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
1177 update_floorbox; 1162 update_floorbox;
1178 1163
1179 $::INVR_HB->clear (); 1164 $::INVR_HB->clear ();
1180 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1165 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
1181 1166
1182 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
1183 $::INVR_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new DC::UI::Button
1184 text => "Close container", 1169 text => "Close container",
1185 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
1186 on_activate => sub { 1171 on_activate => sub {
1187 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1188 if $tag != 0; 1173 if $tag != 0;
… …
1195} 1180}
1196 1181
1197sub update_containers { 1182sub update_containers {
1198 my ($self) = @_; 1183 my ($self) = @_;
1199 1184
1200 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1185 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1201 my $todo = delete $self->{update_container} 1186 my $todo = delete $self->{update_container}
1202 or return; 1187 or return;
1203 1188
1204 for my $tag (keys %$todo) { 1189 for my $tag (keys %$todo) {
1205 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1190 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1242sub item_update { 1227sub item_update {
1243 my ($self, $item) = @_; 1228 my ($self, $item) = @_;
1244 1229
1245 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1230 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1246 1231
1247 CFPlus::Item::update_widgets $item; 1232 DC::Item::update_widgets $item;
1248 1233
1249 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1250 set_opencont ($::CONN, 0, "Floor"); 1235 set_opencont ($::CONN, 0, "Floor");
1251 1236
1252 } elsif ($item->{flags} & F_OPEN) { 1237 } elsif ($item->{flags} & F_OPEN) {
1253 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1238 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1254 1239
1255 } else { 1240 } else {
1256 $self->{update_container}{$item->{container}}++; 1241 $self->{update_container}{$item->{container}}++;
1257 $self->update_containers; 1242 $self->update_containers;
1258 } 1243 }
… …
1317 0 1302 0
1318 }); 1303 });
1319 1304
1320 $self->update_server_info; 1305 $self->update_server_info;
1321 1306
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; 1307 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1325 $self->send_command ("pickup $::CFG->{pickup}"); 1308 $self->send_command ("pickup $::CFG->{pickup}");
1326} 1309}
1327 1310
1328sub lookat { 1311sub lookat {
… …
1332 $self->send_ext_req (lookat => $x, $y, sub { 1315 $self->send_ext_req (lookat => $x, $y, sub {
1333 my (%msg) = @_; 1316 my (%msg) = @_;
1334 1317
1335 if (exists $msg{npc_dialog}) { 1318 if (exists $msg{npc_dialog}) {
1336 # start npc chat dialog 1319 # start npc chat dialog
1337 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1320 $self->{npc_dialog} = new DC::NPCDialog::
1338 token => $msg{npc_dialog}, 1321 token => $msg{npc_dialog},
1339 title => "$msg{npc_dialog}[0] (NPC)", 1322 title => "$msg{npc_dialog}[0] (NPC)",
1340 conn => $self, 1323 conn => $self,
1341 ; 1324 ;
1342 } 1325 }
… …
1355 $self->SUPER::destroy; 1338 $self->SUPER::destroy;
1356 1339
1357 %$self = (); 1340 %$self = ();
1358} 1341}
1359 1342
1360package CFPlus::NPCDialog; 1343package DC::NPCDialog;
1361 1344
1362our @ISA = 'CFPlus::UI::Toplevel'; 1345our @ISA = 'DC::UI::Toplevel';
1363 1346
1364sub new { 1347sub new {
1365 my $class = shift; 1348 my $class = shift;
1366 1349
1367 my $self = $class->SUPER::new ( 1350 my $self = $class->SUPER::new (
… …
1374 kw => { hi => 0, yes => 0, no => 0 }, 1357 kw => { hi => 0, yes => 0, no => 0 },
1375 has_close_button => 1, 1358 has_close_button => 1,
1376 @_, 1359 @_,
1377 ); 1360 );
1378 1361
1379 CFPlus::weaken (my $this = $self); 1362 DC::weaken (my $this = $self);
1380 1363
1381 $self->connect (delete => sub { $this->destroy; 1 }); 1364 $self->connect (delete => sub { $this->destroy; 1 });
1382 1365
1383 # better use a pane... 1366 # better use a pane...
1384 $self->add (my $hbox = new CFPlus::UI::HBox); 1367 $self->add (my $hbox = new DC::UI::HBox);
1385 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1368 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1386 1369
1387 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1370 $hbox->add (my $vbox = new DC::UI::VBox);
1388 1371
1389 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1372 $vbox->add (new DC::UI::Label text => "Message Entry:");
1390 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1373 $vbox->add ($self->{entry} = new DC::UI::Entry
1391 tooltip => "#npc_message_entry", 1374 tooltip => "#npc_message_entry",
1392 on_activate => sub { 1375 on_activate => sub {
1393 my ($entry, $text) = @_; 1376 my ($entry, $text) = @_;
1394 1377
1395 return unless $text =~ /\S/; 1378 return unless $text =~ /\S/;
… …
1399 1382
1400 0 1383 0
1401 }, 1384 },
1402 ); 1385 );
1403 1386
1404 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1387 $vbox->add ($self->{options} = new DC::UI::VBox);
1405 1388
1406 $self->{bye_button} = new CFPlus::UI::Button 1389 $self->{bye_button} = new DC::UI::Button
1407 text => "Bye (close)", 1390 text => "Bye (close)",
1408 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1391 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1409 on_activate => sub { $this->destroy; 1 }, 1392 on_activate => sub { $this->destroy; 1 },
1410 ; 1393 ;
1411 1394
… …
1430}; 1413};
1431 1414
1432sub update_options { 1415sub update_options {
1433 my ($self) = @_; 1416 my ($self) = @_;
1434 1417
1435 CFPlus::weaken $self; 1418 DC::weaken $self;
1436 1419
1437 $self->{options}->clear; 1420 $self->{options}->clear;
1438 $self->{options}->add ($self->{bye_button}); 1421 $self->{options}->add ($self->{bye_button});
1439 1422
1440 for my $kw (sort keys %{ $self->{kw} }) { 1423 for my $kw (sort keys %{ $self->{kw} }) {
1441 $self->{options}->add (new CFPlus::UI::Button 1424 $self->{options}->add (new DC::UI::Button
1442 text => $kw, 1425 text => $kw,
1443 on_activate => sub { 1426 on_activate => sub {
1444 $self->send ($kw); 1427 $self->send ($kw);
1445 0 1428 0
1446 }, 1429 },
… …
1449} 1432}
1450 1433
1451sub feed { 1434sub feed {
1452 my ($self, $type, @arg) = @_; 1435 my ($self, $type, @arg) = @_;
1453 1436
1454 CFPlus::weaken $self; 1437 DC::weaken $self;
1455 1438
1456 if ($type eq "update") { 1439 if ($type eq "update") {
1457 my (%info) = @arg; 1440 my (%info) = @arg;
1458 1441
1459 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1442 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1460 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1443 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1461 1444
1462 if (exists $info{msg}) { 1445 if (exists $info{msg}) {
1463 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1446 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} }; 1447 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1465 my @link; 1448 my @link;
1466 $text =~ s{ 1449 $text =~ s{
1467 ($match) 1450 ($match)
1468 }{ 1451 }{
1469 my $kw = $1; 1452 my $kw = $1;
1470 1453
1471 push @link, new CFPlus::UI::Label 1454 push @link, new DC::UI::Label
1472 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1455 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1473 can_hover => 1, 1456 can_hover => 1,
1474 can_events => 1, 1457 can_events => 1,
1475 padding_x => 0, 1458 padding_x => 0,
1476 padding_y => 0, 1459 padding_y => 0,
… …
1494} 1477}
1495 1478
1496sub send { 1479sub send {
1497 my ($self, $msg) = @_; 1480 my ($self, $msg) = @_;
1498 1481
1499 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1482 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1500 $self->{textview}->scroll_to_bottom; 1483 $self->{textview}->scroll_to_bottom;
1501 1484
1502 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1485 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1503} 1486}
1504 1487

Diff Legend

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