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.172 by root, Sun Sep 2 03:55:03 2007 UTC vs.
Revision 1.184 by root, Thu Dec 27 18:35:56 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 => 2,
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
28 }, 26 },
29 ); 27 );
30 28
31 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
… …
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
… …
104} 102}
105 103
106sub ext_capabilities { 104sub ext_capabilities {
107 my ($self, %cap) = @_; 105 my ($self, %cap) = @_;
108 106
109 #$self->send ("setup sound 0"); # we use a different protocol
110 $self->update_fx_want; 107 $self->update_fx_want;
111 108
112 $self->send_exti_req (resource => "exp_table", sub { 109 $self->send_exti_req (resource => "exp_table", sub {
113 my ($exp_table) = @_; 110 my ($exp_table) = @_;
114 111
… …
144############################################################################# 141#############################################################################
145 142
146sub widget_associate { 143sub widget_associate {
147 my ($self, $ws, $id, $widget) = @_; 144 my ($self, $ws, $id, $widget) = @_;
148 145
149 $widget ||= new CFPlus::UI::Bin; 146 $widget ||= new DC::UI::Bin;
150 147
151 $widget->{s_id} = $id; 148 $widget->{s_id} = $id;
152 $self->{widget}{$id} = $widget; 149 $self->{widget}{$id} = $widget;
153 150
154 if ($ws) { 151 if ($ws) {
… …
190 my ($self, $ws, $id, $class, $args) = @_; 187 my ($self, $ws, $id, $class, $args) = @_;
191 188
192 $self->widget_associate ( 189 $self->widget_associate (
193 $ws, $id => scalar eval { 190 $ws, $id => scalar eval {
194 local $SIG{__DIE__}; 191 local $SIG{__DIE__};
195 "CFPlus::UI::$class"->new (%$args) 192 "DC::UI::$class"->new (%$args)
196 } 193 }
197 ); 194 );
195}
196
197# widgetset create template
198sub ext_ws_ct {
199 my ($self, $ws, $template, $cfg) = @_;
200
201 $template = eval <<EOF;
202[
203 Toplevel => {
204 s_id => "toplevel",
205 title => "Character Creation",
206 x => "center",
207 y => "center",
208 z => 5,
209 s_cl => [VBox => {s_cl => [
210 Label => {
211 text => "Character Creation",
212 fontsize => 1,
213 align => 0,
214 },
215 Label => {
216 markup => "View or Edit your character attributes below, then press <b>Finish</b> to create your character",
217 fontsize => 0.8,
218 align => 0,
219 },
220 Notebook => {
221 s_cl => [
222 Label => {
223 text => "hulla-hoop"
224 },
225 Entry => {
226 s_id => "entry",
227 },
228 ],
229 },
230 Button => {
231 s_id => "finish",
232 title => "Finish",
233 },
234 ]}],
235 },
236]
237EOF
238 die if $@;
239
240 my $parse_list; $parse_list = sub {
241 my ($list) = @_;
242 my @w;
243
244 while (@$list) {
245 my ($class, $args) = splice @$list, 0, 2;
246 my $name = delete $args->{s_id};
247 my $cl = delete $args->{s_cl};
248 my $cfg = delete $cfg->{$name};
249 my $id = delete $cfg->{id};
250 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
251 or next;
252
253 $self->widget_associate ($ws, $id, $w)
254 if $id;
255
256 $w->add ($parse_list->($cl))
257 if $cl;
258
259 push @w, $w;
260 }
261
262 @w
263 };
264
265 $parse_list->($template);
266
198} 267}
199 268
200# widgetset associate 269# widgetset associate
201sub ext_ws_a { 270sub ext_ws_a {
202 my ($self, %ass) = @_; 271 my ($self, %ass) = @_;
203 272
204 # everything that has a name, wether conceivably useful or not 273 # everything that has a name, wether conceivably useful or not
205 my %wkw = ( 274 my %wkw = (
206 root => $CFPlus::UI::ROOT, 275 root => $DC::UI::ROOT,
207 tooltip => $CFPlus::UI::TOOLTIP, 276 tooltip => $DC::UI::TOOLTIP,
208 277
209 mapwidget => $::MAPWIDGET, 278 mapwidget => $::MAPWIDGET,
210 buttonbar => $::BUTTONBAR, 279 buttonbar => $::BUTTONBAR,
211 metaserver => $::METASERVER, 280 metaserver => $::METASERVER,
212 buttonbar => $::BUTTONBAR, 281 buttonbar => $::BUTTONBAR,
… …
296############################################################################# 365#############################################################################
297 366
298sub logprint { 367sub logprint {
299 my ($self, @a) = @_; 368 my ($self, @a) = @_;
300 369
301 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 370 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
302} 371}
303 372
304sub _stat_numdiff { 373sub _stat_numdiff {
305 my ($self, $name, $old, $new) = @_; 374 my ($self, $name, $old, $new) = @_;
306 375
… …
478 $self->{stat_order} = join ",", map $_->[0], @order; 547 $self->{stat_order} = join ",", map $_->[0], @order;
479 548
480 $sktbl->clear; 549 $sktbl->clear;
481 550
482 my $sw = $self->{skillwid}{""} ||= [ 551 my $sw = $self->{skillwid}{""} ||= [
483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 552 0, 0, (new DC::UI::Label text => "Experience", align => 1),
484 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 553 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
485 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 554 2, 0, (new DC::UI::Label text => "Progress", align => 0),
486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 555 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 556 4, 0, (new DC::UI::Label text => "Experience", align => 1),
488 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 557 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
489 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 558 6, 0, (new DC::UI::Label text => "Progress", align => 0),
490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 559 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
491 ]; 560 ];
492 561
493 my @add = @$sw; 562 my @add = @$sw;
494 563
495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 564 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
… …
507 if ($ev->{button} == 1) { 576 if ($ev->{button} == 1) {
508 $::CONN->user_send ("ready_skill $name"); 577 $::CONN->user_send ("ready_skill $name");
509 } elsif ($ev->{button} == 2) { 578 } elsif ($ev->{button} == 2) {
510 $::CONN->user_send ("use_skill $name"); 579 $::CONN->user_send ("use_skill $name");
511 } elsif ($ev->{button} == 3) { 580 } elsif ($ev->{button} == 3) {
512 my $shortname = CFPlus::shorten $name, 14; 581 my $shortname = DC::shorten $name, 14;
513 (new CFPlus::UI::Menu 582 (new DC::UI::Menu
514 items => [ 583 items => [
515 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 584 ["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"] }], 585 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
517 ], 586 ],
518 )->popup ($ev); 587 )->popup ($ev);
519 } else { 588 } else {
520 return 0; 589 return 0;
521 } 590 }
… …
523 1 592 1
524 }; 593 };
525 594
526 my $sw = $self->{skillwid}{$idx} ||= [ 595 my $sw = $self->{skillwid}{$idx} ||= [
527 # exp 596 # exp
528 (new CFPlus::UI::Label 597 (new DC::UI::Label
529 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 598 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
530 599
531 # level 600 # level
532 (new CFPlus::UI::Label 601 (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), 602 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
534 603
535 # progress 604 # progress
536 (new CFPlus::UI::ExperienceProgress), 605 (new DC::UI::ExperienceProgress),
537 606
538 # label 607 # label
539 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 608 (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), 609 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
541 ]; 610 ];
542 611
543 push @add, 612 push @add,
544 $x * 4 + 0, $y, $sw->[0], 613 $x * 4 + 0, $y, $sw->[0],
545 $x * 4 + 1, $y, $sw->[1], 614 $x * 4 + 1, $y, $sw->[1],
… …
615 } 684 }
616 } 685 }
617 686
618 if ($delay) { 687 if ($delay) {
619 # delay the map drawing a tiny bit in the hope of getting the missing fetched 688 # delay the map drawing a tiny bit in the hope of getting the missing fetched
620 Event->timer (after => 0.03, cb => sub { 689 EV::once undef, 0, 0.03, sub {
621 $_[0]->w->cancel;
622 $self->{map_widget}->update 690 $self->{map_widget}->update
623 if $self->{map_widget}; 691 if $self->{map_widget};
624 }); 692 };
625 } else { 693 } else {
626 $self->{map_widget}->update; 694 $self->{map_widget}->update;
627 } 695 }
628} 696}
629 697
… …
641 709
642 my ($hash, $x, $y, $w, $h) = @$map_info; 710 my ($hash, $x, $y, $w, $h) = @$map_info;
643 711
644 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 712 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
645 $self->{map_cache_new}{$hash} = \$data; 713 $self->{map_cache_new}{$hash} = \$data;
646 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 714 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
647} 715}
648 716
649sub map_clear { 717sub map_clear {
650 my ($self) = @_; 718 my ($self) = @_;
651 719
… …
664 do { 732 do {
665 $tile = pop @{$self->{bg_fetch}} 733 $tile = pop @{$self->{bg_fetch}}
666 or return; 734 or return;
667 } while $self->{texture}[$tile]; 735 } while $self->{texture}[$tile];
668 736
669 CFPlus::DB::get tilecache => $tile, sub { 737 DC::DB::get tilecache => $tile, sub {
670 my ($data) = @_; 738 my ($data) = @_;
671 739
672 return unless $self->{map}; # stop when destroyed 740 return unless $self->{map}; # stop when destroyed
673 741
674 if (defined $data) { 742 if (defined $data) {
… …
702 }; 770 };
703 771
704 if (my $rdata = $self->{map_cache_old}{$hash}) { 772 if (my $rdata = $self->{map_cache_old}{$hash}) {
705 $cb->($$rdata); 773 $cb->($$rdata);
706 } else { 774 } else {
707 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 775 DC::DB::get $self->{mapcache} => $hash, $cb;
708 } 776 }
709} 777}
710 778
711# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 779# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
712# (server resource,s latency, bandwidth), so this hack is warranted. 780# (server resource,s latency, bandwidth), so this hack is warranted.
… …
836 904
837sub face_find { 905sub face_find {
838 my ($self, $facenum, $face, $cb) = @_; 906 my ($self, $facenum, $face, $cb) = @_;
839 907
840 if ($face->{type} == 0) { # FT_FACE 908 if ($face->{type} == 0) { # FT_FACE
841 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 909 my $id = DC::DB::get_tile_id_sync $face->{name};
842 910
843 $face->{id} = $id; 911 $face->{id} = $id;
844 $self->{map}->set_tileid ($facenum => $id); 912 $self->{map}->set_tileid ($facenum => $id);
845 913
846 CFPlus::DB::get tilecache => $id, $cb; 914 DC::DB::get tilecache => $id, $cb;
847 915
848 } elsif ($face->{type} & 1) { # with metadata 916 } elsif ($face->{type} & 1) { # with metadata
849 CFPlus::DB::get res_meta => $face->{name}, $cb; 917 DC::DB::get res_meta => $face->{name}, $cb;
850 918
851 } else { # no metadata 919 } else { # no metadata
852 CFPlus::DB::get res_data => $face->{name}, $cb; 920 DC::DB::get res_data => $face->{name}, $cb;
853 } 921 }
854} 922}
855 923
856sub face_update { 924sub face_update {
857 my ($self, $facenum, $face, $changed) = @_; 925 my ($self, $facenum, $face, $changed) = @_;
858 926
859 if ($face->{type} == 0) { 927 if ($face->{type} == 0) {
860 # image, FT_FACE 928 # image, FT_FACE
861 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 929 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
862 if $changed; 930 if $changed;
863 931
864 $self->have_tile ($face->{id}, delete $face->{data}); 932 $self->have_tile ($face->{id}, delete $face->{data});
865 933
866 } elsif ($face->{type} & 1) { 934 } elsif ($face->{type} & 1) {
… …
868 if ($changed) { # new data 936 if ($changed) { # new data
869 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 937 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
870 $face->{data} = $meta; 938 $face->{data} = $meta;
871 939
872 # rely on strict ordering here and also on later fetch 940 # rely on strict ordering here and also on later fetch
873 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 941 DC::DB::put res_data => $face->{name} => $data, sub { };
874 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 942 DC::DB::put res_meta => $face->{name} => $meta, sub { };
875 } 943 }
876 944
877 $face->{data} = $self->{json_coder}->decode ($face->{data}); 945 $face->{data} = $self->{json_coder}->decode ($face->{data});
878 ::add_license ($face); 946 ::add_license ($face);
879 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) 947 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
880 if $changed; 948 if $changed;
881 949
882 if ($face->{type} == 3) { # FT_MUSIC 950 if ($face->{type} == 3) { # FT_MUSIC
883 &::audio_music_push ($facenum); 951 &::audio_music_push ($facenum);
884 } elsif ($face->{type} == 5) { # FT_SOUND 952 } elsif ($face->{type} == 5) { # FT_SOUND
885 &::audio_sound_push ($facenum); 953 &::audio_sound_push ($facenum);
886 } 954 }
887 955
888 } else { 956 } else {
889 # flat resource case, FT_RSRC 957 # flat resource case, FT_RSRC
890 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 958 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
891 if $changed; 959 if $changed;
892 } 960 }
893 961
894 if (my $cbs = $self->{face_cb}{$facenum}) { 962 if (my $cbs = $self->{face_cb}{$facenum}) {
895 $_->($face, $changed) for @$cbs; 963 $_->($face, $changed) for @$cbs;
… …
906 my ($self, $tile, $data) = @_; 974 my ($self, $tile, $data) = @_;
907 975
908 return unless $self->{map}; 976 return unless $self->{map};
909 977
910 my $tex = $self->{texture}[$tile] ||= 978 my $tex = $self->{texture}[$tile] ||=
911 new CFPlus::Texture 979 new DC::Texture
912 tile => $tile, 980 tile => $tile,
913 image => $data, delete_image => 1, 981 image => $data, delete_image => 1,
914 minify => 1, mipmap => 1; 982 minify => 1, mipmap => 1;
915 983
916 if (my $cbs = delete $self->{tile_cb}{$tile}) { 984 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
924 my ($self, $num, $cb) = @_; 992 my ($self, $num, $cb) = @_;
925 993
926 push @{$self->{face_cb}{$num}}, $cb; 994 push @{$self->{face_cb}{$num}}, $cb;
927 995
928 defined wantarray 996 defined wantarray
929 ? CFPlus::guard { 997 ? DC::guard {
930 @{$self->{face_cb}{$num}} 998 @{$self->{face_cb}{$num}}
931 = grep $_ != $cb, 999 = grep $_ != $cb,
932 @{$self->{face_cb}{$num}}; 1000 @{$self->{face_cb}{$num}};
933 } 1001 }
934 : () 1002 : ()
… …
969 1037
970sub sanitise_xml($) { 1038sub sanitise_xml($) {
971 local $_ = shift; 1039 local $_ = shift;
972 1040
973 # we now weed out all tags we do not support 1041 # we now weed out all tags we do not support
974 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1042 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1043 }{
1044 "&lt;"
1045 }gex;
1046
975 # now all entities 1047 # now all entities
976 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1048 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
977 1049
978 # handle some elements 1050 # handle some elements
979 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1051 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1053 $self->{statusbox}->add ($text, 1125 $self->{statusbox}->add ($text,
1054 group => $text, 1126 group => $text,
1055 fg => $fg, 1127 fg => $fg,
1056 timeout => $color >= 2 ? 180 : 10, 1128 timeout => $color >= 2 ? 180 : 10,
1057 tooltip_font => $::FONT_FIXED, 1129 tooltip_font => $::FONT_FIXED,
1058 ); 1130 ) if $type eq "info";
1059 } 1131 }
1060} 1132}
1061 1133
1062sub spell_add { 1134sub spell_add {
1063 my ($self, $spell) = @_; 1135 my ($self, $spell) = @_;
… …
1067 $spell->{message} =~ s/\n+$//; 1139 $spell->{message} =~ s/\n+$//;
1068 $spell->{message} ||= "Server did not provide a description for this spell."; 1140 $spell->{message} ||= "Server did not provide a description for this spell.";
1069 1141
1070 $::SPELL_LIST->add_spell ($spell); 1142 $::SPELL_LIST->add_spell ($spell);
1071 1143
1072 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1144 $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}); 1145 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1074} 1146}
1075 1147
1076sub spell_delete { 1148sub spell_delete {
1077 my ($self, $spell) = @_; 1149 my ($self, $spell) = @_;
1078 1150
… …
1089sub addme_success { 1161sub addme_success {
1090 my ($self) = @_; 1162 my ($self) = @_;
1091 1163
1092 my %skill_help; 1164 my %skill_help;
1093 1165
1094 for my $node (CFPlus::Pod::find skill_description => "*") { 1166 for my $node (DC::Pod::find skill_description => "*") {
1095 my (undef, @par) = CFPlus::Pod::section_of $node; 1167 my (undef, @par) = DC::Pod::section_of $node;
1096 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1168 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
1097 }; 1169 };
1098 1170
1099 for my $skill (values %{$self->{skill_info}}) { 1171 for my $skill (values %{$self->{skill_info}}) {
1100 $self->{map_widget}->add_command ("ready_skill $skill", 1172 $self->{map_widget}->add_command ("ready_skill $skill",
1101 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1173 (DC::asxml "Ready the skill '$skill'\n\n")
1102 . $skill_help{$skill}); 1174 . $skill_help{$skill});
1103 $self->{map_widget}->add_command ("use_skill $skill", 1175 $self->{map_widget}->add_command ("use_skill $skill",
1104 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1176 (DC::asxml "Immediately use the skill '$skill'\n\n")
1105 . $skill_help{$skill}); 1177 . $skill_help{$skill});
1106 } 1178 }
1107} 1179}
1108 1180
1109sub eof { 1181sub eof {
… …
1113 1185
1114 ::stop_game (); 1186 ::stop_game ();
1115} 1187}
1116 1188
1117sub update_floorbox { 1189sub update_floorbox {
1118 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1190 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1119 return unless $::CONN; 1191 return unless $::CONN;
1120 1192
1121 $::FLOORBOX->clear; 1193 $::FLOORBOX->clear;
1122 1194
1123 my @add; 1195 my @add;
… …
1125 my $row; 1197 my $row;
1126 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1198 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1127 if ($row < 6) { 1199 if ($row < 6) {
1128 local $_->{face_widget}; # hack to force recreation of widget 1200 local $_->{face_widget}; # hack to force recreation of widget
1129 local $_->{desc_widget}; # hack to force recreation of widget 1201 local $_->{desc_widget}; # hack to force recreation of widget
1130 CFPlus::Item::update_widgets $_; 1202 DC::Item::update_widgets $_;
1131 1203
1132 push @add, 1204 push @add,
1133 0, $row, $_->{face_widget}, 1205 0, $row, $_->{face_widget},
1134 1, $row, $_->{desc_widget}; 1206 1, $row, $_->{desc_widget};
1135 1207
1136 $row++; 1208 $row++;
1137 } else { 1209 } else {
1138 push @add, 1, $row, new CFPlus::UI::Button 1210 push @add, 1, $row, new DC::UI::Button
1139 text => "More...", 1211 text => "More...",
1140 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1212 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1141 ; 1213 ;
1142 last; 1214 last;
1143 } 1215 }
1144 } 1216 }
1145 if ($::CONN->{open_container}) { 1217 if ($::CONN->{open_container}) {
1146 push @add, 1, $row++, new CFPlus::UI::Button 1218 push @add, 1, $row++, new DC::UI::Button
1147 text => "Close container", 1219 text => "Close container",
1148 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1220 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1149 ; 1221 ;
1150 } 1222 }
1151 1223
1152 $::FLOORBOX->add_at (@add); 1224 $::FLOORBOX->add_at (@add);
1153 }); 1225 });
1154 1226
1155 $::WANT_REFRESH->start; 1227 $::WANT_REFRESH = 1;
1156} 1228}
1157 1229
1158sub set_opencont { 1230sub set_opencont {
1159 my ($conn, $tag, $name) = @_; 1231 my ($conn, $tag, $name) = @_;
1160 $conn->{open_container} = $tag; 1232 $conn->{open_container} = $tag;
1161 update_floorbox; 1233 update_floorbox;
1162 1234
1163 $::INVR_HB->clear (); 1235 $::INVR_HB->clear ();
1164 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1236 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
1165 1237
1166 if ($tag != 0) { # Floor isn't closable, is it? 1238 if ($tag != 0) { # Floor isn't closable, is it?
1167 $::INVR_HB->add (new CFPlus::UI::Button 1239 $::INVR_HB->add (new DC::UI::Button
1168 text => "Close container", 1240 text => "Close container",
1169 tooltip => "Close the currently open container (if one is open)", 1241 tooltip => "Close the currently open container (if one is open)",
1170 on_activate => sub { 1242 on_activate => sub {
1171 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1243 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1172 if $tag != 0; 1244 if $tag != 0;
… …
1179} 1251}
1180 1252
1181sub update_containers { 1253sub update_containers {
1182 my ($self) = @_; 1254 my ($self) = @_;
1183 1255
1184 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1256 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1185 my $todo = delete $self->{update_container} 1257 my $todo = delete $self->{update_container}
1186 or return; 1258 or return;
1187 1259
1188 for my $tag (keys %$todo) { 1260 for my $tag (keys %$todo) {
1189 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1261 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1226sub item_update { 1298sub item_update {
1227 my ($self, $item) = @_; 1299 my ($self, $item) = @_;
1228 1300
1229 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1301 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1230 1302
1231 CFPlus::Item::update_widgets $item; 1303 DC::Item::update_widgets $item;
1232 1304
1233 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1305 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1234 set_opencont ($::CONN, 0, "Floor"); 1306 set_opencont ($::CONN, 0, "Floor");
1235 1307
1236 } elsif ($item->{flags} & F_OPEN) { 1308 } elsif ($item->{flags} & F_OPEN) {
1237 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1309 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1238 1310
1239 } else { 1311 } else {
1240 $self->{update_container}{$item->{container}}++; 1312 $self->{update_container}{$item->{container}}++;
1241 $self->update_containers; 1313 $self->update_containers;
1242 } 1314 }
… …
1301 0 1373 0
1302 }); 1374 });
1303 1375
1304 $self->update_server_info; 1376 $self->update_server_info;
1305 1377
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; 1378 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1309 $self->send_command ("pickup $::CFG->{pickup}"); 1379 $self->send_command ("pickup $::CFG->{pickup}");
1310} 1380}
1311 1381
1312sub lookat { 1382sub lookat {
… …
1316 $self->send_ext_req (lookat => $x, $y, sub { 1386 $self->send_ext_req (lookat => $x, $y, sub {
1317 my (%msg) = @_; 1387 my (%msg) = @_;
1318 1388
1319 if (exists $msg{npc_dialog}) { 1389 if (exists $msg{npc_dialog}) {
1320 # start npc chat dialog 1390 # start npc chat dialog
1321 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1391 $self->{npc_dialog} = new DC::NPCDialog::
1322 token => $msg{npc_dialog}, 1392 token => $msg{npc_dialog},
1323 title => "$msg{npc_dialog}[0] (NPC)", 1393 title => "$msg{npc_dialog}[0] (NPC)",
1324 conn => $self, 1394 conn => $self,
1325 ; 1395 ;
1326 } 1396 }
… …
1339 $self->SUPER::destroy; 1409 $self->SUPER::destroy;
1340 1410
1341 %$self = (); 1411 %$self = ();
1342} 1412}
1343 1413
1344package CFPlus::NPCDialog; 1414package DC::NPCDialog;
1345 1415
1346our @ISA = 'CFPlus::UI::Toplevel'; 1416our @ISA = 'DC::UI::Toplevel';
1347 1417
1348sub new { 1418sub new {
1349 my $class = shift; 1419 my $class = shift;
1350 1420
1351 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
… …
1358 kw => { hi => 0, yes => 0, no => 0 }, 1428 kw => { hi => 0, yes => 0, no => 0 },
1359 has_close_button => 1, 1429 has_close_button => 1,
1360 @_, 1430 @_,
1361 ); 1431 );
1362 1432
1363 CFPlus::weaken (my $this = $self); 1433 DC::weaken (my $this = $self);
1364 1434
1365 $self->connect (delete => sub { $this->destroy; 1 }); 1435 $self->connect (delete => sub { $this->destroy; 1 });
1366 1436
1367 # better use a pane... 1437 # better use a pane...
1368 $self->add (my $hbox = new CFPlus::UI::HBox); 1438 $self->add (my $hbox = new DC::UI::HBox);
1369 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1439 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1370 1440
1371 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1441 $hbox->add (my $vbox = new DC::UI::VBox);
1372 1442
1373 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1443 $vbox->add (new DC::UI::Label text => "Message Entry:");
1374 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1444 $vbox->add ($self->{entry} = new DC::UI::Entry
1375 tooltip => "#npc_message_entry", 1445 tooltip => "#npc_message_entry",
1376 on_activate => sub { 1446 on_activate => sub {
1377 my ($entry, $text) = @_; 1447 my ($entry, $text) = @_;
1378 1448
1379 return unless $text =~ /\S/; 1449 return unless $text =~ /\S/;
… …
1383 1453
1384 0 1454 0
1385 }, 1455 },
1386 ); 1456 );
1387 1457
1388 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1458 $vbox->add ($self->{options} = new DC::UI::VBox);
1389 1459
1390 $self->{bye_button} = new CFPlus::UI::Button 1460 $self->{bye_button} = new DC::UI::Button
1391 text => "Bye (close)", 1461 text => "Bye (close)",
1392 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1462 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1393 on_activate => sub { $this->destroy; 1 }, 1463 on_activate => sub { $this->destroy; 1 },
1394 ; 1464 ;
1395 1465
… …
1414}; 1484};
1415 1485
1416sub update_options { 1486sub update_options {
1417 my ($self) = @_; 1487 my ($self) = @_;
1418 1488
1419 CFPlus::weaken $self; 1489 DC::weaken $self;
1420 1490
1421 $self->{options}->clear; 1491 $self->{options}->clear;
1422 $self->{options}->add ($self->{bye_button}); 1492 $self->{options}->add ($self->{bye_button});
1423 1493
1424 for my $kw (sort keys %{ $self->{kw} }) { 1494 for my $kw (sort keys %{ $self->{kw} }) {
1425 $self->{options}->add (new CFPlus::UI::Button 1495 $self->{options}->add (new DC::UI::Button
1426 text => $kw, 1496 text => $kw,
1427 on_activate => sub { 1497 on_activate => sub {
1428 $self->send ($kw); 1498 $self->send ($kw);
1429 0 1499 0
1430 }, 1500 },
… …
1433} 1503}
1434 1504
1435sub feed { 1505sub feed {
1436 my ($self, $type, @arg) = @_; 1506 my ($self, $type, @arg) = @_;
1437 1507
1438 CFPlus::weaken $self; 1508 DC::weaken $self;
1439 1509
1440 if ($type eq "update") { 1510 if ($type eq "update") {
1441 my (%info) = @arg; 1511 my (%info) = @arg;
1442 1512
1443 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1513 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1444 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1514 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1445 1515
1446 if (exists $info{msg}) { 1516 if (exists $info{msg}) {
1447 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1517 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} }; 1518 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1449 my @link; 1519 my @link;
1450 $text =~ s{ 1520 $text =~ s{
1451 ($match) 1521 ($match)
1452 }{ 1522 }{
1453 my $kw = $1; 1523 my $kw = $1;
1454 1524
1455 push @link, new CFPlus::UI::Label 1525 push @link, new DC::UI::Label
1456 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1526 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1457 can_hover => 1, 1527 can_hover => 1,
1458 can_events => 1, 1528 can_events => 1,
1459 padding_x => 0, 1529 padding_x => 0,
1460 padding_y => 0, 1530 padding_y => 0,
… …
1478} 1548}
1479 1549
1480sub send { 1550sub send {
1481 my ($self, $msg) = @_; 1551 my ($self, $msg) = @_;
1482 1552
1483 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1553 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1484 $self->{textview}->scroll_to_bottom; 1554 $self->{textview}->scroll_to_bottom;
1485 1555
1486 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1556 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1487} 1557}
1488 1558

Diff Legend

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