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.105 by root, Tue Apr 24 01:13:15 2007 UTC vs.
Revision 1.143 by root, Tue Jul 31 02:03:13 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 ywidget => 1,#d#
26 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
27 }, 28 },
28 ); 29 );
29 30
30 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
47 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
48 @args 49 @args
49 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
50 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
51 52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
52 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
53 my ($cap) = @_; 59 my (%cap) = @_;
54 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
55 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default; 70 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
60 73
61 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize}; 75 my $h = int $self->{maph} * 32 / $self->{tilesize};
63 76
64 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
65 } 78 }
79 }
80 });
81
82 $self->{json_coder}
83 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]}
86 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196
197 # destroy widgets on logout
198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy
201 for values %{delete $ws->{w} || {}};
66 } 202 }
67 }); 203 });
68 204
69 $self->{map_widget}->add_command (@$_) 205 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 206 for @cmd_help;
… …
249 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 385 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
250 $::GAUGES->{food} ->set_value ($fo, $fo_m); 386 $::GAUGES->{food} ->set_value ($fo, $fo_m);
251 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 387 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 388 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 389 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
254 my $rng = $stats->{+CS_STAT_RANGE}; 390 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
255 $rng =~ s/^Range: //; # thank you so much dear server
256 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
257 my $title = $stats->{+CS_STAT_TITLE}; 391 my $title = $stats->{+CS_STAT_TITLE};
258 $title =~ s/^Player: //; 392 $title =~ s/^Player: //;
259 $::STATWIDS->{title} ->set_text ("Title: " . $title); 393 $::STATWIDS->{title} ->set_text ("Title: " . $title);
260 394
261 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 395 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
281 my @skills = keys %{ $self->{skill_info} }; 415 my @skills = keys %{ $self->{skill_info} };
282 416
283 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 417 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
284 $sktbl->clear; 418 $sktbl->clear;
285 419
420 my @add;
421
422 push @add,
286 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
287 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 424 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
288 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
289 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
290 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 427 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
291 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
429 ;
292 430
293 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 431 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
294 432
295 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 433 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
296 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 434 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
324 } 462 }
325 463
326 1 464 1
327 }; 465 };
328 466
467 push @add,
329 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 468 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
330 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 469 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
331 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 470 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
332 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 471 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
333 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 472 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
334 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 473 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
474 ;
335 475
336 $x++ and ($x, $y) = (0, $y + 1); 476 $x++ and ($x, $y) = (0, $y + 1);
337 } 477 }
478
479 $sktbl->add_at (@add);
338 } 480 }
339 481
340 for (grep exists $stats->{$_}, @skills) { 482 for (grep exists $stats->{$_}, @skills) {
341 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
342 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
579} 721}
580 722
581sub face_find { 723sub face_find {
582 my ($self, $facenum, $face, $cb) = @_; 724 my ($self, $facenum, $face, $cb) = @_;
583 725
584 my $hash = "$face->{chksum},$face->{name}"; 726 if ($face->{type} == 0) { # FT_FACE
585
586 my $id = CFPlus::DB::get_tile_id_sync $hash; 727 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
587 728
588 $face->{id} = $id; 729 $face->{id} = $id;
589 $self->{faceid}[$facenum] = $id; 730 $self->{faceid}[$facenum] = $id;
590 731
591 $self->{map}->set_tileid ($facenum => $id); 732 $self->{map}->set_tileid ($facenum => $id);
592 733
593 CFPlus::DB::get tilecache => $id, $cb; 734 CFPlus::DB::get tilecache => $id, $cb;
735
736 } elsif ($face->{type} & 1) { # with metadata
737 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
738 CFPlus::DB::get res_meta => $face->{name}, $cb;
739 }
594} 740}
595 741
596sub face_update { 742sub face_update {
597 my ($self, $facenum, $face, $changed) = @_; 743 my ($self, $facenum, $face, $changed) = @_;
598 744
745 if ($face->{type} == 0) { # FT_FACE
599 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
600 if $changed; 747 if $changed;
601 748
602 $self->set_texture ($face->{id} => delete $face->{image}); 749 $self->set_texture ($face->{id} => delete $face->{data});
750
751 } elsif ($face->{type} & 1) { # split metadata
752 my $cb = sub { };
753
754 if ($face->{type} == 3) { # FT_MUSIC
755 $cb = sub {
756 $self->{music_meta}{$facenum} = $face;
757
758 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed;
760
761 &::audio_music_push ($facenum);
762 };
763 } elsif ($face->{type} == 5) { # FT_SOUND
764 $cb = sub {
765 $self->{sound_meta}{$facenum} = $face;
766
767 ::message ({ markup => "downloaded sound #$facenum" })
768 if $changed;
769
770 &::audio_sound_push ($facenum);
771 };
772 }
773
774 if ($changed) { # new data
775 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
776
777 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
778 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
779 $face->{meta} = $self->{json_coder}->decode ($meta_json);
780 $cb->();
781 };
782
783 } else {
784 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
785 $cb->();
786 }
787 }
603} 788}
604 789
605sub smooth_update { 790sub smooth_update {
606 my ($self, $facenum, $face) = @_; 791 my ($self, $facenum, $face) = @_;
607 792
608 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 793 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
609} 794}
610 795
611sub set_texture { 796sub set_texture {
612 my ($self, $id, $data) = @_; 797 my ($self, $id, $data) = @_;
798
799 return unless $self->{map};
613 800
614 $self->{texture}[$id] = my $tex = 801 $self->{texture}[$id] = my $tex =
615 new_from_image CFPlus::Texture 802 new_from_image CFPlus::Texture
616 $data, minify => 1, mipmap => 1; 803 $data, minify => 1, mipmap => 1;
617 804
618 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 805 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
619 $self->{map_widget}->update; 806 $self->{map_widget}->update;
807
808 $_->() for @{(delete $self->{face_cb}{$id}) || []};
809}
810
811sub connect_face_update {
812 my ($self, $id, $cb) = @_;
813
814 push @{$self->{face_cb}{$id}}, $cb;
815
816 CFPlus::guard {
817 @{$self->{face_cb}{$id}}
818 = grep $_ != $cb,
819 @{$self->{face_cb}{$id}};
820 }
620} 821}
621 822
622sub sound_play { 823sub sound_play {
623 my ($self, $x, $y, $soundnum, $type) = @_; 824 my ($self, $type, $face, $dx, $dy, $vol) = @_;
624 825
625 $self->{sound_play}->($x, $y, $soundnum, $type); 826 &::audio_sound_play ($face, $dx, $dy, $vol)
827 unless $type & 1; # odd types are silent for future expansion
626} 828}
627 829
628my $LAST_QUERY; # server is stupid, stupid, stupid 830my $LAST_QUERY; # server is stupid, stupid, stupid
629 831
630sub query { 832sub query {
… …
632 834
633 $prompt = $LAST_QUERY unless length $prompt; 835 $prompt = $LAST_QUERY unless length $prompt;
634 $LAST_QUERY = $prompt; 836 $LAST_QUERY = $prompt;
635 837
636 $self->{query}-> ($self, $flags, $prompt); 838 $self->{query}-> ($self, $flags, $prompt);
839}
840
841sub sanitise_xml($) {
842 local $_ = shift;
843
844 # we now weed out all tags we do not support
845 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
846 # now all entities
847 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
848
849 # handle some elements
850 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
851 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
852
853 $_
637} 854}
638 855
639our %NAME_TO_COLOR = ( 856our %NAME_TO_COLOR = (
640 black => 0, 857 black => 0,
641 white => 1, 858 white => 1,
… …
669); 886);
670 887
671sub msg { 888sub msg {
672 my ($self, $color, $type, $text, @extra) = @_; 889 my ($self, $color, $type, $text, @extra) = @_;
673 890
891 $text = sanitise_xml $text;
892
674 if (my $cb = $self->{cb_msg}{$type}) { 893 if (my $cb = $self->{cb_msg}{$type}) {
675 $_->($self, $color, $type, $text, @extra) for values %$cb; 894 $_->($self, $color, $type, $text, @extra) for values %$cb;
676 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 895 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
677 $type =~ s/-/_/g; 896 $type =~ s/-/_/g;
678 $self->{$type} = $text; 897 $self->{$type} = $text;
679 } else { 898 } else {
680 $self->logprint ("msg: ", $text); 899 $self->logprint ("msg: ", $text);
681 return if $color < 0; # negative color == ignore if not understood 900 return if $color < 0; # negative color == ignore if not understood
682 901
683 my $fg = $CF_COLOR[$color % @CF_COLOR]; 902 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
684 903
685 ## try to create single paragraphs of multiple lines sent by the server 904 ## try to create single paragraphs of multiple lines sent by the server
686 # no longer neecssary with TRT servers 905 # no longer neecssary with TRT servers
687 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 906 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
688 907
689 ::message ({ fg => $fg, markup => $_ }) 908 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
690 for split /\n/, $text; 909 for split /\n/, $text;
691 910
692 $self->{statusbox}->add ($text, 911 $self->{statusbox}->add ($text,
693 group => $text, 912 group => $text,
694 fg => $fg, 913 fg => $fg,
… …
751 $self->{map_widget}->clr_commands; 970 $self->{map_widget}->clr_commands;
752 971
753 ::stop_game (); 972 ::stop_game ();
754} 973}
755 974
756sub image_info {
757 my ($self, $numfaces) = @_;
758
759 $self->{num_faces} = $numfaces;
760 $self->{face_prefetch} = [1 .. $numfaces];
761 $self->face_prefetch;
762}
763
764sub face_prefetch {
765 my ($self) = @_;
766
767 return unless $::CFG->{face_prefetch};
768
769 if ($self->{num_faces}) {
770 return if @{ $self->{send_queue} || [] };
771 my $todo = @{ $self->{face_prefetch} }
772 or return;
773
774 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
775
776 $self->send ("requestinfo image_sums $face $face");
777
778 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
779 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
780 } elsif (!exists $self->{num_faces}) {
781 $self->send ("requestinfo image_info");
782
783 $self->{num_faces} = 0;
784
785 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
786 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
787 }
788}
789
790sub update_floorbox { 975sub update_floorbox {
791 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 976 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
792 return unless $::CONN; 977 return unless $::CONN;
793 978
794 $::FLOORBOX->clear; 979 $::FLOORBOX->clear;
980
981 my @add;
795 982
796 my $row; 983 my $row;
797 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 984 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
798 if ($row < 6) { 985 if ($row < 6) {
799 local $_->{face_widget}; # hack to force recreation of widget 986 local $_->{face_widget}; # hack to force recreation of widget
800 local $_->{desc_widget}; # hack to force recreation of widget 987 local $_->{desc_widget}; # hack to force recreation of widget
801 CFPlus::Item::update_widgets $_; 988 CFPlus::Item::update_widgets $_;
802 989
990 push @add,
803 $::FLOORBOX->add (0, $row, $_->{face_widget}); 991 0, $row, $_->{face_widget},
804 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 992 1, $row, $_->{desc_widget};
805 993
806 $row++; 994 $row++;
807 } else { 995 } else {
808 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 996 push @add, 1, $row, new CFPlus::UI::Button
809 text => "More...", 997 text => "More...",
810 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 998 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
811 ); 999 ;
812 last; 1000 last;
813 } 1001 }
814 } 1002 }
815 if ($::CONN->{open_container}) { 1003 if ($::CONN->{open_container}) {
816 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1004 push @add, 1, $row++, new CFPlus::UI::Button
817 text => "Close container", 1005 text => "Close container",
818 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1006 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
819 ); 1007 ;
820 } 1008 }
1009
1010 $::FLOORBOX->add_at (@add);
821 }); 1011 });
822 1012
823 $::WANT_REFRESH++; 1013 $::WANT_REFRESH++;
824} 1014}
825 1015
… …
945 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1135 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
946 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1136 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
947 . "map size $self->{mapw}×$self->{maph}\n" 1137 . "map size $self->{mapw}×$self->{maph}\n"
948 ); 1138 );
949 1139
950 ::setup_build_button ($self->{editor_support}->{builder_ui});
951} 1140}
952 1141
953sub logged_in { 1142sub logged_in {
954 my ($self) = @_; 1143 my ($self) = @_;
955 1144
956 $self->send_ext_req (cfplus_support => version => 1, sub { 1145 $self->send_ext_req (cfplus_support => version => 2, sub {
1146 my (%msg) = @_;
1147
957 $self->{cfplus_ext} = $_[0]{version}; 1148 $self->{cfplus_ext} = $msg{version};
958 $self->update_server_info; 1149 $self->update_server_info;
959 1150
960 if ($self->{cfplus_ext} >= 2) { 1151 if ($self->{cfplus_ext} >= 2) {
961 $self->send_ext_req ("editor_support", sub { 1152 $self->send_ext_req ("editor_support", sub {
962 $self->{editor_support} = $_[0]; 1153 $self->{editor_support} = { @_ };
963 $self->update_server_info; 1154 $self->update_server_info;
964 1155
965 0 1156 0
966 }); 1157 });
967 } 1158 }
… …
975 $self->send_command ("output-count $::CFG->{output_count}"); 1166 $self->send_command ("output-count $::CFG->{output_count}");
976 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1167 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
977 $self->send_command ("pickup $::CFG->{pickup}"); 1168 $self->send_command ("pickup $::CFG->{pickup}");
978} 1169}
979 1170
980sub buildat {
981 my ($self, $builditem, $x, $y) = @_;
982
983 if ($self->{cfplus_ext}) {
984 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
985 }
986}
987
988sub lookat { 1171sub lookat {
989 my ($self, $x, $y) = @_; 1172 my ($self, $x, $y) = @_;
990 1173
991 if ($self->{cfplus_ext}) { 1174 if ($self->{cfplus_ext}) {
992 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1175 $self->send_ext_req (lookat => $x, $y, sub {
993 my ($msg) = @_; 1176 my (%msg) = @_;
994 1177
995 if (exists $msg->{npc_dialog}) { 1178 if (exists $msg{npc_dialog}) {
996 # start npc chat dialog 1179 # start npc chat dialog
997 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1180 $self->{npc_dialog} = new CFPlus::NPCDialog::
998 dx => $x, 1181 token => $msg{npc_dialog},
999 dy => $y,
1000 title => "$msg->{npc_dialog} (NPC)", 1182 title => "$msg{npc_dialog}[0] (NPC)",
1001 conn => $self, 1183 conn => $self,
1002 ; 1184 ;
1003 } 1185 }
1004 }); 1186 });
1005 } 1187 }
… …
1012 1194
1013 (delete $self->{npc_dialog})->destroy 1195 (delete $self->{npc_dialog})->destroy
1014 if $self->{npc_dialog}; 1196 if $self->{npc_dialog};
1015 1197
1016 $self->SUPER::destroy; 1198 $self->SUPER::destroy;
1199
1200 %$self = ();
1017} 1201}
1018 1202
1019package CFPlus::NPCDialog; 1203package CFPlus::NPCDialog;
1020 1204
1021our @ISA = 'CFPlus::UI::Toplevel'; 1205our @ISA = 'CFPlus::UI::Toplevel';
… …
1068 on_activate => sub { $this->destroy; 1 }, 1252 on_activate => sub { $this->destroy; 1 },
1069 ; 1253 ;
1070 1254
1071 $self->update_options; 1255 $self->update_options;
1072 1256
1073 $self->{id} = $self->{conn}->send_ext_req ( 1257 $self->{id} = "npc-channel-" . $self->{conn}->token;
1074 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1258 $self->{conn}->connect_ext ($self->{id} => sub {
1075 sub { $this && $this->feed (@_) } 1259 $this->feed (@_) if $this;
1076 ); 1260 });
1261
1262 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1077 1263
1078 $self->{entry}->grab_focus; 1264 $self->{entry}->grab_focus;
1079 1265
1080 $self->{textview}->add_paragraph ({ 1266 $self->{textview}->add_paragraph ({
1081 fg => [1, 1, 0, 1], 1267 fg => [1, 1, 0, 1],
… …
1104 ); 1290 );
1105 } 1291 }
1106} 1292}
1107 1293
1108sub feed { 1294sub feed {
1109 my ($self, $msg) = @_; 1295 my ($self, $type, @arg) = @_;
1110 1296
1111 CFPlus::weaken $self; 1297 CFPlus::weaken $self;
1112 1298
1113 if ($msg->{msgtype} eq "reply") { 1299 if ($type eq "update") {
1300 my (%info) = @arg;
1301
1114 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1302 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1115 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1303 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1116
1117 my $text = "\n" . CFPlus::asxml $msg->{msg};
1118 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1119 my @link;
1120 $text =~ s{
1121 ($match)
1122 }{
1123 my $kw = $1;
1124
1125 push @link, new CFPlus::UI::Label
1126 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1127 can_hover => 1,
1128 can_events => 1,
1129 padding_x => 0,
1130 padding_y => 0,
1131 on_button_up => sub {
1132 $self->send ($kw);
1133 };
1134
1135 "\x{fffc}"
1136 }giex;
1137 1304
1305 if (exists $info{msg}) {
1306 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1307 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1308 my @link;
1309 $text =~ s{
1310 ($match)
1311 }{
1312 my $kw = $1;
1313
1314 push @link, new CFPlus::UI::Label
1315 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1316 can_hover => 1,
1317 can_events => 1,
1318 padding_x => 0,
1319 padding_y => 0,
1320 on_button_up => sub {
1321 $self->send ($kw);
1322 };
1323
1324 "\x{fffc}"
1325 }giex;
1326
1138 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1327 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1139 $self->{textview}->scroll_to_bottom; 1328 $self->{textview}->scroll_to_bottom;
1329 }
1330
1140 $self->update_options; 1331 $self->update_options;
1141 } else { 1332 } else {
1142 $self->destroy; 1333 $self->destroy;
1143 } 1334 }
1144 1335
… …
1149 my ($self, $msg) = @_; 1340 my ($self, $msg) = @_;
1150 1341
1151 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1342 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1152 $self->{textview}->scroll_to_bottom; 1343 $self->{textview}->scroll_to_bottom;
1153 1344
1154 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1345 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1155} 1346}
1156 1347
1157sub destroy { 1348sub destroy {
1158 my ($self) = @_; 1349 my ($self) = @_;
1159 1350
1160 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1351 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1161 1352
1162 if ($self->{conn}) { 1353 if ($self->{conn}) {
1163 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1354 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1164 delete $self->{conn}{npc_dialog}; 1355 delete $self->{conn}{npc_dialog};
1165 $self->{conn}->disconnect_ext ($self->{id}); 1356 $self->{conn}->disconnect_ext ($self->{id});
1166 } 1357 }
1167 1358
1168 $self->SUPER::destroy; 1359 $self->SUPER::destroy;

Diff Legend

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