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.186 by root, Thu Dec 27 19:35:09 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, $type, $template, $done_cb, $cfg) = @_;
200
201 $done_cb ||= sub { };
202
203 my $parse_list; $parse_list = sub {
204 my ($list) = @_;
205 my @w;
206
207 while (@$list) {
208 my ($class, $args) = splice @$list, 0, 2;
209 my $name = delete $args->{s_id};
210 my $cl = delete $args->{s_cl};
211 my $cfg = delete $cfg->{$name};
212 my $id = delete $cfg->{id};
213 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
214 or next;
215
216 $self->widget_associate ($ws, $id, $w)
217 if $id;
218
219 $w->add ($parse_list->($cl))
220 if $cl;
221
222 push @w, $w;
223 }
224
225 @w
226 };
227
228 # either array reference, or face #
229 if ($type eq "inline") {
230 $done_cb->();
231 $parse_list->($template);
232 } elsif ($type eq "face") {
233 my $handler; $handler = $self->register_face_handler ($template, sub {
234 my ($face) = @_;
235
236 undef $handler;
237 $done_cb->();
238 $parse_list->($self->{json_coder}->decode ($face->{data}));
239 });
240 } else {
241 $done_cb->(0);
242 }
198} 243}
199 244
200# widgetset associate 245# widgetset associate
201sub ext_ws_a { 246sub ext_ws_a {
202 my ($self, %ass) = @_; 247 my ($self, %ass) = @_;
203 248
204 # everything that has a name, wether conceivably useful or not 249 # everything that has a name, wether conceivably useful or not
205 my %wkw = ( 250 my %wkw = (
206 root => $CFPlus::UI::ROOT, 251 root => $DC::UI::ROOT,
207 tooltip => $CFPlus::UI::TOOLTIP, 252 tooltip => $DC::UI::TOOLTIP,
208 253
209 mapwidget => $::MAPWIDGET, 254 mapwidget => $::MAPWIDGET,
210 buttonbar => $::BUTTONBAR, 255 buttonbar => $::BUTTONBAR,
211 metaserver => $::METASERVER, 256 metaserver => $::METASERVER,
212 buttonbar => $::BUTTONBAR, 257 buttonbar => $::BUTTONBAR,
… …
296############################################################################# 341#############################################################################
297 342
298sub logprint { 343sub logprint {
299 my ($self, @a) = @_; 344 my ($self, @a) = @_;
300 345
301 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 346 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
302} 347}
303 348
304sub _stat_numdiff { 349sub _stat_numdiff {
305 my ($self, $name, $old, $new) = @_; 350 my ($self, $name, $old, $new) = @_;
306 351
… …
478 $self->{stat_order} = join ",", map $_->[0], @order; 523 $self->{stat_order} = join ",", map $_->[0], @order;
479 524
480 $sktbl->clear; 525 $sktbl->clear;
481 526
482 my $sw = $self->{skillwid}{""} ||= [ 527 my $sw = $self->{skillwid}{""} ||= [
483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 528 0, 0, (new DC::UI::Label text => "Experience", align => 1),
484 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 529 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
485 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 530 2, 0, (new DC::UI::Label text => "Progress", align => 0),
486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 531 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 532 4, 0, (new DC::UI::Label text => "Experience", align => 1),
488 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 533 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
489 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 534 6, 0, (new DC::UI::Label text => "Progress", align => 0),
490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 535 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
491 ]; 536 ];
492 537
493 my @add = @$sw; 538 my @add = @$sw;
494 539
495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 540 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
… …
507 if ($ev->{button} == 1) { 552 if ($ev->{button} == 1) {
508 $::CONN->user_send ("ready_skill $name"); 553 $::CONN->user_send ("ready_skill $name");
509 } elsif ($ev->{button} == 2) { 554 } elsif ($ev->{button} == 2) {
510 $::CONN->user_send ("use_skill $name"); 555 $::CONN->user_send ("use_skill $name");
511 } elsif ($ev->{button} == 3) { 556 } elsif ($ev->{button} == 3) {
512 my $shortname = CFPlus::shorten $name, 14; 557 my $shortname = DC::shorten $name, 14;
513 (new CFPlus::UI::Menu 558 (new DC::UI::Menu
514 items => [ 559 items => [
515 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 560 ["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"] }], 561 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
517 ], 562 ],
518 )->popup ($ev); 563 )->popup ($ev);
519 } else { 564 } else {
520 return 0; 565 return 0;
521 } 566 }
… …
523 1 568 1
524 }; 569 };
525 570
526 my $sw = $self->{skillwid}{$idx} ||= [ 571 my $sw = $self->{skillwid}{$idx} ||= [
527 # exp 572 # exp
528 (new CFPlus::UI::Label 573 (new DC::UI::Label
529 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 574 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
530 575
531 # level 576 # level
532 (new CFPlus::UI::Label 577 (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), 578 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
534 579
535 # progress 580 # progress
536 (new CFPlus::UI::ExperienceProgress), 581 (new DC::UI::ExperienceProgress),
537 582
538 # label 583 # label
539 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 584 (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), 585 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
541 ]; 586 ];
542 587
543 push @add, 588 push @add,
544 $x * 4 + 0, $y, $sw->[0], 589 $x * 4 + 0, $y, $sw->[0],
545 $x * 4 + 1, $y, $sw->[1], 590 $x * 4 + 1, $y, $sw->[1],
… …
615 } 660 }
616 } 661 }
617 662
618 if ($delay) { 663 if ($delay) {
619 # delay the map drawing a tiny bit in the hope of getting the missing fetched 664 # delay the map drawing a tiny bit in the hope of getting the missing fetched
620 Event->timer (after => 0.03, cb => sub { 665 EV::once undef, 0, 0.03, sub {
621 $_[0]->w->cancel;
622 $self->{map_widget}->update 666 $self->{map_widget}->update
623 if $self->{map_widget}; 667 if $self->{map_widget};
624 }); 668 };
625 } else { 669 } else {
626 $self->{map_widget}->update; 670 $self->{map_widget}->update;
627 } 671 }
628} 672}
629 673
… …
641 685
642 my ($hash, $x, $y, $w, $h) = @$map_info; 686 my ($hash, $x, $y, $w, $h) = @$map_info;
643 687
644 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 688 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
645 $self->{map_cache_new}{$hash} = \$data; 689 $self->{map_cache_new}{$hash} = \$data;
646 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 690 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
647} 691}
648 692
649sub map_clear { 693sub map_clear {
650 my ($self) = @_; 694 my ($self) = @_;
651 695
… …
664 do { 708 do {
665 $tile = pop @{$self->{bg_fetch}} 709 $tile = pop @{$self->{bg_fetch}}
666 or return; 710 or return;
667 } while $self->{texture}[$tile]; 711 } while $self->{texture}[$tile];
668 712
669 CFPlus::DB::get tilecache => $tile, sub { 713 DC::DB::get tilecache => $tile, sub {
670 my ($data) = @_; 714 my ($data) = @_;
671 715
672 return unless $self->{map}; # stop when destroyed 716 return unless $self->{map}; # stop when destroyed
673 717
674 if (defined $data) { 718 if (defined $data) {
… …
702 }; 746 };
703 747
704 if (my $rdata = $self->{map_cache_old}{$hash}) { 748 if (my $rdata = $self->{map_cache_old}{$hash}) {
705 $cb->($$rdata); 749 $cb->($$rdata);
706 } else { 750 } else {
707 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 751 DC::DB::get $self->{mapcache} => $hash, $cb;
708 } 752 }
709} 753}
710 754
711# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 755# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
712# (server resource,s latency, bandwidth), so this hack is warranted. 756# (server resource,s latency, bandwidth), so this hack is warranted.
… …
836 880
837sub face_find { 881sub face_find {
838 my ($self, $facenum, $face, $cb) = @_; 882 my ($self, $facenum, $face, $cb) = @_;
839 883
840 if ($face->{type} == 0) { # FT_FACE 884 if ($face->{type} == 0) { # FT_FACE
841 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 885 my $id = DC::DB::get_tile_id_sync $face->{name};
842 886
843 $face->{id} = $id; 887 $face->{id} = $id;
844 $self->{map}->set_tileid ($facenum => $id); 888 $self->{map}->set_tileid ($facenum => $id);
845 889
846 CFPlus::DB::get tilecache => $id, $cb; 890 DC::DB::get tilecache => $id, $cb;
847 891
848 } elsif ($face->{type} & 1) { # with metadata 892 } elsif ($face->{type} & 1) { # with metadata
849 CFPlus::DB::get res_meta => $face->{name}, $cb; 893 DC::DB::get res_meta => $face->{name}, $cb;
850 894
851 } else { # no metadata 895 } else { # no metadata
852 CFPlus::DB::get res_data => $face->{name}, $cb; 896 DC::DB::get res_data => $face->{name}, $cb;
853 } 897 }
854} 898}
855 899
856sub face_update { 900sub face_update {
857 my ($self, $facenum, $face, $changed) = @_; 901 my ($self, $facenum, $face, $changed) = @_;
858 902
859 if ($face->{type} == 0) { 903 if ($face->{type} == 0) {
860 # image, FT_FACE 904 # image, FT_FACE
861 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 905 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
862 if $changed; 906 if $changed;
863 907
864 $self->have_tile ($face->{id}, delete $face->{data}); 908 $self->have_tile ($face->{id}, delete $face->{data});
865 909
866 } elsif ($face->{type} & 1) { 910 } elsif ($face->{type} & 1) {
… …
868 if ($changed) { # new data 912 if ($changed) { # new data
869 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 913 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
870 $face->{data} = $meta; 914 $face->{data} = $meta;
871 915
872 # rely on strict ordering here and also on later fetch 916 # rely on strict ordering here and also on later fetch
873 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 917 DC::DB::put res_data => $face->{name} => $data, sub { };
874 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 918 DC::DB::put res_meta => $face->{name} => $meta, sub { };
875 } 919 }
876 920
877 $face->{data} = $self->{json_coder}->decode ($face->{data}); 921 $face->{data} = $self->{json_coder}->decode ($face->{data});
878 ::add_license ($face); 922 ::add_license ($face);
879 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) 923 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
880 if $changed; 924 if $changed;
881 925
882 if ($face->{type} == 3) { # FT_MUSIC 926 if ($face->{type} == 3) { # FT_MUSIC
883 &::audio_music_push ($facenum); 927 &::audio_music_push ($facenum);
884 } elsif ($face->{type} == 5) { # FT_SOUND 928 } elsif ($face->{type} == 5) { # FT_SOUND
885 &::audio_sound_push ($facenum); 929 &::audio_sound_push ($facenum);
886 } 930 }
887 931
888 } else { 932 } else {
889 # flat resource case, FT_RSRC 933 # flat resource case, FT_RSRC
890 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 934 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
891 if $changed; 935 if $changed;
892 } 936 }
893 937
894 if (my $cbs = $self->{face_cb}{$facenum}) { 938 if (my $cbs = $self->{face_cb}{$facenum}) {
895 $_->($face, $changed) for @$cbs; 939 $_->($face, $changed) for @$cbs;
… …
906 my ($self, $tile, $data) = @_; 950 my ($self, $tile, $data) = @_;
907 951
908 return unless $self->{map}; 952 return unless $self->{map};
909 953
910 my $tex = $self->{texture}[$tile] ||= 954 my $tex = $self->{texture}[$tile] ||=
911 new CFPlus::Texture 955 new DC::Texture
912 tile => $tile, 956 tile => $tile,
913 image => $data, delete_image => 1, 957 image => $data, delete_image => 1,
914 minify => 1, mipmap => 1; 958 minify => 1, mipmap => 1;
915 959
916 if (my $cbs = delete $self->{tile_cb}{$tile}) { 960 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
924 my ($self, $num, $cb) = @_; 968 my ($self, $num, $cb) = @_;
925 969
926 push @{$self->{face_cb}{$num}}, $cb; 970 push @{$self->{face_cb}{$num}}, $cb;
927 971
928 defined wantarray 972 defined wantarray
929 ? CFPlus::guard { 973 ? DC::guard {
930 @{$self->{face_cb}{$num}} 974 @{$self->{face_cb}{$num}}
931 = grep $_ != $cb, 975 = grep $_ != $cb,
932 @{$self->{face_cb}{$num}}; 976 @{$self->{face_cb}{$num}};
933 } 977 }
934 : () 978 : ()
… …
969 1013
970sub sanitise_xml($) { 1014sub sanitise_xml($) {
971 local $_ = shift; 1015 local $_ = shift;
972 1016
973 # we now weed out all tags we do not support 1017 # we now weed out all tags we do not support
974 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1018 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1019 }{
1020 "&lt;"
1021 }gex;
1022
975 # now all entities 1023 # now all entities
976 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1024 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
977 1025
978 # handle some elements 1026 # handle some elements
979 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1027 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1038 ::message ({ 1086 ::message ({
1039 fg => $fg, 1087 fg => $fg,
1040 markup => $_, 1088 markup => $_,
1041 type => $type, 1089 type => $type,
1042 extra => [@extra], 1090 extra => [@extra],
1043 color_flags => $color, #d# ugly, kill 1091 color_flags => $color, #d# ugly, kill
1044 }); 1092 });
1045 1093
1046 $color &= ~NDI_CLEAR; # only clear once for multiline messages 1094 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1047 # actually, this is an ugly design. _we_ should control the channels, 1095 # actually, this is an ugly design. _we_ should control the channels,
1048 # not some random other widget, as the channels are clearly protocol-specific. 1096 # not some random other widget, as the channels are clearly protocol-specific.
… …
1053 $self->{statusbox}->add ($text, 1101 $self->{statusbox}->add ($text,
1054 group => $text, 1102 group => $text,
1055 fg => $fg, 1103 fg => $fg,
1056 timeout => $color >= 2 ? 180 : 10, 1104 timeout => $color >= 2 ? 180 : 10,
1057 tooltip_font => $::FONT_FIXED, 1105 tooltip_font => $::FONT_FIXED,
1058 ); 1106 ) if $type eq "info";
1059 } 1107 }
1060} 1108}
1061 1109
1062sub spell_add { 1110sub spell_add {
1063 my ($self, $spell) = @_; 1111 my ($self, $spell) = @_;
… …
1067 $spell->{message} =~ s/\n+$//; 1115 $spell->{message} =~ s/\n+$//;
1068 $spell->{message} ||= "Server did not provide a description for this spell."; 1116 $spell->{message} ||= "Server did not provide a description for this spell.";
1069 1117
1070 $::SPELL_LIST->add_spell ($spell); 1118 $::SPELL_LIST->add_spell ($spell);
1071 1119
1072 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1120 $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}); 1121 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1074} 1122}
1075 1123
1076sub spell_delete { 1124sub spell_delete {
1077 my ($self, $spell) = @_; 1125 my ($self, $spell) = @_;
1078 1126
… …
1089sub addme_success { 1137sub addme_success {
1090 my ($self) = @_; 1138 my ($self) = @_;
1091 1139
1092 my %skill_help; 1140 my %skill_help;
1093 1141
1094 for my $node (CFPlus::Pod::find skill_description => "*") { 1142 for my $node (DC::Pod::find skill_description => "*") {
1095 my (undef, @par) = CFPlus::Pod::section_of $node; 1143 my (undef, @par) = DC::Pod::section_of $node;
1096 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1144 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
1097 }; 1145 };
1098 1146
1099 for my $skill (values %{$self->{skill_info}}) { 1147 for my $skill (values %{$self->{skill_info}}) {
1100 $self->{map_widget}->add_command ("ready_skill $skill", 1148 $self->{map_widget}->add_command ("ready_skill $skill",
1101 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1149 (DC::asxml "Ready the skill '$skill'\n\n")
1102 . $skill_help{$skill}); 1150 . $skill_help{$skill});
1103 $self->{map_widget}->add_command ("use_skill $skill", 1151 $self->{map_widget}->add_command ("use_skill $skill",
1104 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1152 (DC::asxml "Immediately use the skill '$skill'\n\n")
1105 . $skill_help{$skill}); 1153 . $skill_help{$skill});
1106 } 1154 }
1107} 1155}
1108 1156
1109sub eof { 1157sub eof {
… …
1113 1161
1114 ::stop_game (); 1162 ::stop_game ();
1115} 1163}
1116 1164
1117sub update_floorbox { 1165sub update_floorbox {
1118 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1166 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1119 return unless $::CONN; 1167 return unless $::CONN;
1120 1168
1121 $::FLOORBOX->clear; 1169 $::FLOORBOX->clear;
1122 1170
1123 my @add; 1171 my @add;
… …
1125 my $row; 1173 my $row;
1126 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1174 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1127 if ($row < 6) { 1175 if ($row < 6) {
1128 local $_->{face_widget}; # hack to force recreation of widget 1176 local $_->{face_widget}; # hack to force recreation of widget
1129 local $_->{desc_widget}; # hack to force recreation of widget 1177 local $_->{desc_widget}; # hack to force recreation of widget
1130 CFPlus::Item::update_widgets $_; 1178 DC::Item::update_widgets $_;
1131 1179
1132 push @add, 1180 push @add,
1133 0, $row, $_->{face_widget}, 1181 0, $row, $_->{face_widget},
1134 1, $row, $_->{desc_widget}; 1182 1, $row, $_->{desc_widget};
1135 1183
1136 $row++; 1184 $row++;
1137 } else { 1185 } else {
1138 push @add, 1, $row, new CFPlus::UI::Button 1186 push @add, 1, $row, new DC::UI::Button
1139 text => "More...", 1187 text => "More...",
1140 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1188 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1141 ; 1189 ;
1142 last; 1190 last;
1143 } 1191 }
1144 } 1192 }
1145 if ($::CONN->{open_container}) { 1193 if ($::CONN->{open_container}) {
1146 push @add, 1, $row++, new CFPlus::UI::Button 1194 push @add, 1, $row++, new DC::UI::Button
1147 text => "Close container", 1195 text => "Close container",
1148 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1196 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1149 ; 1197 ;
1150 } 1198 }
1151 1199
1152 $::FLOORBOX->add_at (@add); 1200 $::FLOORBOX->add_at (@add);
1153 }); 1201 });
1154 1202
1155 $::WANT_REFRESH->start; 1203 $::WANT_REFRESH = 1;
1156} 1204}
1157 1205
1158sub set_opencont { 1206sub set_opencont {
1159 my ($conn, $tag, $name) = @_; 1207 my ($conn, $tag, $name) = @_;
1160 $conn->{open_container} = $tag; 1208 $conn->{open_container} = $tag;
1161 update_floorbox; 1209 update_floorbox;
1162 1210
1163 $::INVR_HB->clear (); 1211 $::INVR_HB->clear ();
1164 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1212 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
1165 1213
1166 if ($tag != 0) { # Floor isn't closable, is it? 1214 if ($tag != 0) { # Floor isn't closable, is it?
1167 $::INVR_HB->add (new CFPlus::UI::Button 1215 $::INVR_HB->add (new DC::UI::Button
1168 text => "Close container", 1216 text => "Close container",
1169 tooltip => "Close the currently open container (if one is open)", 1217 tooltip => "Close the currently open container (if one is open)",
1170 on_activate => sub { 1218 on_activate => sub {
1171 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1219 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1172 if $tag != 0; 1220 if $tag != 0;
… …
1179} 1227}
1180 1228
1181sub update_containers { 1229sub update_containers {
1182 my ($self) = @_; 1230 my ($self) = @_;
1183 1231
1184 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1232 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1185 my $todo = delete $self->{update_container} 1233 my $todo = delete $self->{update_container}
1186 or return; 1234 or return;
1187 1235
1188 for my $tag (keys %$todo) { 1236 for my $tag (keys %$todo) {
1189 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1237 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1226sub item_update { 1274sub item_update {
1227 my ($self, $item) = @_; 1275 my ($self, $item) = @_;
1228 1276
1229 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1277 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1230 1278
1231 CFPlus::Item::update_widgets $item; 1279 DC::Item::update_widgets $item;
1232 1280
1233 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1281 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1234 set_opencont ($::CONN, 0, "Floor"); 1282 set_opencont ($::CONN, 0, "Floor");
1235 1283
1236 } elsif ($item->{flags} & F_OPEN) { 1284 } elsif ($item->{flags} & F_OPEN) {
1237 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1285 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1238 1286
1239 } else { 1287 } else {
1240 $self->{update_container}{$item->{container}}++; 1288 $self->{update_container}{$item->{container}}++;
1241 $self->update_containers; 1289 $self->update_containers;
1242 } 1290 }
… …
1301 0 1349 0
1302 }); 1350 });
1303 1351
1304 $self->update_server_info; 1352 $self->update_server_info;
1305 1353
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; 1354 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1309 $self->send_command ("pickup $::CFG->{pickup}"); 1355 $self->send_command ("pickup $::CFG->{pickup}");
1310} 1356}
1311 1357
1312sub lookat { 1358sub lookat {
… …
1316 $self->send_ext_req (lookat => $x, $y, sub { 1362 $self->send_ext_req (lookat => $x, $y, sub {
1317 my (%msg) = @_; 1363 my (%msg) = @_;
1318 1364
1319 if (exists $msg{npc_dialog}) { 1365 if (exists $msg{npc_dialog}) {
1320 # start npc chat dialog 1366 # start npc chat dialog
1321 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1367 $self->{npc_dialog} = new DC::NPCDialog::
1322 token => $msg{npc_dialog}, 1368 token => $msg{npc_dialog},
1323 title => "$msg{npc_dialog}[0] (NPC)", 1369 title => "$msg{npc_dialog}[0] (NPC)",
1324 conn => $self, 1370 conn => $self,
1325 ; 1371 ;
1326 } 1372 }
… …
1339 $self->SUPER::destroy; 1385 $self->SUPER::destroy;
1340 1386
1341 %$self = (); 1387 %$self = ();
1342} 1388}
1343 1389
1344package CFPlus::NPCDialog; 1390package DC::NPCDialog;
1345 1391
1346our @ISA = 'CFPlus::UI::Toplevel'; 1392our @ISA = 'DC::UI::Toplevel';
1347 1393
1348sub new { 1394sub new {
1349 my $class = shift; 1395 my $class = shift;
1350 1396
1351 my $self = $class->SUPER::new ( 1397 my $self = $class->SUPER::new (
… …
1358 kw => { hi => 0, yes => 0, no => 0 }, 1404 kw => { hi => 0, yes => 0, no => 0 },
1359 has_close_button => 1, 1405 has_close_button => 1,
1360 @_, 1406 @_,
1361 ); 1407 );
1362 1408
1363 CFPlus::weaken (my $this = $self); 1409 DC::weaken (my $this = $self);
1364 1410
1365 $self->connect (delete => sub { $this->destroy; 1 }); 1411 $self->connect (delete => sub { $this->destroy; 1 });
1366 1412
1367 # better use a pane... 1413 # better use a pane...
1368 $self->add (my $hbox = new CFPlus::UI::HBox); 1414 $self->add (my $hbox = new DC::UI::HBox);
1369 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1415 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1370 1416
1371 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1417 $hbox->add (my $vbox = new DC::UI::VBox);
1372 1418
1373 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1419 $vbox->add (new DC::UI::Label text => "Message Entry:");
1374 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1420 $vbox->add ($self->{entry} = new DC::UI::Entry
1375 tooltip => "#npc_message_entry", 1421 tooltip => "#npc_message_entry",
1376 on_activate => sub { 1422 on_activate => sub {
1377 my ($entry, $text) = @_; 1423 my ($entry, $text) = @_;
1378 1424
1379 return unless $text =~ /\S/; 1425 return unless $text =~ /\S/;
… …
1383 1429
1384 0 1430 0
1385 }, 1431 },
1386 ); 1432 );
1387 1433
1388 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1434 $vbox->add ($self->{options} = new DC::UI::VBox);
1389 1435
1390 $self->{bye_button} = new CFPlus::UI::Button 1436 $self->{bye_button} = new DC::UI::Button
1391 text => "Bye (close)", 1437 text => "Bye (close)",
1392 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1438 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1393 on_activate => sub { $this->destroy; 1 }, 1439 on_activate => sub { $this->destroy; 1 },
1394 ; 1440 ;
1395 1441
… …
1414}; 1460};
1415 1461
1416sub update_options { 1462sub update_options {
1417 my ($self) = @_; 1463 my ($self) = @_;
1418 1464
1419 CFPlus::weaken $self; 1465 DC::weaken $self;
1420 1466
1421 $self->{options}->clear; 1467 $self->{options}->clear;
1422 $self->{options}->add ($self->{bye_button}); 1468 $self->{options}->add ($self->{bye_button});
1423 1469
1424 for my $kw (sort keys %{ $self->{kw} }) { 1470 for my $kw (sort keys %{ $self->{kw} }) {
1425 $self->{options}->add (new CFPlus::UI::Button 1471 $self->{options}->add (new DC::UI::Button
1426 text => $kw, 1472 text => $kw,
1427 on_activate => sub { 1473 on_activate => sub {
1428 $self->send ($kw); 1474 $self->send ($kw);
1429 0 1475 0
1430 }, 1476 },
… …
1433} 1479}
1434 1480
1435sub feed { 1481sub feed {
1436 my ($self, $type, @arg) = @_; 1482 my ($self, $type, @arg) = @_;
1437 1483
1438 CFPlus::weaken $self; 1484 DC::weaken $self;
1439 1485
1440 if ($type eq "update") { 1486 if ($type eq "update") {
1441 my (%info) = @arg; 1487 my (%info) = @arg;
1442 1488
1443 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1489 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1444 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1490 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1445 1491
1446 if (exists $info{msg}) { 1492 if (exists $info{msg}) {
1447 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1493 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} }; 1494 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1449 my @link; 1495 my @link;
1450 $text =~ s{ 1496 $text =~ s{
1451 ($match) 1497 ($match)
1452 }{ 1498 }{
1453 my $kw = $1; 1499 my $kw = $1;
1454 1500
1455 push @link, new CFPlus::UI::Label 1501 push @link, new DC::UI::Label
1456 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1502 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1457 can_hover => 1, 1503 can_hover => 1,
1458 can_events => 1, 1504 can_events => 1,
1459 padding_x => 0, 1505 padding_x => 0,
1460 padding_y => 0, 1506 padding_y => 0,
… …
1478} 1524}
1479 1525
1480sub send { 1526sub send {
1481 my ($self, $msg) = @_; 1527 my ($self, $msg) = @_;
1482 1528
1483 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1529 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1484 $self->{textview}->scroll_to_bottom; 1530 $self->{textview}->scroll_to_bottom;
1485 1531
1486 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1532 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1487} 1533}
1488 1534

Diff Legend

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