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.180 by root, Wed Dec 26 18:09:30 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 Deliantra::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 'Deliantra::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 widget => 1, 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;
… …
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->{par} <=> $b->{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]}
… …
70 70
71 $self->{map_widget}->add_command (@$_) 71 $self->{map_widget}->add_command (@$_)
72 for @cmd_help; 72 for @cmd_help;
73 73
74 { 74 {
75 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
76 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
77 $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}});
78 } 78 }
79 79
80 { 80 {
81 $self->{noface} = my $tex = new_from_file CFPlus::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
82 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
83 $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}});
84 } 84 }
85 85
86 $self->{open_container} = 0; 86 $self->{open_container} = 0;
87 87
… …
102} 102}
103 103
104sub ext_capabilities { 104sub ext_capabilities {
105 my ($self, %cap) = @_; 105 my ($self, %cap) = @_;
106 106
107 #$self->send ("setup sound 0"); # we use a different protocol
108 $self->update_fx_want; 107 $self->update_fx_want;
109 108
110 $self->send_exti_req (resource => "exp_table", sub { 109 $self->send_exti_req (resource => "exp_table", sub {
111 my ($exp_table) = @_; 110 my ($exp_table) = @_;
112 111
… …
142############################################################################# 141#############################################################################
143 142
144sub widget_associate { 143sub widget_associate {
145 my ($self, $ws, $id, $widget) = @_; 144 my ($self, $ws, $id, $widget) = @_;
146 145
147 $widget ||= new CFPlus::UI::Bin; 146 $widget ||= new DC::UI::Bin;
148 147
149 $widget->{s_id} = $id; 148 $widget->{s_id} = $id;
150 $self->{widget}{$id} = $widget; 149 $self->{widget}{$id} = $widget;
151 150
152 if ($ws) { 151 if ($ws) {
… …
188 my ($self, $ws, $id, $class, $args) = @_; 187 my ($self, $ws, $id, $class, $args) = @_;
189 188
190 $self->widget_associate ( 189 $self->widget_associate (
191 $ws, $id => scalar eval { 190 $ws, $id => scalar eval {
192 local $SIG{__DIE__}; 191 local $SIG{__DIE__};
193 "CFPlus::UI::$class"->new (%$args) 192 "DC::UI::$class"->new (%$args)
194 } 193 }
195 ); 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
196} 267}
197 268
198# widgetset associate 269# widgetset associate
199sub ext_ws_a { 270sub ext_ws_a {
200 my ($self, %ass) = @_; 271 my ($self, %ass) = @_;
201 272
202 # everything that has a name, wether conceivably useful or not 273 # everything that has a name, wether conceivably useful or not
203 my %wkw = ( 274 my %wkw = (
204 root => $CFPlus::UI::ROOT, 275 root => $DC::UI::ROOT,
205 tooltip => $CFPlus::UI::TOOLTIP, 276 tooltip => $DC::UI::TOOLTIP,
206 277
207 mapwidget => $::MAPWIDGET, 278 mapwidget => $::MAPWIDGET,
208 buttonbar => $::BUTTONBAR, 279 buttonbar => $::BUTTONBAR,
209 metaserver => $::METASERVER, 280 metaserver => $::METASERVER,
210 buttonbar => $::BUTTONBAR, 281 buttonbar => $::BUTTONBAR,
… …
294############################################################################# 365#############################################################################
295 366
296sub logprint { 367sub logprint {
297 my ($self, @a) = @_; 368 my ($self, @a) = @_;
298 369
299 CFPlus::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 370 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
300} 371}
301 372
302sub _stat_numdiff { 373sub _stat_numdiff {
303 my ($self, $name, $old, $new) = @_; 374 my ($self, $name, $old, $new) = @_;
304 375
… …
476 $self->{stat_order} = join ",", map $_->[0], @order; 547 $self->{stat_order} = join ",", map $_->[0], @order;
477 548
478 $sktbl->clear; 549 $sktbl->clear;
479 550
480 my $sw = $self->{skillwid}{""} ||= [ 551 my $sw = $self->{skillwid}{""} ||= [
481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 552 0, 0, (new DC::UI::Label text => "Experience", align => 1),
482 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 553 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 554 2, 0, (new DC::UI::Label text => "Progress", align => 0),
484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 555 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 556 4, 0, (new DC::UI::Label text => "Experience", align => 1),
486 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 557 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 558 6, 0, (new DC::UI::Label text => "Progress", align => 0),
488 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 559 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
489 ]; 560 ];
490 561
491 my @add = @$sw; 562 my @add = @$sw;
492 563
493 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>";
… …
505 if ($ev->{button} == 1) { 576 if ($ev->{button} == 1) {
506 $::CONN->user_send ("ready_skill $name"); 577 $::CONN->user_send ("ready_skill $name");
507 } elsif ($ev->{button} == 2) { 578 } elsif ($ev->{button} == 2) {
508 $::CONN->user_send ("use_skill $name"); 579 $::CONN->user_send ("use_skill $name");
509 } elsif ($ev->{button} == 3) { 580 } elsif ($ev->{button} == 3) {
510 my $shortname = CFPlus::shorten $name, 14; 581 my $shortname = DC::shorten $name, 14;
511 (new CFPlus::UI::Menu 582 (new DC::UI::Menu
512 items => [ 583 items => [
513 ["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"] }],
514 ["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"] }],
515 ], 586 ],
516 )->popup ($ev); 587 )->popup ($ev);
517 } else { 588 } else {
518 return 0; 589 return 0;
519 } 590 }
… …
521 1 592 1
522 }; 593 };
523 594
524 my $sw = $self->{skillwid}{$idx} ||= [ 595 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp 596 # exp
526 (new CFPlus::UI::Label 597 (new DC::UI::Label
527 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),
528 599
529 # level 600 # level
530 (new CFPlus::UI::Label 601 (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), 602 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
532 603
533 # progress 604 # progress
534 (new CFPlus::UI::ExperienceProgress), 605 (new DC::UI::ExperienceProgress),
535 606
536 # label 607 # label
537 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 608 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
538 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),
539 ]; 610 ];
540 611
541 push @add, 612 push @add,
542 $x * 4 + 0, $y, $sw->[0], 613 $x * 4 + 0, $y, $sw->[0],
543 $x * 4 + 1, $y, $sw->[1], 614 $x * 4 + 1, $y, $sw->[1],
… …
638 709
639 my ($hash, $x, $y, $w, $h) = @$map_info; 710 my ($hash, $x, $y, $w, $h) = @$map_info;
640 711
641 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);
642 $self->{map_cache_new}{$hash} = \$data; 713 $self->{map_cache_new}{$hash} = \$data;
643 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 714 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
644} 715}
645 716
646sub map_clear { 717sub map_clear {
647 my ($self) = @_; 718 my ($self) = @_;
648 719
… …
661 do { 732 do {
662 $tile = pop @{$self->{bg_fetch}} 733 $tile = pop @{$self->{bg_fetch}}
663 or return; 734 or return;
664 } while $self->{texture}[$tile]; 735 } while $self->{texture}[$tile];
665 736
666 CFPlus::DB::get tilecache => $tile, sub { 737 DC::DB::get tilecache => $tile, sub {
667 my ($data) = @_; 738 my ($data) = @_;
668 739
669 return unless $self->{map}; # stop when destroyed 740 return unless $self->{map}; # stop when destroyed
670 741
671 if (defined $data) { 742 if (defined $data) {
… …
699 }; 770 };
700 771
701 if (my $rdata = $self->{map_cache_old}{$hash}) { 772 if (my $rdata = $self->{map_cache_old}{$hash}) {
702 $cb->($$rdata); 773 $cb->($$rdata);
703 } else { 774 } else {
704 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 775 DC::DB::get $self->{mapcache} => $hash, $cb;
705 } 776 }
706} 777}
707 778
708# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 779# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
709# (server resource,s latency, bandwidth), so this hack is warranted. 780# (server resource,s latency, bandwidth), so this hack is warranted.
… …
833 904
834sub face_find { 905sub face_find {
835 my ($self, $facenum, $face, $cb) = @_; 906 my ($self, $facenum, $face, $cb) = @_;
836 907
837 if ($face->{type} == 0) { # FT_FACE 908 if ($face->{type} == 0) { # FT_FACE
838 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 909 my $id = DC::DB::get_tile_id_sync $face->{name};
839 910
840 $face->{id} = $id; 911 $face->{id} = $id;
841 $self->{map}->set_tileid ($facenum => $id); 912 $self->{map}->set_tileid ($facenum => $id);
842 913
843 CFPlus::DB::get tilecache => $id, $cb; 914 DC::DB::get tilecache => $id, $cb;
844 915
845 } elsif ($face->{type} & 1) { # with metadata 916 } elsif ($face->{type} & 1) { # with metadata
846 CFPlus::DB::get res_meta => $face->{name}, $cb; 917 DC::DB::get res_meta => $face->{name}, $cb;
847 918
848 } else { # no metadata 919 } else { # no metadata
849 CFPlus::DB::get res_data => $face->{name}, $cb; 920 DC::DB::get res_data => $face->{name}, $cb;
850 } 921 }
851} 922}
852 923
853sub face_update { 924sub face_update {
854 my ($self, $facenum, $face, $changed) = @_; 925 my ($self, $facenum, $face, $changed) = @_;
855 926
856 if ($face->{type} == 0) { 927 if ($face->{type} == 0) {
857 # image, FT_FACE 928 # image, FT_FACE
858 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 929 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
859 if $changed; 930 if $changed;
860 931
861 $self->have_tile ($face->{id}, delete $face->{data}); 932 $self->have_tile ($face->{id}, delete $face->{data});
862 933
863 } elsif ($face->{type} & 1) { 934 } elsif ($face->{type} & 1) {
… …
865 if ($changed) { # new data 936 if ($changed) { # new data
866 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 937 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
867 $face->{data} = $meta; 938 $face->{data} = $meta;
868 939
869 # rely on strict ordering here and also on later fetch 940 # rely on strict ordering here and also on later fetch
870 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 941 DC::DB::put res_data => $face->{name} => $data, sub { };
871 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 942 DC::DB::put res_meta => $face->{name} => $meta, sub { };
872 } 943 }
873 944
874 $face->{data} = $self->{json_coder}->decode ($face->{data}); 945 $face->{data} = $self->{json_coder}->decode ($face->{data});
875 ::add_license ($face); 946 ::add_license ($face);
876 ::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}." })
877 if $changed; 948 if $changed;
878 949
879 if ($face->{type} == 3) { # FT_MUSIC 950 if ($face->{type} == 3) { # FT_MUSIC
880 &::audio_music_push ($facenum); 951 &::audio_music_push ($facenum);
881 } elsif ($face->{type} == 5) { # FT_SOUND 952 } elsif ($face->{type} == 5) { # FT_SOUND
882 &::audio_sound_push ($facenum); 953 &::audio_sound_push ($facenum);
883 } 954 }
884 955
885 } else { 956 } else {
886 # flat resource case, FT_RSRC 957 # flat resource case, FT_RSRC
887 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 958 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
888 if $changed; 959 if $changed;
889 } 960 }
890 961
891 if (my $cbs = $self->{face_cb}{$facenum}) { 962 if (my $cbs = $self->{face_cb}{$facenum}) {
892 $_->($face, $changed) for @$cbs; 963 $_->($face, $changed) for @$cbs;
… …
903 my ($self, $tile, $data) = @_; 974 my ($self, $tile, $data) = @_;
904 975
905 return unless $self->{map}; 976 return unless $self->{map};
906 977
907 my $tex = $self->{texture}[$tile] ||= 978 my $tex = $self->{texture}[$tile] ||=
908 new CFPlus::Texture 979 new DC::Texture
909 tile => $tile, 980 tile => $tile,
910 image => $data, delete_image => 1, 981 image => $data, delete_image => 1,
911 minify => 1, mipmap => 1; 982 minify => 1, mipmap => 1;
912 983
913 if (my $cbs = delete $self->{tile_cb}{$tile}) { 984 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
921 my ($self, $num, $cb) = @_; 992 my ($self, $num, $cb) = @_;
922 993
923 push @{$self->{face_cb}{$num}}, $cb; 994 push @{$self->{face_cb}{$num}}, $cb;
924 995
925 defined wantarray 996 defined wantarray
926 ? CFPlus::guard { 997 ? DC::guard {
927 @{$self->{face_cb}{$num}} 998 @{$self->{face_cb}{$num}}
928 = grep $_ != $cb, 999 = grep $_ != $cb,
929 @{$self->{face_cb}{$num}}; 1000 @{$self->{face_cb}{$num}};
930 } 1001 }
931 : () 1002 : ()
… …
1068 $spell->{message} =~ s/\n+$//; 1139 $spell->{message} =~ s/\n+$//;
1069 $spell->{message} ||= "Server did not provide a description for this spell."; 1140 $spell->{message} ||= "Server did not provide a description for this spell.";
1070 1141
1071 $::SPELL_LIST->add_spell ($spell); 1142 $::SPELL_LIST->add_spell ($spell);
1072 1143
1073 $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});
1074 $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});
1075} 1146}
1076 1147
1077sub spell_delete { 1148sub spell_delete {
1078 my ($self, $spell) = @_; 1149 my ($self, $spell) = @_;
1079 1150
… …
1090sub addme_success { 1161sub addme_success {
1091 my ($self) = @_; 1162 my ($self) = @_;
1092 1163
1093 my %skill_help; 1164 my %skill_help;
1094 1165
1095 for my $node (CFPlus::Pod::find skill_description => "*") { 1166 for my $node (DC::Pod::find skill_description => "*") {
1096 my (undef, @par) = CFPlus::Pod::section_of $node; 1167 my (undef, @par) = DC::Pod::section_of $node;
1097 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1168 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
1098 }; 1169 };
1099 1170
1100 for my $skill (values %{$self->{skill_info}}) { 1171 for my $skill (values %{$self->{skill_info}}) {
1101 $self->{map_widget}->add_command ("ready_skill $skill", 1172 $self->{map_widget}->add_command ("ready_skill $skill",
1102 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1173 (DC::asxml "Ready the skill '$skill'\n\n")
1103 . $skill_help{$skill}); 1174 . $skill_help{$skill});
1104 $self->{map_widget}->add_command ("use_skill $skill", 1175 $self->{map_widget}->add_command ("use_skill $skill",
1105 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1176 (DC::asxml "Immediately use the skill '$skill'\n\n")
1106 . $skill_help{$skill}); 1177 . $skill_help{$skill});
1107 } 1178 }
1108} 1179}
1109 1180
1110sub eof { 1181sub eof {
… …
1114 1185
1115 ::stop_game (); 1186 ::stop_game ();
1116} 1187}
1117 1188
1118sub update_floorbox { 1189sub update_floorbox {
1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1190 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1120 return unless $::CONN; 1191 return unless $::CONN;
1121 1192
1122 $::FLOORBOX->clear; 1193 $::FLOORBOX->clear;
1123 1194
1124 my @add; 1195 my @add;
… …
1126 my $row; 1197 my $row;
1127 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} }) {
1128 if ($row < 6) { 1199 if ($row < 6) {
1129 local $_->{face_widget}; # hack to force recreation of widget 1200 local $_->{face_widget}; # hack to force recreation of widget
1130 local $_->{desc_widget}; # hack to force recreation of widget 1201 local $_->{desc_widget}; # hack to force recreation of widget
1131 CFPlus::Item::update_widgets $_; 1202 DC::Item::update_widgets $_;
1132 1203
1133 push @add, 1204 push @add,
1134 0, $row, $_->{face_widget}, 1205 0, $row, $_->{face_widget},
1135 1, $row, $_->{desc_widget}; 1206 1, $row, $_->{desc_widget};
1136 1207
1137 $row++; 1208 $row++;
1138 } else { 1209 } else {
1139 push @add, 1, $row, new CFPlus::UI::Button 1210 push @add, 1, $row, new DC::UI::Button
1140 text => "More...", 1211 text => "More...",
1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1212 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1142 ; 1213 ;
1143 last; 1214 last;
1144 } 1215 }
1145 } 1216 }
1146 if ($::CONN->{open_container}) { 1217 if ($::CONN->{open_container}) {
1147 push @add, 1, $row++, new CFPlus::UI::Button 1218 push @add, 1, $row++, new DC::UI::Button
1148 text => "Close container", 1219 text => "Close container",
1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1220 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1150 ; 1221 ;
1151 } 1222 }
1152 1223
1153 $::FLOORBOX->add_at (@add); 1224 $::FLOORBOX->add_at (@add);
1154 }); 1225 });
1155 1226
1156 $::WANT_REFRESH->start; 1227 $::WANT_REFRESH = 1;
1157} 1228}
1158 1229
1159sub set_opencont { 1230sub set_opencont {
1160 my ($conn, $tag, $name) = @_; 1231 my ($conn, $tag, $name) = @_;
1161 $conn->{open_container} = $tag; 1232 $conn->{open_container} = $tag;
1162 update_floorbox; 1233 update_floorbox;
1163 1234
1164 $::INVR_HB->clear (); 1235 $::INVR_HB->clear ();
1165 $::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);
1166 1237
1167 if ($tag != 0) { # Floor isn't closable, is it? 1238 if ($tag != 0) { # Floor isn't closable, is it?
1168 $::INVR_HB->add (new CFPlus::UI::Button 1239 $::INVR_HB->add (new DC::UI::Button
1169 text => "Close container", 1240 text => "Close container",
1170 tooltip => "Close the currently open container (if one is open)", 1241 tooltip => "Close the currently open container (if one is open)",
1171 on_activate => sub { 1242 on_activate => sub {
1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1243 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1173 if $tag != 0; 1244 if $tag != 0;
… …
1180} 1251}
1181 1252
1182sub update_containers { 1253sub update_containers {
1183 my ($self) = @_; 1254 my ($self) = @_;
1184 1255
1185 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1256 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1186 my $todo = delete $self->{update_container} 1257 my $todo = delete $self->{update_container}
1187 or return; 1258 or return;
1188 1259
1189 for my $tag (keys %$todo) { 1260 for my $tag (keys %$todo) {
1190 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1261 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1227sub item_update { 1298sub item_update {
1228 my ($self, $item) = @_; 1299 my ($self, $item) = @_;
1229 1300
1230 #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";
1231 1302
1232 CFPlus::Item::update_widgets $item; 1303 DC::Item::update_widgets $item;
1233 1304
1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1305 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1235 set_opencont ($::CONN, 0, "Floor"); 1306 set_opencont ($::CONN, 0, "Floor");
1236 1307
1237 } elsif ($item->{flags} & F_OPEN) { 1308 } elsif ($item->{flags} & F_OPEN) {
1238 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1309 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1239 1310
1240 } else { 1311 } else {
1241 $self->{update_container}{$item->{container}}++; 1312 $self->{update_container}{$item->{container}}++;
1242 $self->update_containers; 1313 $self->update_containers;
1243 } 1314 }
… …
1315 $self->send_ext_req (lookat => $x, $y, sub { 1386 $self->send_ext_req (lookat => $x, $y, sub {
1316 my (%msg) = @_; 1387 my (%msg) = @_;
1317 1388
1318 if (exists $msg{npc_dialog}) { 1389 if (exists $msg{npc_dialog}) {
1319 # start npc chat dialog 1390 # start npc chat dialog
1320 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1391 $self->{npc_dialog} = new DC::NPCDialog::
1321 token => $msg{npc_dialog}, 1392 token => $msg{npc_dialog},
1322 title => "$msg{npc_dialog}[0] (NPC)", 1393 title => "$msg{npc_dialog}[0] (NPC)",
1323 conn => $self, 1394 conn => $self,
1324 ; 1395 ;
1325 } 1396 }
… …
1338 $self->SUPER::destroy; 1409 $self->SUPER::destroy;
1339 1410
1340 %$self = (); 1411 %$self = ();
1341} 1412}
1342 1413
1343package CFPlus::NPCDialog; 1414package DC::NPCDialog;
1344 1415
1345our @ISA = 'CFPlus::UI::Toplevel'; 1416our @ISA = 'DC::UI::Toplevel';
1346 1417
1347sub new { 1418sub new {
1348 my $class = shift; 1419 my $class = shift;
1349 1420
1350 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
… …
1357 kw => { hi => 0, yes => 0, no => 0 }, 1428 kw => { hi => 0, yes => 0, no => 0 },
1358 has_close_button => 1, 1429 has_close_button => 1,
1359 @_, 1430 @_,
1360 ); 1431 );
1361 1432
1362 CFPlus::weaken (my $this = $self); 1433 DC::weaken (my $this = $self);
1363 1434
1364 $self->connect (delete => sub { $this->destroy; 1 }); 1435 $self->connect (delete => sub { $this->destroy; 1 });
1365 1436
1366 # better use a pane... 1437 # better use a pane...
1367 $self->add (my $hbox = new CFPlus::UI::HBox); 1438 $self->add (my $hbox = new DC::UI::HBox);
1368 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1439 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1369 1440
1370 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1441 $hbox->add (my $vbox = new DC::UI::VBox);
1371 1442
1372 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1443 $vbox->add (new DC::UI::Label text => "Message Entry:");
1373 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1444 $vbox->add ($self->{entry} = new DC::UI::Entry
1374 tooltip => "#npc_message_entry", 1445 tooltip => "#npc_message_entry",
1375 on_activate => sub { 1446 on_activate => sub {
1376 my ($entry, $text) = @_; 1447 my ($entry, $text) = @_;
1377 1448
1378 return unless $text =~ /\S/; 1449 return unless $text =~ /\S/;
… …
1382 1453
1383 0 1454 0
1384 }, 1455 },
1385 ); 1456 );
1386 1457
1387 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1458 $vbox->add ($self->{options} = new DC::UI::VBox);
1388 1459
1389 $self->{bye_button} = new CFPlus::UI::Button 1460 $self->{bye_button} = new DC::UI::Button
1390 text => "Bye (close)", 1461 text => "Bye (close)",
1391 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.",
1392 on_activate => sub { $this->destroy; 1 }, 1463 on_activate => sub { $this->destroy; 1 },
1393 ; 1464 ;
1394 1465
… …
1413}; 1484};
1414 1485
1415sub update_options { 1486sub update_options {
1416 my ($self) = @_; 1487 my ($self) = @_;
1417 1488
1418 CFPlus::weaken $self; 1489 DC::weaken $self;
1419 1490
1420 $self->{options}->clear; 1491 $self->{options}->clear;
1421 $self->{options}->add ($self->{bye_button}); 1492 $self->{options}->add ($self->{bye_button});
1422 1493
1423 for my $kw (sort keys %{ $self->{kw} }) { 1494 for my $kw (sort keys %{ $self->{kw} }) {
1424 $self->{options}->add (new CFPlus::UI::Button 1495 $self->{options}->add (new DC::UI::Button
1425 text => $kw, 1496 text => $kw,
1426 on_activate => sub { 1497 on_activate => sub {
1427 $self->send ($kw); 1498 $self->send ($kw);
1428 0 1499 0
1429 }, 1500 },
… …
1432} 1503}
1433 1504
1434sub feed { 1505sub feed {
1435 my ($self, $type, @arg) = @_; 1506 my ($self, $type, @arg) = @_;
1436 1507
1437 CFPlus::weaken $self; 1508 DC::weaken $self;
1438 1509
1439 if ($type eq "update") { 1510 if ($type eq "update") {
1440 my (%info) = @arg; 1511 my (%info) = @arg;
1441 1512
1442 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1513 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1443 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1514 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1444 1515
1445 if (exists $info{msg}) { 1516 if (exists $info{msg}) {
1446 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1517 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1447 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} };
1448 my @link; 1519 my @link;
1449 $text =~ s{ 1520 $text =~ s{
1450 ($match) 1521 ($match)
1451 }{ 1522 }{
1452 my $kw = $1; 1523 my $kw = $1;
1453 1524
1454 push @link, new CFPlus::UI::Label 1525 push @link, new DC::UI::Label
1455 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1526 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1456 can_hover => 1, 1527 can_hover => 1,
1457 can_events => 1, 1528 can_events => 1,
1458 padding_x => 0, 1529 padding_x => 0,
1459 padding_y => 0, 1530 padding_y => 0,
… …
1477} 1548}
1478 1549
1479sub send { 1550sub send {
1480 my ($self, $msg) = @_; 1551 my ($self, $msg) = @_;
1481 1552
1482 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1553 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1483 $self->{textview}->scroll_to_bottom; 1554 $self->{textview}->scroll_to_bottom;
1484 1555
1485 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1556 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1486} 1557}
1487 1558

Diff Legend

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