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.176 by root, Sun Oct 14 15:33:30 2007 UTC vs.
Revision 1.196 by root, Thu May 8 21:30:23 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 base 'Crossfire::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
16 16
17sub new { 17sub new {
18 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
19 19
20 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
21 setup_req => { 21 setup_req => {
22 extmap => 1, 22 extmap => 1,
23 excmd => 1, 23 excmd => 1,
24 xwidget2 => 1,#d# 24 widget => 2,
25 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
26 }, 26 },
27 ); 27 );
28 28
29 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
30 30
31 my @cmd_help = map { 31 my @cmd_help = map {
32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
33 or die "unparseable command help: $_->{kw}[0]"; 33 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
34 34
35 my $cmd = $1; 35 my $cmd = $1;
36 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
37 @args = (".*") unless @args; 37 @args = (".*") unless @args;
38 38
39 my (undef, @par) = CFPlus::Pod::section_of $_; 39 my (undef, @par) = DC::Pod::section_of $_;
40 my $text = CFPlus::Pod::as_label @par; 40 my $text = DC::Pod::as_label @par;
41 41
42 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
43 for @args; 43 for @args;
44 44
45 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
46 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
47 @args 47 @args
48 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
49 CFPlus::Pod::find command => "*"; 49 DC::Pod::find command => "*";
50 50
51 $self->{json_coder} 51 $self->{json_coder}
52 ->convert_blessed 52 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
54 $self->{widget}{$_[0]} 54 $self->{widget}{$_[0]}
… …
64 $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 {
65 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy 66 $_->destroy
67 for values %{delete $ws->{w} || {}}; 67 for values %{delete $ws->{w} || {}};
68 } 68 }
69
70 delete $self->{items};
71 $::INV->clear;
72 $::INVR_HB->clear;
73 $::FLOORBOX->clear;
69 }); 74 });
70 75
71 $self->{map_widget}->add_command (@$_) 76 $self->{map_widget}->add_command (@$_)
72 for @cmd_help; 77 for @cmd_help;
73 78
74 { 79 {
75 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 80 $self->{dialogue} = my $tex = new_from_file DC::Texture
76 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 81 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
77 $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}});
78 } 83 }
79 84
80 { 85 {
81 $self->{noface} = my $tex = new_from_file CFPlus::Texture 86 $self->{noface} = my $tex = new_from_file DC::Texture
82 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 87 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
83 $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}});
84 } 89 }
85 90
86 $self->{open_container} = 0; 91 $self->{open_container} = 0;
87 92
… …
102} 107}
103 108
104sub ext_capabilities { 109sub ext_capabilities {
105 my ($self, %cap) = @_; 110 my ($self, %cap) = @_;
106 111
107 #$self->send ("setup sound 0"); # we use a different protocol
108 $self->update_fx_want; 112 $self->update_fx_want;
109 113
110 $self->send_exti_req (resource => "exp_table", sub { 114 $self->send_exti_req (resource => "exp_table", sub {
111 my ($exp_table) = @_; 115 my ($exp_table) = @_;
112 116
… …
142############################################################################# 146#############################################################################
143 147
144sub widget_associate { 148sub widget_associate {
145 my ($self, $ws, $id, $widget) = @_; 149 my ($self, $ws, $id, $widget) = @_;
146 150
147 $widget ||= new CFPlus::UI::Bin; 151 $widget ||= new DC::UI::Bin;
148 152
149 $widget->{s_id} = $id; 153 $widget->{s_id} = $id;
150 $self->{widget}{$id} = $widget; 154 $self->{widget}{$id} = $widget;
151 155
152 if ($ws) { 156 if ($ws) {
… …
188 my ($self, $ws, $id, $class, $args) = @_; 192 my ($self, $ws, $id, $class, $args) = @_;
189 193
190 $self->widget_associate ( 194 $self->widget_associate (
191 $ws, $id => scalar eval { 195 $ws, $id => scalar eval {
192 local $SIG{__DIE__}; 196 local $SIG{__DIE__};
193 "CFPlus::UI::$class"->new (%$args) 197 "DC::UI::$class"->new (%$args)
194 } 198 }
195 ); 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}));
244 });
245 } else {
246 $done_cb->(0);
247 }
196} 248}
197 249
198# widgetset associate 250# widgetset associate
199sub ext_ws_a { 251sub ext_ws_a {
200 my ($self, %ass) = @_; 252 my ($self, %ass) = @_;
201 253
202 # everything that has a name, wether conceivably useful or not 254 # everything that has a name, wether conceivably useful or not
203 my %wkw = ( 255 my %wkw = (
204 root => $CFPlus::UI::ROOT, 256 root => $DC::UI::ROOT,
205 tooltip => $CFPlus::UI::TOOLTIP, 257 tooltip => $DC::UI::TOOLTIP,
206 258
207 mapwidget => $::MAPWIDGET, 259 mapwidget => $::MAPWIDGET,
208 buttonbar => $::BUTTONBAR, 260 buttonbar => $::BUTTONBAR,
209 metaserver => $::METASERVER, 261 metaserver => $::METASERVER,
210 buttonbar => $::BUTTONBAR, 262 buttonbar => $::BUTTONBAR,
… …
228 spell_list => $::SPELL_LIST, 280 spell_list => $::SPELL_LIST,
229 281
230 floorbox => $::FLOORBOX, 282 floorbox => $::FLOORBOX,
231 help_window => $::HELP_WINDOW, 283 help_window => $::HELP_WINDOW,
232 message_window => $::MESSAGE_WINDOW, 284 message_window => $::MESSAGE_WINDOW,
285 message_dist => $::MESSAGE_DIST,
233 statusbox => $::SDTATUSBOX, 286 statusbox => $::SDTATUSBOX,
234 287
235 inv => $::INV, 288 inv => $::INV,
236 invr => $::INVR, 289 invr => $::INVR,
237 invr_hb => $::INVR_HB, 290 invr_hb => $::INVR_HB,
… …
286 339
287# message window 340# message window
288sub ext_channel_info { 341sub ext_channel_info {
289 my ($self, $info) = @_; 342 my ($self, $info) = @_;
290 $self->{channels}->{$info->{id}} = $info; 343 $self->{channels}->{$info->{id}} = $info;
291 $::MESSAGE_WINDOW->add_channel ($info); 344 $::MESSAGE_DIST->add_channel ($info);
292} 345}
293 346
294############################################################################# 347#############################################################################
295 348
296sub logprint { 349sub logprint {
297 my ($self, @a) = @_; 350 my ($self, @a) = @_;
298 351
299 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 352 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
300} 353}
301 354
302sub _stat_numdiff { 355sub _stat_numdiff {
303 my ($self, $name, $old, $new) = @_; 356 my ($self, $name, $old, $new) = @_;
304 357
… …
476 $self->{stat_order} = join ",", map $_->[0], @order; 529 $self->{stat_order} = join ",", map $_->[0], @order;
477 530
478 $sktbl->clear; 531 $sktbl->clear;
479 532
480 my $sw = $self->{skillwid}{""} ||= [ 533 my $sw = $self->{skillwid}{""} ||= [
481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 534 0, 0, (new DC::UI::Label text => "Experience", align => 1),
482 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 535 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 536 2, 0, (new DC::UI::Label text => "Progress"),
484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 537 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 538 4, 0, (new DC::UI::Label text => "Experience", align => 1),
486 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 539 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 540 6, 0, (new DC::UI::Label text => "Progress"),
488 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 541 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
489 ]; 542 ];
490 543
491 my @add = @$sw; 544 my @add = @$sw;
492 545
493 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>";
… …
505 if ($ev->{button} == 1) { 558 if ($ev->{button} == 1) {
506 $::CONN->user_send ("ready_skill $name"); 559 $::CONN->user_send ("ready_skill $name");
507 } elsif ($ev->{button} == 2) { 560 } elsif ($ev->{button} == 2) {
508 $::CONN->user_send ("use_skill $name"); 561 $::CONN->user_send ("use_skill $name");
509 } elsif ($ev->{button} == 3) { 562 } elsif ($ev->{button} == 3) {
510 my $shortname = CFPlus::shorten $name, 14; 563 my $shortname = DC::shorten $name, 14;
511 (new CFPlus::UI::Menu 564 (new DC::UI::Menu
512 items => [ 565 items => [
513 ["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"] }],
514 ["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"] }],
515 ], 568 ],
516 )->popup ($ev); 569 )->popup ($ev);
517 } else { 570 } else {
518 return 0; 571 return 0;
519 } 572 }
… …
521 1 574 1
522 }; 575 };
523 576
524 my $sw = $self->{skillwid}{$idx} ||= [ 577 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp 578 # exp
526 (new CFPlus::UI::Label 579 (new DC::UI::Label
527 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),
528 581
529 # level 582 # level
530 (new CFPlus::UI::Label 583 (new DC::UI::Label
531 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),
532 585
533 # progress 586 # progress
534 (new CFPlus::UI::ExperienceProgress), 587 (new DC::UI::ExperienceProgress),
535 588
536 # label 589 # label
537 (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,
538 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),
539 ]; 592 ];
540 593
541 push @add, 594 push @add,
542 $x * 4 + 0, $y, $sw->[0], 595 $x * 4 + 0, $y, $sw->[0],
543 $x * 4 + 1, $y, $sw->[1], 596 $x * 4 + 1, $y, $sw->[1],
… …
613 } 666 }
614 } 667 }
615 668
616 if ($delay) { 669 if ($delay) {
617 # 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
618 Event->timer (after => 0.03, cb => sub { 671 EV::once undef, 0, 0.03, sub {
619 $_[0]->w->cancel;
620 $self->{map_widget}->update 672 $self->{map_widget}->update
621 if $self->{map_widget}; 673 if $self->{map_widget};
622 }); 674 };
623 } else { 675 } else {
624 $self->{map_widget}->update; 676 $self->{map_widget}->update;
625 } 677 }
626} 678}
627 679
… …
639 691
640 my ($hash, $x, $y, $w, $h) = @$map_info; 692 my ($hash, $x, $y, $w, $h) = @$map_info;
641 693
642 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 694 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
643 $self->{map_cache_new}{$hash} = \$data; 695 $self->{map_cache_new}{$hash} = \$data;
644 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 696 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
645} 697}
646 698
647sub map_clear { 699sub map_clear {
648 my ($self) = @_; 700 my ($self) = @_;
649 701
… …
662 do { 714 do {
663 $tile = pop @{$self->{bg_fetch}} 715 $tile = pop @{$self->{bg_fetch}}
664 or return; 716 or return;
665 } while $self->{texture}[$tile]; 717 } while $self->{texture}[$tile];
666 718
667 CFPlus::DB::get tilecache => $tile, sub { 719 DC::DB::get tilecache => $tile, sub {
668 my ($data) = @_; 720 my ($data) = @_;
669 721
670 return unless $self->{map}; # stop when destroyed 722 return unless $self->{map}; # stop when destroyed
671 723
672 if (defined $data) { 724 if (defined $data) {
… …
700 }; 752 };
701 753
702 if (my $rdata = $self->{map_cache_old}{$hash}) { 754 if (my $rdata = $self->{map_cache_old}{$hash}) {
703 $cb->($$rdata); 755 $cb->($$rdata);
704 } else { 756 } else {
705 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 757 DC::DB::get $self->{mapcache} => $hash, $cb;
706 } 758 }
707} 759}
708 760
709# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 761# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
710# (server resource,s latency, bandwidth), so this hack is warranted. 762# (server resource,s latency, bandwidth), so this hack is warranted.
… …
834 886
835sub face_find { 887sub face_find {
836 my ($self, $facenum, $face, $cb) = @_; 888 my ($self, $facenum, $face, $cb) = @_;
837 889
838 if ($face->{type} == 0) { # FT_FACE 890 if ($face->{type} == 0) { # FT_FACE
839 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 891 my $id = DC::DB::get_tile_id_sync $face->{name};
840 892
841 $face->{id} = $id; 893 $face->{id} = $id;
842 $self->{map}->set_tileid ($facenum => $id); 894 $self->{map}->set_tileid ($facenum => $id);
843 895
844 CFPlus::DB::get tilecache => $id, $cb; 896 DC::DB::get tilecache => $id, $cb;
845 897
846 } elsif ($face->{type} & 1) { # with metadata 898 } elsif ($face->{type} & 1) { # with metadata
847 CFPlus::DB::get res_meta => $face->{name}, $cb; 899 DC::DB::get res_meta => $face->{name}, $cb;
848 900
849 } else { # no metadata 901 } else { # no metadata
850 CFPlus::DB::get res_data => $face->{name}, $cb; 902 DC::DB::get res_data => $face->{name}, $cb;
851 } 903 }
852} 904}
853 905
854sub face_update { 906sub face_update {
855 my ($self, $facenum, $face, $changed) = @_; 907 my ($self, $facenum, $face, $changed) = @_;
856 908
857 if ($face->{type} == 0) { 909 if ($face->{type} == 0) {
858 # image, FT_FACE 910 # image, FT_FACE
859 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 911 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
860 if $changed; 912 if $changed;
861 913
862 $self->have_tile ($face->{id}, delete $face->{data}); 914 $self->have_tile ($face->{id}, delete $face->{data});
863 915
864 } elsif ($face->{type} & 1) { 916 } elsif ($face->{type} & 1) {
… …
866 if ($changed) { # new data 918 if ($changed) { # new data
867 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 919 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
868 $face->{data} = $meta; 920 $face->{data} = $meta;
869 921
870 # rely on strict ordering here and also on later fetch 922 # rely on strict ordering here and also on later fetch
871 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 923 DC::DB::put res_data => $face->{name} => $data, sub { };
872 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 924 DC::DB::put res_meta => $face->{name} => $meta, sub { };
873 } 925 }
874 926
875 $face->{data} = $self->{json_coder}->decode ($face->{data}); 927 $face->{data} = $self->{json_coder}->decode ($face->{data});
876 ::add_license ($face); 928 ::add_license ($face);
877 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) 929 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
878 if $changed; 930 if $changed;
879 931
880 if ($face->{type} == 3) { # FT_MUSIC 932 if ($face->{type} == 3) { # FT_MUSIC
881 &::audio_music_push ($facenum); 933 &::audio_music_push ($facenum);
882 } elsif ($face->{type} == 5) { # FT_SOUND 934 } elsif ($face->{type} == 5) { # FT_SOUND
883 &::audio_sound_push ($facenum); 935 &::audio_sound_push ($facenum);
884 } 936 }
885 937
886 } else { 938 } else {
887 # flat resource case, FT_RSRC 939 # flat resource case, FT_RSRC
888 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 940 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
889 if $changed; 941 if $changed;
890 } 942 }
891 943
892 if (my $cbs = $self->{face_cb}{$facenum}) { 944 if (my $cbs = $self->{face_cb}{$facenum}) {
893 $_->($face, $changed) for @$cbs; 945 $_->($face, $changed) for @$cbs;
… …
904 my ($self, $tile, $data) = @_; 956 my ($self, $tile, $data) = @_;
905 957
906 return unless $self->{map}; 958 return unless $self->{map};
907 959
908 my $tex = $self->{texture}[$tile] ||= 960 my $tex = $self->{texture}[$tile] ||=
909 new CFPlus::Texture 961 new DC::Texture
910 tile => $tile, 962 tile => $tile,
911 image => $data, delete_image => 1, 963 image => $data, delete_image => 1,
912 minify => 1, mipmap => 1; 964 minify => 1, mipmap => 1;
913 965
914 if (my $cbs = delete $self->{tile_cb}{$tile}) { 966 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
922 my ($self, $num, $cb) = @_; 974 my ($self, $num, $cb) = @_;
923 975
924 push @{$self->{face_cb}{$num}}, $cb; 976 push @{$self->{face_cb}{$num}}, $cb;
925 977
926 defined wantarray 978 defined wantarray
927 ? CFPlus::guard { 979 ? DC::guard {
928 @{$self->{face_cb}{$num}} 980 @{$self->{face_cb}{$num}}
929 = grep $_ != $cb, 981 = grep $_ != $cb,
930 @{$self->{face_cb}{$num}}; 982 @{$self->{face_cb}{$num}};
931 } 983 }
932 : () 984 : ()
… …
978 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1030 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
979 1031
980 # handle some elements 1032 # handle some elements
981 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1033 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
982 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1034 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1035
1036 s/\s+$//;
983 1037
984 $_ 1038 $_
985} 1039}
986 1040
987our %NAME_TO_COLOR = ( 1041our %NAME_TO_COLOR = (
… …
1069 $spell->{message} =~ s/\n+$//; 1123 $spell->{message} =~ s/\n+$//;
1070 $spell->{message} ||= "Server did not provide a description for this spell."; 1124 $spell->{message} ||= "Server did not provide a description for this spell.";
1071 1125
1072 $::SPELL_LIST->add_spell ($spell); 1126 $::SPELL_LIST->add_spell ($spell);
1073 1127
1074 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1128 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
1075 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1129 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1076} 1130}
1077 1131
1078sub spell_delete { 1132sub spell_delete {
1079 my ($self, $spell) = @_; 1133 my ($self, $spell) = @_;
1080 1134
… …
1091sub addme_success { 1145sub addme_success {
1092 my ($self) = @_; 1146 my ($self) = @_;
1093 1147
1094 my %skill_help; 1148 my %skill_help;
1095 1149
1096 for my $node (CFPlus::Pod::find skill_description => "*") { 1150 for my $node (DC::Pod::find skill_description => "*") {
1097 my (undef, @par) = CFPlus::Pod::section_of $node; 1151 my (undef, @par) = DC::Pod::section_of $node;
1098 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1152 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1099 }; 1153 };
1100 1154
1101 for my $skill (values %{$self->{skill_info}}) { 1155 for my $skill (values %{$self->{skill_info}}) {
1102 $self->{map_widget}->add_command ("ready_skill $skill", 1156 $self->{map_widget}->add_command ("ready_skill $skill",
1103 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1157 (DC::asxml "Ready the skill '$skill'\n\n")
1104 . $skill_help{$skill}); 1158 . $skill_help{$skill});
1105 $self->{map_widget}->add_command ("use_skill $skill", 1159 $self->{map_widget}->add_command ("use_skill $skill",
1106 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1160 (DC::asxml "Immediately use the skill '$skill'\n\n")
1107 . $skill_help{$skill}); 1161 . $skill_help{$skill});
1108 } 1162 }
1109} 1163}
1110 1164
1111sub eof { 1165sub eof {
… …
1115 1169
1116 ::stop_game (); 1170 ::stop_game ();
1117} 1171}
1118 1172
1119sub update_floorbox { 1173sub update_floorbox {
1120 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1174 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1121 return unless $::CONN; 1175 return unless $::CONN;
1122 1176
1123 $::FLOORBOX->clear; 1177 $::FLOORBOX->clear;
1124 1178
1125 my @add; 1179 my @add;
1126 1180
1127 my $row; 1181 my $row;
1128 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1182 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1183 next if $_->{tag} & 0x80000000;
1129 if ($row < 6) { 1184 if ($row < 6) {
1130 local $_->{face_widget}; # hack to force recreation of widget 1185 local $_->{face_widget}; # hack to force recreation of widget
1131 local $_->{desc_widget}; # hack to force recreation of widget 1186 local $_->{desc_widget}; # hack to force recreation of widget
1132 CFPlus::Item::update_widgets $_; 1187 DC::Item::update_widgets $_;
1133 1188
1134 push @add, 1189 push @add,
1135 0, $row, $_->{face_widget}, 1190 0, $row, $_->{face_widget},
1136 1, $row, $_->{desc_widget}; 1191 1, $row, $_->{desc_widget};
1137 1192
1138 $row++; 1193 $row++;
1139 } else { 1194 } else {
1140 push @add, 1, $row, new CFPlus::UI::Button 1195 push @add, 1, $row, new DC::UI::Button
1141 text => "More...", 1196 text => "More...",
1142 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1197 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1143 ; 1198 ;
1144 last; 1199 last;
1145 } 1200 }
1146 } 1201 }
1147 if ($::CONN->{open_container}) { 1202 if ($::CONN->{open_container}) {
1148 push @add, 1, $row++, new CFPlus::UI::Button 1203 push @add, 1, $row++, new DC::UI::Button
1149 text => "Close container", 1204 text => "Close container",
1150 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1205 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1151 ; 1206 ;
1152 } 1207 }
1153 1208
1154 $::FLOORBOX->add_at (@add); 1209 $::FLOORBOX->add_at (@add);
1155 }); 1210 });
1156 1211
1157 $::WANT_REFRESH->start; 1212 $::WANT_REFRESH = 1;
1158} 1213}
1159 1214
1160sub set_opencont { 1215sub set_opencont {
1161 my ($conn, $tag, $name) = @_; 1216 my ($conn, $tag, $name) = @_;
1162 $conn->{open_container} = $tag; 1217 $conn->{open_container} = $tag;
1163 update_floorbox; 1218 update_floorbox;
1164 1219
1165 $::INVR_HB->clear (); 1220 $::INVR_HB->clear;
1166 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1221 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1167 1222
1168 if ($tag != 0) { # Floor isn't closable, is it? 1223 if ($tag != 0) { # Floor isn't closable, is it?
1169 $::INVR_HB->add (new CFPlus::UI::Button 1224 $::INVR_HB->add (new DC::UI::Button
1170 text => "Close container", 1225 text => "Close container",
1171 tooltip => "Close the currently open container (if one is open)", 1226 tooltip => "Close the currently open container (if one is open)",
1172 on_activate => sub { 1227 on_activate => sub {
1173 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1228 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1174 if $tag != 0; 1229 if $tag != 0;
… …
1181} 1236}
1182 1237
1183sub update_containers { 1238sub update_containers {
1184 my ($self) = @_; 1239 my ($self) = @_;
1185 1240
1186 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1241 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1187 my $todo = delete $self->{update_container} 1242 my $todo = delete $self->{update_container}
1188 or return; 1243 or return;
1189 1244
1190 for my $tag (keys %$todo) { 1245 for my $tag (keys %$todo) {
1191 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1246 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1226} 1281}
1227 1282
1228sub item_update { 1283sub item_update {
1229 my ($self, $item) = @_; 1284 my ($self, $item) = @_;
1230 1285
1231 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1286 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1232 1287
1233 CFPlus::Item::update_widgets $item; 1288 DC::Item::update_widgets $item;
1234 1289
1235 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1290 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1236 set_opencont ($::CONN, 0, "Floor"); 1291 set_opencont ($::CONN, 0, "Floor");
1237 1292
1238 } elsif ($item->{flags} & F_OPEN) { 1293 } elsif ($item->{flags} & F_OPEN) {
1239 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1294 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1240 1295
1241 } else { 1296 } else {
1242 $self->{update_container}{$item->{container}}++; 1297 $self->{update_container}{$item->{container}}++;
1243 $self->update_containers; 1298 $self->update_containers;
1244 } 1299 }
… …
1255 1310
1256 my $weight = .001 * $self->{player}{weight}; 1311 my $weight = .001 * $self->{player}{weight};
1257 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1312 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1258 1313
1259 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1314 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1260 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1315 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1261 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1316 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1262} 1317}
1263 1318
1264sub update_server_info { 1319sub update_server_info {
1265 my ($self) = @_; 1320 my ($self) = @_;
… …
1273 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1328 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1274 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1329 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1275 . "editing support $yesno[!!$self->{editor_support}]\n" 1330 . "editing support $yesno[!!$self->{editor_support}]\n"
1276 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1331 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1277 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1332 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1278 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1333 . "client support $yesno[$self->{cfplus_ext} > 0]"
1279 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1334 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1280 . "map size $self->{mapw}×$self->{maph}\n" 1335 . "map size $self->{mapw}×$self->{maph}\n"
1281 ); 1336 );
1282 1337
1283} 1338}
… …
1316 $self->send_ext_req (lookat => $x, $y, sub { 1371 $self->send_ext_req (lookat => $x, $y, sub {
1317 my (%msg) = @_; 1372 my (%msg) = @_;
1318 1373
1319 if (exists $msg{npc_dialog}) { 1374 if (exists $msg{npc_dialog}) {
1320 # start npc chat dialog 1375 # start npc chat dialog
1321 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1376 $self->{npc_dialog} = new DC::NPCDialog::
1322 token => $msg{npc_dialog}, 1377 token => $msg{npc_dialog},
1323 title => "$msg{npc_dialog}[0] (NPC)", 1378 title => "$msg{npc_dialog}[0] (NPC)",
1324 conn => $self, 1379 conn => $self,
1325 ; 1380 ;
1326 } 1381 }
… …
1339 $self->SUPER::destroy; 1394 $self->SUPER::destroy;
1340 1395
1341 %$self = (); 1396 %$self = ();
1342} 1397}
1343 1398
1344package CFPlus::NPCDialog; 1399package DC::NPCDialog;
1345 1400
1346our @ISA = 'CFPlus::UI::Toplevel'; 1401our @ISA = 'DC::UI::Toplevel';
1347 1402
1348sub new { 1403sub new {
1349 my $class = shift; 1404 my $class = shift;
1350 1405
1351 my $self = $class->SUPER::new ( 1406 my $self = $class->SUPER::new (
… …
1358 kw => { hi => 0, yes => 0, no => 0 }, 1413 kw => { hi => 0, yes => 0, no => 0 },
1359 has_close_button => 1, 1414 has_close_button => 1,
1360 @_, 1415 @_,
1361 ); 1416 );
1362 1417
1363 CFPlus::weaken (my $this = $self); 1418 DC::weaken (my $this = $self);
1364 1419
1365 $self->connect (delete => sub { $this->destroy; 1 }); 1420 $self->connect (delete => sub { $this->destroy; 1 });
1366 1421
1367 # better use a pane... 1422 # better use a pane...
1368 $self->add (my $hbox = new CFPlus::UI::HBox); 1423 $self->add (my $hbox = new DC::UI::HBox);
1369 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1424 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1370 1425
1371 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1426 $hbox->add (my $vbox = new DC::UI::VBox);
1372 1427
1373 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1428 $vbox->add (new DC::UI::Label text => "Message Entry:");
1374 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1429 $vbox->add ($self->{entry} = new DC::UI::Entry
1375 tooltip => "#npc_message_entry", 1430 tooltip => "#npc_message_entry",
1376 on_activate => sub { 1431 on_activate => sub {
1377 my ($entry, $text) = @_; 1432 my ($entry, $text) = @_;
1378 1433
1379 return unless $text =~ /\S/; 1434 return unless $text =~ /\S/;
… …
1383 1438
1384 0 1439 0
1385 }, 1440 },
1386 ); 1441 );
1387 1442
1388 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1443 $vbox->add ($self->{options} = new DC::UI::VBox);
1389 1444
1390 $self->{bye_button} = new CFPlus::UI::Button 1445 $self->{bye_button} = new DC::UI::Button
1391 text => "Bye (close)", 1446 text => "Bye (close)",
1392 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1447 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1393 on_activate => sub { $this->destroy; 1 }, 1448 on_activate => sub { $this->destroy; 1 },
1394 ; 1449 ;
1395 1450
… …
1414}; 1469};
1415 1470
1416sub update_options { 1471sub update_options {
1417 my ($self) = @_; 1472 my ($self) = @_;
1418 1473
1419 CFPlus::weaken $self; 1474 DC::weaken $self;
1420 1475
1421 $self->{options}->clear; 1476 $self->{options}->clear;
1422 $self->{options}->add ($self->{bye_button}); 1477 $self->{options}->add ($self->{bye_button});
1423 1478
1424 for my $kw (sort keys %{ $self->{kw} }) { 1479 for my $kw (sort keys %{ $self->{kw} }) {
1425 $self->{options}->add (new CFPlus::UI::Button 1480 $self->{options}->add (new DC::UI::Button
1426 text => $kw, 1481 text => $kw,
1427 on_activate => sub { 1482 on_activate => sub {
1428 $self->send ($kw); 1483 $self->send ($kw);
1429 0 1484 0
1430 }, 1485 },
… …
1433} 1488}
1434 1489
1435sub feed { 1490sub feed {
1436 my ($self, $type, @arg) = @_; 1491 my ($self, $type, @arg) = @_;
1437 1492
1438 CFPlus::weaken $self; 1493 DC::weaken $self;
1439 1494
1440 if ($type eq "update") { 1495 if ($type eq "update") {
1441 my (%info) = @arg; 1496 my (%info) = @arg;
1442 1497
1443 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1498 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1444 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1499 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1445 1500
1446 if (exists $info{msg}) { 1501 if (exists $info{msg}) {
1447 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1502 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1448 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1503 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1449 my @link; 1504 my @link;
1450 $text =~ s{ 1505 $text =~ s{
1451 ($match) 1506 ($match)
1452 }{ 1507 }{
1453 my $kw = $1; 1508 my $kw = $1;
1454 1509
1455 push @link, new CFPlus::UI::Label 1510 push @link, new DC::UI::Label
1456 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1511 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1457 can_hover => 1, 1512 can_hover => 1,
1458 can_events => 1, 1513 can_events => 1,
1459 padding_x => 0, 1514 padding_x => 0,
1460 padding_y => 0, 1515 padding_y => 0,
… …
1478} 1533}
1479 1534
1480sub send { 1535sub send {
1481 my ($self, $msg) = @_; 1536 my ($self, $msg) = @_;
1482 1537
1483 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1538 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1484 $self->{textview}->scroll_to_bottom; 1539 $self->{textview}->scroll_to_bottom;
1485 1540
1486 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1541 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1487} 1542}
1488 1543

Diff Legend

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