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.104 by root, Mon Apr 23 19:22:24 2007 UTC vs.
Revision 1.138 by root, Sat Jul 28 16:48:45 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 (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
52 $self->connect_ext (event_capabilities => sub { 60 $self->connect_ext (capabilities => sub {
53 my ($cap) = @_; 61 my (%cap) = @_;
54 62
63 #$self->send ("setup sound 0"); # we use a different protocol
64
65 $self->send_exti_msg (fx_want => {
66 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
67 #5 => !!$::CFG->{audio_enable}, # FT_SOUND
68 });
69
55 if (my $ts = $cap->{tileset}) { 70 if (my $ts = $cap{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) { 71 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default; 72 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3]; 73 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]); 74 $self->setup_req (tileset => $default->[0]);
60 75
61 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 76 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize}; 77 my $h = int $self->{maph} * 32 / $self->{tilesize};
63 78
64 $self->setup_req (mapsize => "${w}x${h}"); 79 $self->setup_req (mapsize => "${w}x${h}");
65 } 80 }
81 }
82 });
83
84 $self->{json_coder}
85 ->convert_blessed
86 ->filter_json_single_key_object (__w_ => sub {
87 $self->{widget}{$_[0]}
88 });
89
90 # widgetset new
91 $self->connect_ext (ws_n => sub {
92 my ($id) = @_;
93
94 $self->{widgetset}{$id} = {
95 w => {},
96 };
97 });
98
99 # widgetset destroy
100 $self->connect_ext (ws_d => sub {
101 my ($id) = @_;
102
103 my $ws = delete $self->{widgetset}{$id}
104 or return;
105
106 $_->destroy
107 for values %{$ws->{w}};
108 });
109
110 # widgetset create
111 $self->connect_ext (ws_c => sub {
112 my ($ws, $id, $class, $args) = @_;
113
114 for my $ev (grep /^on_/, keys %$args) {
115 $args->{$ev} = sub {
116 my $id = shift->{s_id};
117 $self->send_exti_msg (w_e => $id, $ev, \@_);
118
119 1
120 };
121 }
122
123 if (my $widget = eval {
124 local $SIG{__DIE__};
125 "CFPlus::UI::$class"->new (
126 %$args,
127 s_ws => $ws,
128 s_id => $id,
129 )
130 }
131 ) {
132 $self->{widget}{$id}
133 = $self->{widgetset}{$ws}{w}{$id}
134 = $widget;
135
136 $widget->connect (on_destroy => sub {
137 my ($widget) = @_;
138
139 delete $self->{widget}{$widget->{s_id}};
140 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
141 });
142 } else {
143 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
144 $self->send_exti_msg (w_e => $id, "destroy");
145 }
146 });
147
148 # widget call
149 $self->connect_ext (w_c => sub {
150 my ($id, $rid, $method, $args) = @_;
151
152 my $w = $self->{widget}{$id}
153 or return;
154
155 $args ||= [];
156
157 if ($rid) {
158 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
159 } else {
160 $w->$method (@$args);
161 }
162 });
163
164 # widget set
165 $self->connect_ext (w_s => sub {
166 my ($id, $attr) = @_;
167
168 my $w = $self->{widget}{$id}
169 or return;
170
171 for (my $i = 0; $i < $#$attr; $i += 2) {
172 my ($member, $value) = @$attr[$i, $i+1];
173 if (defined $value) {
174 $w->{$member} = $value;
175 } else {
176 delete $w->{$member};
177 }
178 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
179 }
180 });
181
182 # widget get
183 $self->connect_ext (w_g => sub {
184 my ($id, $rid, $attr) = @_;
185
186 my $w = $self->{widget}{$id}
187 or return;
188
189 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
190 });
191
192 # message window
193 $self->connect_ext (channel_info => sub {
194 my ($info) = @_;
195 $self->{channels}->{$info->{id}} = $info;
196 $::MESSAGE_WINDOW->add_channel ($info);
197 });
198
199 # destroy widgets on logout
200 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
201 for my $ws (values %{delete $self->{widgetset} || {}}) {
202 $_->destroy
203 for values %{delete $ws->{w} || {}};
66 } 204 }
67 }); 205 });
68 206
69 $self->{map_widget}->add_command (@$_) 207 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 208 for @cmd_help;
… …
249 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 387 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
250 $::GAUGES->{food} ->set_value ($fo, $fo_m); 388 $::GAUGES->{food} ->set_value ($fo, $fo_m);
251 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 389 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 390 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 391 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
254 my $rng = $stats->{+CS_STAT_RANGE}; 392 $::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}; 393 my $title = $stats->{+CS_STAT_TITLE};
258 $title =~ s/^Player: //; 394 $title =~ s/^Player: //;
259 $::STATWIDS->{title} ->set_text ("Title: " . $title); 395 $::STATWIDS->{title} ->set_text ("Title: " . $title);
260 396
261 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 397 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
281 my @skills = keys %{ $self->{skill_info} }; 417 my @skills = keys %{ $self->{skill_info} };
282 418
283 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 419 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
284 $sktbl->clear; 420 $sktbl->clear;
285 421
422 my @add;
423
424 push @add,
286 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 425 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
287 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 426 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
288 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 427 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
289 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 428 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
290 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 429 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
291 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 430 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
431 ;
292 432
293 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 433 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
294 434
295 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 435 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); 436 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
324 } 464 }
325 465
326 1 466 1
327 }; 467 };
328 468
469 push @add,
329 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 470 $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); 471 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 472 $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); 473 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, 474 $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); 475 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
476 ;
335 477
336 $x++ and ($x, $y) = (0, $y + 1); 478 $x++ and ($x, $y) = (0, $y + 1);
337 } 479 }
480
481 $sktbl->add_at (@add);
338 } 482 }
339 483
340 for (grep exists $stats->{$_}, @skills) { 484 for (grep exists $stats->{$_}, @skills) {
341 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 485 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
342 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 486 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
579} 723}
580 724
581sub face_find { 725sub face_find {
582 my ($self, $facenum, $face, $cb) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
583 727
584 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
585
586 my $id = CFPlus::DB::get_tile_id_sync $hash; 729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
587 730
588 $face->{id} = $id; 731 $face->{id} = $id;
589 $self->{faceid}[$facenum] = $id; 732 $self->{faceid}[$facenum] = $id;
590 733
591 $self->{map}->set_tileid ($facenum => $id); 734 $self->{map}->set_tileid ($facenum => $id);
592 735
593 CFPlus::DB::get tilecache => $id, $cb; 736 CFPlus::DB::get tilecache => $id, $cb;
737
738 } elsif ($face->{type} & 1) { # with metadata
739 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
740 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
741 }
594} 742}
595 743
596sub face_update { 744sub face_update {
597 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
598 746
747 if ($face->{type} == 0) { # FT_FACE
599 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
600 if $changed; 749 if $changed;
601 750
602 $self->set_texture ($face->{id} => delete $face->{image}); 751 $self->set_texture ($face->{id} => delete $face->{data});
752
753 } elsif ($face->{type} & 1) { # split metadata
754 my $cb = sub { };
755
756 if ($face->{type} == 3) { # FT_MUSIC
757 $cb = sub {
758 $self->{music_meta}{$facenum} = $face;
759
760 ::message ({ markup => "downloaded song #$facenum" })
761 if $changed;
762
763 &::audio_music_set ($self->{songs});
764 };
765 }
766
767 my $path = CFPlus::DB::path_of_res $face->{name};
768
769 if ($changed) { # new data
770 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
771
772 CFPlus::DB::write_file $path, $data, sub {
773 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
774 $face->{meta} = $self->{json_coder}->decode ($meta_json);
775 $face->{path} = $path;
776
777 $cb->();
778 };
779 };
780 } else {
781 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
782 $face->{path} = $path;
783 $cb->();
784 }
785 }
603} 786}
604 787
605sub smooth_update { 788sub smooth_update {
606 my ($self, $facenum, $face) = @_; 789 my ($self, $facenum, $face) = @_;
607 790
608 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 791 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
609} 792}
610 793
611sub set_texture { 794sub set_texture {
612 my ($self, $id, $data) = @_; 795 my ($self, $id, $data) = @_;
796
797 return unless $self->{map};
613 798
614 $self->{texture}[$id] = my $tex = 799 $self->{texture}[$id] = my $tex =
615 new_from_image CFPlus::Texture 800 new_from_image CFPlus::Texture
616 $data, minify => 1, mipmap => 1; 801 $data, minify => 1, mipmap => 1;
617 802
618 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 803 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
619 $self->{map_widget}->update; 804 $self->{map_widget}->update;
805
806 $_->() for @{(delete $self->{face_cb}{$id}) || []};
807}
808
809sub connect_face_update {
810 my ($self, $id, $cb) = @_;
811
812 push @{$self->{face_cb}{$id}}, $cb;
813
814 CFPlus::guard {
815 @{$self->{face_cb}{$id}}
816 = grep $_ != $cb,
817 @{$self->{face_cb}{$id}};
818 }
620} 819}
621 820
622sub sound_play { 821sub sound_play {
623 my ($self, $x, $y, $soundnum, $type) = @_; 822 my ($self, $x, $y, $soundnum, $type) = @_;
823 warn "sound play <@_>\n";#d#
624 824
625 $self->{sound_play}->($x, $y, $soundnum, $type); 825 #$self->{sound_play}->($x, $y, $soundnum, $type);
626} 826}
627 827
628my $LAST_QUERY; # server is stupid, stupid, stupid 828my $LAST_QUERY; # server is stupid, stupid, stupid
629 829
630sub query { 830sub query {
… …
633 $prompt = $LAST_QUERY unless length $prompt; 833 $prompt = $LAST_QUERY unless length $prompt;
634 $LAST_QUERY = $prompt; 834 $LAST_QUERY = $prompt;
635 835
636 $self->{query}-> ($self, $flags, $prompt); 836 $self->{query}-> ($self, $flags, $prompt);
637} 837}
838
839sub sanitise_xml($) {
840 local $_ = shift;
841
842 # we now weed out all tags we do not support
843 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
844 # now all entities
845 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
846
847 # handle some elements
848 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
849 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
850
851 $_
852}
853
854our %NAME_TO_COLOR = (
855 black => 0,
856 white => 1,
857 darkblue => 2,
858 red => 3,
859 orange => 4,
860 lightblue => 5,
861 darkorange => 6,
862 green => 7,
863 darkgreen => 8,
864 grey => 9,
865 brown => 10,
866 yellow => 11,
867 tan => 12,
868);
638 869
639our @CF_COLOR = ( 870our @CF_COLOR = (
640 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 871 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
641 [1.00, 1.00, 1.00], 872 [1.00, 1.00, 1.00],
642 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 873 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
… …
650 [0.75, 0.61, 0.20], 881 [0.75, 0.61, 0.20],
651 [0.99, 0.77, 0.26], 882 [0.99, 0.77, 0.26],
652 [0.74, 0.65, 0.41], 883 [0.74, 0.65, 0.41],
653); 884);
654 885
655sub drawinfo { 886sub msg {
656 my ($self, $color, $text) = @_; 887 my ($self, $color, $type, $text, @extra) = @_;
657 888
658 my $fg = $CF_COLOR[$color % @CF_COLOR]; 889 $text = sanitise_xml $text;
659 890
891 if (my $cb = $self->{cb_msg}{$type}) {
892 $_->($self, $color, $type, $text, @extra) for values %$cb;
893 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
894 $type =~ s/-/_/g;
895 $self->{$type} = $text;
896 } else {
660 $self->logprint ("info: ", $text); 897 $self->logprint ("msg: ", $text);
898 return if $color < 0; # negative color == ignore if not understood
661 899
900 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
901
662 ## try to create single paragraphs of multiple lines sent by the server 902 ## try to create single paragraphs of multiple lines sent by the server
663 # no longer neecssary with TRT servers 903 # no longer neecssary with TRT servers
664 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 904 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
665 905
666 $text = CFPlus::asxml $text; 906 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
667 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
668 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
669
670 ::message ({ fg => $fg, markup => $_ })
671 for split /\n/, $text; 907 for split /\n/, $text;
672 908
673 $self->{statusbox}->add ($text, 909 $self->{statusbox}->add ($text,
674 group => $text, 910 group => $text,
675 fg => $fg, 911 fg => $fg,
676 timeout => $color >= 2 ? 180 : 10, 912 timeout => $color >= 2 ? 180 : 10,
677 tooltip_font => $::FONT_FIXED, 913 tooltip_font => $::FONT_FIXED,
678 ); 914 );
679} 915 }
680
681sub drawextinfo {
682 my ($self, $color, $type, $subtype, $message) = @_;
683
684 $self->drawinfo ($color, $message);
685} 916}
686 917
687sub spell_add { 918sub spell_add {
688 my ($self, $spell) = @_; 919 my ($self, $spell) = @_;
689 920
… …
777 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1008 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
778 return unless $::CONN; 1009 return unless $::CONN;
779 1010
780 $::FLOORBOX->clear; 1011 $::FLOORBOX->clear;
781 1012
1013 my @add;
1014
782 my $row; 1015 my $row;
783 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1016 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
784 if ($row < 6) { 1017 if ($row < 6) {
785 local $_->{face_widget}; # hack to force recreation of widget 1018 local $_->{face_widget}; # hack to force recreation of widget
786 local $_->{desc_widget}; # hack to force recreation of widget 1019 local $_->{desc_widget}; # hack to force recreation of widget
787 CFPlus::Item::update_widgets $_; 1020 CFPlus::Item::update_widgets $_;
788 1021
1022 push @add,
789 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1023 0, $row, $_->{face_widget},
790 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1024 1, $row, $_->{desc_widget};
791 1025
792 $row++; 1026 $row++;
793 } else { 1027 } else {
794 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1028 push @add, 1, $row, new CFPlus::UI::Button
795 text => "More...", 1029 text => "More...",
796 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1030 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
797 ); 1031 ;
798 last; 1032 last;
799 } 1033 }
800 } 1034 }
801 if ($::CONN->{open_container}) { 1035 if ($::CONN->{open_container}) {
802 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1036 push @add, 1, $row++, new CFPlus::UI::Button
803 text => "Close container", 1037 text => "Close container",
804 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1038 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
805 ); 1039 ;
806 } 1040 }
1041
1042 $::FLOORBOX->add_at (@add);
807 }); 1043 });
808 1044
809 $::WANT_REFRESH++; 1045 $::WANT_REFRESH++;
810} 1046}
811 1047
… …
931 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1167 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
932 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1168 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
933 . "map size $self->{mapw}×$self->{maph}\n" 1169 . "map size $self->{mapw}×$self->{maph}\n"
934 ); 1170 );
935 1171
936 ::setup_build_button ($self->{editor_support}->{builder_ui});
937} 1172}
938 1173
939sub logged_in { 1174sub logged_in {
940 my ($self) = @_; 1175 my ($self) = @_;
941 1176
942 $self->send_ext_req (cfplus_support => version => 1, sub { 1177 $self->send_ext_req (cfplus_support => version => 2, sub {
1178 my (%msg) = @_;
1179
943 $self->{cfplus_ext} = $_[0]{version}; 1180 $self->{cfplus_ext} = $msg{version};
944 $self->update_server_info; 1181 $self->update_server_info;
945 1182
946 if ($self->{cfplus_ext} >= 2) { 1183 if ($self->{cfplus_ext} >= 2) {
947 $self->send_ext_req ("editor_support", sub { 1184 $self->send_ext_req ("editor_support", sub {
948 $self->{editor_support} = $_[0]; 1185 $self->{editor_support} = { @_ };
949 $self->update_server_info; 1186 $self->update_server_info;
950 1187
951 0 1188 0
952 }); 1189 });
953 } 1190 }
… …
961 $self->send_command ("output-count $::CFG->{output_count}"); 1198 $self->send_command ("output-count $::CFG->{output_count}");
962 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1199 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
963 $self->send_command ("pickup $::CFG->{pickup}"); 1200 $self->send_command ("pickup $::CFG->{pickup}");
964} 1201}
965 1202
966sub buildat {
967 my ($self, $builditem, $x, $y) = @_;
968
969 if ($self->{cfplus_ext}) {
970 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
971 }
972}
973
974sub lookat { 1203sub lookat {
975 my ($self, $x, $y) = @_; 1204 my ($self, $x, $y) = @_;
976 1205
977 if ($self->{cfplus_ext}) { 1206 if ($self->{cfplus_ext}) {
978 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1207 $self->send_ext_req (lookat => $x, $y, sub {
979 my ($msg) = @_; 1208 my (%msg) = @_;
980 1209
981 if (exists $msg->{npc_dialog}) { 1210 if (exists $msg{npc_dialog}) {
982 # start npc chat dialog 1211 # start npc chat dialog
983 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1212 $self->{npc_dialog} = new CFPlus::NPCDialog::
984 dx => $x, 1213 token => $msg{npc_dialog},
985 dy => $y,
986 title => "$msg->{npc_dialog} (NPC)", 1214 title => "$msg{npc_dialog}[0] (NPC)",
987 conn => $self, 1215 conn => $self,
988 ; 1216 ;
989 } 1217 }
990 }); 1218 });
991 } 1219 }
… …
998 1226
999 (delete $self->{npc_dialog})->destroy 1227 (delete $self->{npc_dialog})->destroy
1000 if $self->{npc_dialog}; 1228 if $self->{npc_dialog};
1001 1229
1002 $self->SUPER::destroy; 1230 $self->SUPER::destroy;
1231
1232 %$self = ();
1003} 1233}
1004 1234
1005package CFPlus::NPCDialog; 1235package CFPlus::NPCDialog;
1006 1236
1007our @ISA = 'CFPlus::UI::Toplevel'; 1237our @ISA = 'CFPlus::UI::Toplevel';
… …
1054 on_activate => sub { $this->destroy; 1 }, 1284 on_activate => sub { $this->destroy; 1 },
1055 ; 1285 ;
1056 1286
1057 $self->update_options; 1287 $self->update_options;
1058 1288
1059 $self->{id} = $self->{conn}->send_ext_req ( 1289 $self->{id} = "npc-channel-" . $self->{conn}->token;
1060 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1290 $self->{conn}->connect_ext ($self->{id} => sub {
1061 sub { $this && $this->feed (@_) } 1291 $this->feed (@_) if $this;
1062 ); 1292 });
1293
1294 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1063 1295
1064 $self->{entry}->grab_focus; 1296 $self->{entry}->grab_focus;
1065 1297
1066 $self->{textview}->add_paragraph ({ 1298 $self->{textview}->add_paragraph ({
1067 fg => [1, 1, 0, 1], 1299 fg => [1, 1, 0, 1],
… …
1090 ); 1322 );
1091 } 1323 }
1092} 1324}
1093 1325
1094sub feed { 1326sub feed {
1095 my ($self, $msg) = @_; 1327 my ($self, $type, @arg) = @_;
1096 1328
1097 CFPlus::weaken $self; 1329 CFPlus::weaken $self;
1098 1330
1099 if ($msg->{msgtype} eq "reply") { 1331 if ($type eq "update") {
1332 my (%info) = @arg;
1333
1100 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1334 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1101 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1335 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1102
1103 my $text = "\n" . CFPlus::asxml $msg->{msg};
1104 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1105 my @link;
1106 $text =~ s{
1107 ($match)
1108 }{
1109 my $kw = $1;
1110
1111 push @link, new CFPlus::UI::Label
1112 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1113 can_hover => 1,
1114 can_events => 1,
1115 padding_x => 0,
1116 padding_y => 0,
1117 on_button_up => sub {
1118 $self->send ($kw);
1119 };
1120
1121 "\x{fffc}"
1122 }giex;
1123 1336
1337 if (exists $info{msg}) {
1338 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1339 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1340 my @link;
1341 $text =~ s{
1342 ($match)
1343 }{
1344 my $kw = $1;
1345
1346 push @link, new CFPlus::UI::Label
1347 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1348 can_hover => 1,
1349 can_events => 1,
1350 padding_x => 0,
1351 padding_y => 0,
1352 on_button_up => sub {
1353 $self->send ($kw);
1354 };
1355
1356 "\x{fffc}"
1357 }giex;
1358
1124 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1359 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1125 $self->{textview}->scroll_to_bottom; 1360 $self->{textview}->scroll_to_bottom;
1361 }
1362
1126 $self->update_options; 1363 $self->update_options;
1127 } else { 1364 } else {
1128 $self->destroy; 1365 $self->destroy;
1129 } 1366 }
1130 1367
… …
1135 my ($self, $msg) = @_; 1372 my ($self, $msg) = @_;
1136 1373
1137 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1374 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1138 $self->{textview}->scroll_to_bottom; 1375 $self->{textview}->scroll_to_bottom;
1139 1376
1140 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1377 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1141} 1378}
1142 1379
1143sub destroy { 1380sub destroy {
1144 my ($self) = @_; 1381 my ($self) = @_;
1145 1382
1146 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1383 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1147 1384
1148 if ($self->{conn}) { 1385 if ($self->{conn}) {
1149 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1386 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1150 delete $self->{conn}{npc_dialog}; 1387 delete $self->{conn}{npc_dialog};
1151 $self->{conn}->disconnect_ext ($self->{id}); 1388 $self->{conn}->disconnect_ext ($self->{id});
1152 } 1389 }
1153 1390
1154 $self->SUPER::destroy; 1391 $self->SUPER::destroy;

Diff Legend

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