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.171 by root, Sat Sep 1 08:08:52 2007 UTC vs.
Revision 1.182 by root, Wed Dec 26 20:46:39 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 xwidget2 => 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 ("\fw" => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
56 $self->{widget}{$_[0]} 54 $self->{widget}{$_[0]}
… …
72 70
73 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
74 for @cmd_help; 72 for @cmd_help;
75 73
76 { 74 {
77 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file dc::Texture
78 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 dc::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
79 $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}});
80 } 78 }
81 79
82 { 80 {
83 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file dc::Texture
84 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 dc::find_rcfile "noface.png", minify => 1, mipmap => 1;
85 $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}});
86 } 84 }
87 85
88 $self->{open_container} = 0; 86 $self->{open_container} = 0;
89 87
… …
144############################################################################# 142#############################################################################
145 143
146sub widget_associate { 144sub widget_associate {
147 my ($self, $ws, $id, $widget) = @_; 145 my ($self, $ws, $id, $widget) = @_;
148 146
149 $widget ||= new CFPlus::UI::Bin; 147 $widget ||= new dc::UI::Bin;
150 148
151 $widget->{s_id} = $id; 149 $widget->{s_id} = $id;
152 $self->{widget}{$id} = $widget; 150 $self->{widget}{$id} = $widget;
153 151
154 if ($ws) { 152 if ($ws) {
… …
190 my ($self, $ws, $id, $class, $args) = @_; 188 my ($self, $ws, $id, $class, $args) = @_;
191 189
192 $self->widget_associate ( 190 $self->widget_associate (
193 $ws, $id => scalar eval { 191 $ws, $id => scalar eval {
194 local $SIG{__DIE__}; 192 local $SIG{__DIE__};
195 "CFPlus::UI::$class"->new (%$args) 193 "dc::UI::$class"->new (%$args)
196 } 194 }
197 ); 195 );
198} 196}
199 197
200# widgetset associate 198# widgetset associate
201sub ext_ws_a { 199sub ext_ws_a {
202 my ($self, %ass) = @_; 200 my ($self, %ass) = @_;
203 201
204 # everything that has a name, wether conceivably useful or not 202 # everything that has a name, wether conceivably useful or not
205 my %wkw = ( 203 my %wkw = (
206 root => $CFPlus::UI::ROOT, 204 root => $dc::UI::ROOT,
207 tooltip => $CFPlus::UI::TOOLTIP, 205 tooltip => $dc::UI::TOOLTIP,
208 206
209 mapwidget => $::MAPWIDGET, 207 mapwidget => $::MAPWIDGET,
210 buttonbar => $::BUTTONBAR, 208 buttonbar => $::BUTTONBAR,
211 metaserver => $::METASERVER, 209 metaserver => $::METASERVER,
212 buttonbar => $::BUTTONBAR, 210 buttonbar => $::BUTTONBAR,
… …
296############################################################################# 294#############################################################################
297 295
298sub logprint { 296sub logprint {
299 my ($self, @a) = @_; 297 my ($self, @a) = @_;
300 298
301 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 299 dc::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
302} 300}
303 301
304sub _stat_numdiff { 302sub _stat_numdiff {
305 my ($self, $name, $old, $new) = @_; 303 my ($self, $name, $old, $new) = @_;
306 304
… …
478 $self->{stat_order} = join ",", map $_->[0], @order; 476 $self->{stat_order} = join ",", map $_->[0], @order;
479 477
480 $sktbl->clear; 478 $sktbl->clear;
481 479
482 my $sw = $self->{skillwid}{""} ||= [ 480 my $sw = $self->{skillwid}{""} ||= [
483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 481 0, 0, (new dc::UI::Label text => "Experience", align => 1),
484 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 482 1, 0, (new dc::UI::Label text => "Lvl.", align => 1),
485 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 483 2, 0, (new dc::UI::Label text => "Progress", align => 0),
486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 484 3, 0, (new dc::UI::Label text => "Skill", expand => 1),
487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 485 4, 0, (new dc::UI::Label text => "Experience", align => 1),
488 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 486 5, 0, (new dc::UI::Label text => "Lvl.", align => 1),
489 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 487 6, 0, (new dc::UI::Label text => "Progress", align => 0),
490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 488 7, 0, (new dc::UI::Label text => "Skill", expand => 1),
491 ]; 489 ];
492 490
493 my @add = @$sw; 491 my @add = @$sw;
494 492
495 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>";
… …
507 if ($ev->{button} == 1) { 505 if ($ev->{button} == 1) {
508 $::CONN->user_send ("ready_skill $name"); 506 $::CONN->user_send ("ready_skill $name");
509 } elsif ($ev->{button} == 2) { 507 } elsif ($ev->{button} == 2) {
510 $::CONN->user_send ("use_skill $name"); 508 $::CONN->user_send ("use_skill $name");
511 } elsif ($ev->{button} == 3) { 509 } elsif ($ev->{button} == 3) {
512 my $shortname = CFPlus::shorten $name, 14; 510 my $shortname = dc::shorten $name, 14;
513 (new CFPlus::UI::Menu 511 (new dc::UI::Menu
514 items => [ 512 items => [
515 ["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"] }],
516 ["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"] }],
517 ], 515 ],
518 )->popup ($ev); 516 )->popup ($ev);
519 } else { 517 } else {
520 return 0; 518 return 0;
521 } 519 }
… …
523 1 521 1
524 }; 522 };
525 523
526 my $sw = $self->{skillwid}{$idx} ||= [ 524 my $sw = $self->{skillwid}{$idx} ||= [
527 # exp 525 # exp
528 (new CFPlus::UI::Label 526 (new dc::UI::Label
529 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),
530 528
531 # level 529 # level
532 (new CFPlus::UI::Label 530 (new dc::UI::Label
533 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),
534 532
535 # progress 533 # progress
536 (new CFPlus::UI::ExperienceProgress), 534 (new dc::UI::ExperienceProgress),
537 535
538 # label 536 # label
539 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 537 (new dc::UI::Label text => $name, on_button_down => $spell_cb,
540 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),
541 ]; 539 ];
542 540
543 push @add, 541 push @add,
544 $x * 4 + 0, $y, $sw->[0], 542 $x * 4 + 0, $y, $sw->[0],
545 $x * 4 + 1, $y, $sw->[1], 543 $x * 4 + 1, $y, $sw->[1],
… …
615 } 613 }
616 } 614 }
617 615
618 if ($delay) { 616 if ($delay) {
619 # 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
620 Event->timer (after => 0.03, cb => sub { 618 EV::once undef, 0, 0.03, sub {
621 $_[0]->w->cancel;
622 $self->{map_widget}->update 619 $self->{map_widget}->update
623 if $self->{map_widget}; 620 if $self->{map_widget};
624 }); 621 };
625 } else { 622 } else {
626 $self->{map_widget}->update; 623 $self->{map_widget}->update;
627 } 624 }
628} 625}
629 626
… …
641 638
642 my ($hash, $x, $y, $w, $h) = @$map_info; 639 my ($hash, $x, $y, $w, $h) = @$map_info;
643 640
644 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);
645 $self->{map_cache_new}{$hash} = \$data; 642 $self->{map_cache_new}{$hash} = \$data;
646 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 643 dc::DB::put $self->{mapcache} => $hash => $data, sub { };
647} 644}
648 645
649sub map_clear { 646sub map_clear {
650 my ($self) = @_; 647 my ($self) = @_;
651 648
… …
664 do { 661 do {
665 $tile = pop @{$self->{bg_fetch}} 662 $tile = pop @{$self->{bg_fetch}}
666 or return; 663 or return;
667 } while $self->{texture}[$tile]; 664 } while $self->{texture}[$tile];
668 665
669 CFPlus::DB::get tilecache => $tile, sub { 666 dc::DB::get tilecache => $tile, sub {
670 my ($data) = @_; 667 my ($data) = @_;
671 668
672 return unless $self->{map}; # stop when destroyed 669 return unless $self->{map}; # stop when destroyed
673 670
674 if (defined $data) { 671 if (defined $data) {
… …
702 }; 699 };
703 700
704 if (my $rdata = $self->{map_cache_old}{$hash}) { 701 if (my $rdata = $self->{map_cache_old}{$hash}) {
705 $cb->($$rdata); 702 $cb->($$rdata);
706 } else { 703 } else {
707 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 704 dc::DB::get $self->{mapcache} => $hash, $cb;
708 } 705 }
709} 706}
710 707
711# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 708# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
712# (server resource,s latency, bandwidth), so this hack is warranted. 709# (server resource,s latency, bandwidth), so this hack is warranted.
… …
836 833
837sub face_find { 834sub face_find {
838 my ($self, $facenum, $face, $cb) = @_; 835 my ($self, $facenum, $face, $cb) = @_;
839 836
840 if ($face->{type} == 0) { # FT_FACE 837 if ($face->{type} == 0) { # FT_FACE
841 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 838 my $id = dc::DB::get_tile_id_sync $face->{name};
842 839
843 $face->{id} = $id; 840 $face->{id} = $id;
844 $self->{map}->set_tileid ($facenum => $id); 841 $self->{map}->set_tileid ($facenum => $id);
845 842
846 CFPlus::DB::get tilecache => $id, $cb; 843 dc::DB::get tilecache => $id, $cb;
847 844
848 } elsif ($face->{type} & 1) { # with metadata 845 } elsif ($face->{type} & 1) { # with metadata
849 CFPlus::DB::get res_meta => $face->{name}, $cb; 846 dc::DB::get res_meta => $face->{name}, $cb;
850 847
851 } else { # no metadata 848 } else { # no metadata
852 CFPlus::DB::get res_data => $face->{name}, $cb; 849 dc::DB::get res_data => $face->{name}, $cb;
853 } 850 }
854} 851}
855 852
856sub face_update { 853sub face_update {
857 my ($self, $facenum, $face, $changed) = @_; 854 my ($self, $facenum, $face, $changed) = @_;
858 855
859 if ($face->{type} == 0) { 856 if ($face->{type} == 0) {
860 # image, FT_FACE 857 # image, FT_FACE
861 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 858 dc::DB::put tilecache => $face->{id} => $face->{data}, sub { }
862 if $changed; 859 if $changed;
863 860
864 $self->have_tile ($face->{id}, delete $face->{data}); 861 $self->have_tile ($face->{id}, delete $face->{data});
865 862
866 } elsif ($face->{type} & 1) { 863 } elsif ($face->{type} & 1) {
… …
868 if ($changed) { # new data 865 if ($changed) { # new data
869 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 866 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
870 $face->{data} = $meta; 867 $face->{data} = $meta;
871 868
872 # rely on strict ordering here and also on later fetch 869 # rely on strict ordering here and also on later fetch
873 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 870 dc::DB::put res_data => $face->{name} => $data, sub { };
874 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 871 dc::DB::put res_meta => $face->{name} => $meta, sub { };
875 } 872 }
876 873
877 $face->{data} = $self->{json_coder}->decode ($face->{data}); 874 $face->{data} = $self->{json_coder}->decode ($face->{data});
878 ::add_license ($face); 875 ::add_license ($face);
879 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) 876 ::message ({ markup => dc::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
880 if $changed; 877 if $changed;
881 878
882 if ($face->{type} == 3) { # FT_MUSIC 879 if ($face->{type} == 3) { # FT_MUSIC
883 &::audio_music_push ($facenum); 880 &::audio_music_push ($facenum);
884 } elsif ($face->{type} == 5) { # FT_SOUND 881 } elsif ($face->{type} == 5) { # FT_SOUND
885 &::audio_sound_push ($facenum); 882 &::audio_sound_push ($facenum);
886 } 883 }
887 884
888 } else { 885 } else {
889 # flat resource case, FT_RSRC 886 # flat resource case, FT_RSRC
890 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 887 dc::DB::put res_data => $face->{name} => $face->{data}, sub { }
891 if $changed; 888 if $changed;
892 } 889 }
893 890
894 if (my $cbs = $self->{face_cb}{$facenum}) { 891 if (my $cbs = $self->{face_cb}{$facenum}) {
895 $_->($face, $changed) for @$cbs; 892 $_->($face, $changed) for @$cbs;
… …
906 my ($self, $tile, $data) = @_; 903 my ($self, $tile, $data) = @_;
907 904
908 return unless $self->{map}; 905 return unless $self->{map};
909 906
910 my $tex = $self->{texture}[$tile] ||= 907 my $tex = $self->{texture}[$tile] ||=
911 new CFPlus::Texture 908 new dc::Texture
912 tile => $tile, 909 tile => $tile,
913 image => $data, delete_image => 1, 910 image => $data, delete_image => 1,
914 minify => 1, mipmap => 1; 911 minify => 1, mipmap => 1;
915 912
916 if (my $cbs = delete $self->{tile_cb}{$tile}) { 913 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
924 my ($self, $num, $cb) = @_; 921 my ($self, $num, $cb) = @_;
925 922
926 push @{$self->{face_cb}{$num}}, $cb; 923 push @{$self->{face_cb}{$num}}, $cb;
927 924
928 defined wantarray 925 defined wantarray
929 ? CFPlus::guard { 926 ? dc::guard {
930 @{$self->{face_cb}{$num}} 927 @{$self->{face_cb}{$num}}
931 = grep $_ != $cb, 928 = grep $_ != $cb,
932 @{$self->{face_cb}{$num}}; 929 @{$self->{face_cb}{$num}};
933 } 930 }
934 : () 931 : ()
… …
969 966
970sub sanitise_xml($) { 967sub sanitise_xml($) {
971 local $_ = shift; 968 local $_ = shift;
972 969
973 # we now weed out all tags we do not support 970 # we now weed out all tags we do not support
974 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
975 # now all entities 976 # now all entities
976 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;
977 978
978 # handle some elements 979 # handle some elements
979 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 980 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1038 ::message ({ 1039 ::message ({
1039 fg => $fg, 1040 fg => $fg,
1040 markup => $_, 1041 markup => $_,
1041 type => $type, 1042 type => $type,
1042 extra => [@extra], 1043 extra => [@extra],
1043 color_flags => $color, #d# ugly, kill 1044 color_flags => $color, #d# ugly, kill
1044 }); 1045 });
1045 1046
1046 $color &= ~NDI_CLEAR; # only clear once for multiline messages 1047 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1047 # actually, this is an ugly design. _we_ should control the channels, 1048 # actually, this is an ugly design. _we_ should control the channels,
1048 # not some random other widget, as the channels are clearly protocol-specific. 1049 # not some random other widget, as the channels are clearly protocol-specific.
… …
1053 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
1054 group => $text, 1055 group => $text,
1055 fg => $fg, 1056 fg => $fg,
1056 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
1057 tooltip_font => $::FONT_FIXED, 1058 tooltip_font => $::FONT_FIXED,
1058 ); 1059 ) if $type eq "info";
1059 } 1060 }
1060} 1061}
1061 1062
1062sub spell_add { 1063sub spell_add {
1063 my ($self, $spell) = @_; 1064 my ($self, $spell) = @_;
… …
1067 $spell->{message} =~ s/\n+$//; 1068 $spell->{message} =~ s/\n+$//;
1068 $spell->{message} ||= "Server did not provide a description for this spell."; 1069 $spell->{message} ||= "Server did not provide a description for this spell.";
1069 1070
1070 $::SPELL_LIST->add_spell ($spell); 1071 $::SPELL_LIST->add_spell ($spell);
1071 1072
1072 $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});
1073 $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});
1074} 1075}
1075 1076
1076sub spell_delete { 1077sub spell_delete {
1077 my ($self, $spell) = @_; 1078 my ($self, $spell) = @_;
1078 1079
… …
1089sub addme_success { 1090sub addme_success {
1090 my ($self) = @_; 1091 my ($self) = @_;
1091 1092
1092 my %skill_help; 1093 my %skill_help;
1093 1094
1094 for my $node (CFPlus::Pod::find skill_description => "*") { 1095 for my $node (dc::Pod::find skill_description => "*") {
1095 my (undef, @par) = CFPlus::Pod::section_of $node; 1096 my (undef, @par) = dc::Pod::section_of $node;
1096 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1097 $skill_help{$node->{kw}[0]} = dc::Pod::as_label @par;
1097 }; 1098 };
1098 1099
1099 for my $skill (values %{$self->{skill_info}}) { 1100 for my $skill (values %{$self->{skill_info}}) {
1100 $self->{map_widget}->add_command ("ready_skill $skill", 1101 $self->{map_widget}->add_command ("ready_skill $skill",
1101 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1102 (dc::asxml "Ready the skill '$skill'\n\n")
1102 . $skill_help{$skill}); 1103 . $skill_help{$skill});
1103 $self->{map_widget}->add_command ("use_skill $skill", 1104 $self->{map_widget}->add_command ("use_skill $skill",
1104 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1105 (dc::asxml "Immediately use the skill '$skill'\n\n")
1105 . $skill_help{$skill}); 1106 . $skill_help{$skill});
1106 } 1107 }
1107} 1108}
1108 1109
1109sub eof { 1110sub eof {
… …
1113 1114
1114 ::stop_game (); 1115 ::stop_game ();
1115} 1116}
1116 1117
1117sub update_floorbox { 1118sub update_floorbox {
1118 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $dc::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1119 return unless $::CONN; 1120 return unless $::CONN;
1120 1121
1121 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
1122 1123
1123 my @add; 1124 my @add;
… …
1125 my $row; 1126 my $row;
1126 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} }) {
1127 if ($row < 6) { 1128 if ($row < 6) {
1128 local $_->{face_widget}; # hack to force recreation of widget 1129 local $_->{face_widget}; # hack to force recreation of widget
1129 local $_->{desc_widget}; # hack to force recreation of widget 1130 local $_->{desc_widget}; # hack to force recreation of widget
1130 CFPlus::Item::update_widgets $_; 1131 dc::Item::update_widgets $_;
1131 1132
1132 push @add, 1133 push @add,
1133 0, $row, $_->{face_widget}, 1134 0, $row, $_->{face_widget},
1134 1, $row, $_->{desc_widget}; 1135 1, $row, $_->{desc_widget};
1135 1136
1136 $row++; 1137 $row++;
1137 } else { 1138 } else {
1138 push @add, 1, $row, new CFPlus::UI::Button 1139 push @add, 1, $row, new dc::UI::Button
1139 text => "More...", 1140 text => "More...",
1140 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1141 ; 1142 ;
1142 last; 1143 last;
1143 } 1144 }
1144 } 1145 }
1145 if ($::CONN->{open_container}) { 1146 if ($::CONN->{open_container}) {
1146 push @add, 1, $row++, new CFPlus::UI::Button 1147 push @add, 1, $row++, new dc::UI::Button
1147 text => "Close container", 1148 text => "Close container",
1148 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1149 ; 1150 ;
1150 } 1151 }
1151 1152
1152 $::FLOORBOX->add_at (@add); 1153 $::FLOORBOX->add_at (@add);
1153 }); 1154 });
1154 1155
1155 $::WANT_REFRESH->start; 1156 $::WANT_REFRESH = 1;
1156} 1157}
1157 1158
1158sub set_opencont { 1159sub set_opencont {
1159 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
1160 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
1161 update_floorbox; 1162 update_floorbox;
1162 1163
1163 $::INVR_HB->clear (); 1164 $::INVR_HB->clear ();
1164 $::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);
1165 1166
1166 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
1167 $::INVR_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new dc::UI::Button
1168 text => "Close container", 1169 text => "Close container",
1169 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
1170 on_activate => sub { 1171 on_activate => sub {
1171 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1172 if $tag != 0; 1173 if $tag != 0;
… …
1179} 1180}
1180 1181
1181sub update_containers { 1182sub update_containers {
1182 my ($self) = @_; 1183 my ($self) = @_;
1183 1184
1184 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1185 $dc::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1185 my $todo = delete $self->{update_container} 1186 my $todo = delete $self->{update_container}
1186 or return; 1187 or return;
1187 1188
1188 for my $tag (keys %$todo) { 1189 for my $tag (keys %$todo) {
1189 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1190 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1226sub item_update { 1227sub item_update {
1227 my ($self, $item) = @_; 1228 my ($self, $item) = @_;
1228 1229
1229 #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";
1230 1231
1231 CFPlus::Item::update_widgets $item; 1232 dc::Item::update_widgets $item;
1232 1233
1233 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1234 set_opencont ($::CONN, 0, "Floor"); 1235 set_opencont ($::CONN, 0, "Floor");
1235 1236
1236 } elsif ($item->{flags} & F_OPEN) { 1237 } elsif ($item->{flags} & F_OPEN) {
1237 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1238 set_opencont ($::CONN, $item->{tag}, dc::Item::desc_string $item);
1238 1239
1239 } else { 1240 } else {
1240 $self->{update_container}{$item->{container}}++; 1241 $self->{update_container}{$item->{container}}++;
1241 $self->update_containers; 1242 $self->update_containers;
1242 } 1243 }
… …
1301 0 1302 0
1302 }); 1303 });
1303 1304
1304 $self->update_server_info; 1305 $self->update_server_info;
1305 1306
1306 $self->send_command ("output-sync $::CFG->{output_sync}");
1307 $self->send_command ("output-count $::CFG->{output_count}");
1308 $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;
1309 $self->send_command ("pickup $::CFG->{pickup}"); 1308 $self->send_command ("pickup $::CFG->{pickup}");
1310} 1309}
1311 1310
1312sub lookat { 1311sub lookat {
… …
1316 $self->send_ext_req (lookat => $x, $y, sub { 1315 $self->send_ext_req (lookat => $x, $y, sub {
1317 my (%msg) = @_; 1316 my (%msg) = @_;
1318 1317
1319 if (exists $msg{npc_dialog}) { 1318 if (exists $msg{npc_dialog}) {
1320 # start npc chat dialog 1319 # start npc chat dialog
1321 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1320 $self->{npc_dialog} = new dc::NPCDialog::
1322 token => $msg{npc_dialog}, 1321 token => $msg{npc_dialog},
1323 title => "$msg{npc_dialog}[0] (NPC)", 1322 title => "$msg{npc_dialog}[0] (NPC)",
1324 conn => $self, 1323 conn => $self,
1325 ; 1324 ;
1326 } 1325 }
… …
1339 $self->SUPER::destroy; 1338 $self->SUPER::destroy;
1340 1339
1341 %$self = (); 1340 %$self = ();
1342} 1341}
1343 1342
1344package CFPlus::NPCDialog; 1343package dc::NPCDialog;
1345 1344
1346our @ISA = 'CFPlus::UI::Toplevel'; 1345our @ISA = 'dc::UI::Toplevel';
1347 1346
1348sub new { 1347sub new {
1349 my $class = shift; 1348 my $class = shift;
1350 1349
1351 my $self = $class->SUPER::new ( 1350 my $self = $class->SUPER::new (
… …
1358 kw => { hi => 0, yes => 0, no => 0 }, 1357 kw => { hi => 0, yes => 0, no => 0 },
1359 has_close_button => 1, 1358 has_close_button => 1,
1360 @_, 1359 @_,
1361 ); 1360 );
1362 1361
1363 CFPlus::weaken (my $this = $self); 1362 dc::weaken (my $this = $self);
1364 1363
1365 $self->connect (delete => sub { $this->destroy; 1 }); 1364 $self->connect (delete => sub { $this->destroy; 1 });
1366 1365
1367 # better use a pane... 1366 # better use a pane...
1368 $self->add (my $hbox = new CFPlus::UI::HBox); 1367 $self->add (my $hbox = new dc::UI::HBox);
1369 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1368 $hbox->add ($self->{textview} = new dc::UI::TextScroller expand => 1);
1370 1369
1371 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1370 $hbox->add (my $vbox = new dc::UI::VBox);
1372 1371
1373 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1372 $vbox->add (new dc::UI::Label text => "Message Entry:");
1374 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1373 $vbox->add ($self->{entry} = new dc::UI::Entry
1375 tooltip => "#npc_message_entry", 1374 tooltip => "#npc_message_entry",
1376 on_activate => sub { 1375 on_activate => sub {
1377 my ($entry, $text) = @_; 1376 my ($entry, $text) = @_;
1378 1377
1379 return unless $text =~ /\S/; 1378 return unless $text =~ /\S/;
… …
1383 1382
1384 0 1383 0
1385 }, 1384 },
1386 ); 1385 );
1387 1386
1388 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1387 $vbox->add ($self->{options} = new dc::UI::VBox);
1389 1388
1390 $self->{bye_button} = new CFPlus::UI::Button 1389 $self->{bye_button} = new dc::UI::Button
1391 text => "Bye (close)", 1390 text => "Bye (close)",
1392 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.",
1393 on_activate => sub { $this->destroy; 1 }, 1392 on_activate => sub { $this->destroy; 1 },
1394 ; 1393 ;
1395 1394
… …
1414}; 1413};
1415 1414
1416sub update_options { 1415sub update_options {
1417 my ($self) = @_; 1416 my ($self) = @_;
1418 1417
1419 CFPlus::weaken $self; 1418 dc::weaken $self;
1420 1419
1421 $self->{options}->clear; 1420 $self->{options}->clear;
1422 $self->{options}->add ($self->{bye_button}); 1421 $self->{options}->add ($self->{bye_button});
1423 1422
1424 for my $kw (sort keys %{ $self->{kw} }) { 1423 for my $kw (sort keys %{ $self->{kw} }) {
1425 $self->{options}->add (new CFPlus::UI::Button 1424 $self->{options}->add (new dc::UI::Button
1426 text => $kw, 1425 text => $kw,
1427 on_activate => sub { 1426 on_activate => sub {
1428 $self->send ($kw); 1427 $self->send ($kw);
1429 0 1428 0
1430 }, 1429 },
… …
1433} 1432}
1434 1433
1435sub feed { 1434sub feed {
1436 my ($self, $type, @arg) = @_; 1435 my ($self, $type, @arg) = @_;
1437 1436
1438 CFPlus::weaken $self; 1437 dc::weaken $self;
1439 1438
1440 if ($type eq "update") { 1439 if ($type eq "update") {
1441 my (%info) = @arg; 1440 my (%info) = @arg;
1442 1441
1443 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1442 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1444 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1443 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1445 1444
1446 if (exists $info{msg}) { 1445 if (exists $info{msg}) {
1447 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1446 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} }; 1447 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1449 my @link; 1448 my @link;
1450 $text =~ s{ 1449 $text =~ s{
1451 ($match) 1450 ($match)
1452 }{ 1451 }{
1453 my $kw = $1; 1452 my $kw = $1;
1454 1453
1455 push @link, new CFPlus::UI::Label 1454 push @link, new dc::UI::Label
1456 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1455 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1457 can_hover => 1, 1456 can_hover => 1,
1458 can_events => 1, 1457 can_events => 1,
1459 padding_x => 0, 1458 padding_x => 0,
1460 padding_y => 0, 1459 padding_y => 0,
… …
1478} 1477}
1479 1478
1480sub send { 1479sub send {
1481 my ($self, $msg) = @_; 1480 my ($self, $msg) = @_;
1482 1481
1483 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1482 $self->{textview}->add_paragraph ({ markup => "\n" . dc::asxml $msg });
1484 $self->{textview}->scroll_to_bottom; 1483 $self->{textview}->scroll_to_bottom;
1485 1484
1486 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1485 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1487} 1486}
1488 1487

Diff Legend

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