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.182 by root, Wed Dec 26 20:46:39 2007 UTC vs.
Revision 1.183 by root, Wed Dec 26 21:03:21 2007 UTC

1package dc::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 dc; 8use DC;
9use dc::DB; 9use DC::DB;
10use dc::UI; 10use DC::UI;
11use dc::Pod; 11use DC::Pod;
12use dc::Macro; 12use DC::Macro;
13use dc::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) = @_;
… …
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) = dc::Pod::section_of $_; 39 my (undef, @par) = DC::Pod::section_of $_;
40 my $text = dc::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 dc::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 dc::Texture 75 $self->{dialogue} = my $tex = new_from_file DC::Texture
76 dc::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 dc::Texture 81 $self->{noface} = my $tex = new_from_file DC::Texture
82 dc::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
… …
142############################################################################# 142#############################################################################
143 143
144sub widget_associate { 144sub widget_associate {
145 my ($self, $ws, $id, $widget) = @_; 145 my ($self, $ws, $id, $widget) = @_;
146 146
147 $widget ||= new dc::UI::Bin; 147 $widget ||= new DC::UI::Bin;
148 148
149 $widget->{s_id} = $id; 149 $widget->{s_id} = $id;
150 $self->{widget}{$id} = $widget; 150 $self->{widget}{$id} = $widget;
151 151
152 if ($ws) { 152 if ($ws) {
… …
188 my ($self, $ws, $id, $class, $args) = @_; 188 my ($self, $ws, $id, $class, $args) = @_;
189 189
190 $self->widget_associate ( 190 $self->widget_associate (
191 $ws, $id => scalar eval { 191 $ws, $id => scalar eval {
192 local $SIG{__DIE__}; 192 local $SIG{__DIE__};
193 "dc::UI::$class"->new (%$args) 193 "DC::UI::$class"->new (%$args)
194 } 194 }
195 ); 195 );
196} 196}
197 197
198# widgetset associate 198# widgetset associate
199sub ext_ws_a { 199sub ext_ws_a {
200 my ($self, %ass) = @_; 200 my ($self, %ass) = @_;
201 201
202 # everything that has a name, wether conceivably useful or not 202 # everything that has a name, wether conceivably useful or not
203 my %wkw = ( 203 my %wkw = (
204 root => $dc::UI::ROOT, 204 root => $DC::UI::ROOT,
205 tooltip => $dc::UI::TOOLTIP, 205 tooltip => $DC::UI::TOOLTIP,
206 206
207 mapwidget => $::MAPWIDGET, 207 mapwidget => $::MAPWIDGET,
208 buttonbar => $::BUTTONBAR, 208 buttonbar => $::BUTTONBAR,
209 metaserver => $::METASERVER, 209 metaserver => $::METASERVER,
210 buttonbar => $::BUTTONBAR, 210 buttonbar => $::BUTTONBAR,
… …
294############################################################################# 294#############################################################################
295 295
296sub logprint { 296sub logprint {
297 my ($self, @a) = @_; 297 my ($self, @a) = @_;
298 298
299 dc::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 299 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
300} 300}
301 301
302sub _stat_numdiff { 302sub _stat_numdiff {
303 my ($self, $name, $old, $new) = @_; 303 my ($self, $name, $old, $new) = @_;
304 304
… …
476 $self->{stat_order} = join ",", map $_->[0], @order; 476 $self->{stat_order} = join ",", map $_->[0], @order;
477 477
478 $sktbl->clear; 478 $sktbl->clear;
479 479
480 my $sw = $self->{skillwid}{""} ||= [ 480 my $sw = $self->{skillwid}{""} ||= [
481 0, 0, (new dc::UI::Label text => "Experience", align => 1), 481 0, 0, (new DC::UI::Label text => "Experience", align => 1),
482 1, 0, (new dc::UI::Label text => "Lvl.", align => 1), 482 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new dc::UI::Label text => "Progress", align => 0), 483 2, 0, (new DC::UI::Label text => "Progress", align => 0),
484 3, 0, (new dc::UI::Label text => "Skill", expand => 1), 484 3, 0, (new DC::UI::Label text => "Skill", expand => 1),
485 4, 0, (new dc::UI::Label text => "Experience", align => 1), 485 4, 0, (new DC::UI::Label text => "Experience", align => 1),
486 5, 0, (new dc::UI::Label text => "Lvl.", align => 1), 486 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new dc::UI::Label text => "Progress", align => 0), 487 6, 0, (new DC::UI::Label text => "Progress", align => 0),
488 7, 0, (new dc::UI::Label text => "Skill", expand => 1), 488 7, 0, (new DC::UI::Label text => "Skill", expand => 1),
489 ]; 489 ];
490 490
491 my @add = @$sw; 491 my @add = @$sw;
492 492
493 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 493 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
… …
505 if ($ev->{button} == 1) { 505 if ($ev->{button} == 1) {
506 $::CONN->user_send ("ready_skill $name"); 506 $::CONN->user_send ("ready_skill $name");
507 } elsif ($ev->{button} == 2) { 507 } elsif ($ev->{button} == 2) {
508 $::CONN->user_send ("use_skill $name"); 508 $::CONN->user_send ("use_skill $name");
509 } elsif ($ev->{button} == 3) { 509 } elsif ($ev->{button} == 3) {
510 my $shortname = dc::shorten $name, 14; 510 my $shortname = DC::shorten $name, 14;
511 (new dc::UI::Menu 511 (new DC::UI::Menu
512 items => [ 512 items => [
513 ["bind <i>ready_skill $shortname</i> to a key" => sub { dc::Macro::quick_macro ["ready_skill $name"] }], 513 ["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 { dc::Macro::quick_macro ["use_skill $name"] }], 514 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
515 ], 515 ],
516 )->popup ($ev); 516 )->popup ($ev);
517 } else { 517 } else {
518 return 0; 518 return 0;
519 } 519 }
… …
521 1 521 1
522 }; 522 };
523 523
524 my $sw = $self->{skillwid}{$idx} ||= [ 524 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp 525 # exp
526 (new dc::UI::Label 526 (new DC::UI::Label
527 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 527 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
528 528
529 # level 529 # level
530 (new dc::UI::Label 530 (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), 531 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
532 532
533 # progress 533 # progress
534 (new dc::UI::ExperienceProgress), 534 (new DC::UI::ExperienceProgress),
535 535
536 # label 536 # label
537 (new dc::UI::Label text => $name, on_button_down => $spell_cb, 537 (new DC::UI::Label text => $name, on_button_down => $spell_cb,
538 can_events => 1, can_hover => 1, tooltip => (dc::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 538 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ]; 539 ];
540 540
541 push @add, 541 push @add,
542 $x * 4 + 0, $y, $sw->[0], 542 $x * 4 + 0, $y, $sw->[0],
543 $x * 4 + 1, $y, $sw->[1], 543 $x * 4 + 1, $y, $sw->[1],
… …
638 638
639 my ($hash, $x, $y, $w, $h) = @$map_info; 639 my ($hash, $x, $y, $w, $h) = @$map_info;
640 640
641 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 641 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
642 $self->{map_cache_new}{$hash} = \$data; 642 $self->{map_cache_new}{$hash} = \$data;
643 dc::DB::put $self->{mapcache} => $hash => $data, sub { }; 643 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
644} 644}
645 645
646sub map_clear { 646sub map_clear {
647 my ($self) = @_; 647 my ($self) = @_;
648 648
… …
661 do { 661 do {
662 $tile = pop @{$self->{bg_fetch}} 662 $tile = pop @{$self->{bg_fetch}}
663 or return; 663 or return;
664 } while $self->{texture}[$tile]; 664 } while $self->{texture}[$tile];
665 665
666 dc::DB::get tilecache => $tile, sub { 666 DC::DB::get tilecache => $tile, sub {
667 my ($data) = @_; 667 my ($data) = @_;
668 668
669 return unless $self->{map}; # stop when destroyed 669 return unless $self->{map}; # stop when destroyed
670 670
671 if (defined $data) { 671 if (defined $data) {
… …
699 }; 699 };
700 700
701 if (my $rdata = $self->{map_cache_old}{$hash}) { 701 if (my $rdata = $self->{map_cache_old}{$hash}) {
702 $cb->($$rdata); 702 $cb->($$rdata);
703 } else { 703 } else {
704 dc::DB::get $self->{mapcache} => $hash, $cb; 704 DC::DB::get $self->{mapcache} => $hash, $cb;
705 } 705 }
706} 706}
707 707
708# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 708# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
709# (server resource,s latency, bandwidth), so this hack is warranted. 709# (server resource,s latency, bandwidth), so this hack is warranted.
… …
833 833
834sub face_find { 834sub face_find {
835 my ($self, $facenum, $face, $cb) = @_; 835 my ($self, $facenum, $face, $cb) = @_;
836 836
837 if ($face->{type} == 0) { # FT_FACE 837 if ($face->{type} == 0) { # FT_FACE
838 my $id = dc::DB::get_tile_id_sync $face->{name}; 838 my $id = DC::DB::get_tile_id_sync $face->{name};
839 839
840 $face->{id} = $id; 840 $face->{id} = $id;
841 $self->{map}->set_tileid ($facenum => $id); 841 $self->{map}->set_tileid ($facenum => $id);
842 842
843 dc::DB::get tilecache => $id, $cb; 843 DC::DB::get tilecache => $id, $cb;
844 844
845 } elsif ($face->{type} & 1) { # with metadata 845 } elsif ($face->{type} & 1) { # with metadata
846 dc::DB::get res_meta => $face->{name}, $cb; 846 DC::DB::get res_meta => $face->{name}, $cb;
847 847
848 } else { # no metadata 848 } else { # no metadata
849 dc::DB::get res_data => $face->{name}, $cb; 849 DC::DB::get res_data => $face->{name}, $cb;
850 } 850 }
851} 851}
852 852
853sub face_update { 853sub face_update {
854 my ($self, $facenum, $face, $changed) = @_; 854 my ($self, $facenum, $face, $changed) = @_;
855 855
856 if ($face->{type} == 0) { 856 if ($face->{type} == 0) {
857 # image, FT_FACE 857 # image, FT_FACE
858 dc::DB::put tilecache => $face->{id} => $face->{data}, sub { } 858 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
859 if $changed; 859 if $changed;
860 860
861 $self->have_tile ($face->{id}, delete $face->{data}); 861 $self->have_tile ($face->{id}, delete $face->{data});
862 862
863 } elsif ($face->{type} & 1) { 863 } elsif ($face->{type} & 1) {
… …
865 if ($changed) { # new data 865 if ($changed) { # new data
866 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 866 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
867 $face->{data} = $meta; 867 $face->{data} = $meta;
868 868
869 # rely on strict ordering here and also on later fetch 869 # rely on strict ordering here and also on later fetch
870 dc::DB::put res_data => $face->{name} => $data, sub { }; 870 DC::DB::put res_data => $face->{name} => $data, sub { };
871 dc::DB::put res_meta => $face->{name} => $meta, sub { }; 871 DC::DB::put res_meta => $face->{name} => $meta, sub { };
872 } 872 }
873 873
874 $face->{data} = $self->{json_coder}->decode ($face->{data}); 874 $face->{data} = $self->{json_coder}->decode ($face->{data});
875 ::add_license ($face); 875 ::add_license ($face);
876 ::message ({ markup => dc::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) 876 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
877 if $changed; 877 if $changed;
878 878
879 if ($face->{type} == 3) { # FT_MUSIC 879 if ($face->{type} == 3) { # FT_MUSIC
880 &::audio_music_push ($facenum); 880 &::audio_music_push ($facenum);
881 } elsif ($face->{type} == 5) { # FT_SOUND 881 } elsif ($face->{type} == 5) { # FT_SOUND
882 &::audio_sound_push ($facenum); 882 &::audio_sound_push ($facenum);
883 } 883 }
884 884
885 } else { 885 } else {
886 # flat resource case, FT_RSRC 886 # flat resource case, FT_RSRC
887 dc::DB::put res_data => $face->{name} => $face->{data}, sub { } 887 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
888 if $changed; 888 if $changed;
889 } 889 }
890 890
891 if (my $cbs = $self->{face_cb}{$facenum}) { 891 if (my $cbs = $self->{face_cb}{$facenum}) {
892 $_->($face, $changed) for @$cbs; 892 $_->($face, $changed) for @$cbs;
… …
903 my ($self, $tile, $data) = @_; 903 my ($self, $tile, $data) = @_;
904 904
905 return unless $self->{map}; 905 return unless $self->{map};
906 906
907 my $tex = $self->{texture}[$tile] ||= 907 my $tex = $self->{texture}[$tile] ||=
908 new dc::Texture 908 new DC::Texture
909 tile => $tile, 909 tile => $tile,
910 image => $data, delete_image => 1, 910 image => $data, delete_image => 1,
911 minify => 1, mipmap => 1; 911 minify => 1, mipmap => 1;
912 912
913 if (my $cbs = delete $self->{tile_cb}{$tile}) { 913 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
921 my ($self, $num, $cb) = @_; 921 my ($self, $num, $cb) = @_;
922 922
923 push @{$self->{face_cb}{$num}}, $cb; 923 push @{$self->{face_cb}{$num}}, $cb;
924 924
925 defined wantarray 925 defined wantarray
926 ? dc::guard { 926 ? DC::guard {
927 @{$self->{face_cb}{$num}} 927 @{$self->{face_cb}{$num}}
928 = grep $_ != $cb, 928 = grep $_ != $cb,
929 @{$self->{face_cb}{$num}}; 929 @{$self->{face_cb}{$num}};
930 } 930 }
931 : () 931 : ()
… …
1068 $spell->{message} =~ s/\n+$//; 1068 $spell->{message} =~ s/\n+$//;
1069 $spell->{message} ||= "Server did not provide a description for this spell."; 1069 $spell->{message} ||= "Server did not provide a description for this spell.";
1070 1070
1071 $::SPELL_LIST->add_spell ($spell); 1071 $::SPELL_LIST->add_spell ($spell);
1072 1072
1073 $self->{map_widget}->add_command ("invoke $spell->{name}", dc::asxml $spell->{message}); 1073 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
1074 $self->{map_widget}->add_command ("cast $spell->{name}", dc::asxml $spell->{message}); 1074 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1075} 1075}
1076 1076
1077sub spell_delete { 1077sub spell_delete {
1078 my ($self, $spell) = @_; 1078 my ($self, $spell) = @_;
1079 1079
… …
1090sub addme_success { 1090sub addme_success {
1091 my ($self) = @_; 1091 my ($self) = @_;
1092 1092
1093 my %skill_help; 1093 my %skill_help;
1094 1094
1095 for my $node (dc::Pod::find skill_description => "*") { 1095 for my $node (DC::Pod::find skill_description => "*") {
1096 my (undef, @par) = dc::Pod::section_of $node; 1096 my (undef, @par) = DC::Pod::section_of $node;
1097 $skill_help{$node->{kw}[0]} = dc::Pod::as_label @par; 1097 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
1098 }; 1098 };
1099 1099
1100 for my $skill (values %{$self->{skill_info}}) { 1100 for my $skill (values %{$self->{skill_info}}) {
1101 $self->{map_widget}->add_command ("ready_skill $skill", 1101 $self->{map_widget}->add_command ("ready_skill $skill",
1102 (dc::asxml "Ready the skill '$skill'\n\n") 1102 (DC::asxml "Ready the skill '$skill'\n\n")
1103 . $skill_help{$skill}); 1103 . $skill_help{$skill});
1104 $self->{map_widget}->add_command ("use_skill $skill", 1104 $self->{map_widget}->add_command ("use_skill $skill",
1105 (dc::asxml "Immediately use the skill '$skill'\n\n") 1105 (DC::asxml "Immediately use the skill '$skill'\n\n")
1106 . $skill_help{$skill}); 1106 . $skill_help{$skill});
1107 } 1107 }
1108} 1108}
1109 1109
1110sub eof { 1110sub eof {
… …
1114 1114
1115 ::stop_game (); 1115 ::stop_game ();
1116} 1116}
1117 1117
1118sub update_floorbox { 1118sub update_floorbox {
1119 $dc::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1120 return unless $::CONN; 1120 return unless $::CONN;
1121 1121
1122 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
1123 1123
1124 my @add; 1124 my @add;
… …
1126 my $row; 1126 my $row;
1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1128 if ($row < 6) { 1128 if ($row < 6) {
1129 local $_->{face_widget}; # hack to force recreation of widget 1129 local $_->{face_widget}; # hack to force recreation of widget
1130 local $_->{desc_widget}; # hack to force recreation of widget 1130 local $_->{desc_widget}; # hack to force recreation of widget
1131 dc::Item::update_widgets $_; 1131 DC::Item::update_widgets $_;
1132 1132
1133 push @add, 1133 push @add,
1134 0, $row, $_->{face_widget}, 1134 0, $row, $_->{face_widget},
1135 1, $row, $_->{desc_widget}; 1135 1, $row, $_->{desc_widget};
1136 1136
1137 $row++; 1137 $row++;
1138 } else { 1138 } else {
1139 push @add, 1, $row, new dc::UI::Button 1139 push @add, 1, $row, new DC::UI::Button
1140 text => "More...", 1140 text => "More...",
1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1142 ; 1142 ;
1143 last; 1143 last;
1144 } 1144 }
1145 } 1145 }
1146 if ($::CONN->{open_container}) { 1146 if ($::CONN->{open_container}) {
1147 push @add, 1, $row++, new dc::UI::Button 1147 push @add, 1, $row++, new DC::UI::Button
1148 text => "Close container", 1148 text => "Close container",
1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1150 ; 1150 ;
1151 } 1151 }
1152 1152
… …
1160 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
1161 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
1162 update_floorbox; 1162 update_floorbox;
1163 1163
1164 $::INVR_HB->clear (); 1164 $::INVR_HB->clear ();
1165 $::INVR_HB->add (new dc::UI::Label align => 0, expand => 1, text => $name); 1165 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
1166 1166
1167 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
1168 $::INVR_HB->add (new dc::UI::Button 1168 $::INVR_HB->add (new DC::UI::Button
1169 text => "Close container", 1169 text => "Close container",
1170 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
1171 on_activate => sub { 1171 on_activate => sub {
1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1173 if $tag != 0; 1173 if $tag != 0;
… …
1180} 1180}
1181 1181
1182sub update_containers { 1182sub update_containers {
1183 my ($self) = @_; 1183 my ($self) = @_;
1184 1184
1185 $dc::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1185 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1186 my $todo = delete $self->{update_container} 1186 my $todo = delete $self->{update_container}
1187 or return; 1187 or return;
1188 1188
1189 for my $tag (keys %$todo) { 1189 for my $tag (keys %$todo) {
1190 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1190 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1227sub item_update { 1227sub item_update {
1228 my ($self, $item) = @_; 1228 my ($self, $item) = @_;
1229 1229
1230 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1230 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
1231 1231
1232 dc::Item::update_widgets $item; 1232 DC::Item::update_widgets $item;
1233 1233
1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1235 set_opencont ($::CONN, 0, "Floor"); 1235 set_opencont ($::CONN, 0, "Floor");
1236 1236
1237 } elsif ($item->{flags} & F_OPEN) { 1237 } elsif ($item->{flags} & F_OPEN) {
1238 set_opencont ($::CONN, $item->{tag}, dc::Item::desc_string $item); 1238 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1239 1239
1240 } else { 1240 } else {
1241 $self->{update_container}{$item->{container}}++; 1241 $self->{update_container}{$item->{container}}++;
1242 $self->update_containers; 1242 $self->update_containers;
1243 } 1243 }
… …
1315 $self->send_ext_req (lookat => $x, $y, sub { 1315 $self->send_ext_req (lookat => $x, $y, sub {
1316 my (%msg) = @_; 1316 my (%msg) = @_;
1317 1317
1318 if (exists $msg{npc_dialog}) { 1318 if (exists $msg{npc_dialog}) {
1319 # start npc chat dialog 1319 # start npc chat dialog
1320 $self->{npc_dialog} = new dc::NPCDialog:: 1320 $self->{npc_dialog} = new DC::NPCDialog::
1321 token => $msg{npc_dialog}, 1321 token => $msg{npc_dialog},
1322 title => "$msg{npc_dialog}[0] (NPC)", 1322 title => "$msg{npc_dialog}[0] (NPC)",
1323 conn => $self, 1323 conn => $self,
1324 ; 1324 ;
1325 } 1325 }
… …
1338 $self->SUPER::destroy; 1338 $self->SUPER::destroy;
1339 1339
1340 %$self = (); 1340 %$self = ();
1341} 1341}
1342 1342
1343package dc::NPCDialog; 1343package DC::NPCDialog;
1344 1344
1345our @ISA = 'dc::UI::Toplevel'; 1345our @ISA = 'DC::UI::Toplevel';
1346 1346
1347sub new { 1347sub new {
1348 my $class = shift; 1348 my $class = shift;
1349 1349
1350 my $self = $class->SUPER::new ( 1350 my $self = $class->SUPER::new (
… …
1357 kw => { hi => 0, yes => 0, no => 0 }, 1357 kw => { hi => 0, yes => 0, no => 0 },
1358 has_close_button => 1, 1358 has_close_button => 1,
1359 @_, 1359 @_,
1360 ); 1360 );
1361 1361
1362 dc::weaken (my $this = $self); 1362 DC::weaken (my $this = $self);
1363 1363
1364 $self->connect (delete => sub { $this->destroy; 1 }); 1364 $self->connect (delete => sub { $this->destroy; 1 });
1365 1365
1366 # better use a pane... 1366 # better use a pane...
1367 $self->add (my $hbox = new dc::UI::HBox); 1367 $self->add (my $hbox = new DC::UI::HBox);
1368 $hbox->add ($self->{textview} = new dc::UI::TextScroller expand => 1); 1368 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1369 1369
1370 $hbox->add (my $vbox = new dc::UI::VBox); 1370 $hbox->add (my $vbox = new DC::UI::VBox);
1371 1371
1372 $vbox->add (new dc::UI::Label text => "Message Entry:"); 1372 $vbox->add (new DC::UI::Label text => "Message Entry:");
1373 $vbox->add ($self->{entry} = new dc::UI::Entry 1373 $vbox->add ($self->{entry} = new DC::UI::Entry
1374 tooltip => "#npc_message_entry", 1374 tooltip => "#npc_message_entry",
1375 on_activate => sub { 1375 on_activate => sub {
1376 my ($entry, $text) = @_; 1376 my ($entry, $text) = @_;
1377 1377
1378 return unless $text =~ /\S/; 1378 return unless $text =~ /\S/;
… …
1382 1382
1383 0 1383 0
1384 }, 1384 },
1385 ); 1385 );
1386 1386
1387 $vbox->add ($self->{options} = new dc::UI::VBox); 1387 $vbox->add ($self->{options} = new DC::UI::VBox);
1388 1388
1389 $self->{bye_button} = new dc::UI::Button 1389 $self->{bye_button} = new DC::UI::Button
1390 text => "Bye (close)", 1390 text => "Bye (close)",
1391 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1391 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1392 on_activate => sub { $this->destroy; 1 }, 1392 on_activate => sub { $this->destroy; 1 },
1393 ; 1393 ;
1394 1394
… …
1413}; 1413};
1414 1414
1415sub update_options { 1415sub update_options {
1416 my ($self) = @_; 1416 my ($self) = @_;
1417 1417
1418 dc::weaken $self; 1418 DC::weaken $self;
1419 1419
1420 $self->{options}->clear; 1420 $self->{options}->clear;
1421 $self->{options}->add ($self->{bye_button}); 1421 $self->{options}->add ($self->{bye_button});
1422 1422
1423 for my $kw (sort keys %{ $self->{kw} }) { 1423 for my $kw (sort keys %{ $self->{kw} }) {
1424 $self->{options}->add (new dc::UI::Button 1424 $self->{options}->add (new DC::UI::Button
1425 text => $kw, 1425 text => $kw,
1426 on_activate => sub { 1426 on_activate => sub {
1427 $self->send ($kw); 1427 $self->send ($kw);
1428 0 1428 0
1429 }, 1429 },
… …
1432} 1432}
1433 1433
1434sub feed { 1434sub feed {
1435 my ($self, $type, @arg) = @_; 1435 my ($self, $type, @arg) = @_;
1436 1436
1437 dc::weaken $self; 1437 DC::weaken $self;
1438 1438
1439 if ($type eq "update") { 1439 if ($type eq "update") {
1440 my (%info) = @arg; 1440 my (%info) = @arg;
1441 1441
1442 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1442 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1443 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1443 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1444 1444
1445 if (exists $info{msg}) { 1445 if (exists $info{msg}) {
1446 my $text = "\n" . dc::Protocol::sanitise_xml $info{msg}; 1446 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} }; 1447 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1448 my @link; 1448 my @link;
1449 $text =~ s{ 1449 $text =~ s{
1450 ($match) 1450 ($match)
1451 }{ 1451 }{
1452 my $kw = $1; 1452 my $kw = $1;
1453 1453
1454 push @link, new dc::UI::Label 1454 push @link, new DC::UI::Label
1455 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1455 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1456 can_hover => 1, 1456 can_hover => 1,
1457 can_events => 1, 1457 can_events => 1,
1458 padding_x => 0, 1458 padding_x => 0,
1459 padding_y => 0, 1459 padding_y => 0,
… …
1477} 1477}
1478 1478
1479sub send { 1479sub send {
1480 my ($self, $msg) = @_; 1480 my ($self, $msg) = @_;
1481 1481
1482 $self->{textview}->add_paragraph ({ markup => "\n" . dc::asxml $msg }); 1482 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1483 $self->{textview}->scroll_to_bottom; 1483 $self->{textview}->scroll_to_bottom;
1484 1484
1485 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1485 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1486} 1486}
1487 1487

Diff Legend

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