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.142 by root, Tue Jul 31 00:50:04 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_ambient ($self->{songs} = $ev->{ambient})
57 if $ev->{ambient};
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_meta => $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_ambient ($self->{songs});
764 };
765 } elsif ($face->{type} == 5) { # FT_SOUND
766 $cb = sub {
767 $self->{sound_meta}{$facenum} = $face;
768
769 ::message ({ markup => "downloaded sound #$facenum" })
770 if $changed;
771
772 &::audio_sound_push ($facenum);
773 };
774 }
775
776 if ($changed) { # new data
777 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
778
779 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
780 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
781 $face->{meta} = $self->{json_coder}->decode ($meta_json);
782 $cb->();
783 };
784
785 } else {
786 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
787 $cb->();
788 }
789 }
603} 790}
604 791
605sub smooth_update { 792sub smooth_update {
606 my ($self, $facenum, $face) = @_; 793 my ($self, $facenum, $face) = @_;
607 794
608 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 795 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
609} 796}
610 797
611sub set_texture { 798sub set_texture {
612 my ($self, $id, $data) = @_; 799 my ($self, $id, $data) = @_;
800
801 return unless $self->{map};
613 802
614 $self->{texture}[$id] = my $tex = 803 $self->{texture}[$id] = my $tex =
615 new_from_image CFPlus::Texture 804 new_from_image CFPlus::Texture
616 $data, minify => 1, mipmap => 1; 805 $data, minify => 1, mipmap => 1;
617 806
618 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 807 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
619 $self->{map_widget}->update; 808 $self->{map_widget}->update;
809
810 $_->() for @{(delete $self->{face_cb}{$id}) || []};
811}
812
813sub connect_face_update {
814 my ($self, $id, $cb) = @_;
815
816 push @{$self->{face_cb}{$id}}, $cb;
817
818 CFPlus::guard {
819 @{$self->{face_cb}{$id}}
820 = grep $_ != $cb,
821 @{$self->{face_cb}{$id}};
822 }
620} 823}
621 824
622sub sound_play { 825sub sound_play {
623 my ($self, $x, $y, $soundnum, $type) = @_; 826 my ($self, $type, $face, $dx, $dy, $vol) = @_;
624 827
625 $self->{sound_play}->($x, $y, $soundnum, $type); 828 &::audio_sound_play ($face, $dx, $dy, $vol)
829 unless $type & 1; # odd types are silent for future expansion
626} 830}
627 831
628my $LAST_QUERY; # server is stupid, stupid, stupid 832my $LAST_QUERY; # server is stupid, stupid, stupid
629 833
630sub query { 834sub query {
… …
633 $prompt = $LAST_QUERY unless length $prompt; 837 $prompt = $LAST_QUERY unless length $prompt;
634 $LAST_QUERY = $prompt; 838 $LAST_QUERY = $prompt;
635 839
636 $self->{query}-> ($self, $flags, $prompt); 840 $self->{query}-> ($self, $flags, $prompt);
637} 841}
842
843sub sanitise_xml($) {
844 local $_ = shift;
845
846 # we now weed out all tags we do not support
847 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
848 # now all entities
849 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
850
851 # handle some elements
852 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
853 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
854
855 $_
856}
857
858our %NAME_TO_COLOR = (
859 black => 0,
860 white => 1,
861 darkblue => 2,
862 red => 3,
863 orange => 4,
864 lightblue => 5,
865 darkorange => 6,
866 green => 7,
867 darkgreen => 8,
868 grey => 9,
869 brown => 10,
870 yellow => 11,
871 tan => 12,
872);
638 873
639our @CF_COLOR = ( 874our @CF_COLOR = (
640 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 875 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
641 [1.00, 1.00, 1.00], 876 [1.00, 1.00, 1.00],
642 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 877 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
… …
650 [0.75, 0.61, 0.20], 885 [0.75, 0.61, 0.20],
651 [0.99, 0.77, 0.26], 886 [0.99, 0.77, 0.26],
652 [0.74, 0.65, 0.41], 887 [0.74, 0.65, 0.41],
653); 888);
654 889
655sub drawinfo { 890sub msg {
656 my ($self, $color, $text) = @_; 891 my ($self, $color, $type, $text, @extra) = @_;
657 892
658 my $fg = $CF_COLOR[$color % @CF_COLOR]; 893 $text = sanitise_xml $text;
659 894
895 if (my $cb = $self->{cb_msg}{$type}) {
896 $_->($self, $color, $type, $text, @extra) for values %$cb;
897 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
898 $type =~ s/-/_/g;
899 $self->{$type} = $text;
900 } else {
660 $self->logprint ("info: ", $text); 901 $self->logprint ("msg: ", $text);
902 return if $color < 0; # negative color == ignore if not understood
661 903
904 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
905
662 ## try to create single paragraphs of multiple lines sent by the server 906 ## try to create single paragraphs of multiple lines sent by the server
663 # no longer neecssary with TRT servers 907 # no longer neecssary with TRT servers
664 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 908 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
665 909
666 $text = CFPlus::asxml $text; 910 ::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; 911 for split /\n/, $text;
672 912
673 $self->{statusbox}->add ($text, 913 $self->{statusbox}->add ($text,
674 group => $text, 914 group => $text,
675 fg => $fg, 915 fg => $fg,
676 timeout => $color >= 2 ? 180 : 10, 916 timeout => $color >= 2 ? 180 : 10,
677 tooltip_font => $::FONT_FIXED, 917 tooltip_font => $::FONT_FIXED,
678 ); 918 );
679} 919 }
680
681sub drawextinfo {
682 my ($self, $color, $type, $subtype, $message) = @_;
683
684 $self->drawinfo ($color, $message);
685} 920}
686 921
687sub spell_add { 922sub spell_add {
688 my ($self, $spell) = @_; 923 my ($self, $spell) = @_;
689 924
… …
737 $self->{map_widget}->clr_commands; 972 $self->{map_widget}->clr_commands;
738 973
739 ::stop_game (); 974 ::stop_game ();
740} 975}
741 976
742sub image_info {
743 my ($self, $numfaces) = @_;
744
745 $self->{num_faces} = $numfaces;
746 $self->{face_prefetch} = [1 .. $numfaces];
747 $self->face_prefetch;
748}
749
750sub face_prefetch {
751 my ($self) = @_;
752
753 return unless $::CFG->{face_prefetch};
754
755 if ($self->{num_faces}) {
756 return if @{ $self->{send_queue} || [] };
757 my $todo = @{ $self->{face_prefetch} }
758 or return;
759
760 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
761
762 $self->send ("requestinfo image_sums $face $face");
763
764 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
765 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
766 } elsif (!exists $self->{num_faces}) {
767 $self->send ("requestinfo image_info");
768
769 $self->{num_faces} = 0;
770
771 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
772 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
773 }
774}
775
776sub update_floorbox { 977sub update_floorbox {
777 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 978 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
778 return unless $::CONN; 979 return unless $::CONN;
779 980
780 $::FLOORBOX->clear; 981 $::FLOORBOX->clear;
982
983 my @add;
781 984
782 my $row; 985 my $row;
783 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 986 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
784 if ($row < 6) { 987 if ($row < 6) {
785 local $_->{face_widget}; # hack to force recreation of widget 988 local $_->{face_widget}; # hack to force recreation of widget
786 local $_->{desc_widget}; # hack to force recreation of widget 989 local $_->{desc_widget}; # hack to force recreation of widget
787 CFPlus::Item::update_widgets $_; 990 CFPlus::Item::update_widgets $_;
788 991
992 push @add,
789 $::FLOORBOX->add (0, $row, $_->{face_widget}); 993 0, $row, $_->{face_widget},
790 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 994 1, $row, $_->{desc_widget};
791 995
792 $row++; 996 $row++;
793 } else { 997 } else {
794 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 998 push @add, 1, $row, new CFPlus::UI::Button
795 text => "More...", 999 text => "More...",
796 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1000 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
797 ); 1001 ;
798 last; 1002 last;
799 } 1003 }
800 } 1004 }
801 if ($::CONN->{open_container}) { 1005 if ($::CONN->{open_container}) {
802 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1006 push @add, 1, $row++, new CFPlus::UI::Button
803 text => "Close container", 1007 text => "Close container",
804 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1008 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
805 ); 1009 ;
806 } 1010 }
1011
1012 $::FLOORBOX->add_at (@add);
807 }); 1013 });
808 1014
809 $::WANT_REFRESH++; 1015 $::WANT_REFRESH++;
810} 1016}
811 1017
… …
931 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1137 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
932 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1138 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
933 . "map size $self->{mapw}×$self->{maph}\n" 1139 . "map size $self->{mapw}×$self->{maph}\n"
934 ); 1140 );
935 1141
936 ::setup_build_button ($self->{editor_support}->{builder_ui});
937} 1142}
938 1143
939sub logged_in { 1144sub logged_in {
940 my ($self) = @_; 1145 my ($self) = @_;
941 1146
942 $self->send_ext_req (cfplus_support => version => 1, sub { 1147 $self->send_ext_req (cfplus_support => version => 2, sub {
1148 my (%msg) = @_;
1149
943 $self->{cfplus_ext} = $_[0]{version}; 1150 $self->{cfplus_ext} = $msg{version};
944 $self->update_server_info; 1151 $self->update_server_info;
945 1152
946 if ($self->{cfplus_ext} >= 2) { 1153 if ($self->{cfplus_ext} >= 2) {
947 $self->send_ext_req ("editor_support", sub { 1154 $self->send_ext_req ("editor_support", sub {
948 $self->{editor_support} = $_[0]; 1155 $self->{editor_support} = { @_ };
949 $self->update_server_info; 1156 $self->update_server_info;
950 1157
951 0 1158 0
952 }); 1159 });
953 } 1160 }
… …
961 $self->send_command ("output-count $::CFG->{output_count}"); 1168 $self->send_command ("output-count $::CFG->{output_count}");
962 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1169 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
963 $self->send_command ("pickup $::CFG->{pickup}"); 1170 $self->send_command ("pickup $::CFG->{pickup}");
964} 1171}
965 1172
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 { 1173sub lookat {
975 my ($self, $x, $y) = @_; 1174 my ($self, $x, $y) = @_;
976 1175
977 if ($self->{cfplus_ext}) { 1176 if ($self->{cfplus_ext}) {
978 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1177 $self->send_ext_req (lookat => $x, $y, sub {
979 my ($msg) = @_; 1178 my (%msg) = @_;
980 1179
981 if (exists $msg->{npc_dialog}) { 1180 if (exists $msg{npc_dialog}) {
982 # start npc chat dialog 1181 # start npc chat dialog
983 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1182 $self->{npc_dialog} = new CFPlus::NPCDialog::
984 dx => $x, 1183 token => $msg{npc_dialog},
985 dy => $y,
986 title => "$msg->{npc_dialog} (NPC)", 1184 title => "$msg{npc_dialog}[0] (NPC)",
987 conn => $self, 1185 conn => $self,
988 ; 1186 ;
989 } 1187 }
990 }); 1188 });
991 } 1189 }
… …
998 1196
999 (delete $self->{npc_dialog})->destroy 1197 (delete $self->{npc_dialog})->destroy
1000 if $self->{npc_dialog}; 1198 if $self->{npc_dialog};
1001 1199
1002 $self->SUPER::destroy; 1200 $self->SUPER::destroy;
1201
1202 %$self = ();
1003} 1203}
1004 1204
1005package CFPlus::NPCDialog; 1205package CFPlus::NPCDialog;
1006 1206
1007our @ISA = 'CFPlus::UI::Toplevel'; 1207our @ISA = 'CFPlus::UI::Toplevel';
… …
1054 on_activate => sub { $this->destroy; 1 }, 1254 on_activate => sub { $this->destroy; 1 },
1055 ; 1255 ;
1056 1256
1057 $self->update_options; 1257 $self->update_options;
1058 1258
1059 $self->{id} = $self->{conn}->send_ext_req ( 1259 $self->{id} = "npc-channel-" . $self->{conn}->token;
1060 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1260 $self->{conn}->connect_ext ($self->{id} => sub {
1061 sub { $this && $this->feed (@_) } 1261 $this->feed (@_) if $this;
1062 ); 1262 });
1263
1264 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1063 1265
1064 $self->{entry}->grab_focus; 1266 $self->{entry}->grab_focus;
1065 1267
1066 $self->{textview}->add_paragraph ({ 1268 $self->{textview}->add_paragraph ({
1067 fg => [1, 1, 0, 1], 1269 fg => [1, 1, 0, 1],
… …
1090 ); 1292 );
1091 } 1293 }
1092} 1294}
1093 1295
1094sub feed { 1296sub feed {
1095 my ($self, $msg) = @_; 1297 my ($self, $type, @arg) = @_;
1096 1298
1097 CFPlus::weaken $self; 1299 CFPlus::weaken $self;
1098 1300
1099 if ($msg->{msgtype} eq "reply") { 1301 if ($type eq "update") {
1302 my (%info) = @arg;
1303
1100 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1304 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1101 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1305 $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 1306
1307 if (exists $info{msg}) {
1308 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1309 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1310 my @link;
1311 $text =~ s{
1312 ($match)
1313 }{
1314 my $kw = $1;
1315
1316 push @link, new CFPlus::UI::Label
1317 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1318 can_hover => 1,
1319 can_events => 1,
1320 padding_x => 0,
1321 padding_y => 0,
1322 on_button_up => sub {
1323 $self->send ($kw);
1324 };
1325
1326 "\x{fffc}"
1327 }giex;
1328
1124 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1329 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1125 $self->{textview}->scroll_to_bottom; 1330 $self->{textview}->scroll_to_bottom;
1331 }
1332
1126 $self->update_options; 1333 $self->update_options;
1127 } else { 1334 } else {
1128 $self->destroy; 1335 $self->destroy;
1129 } 1336 }
1130 1337
… …
1135 my ($self, $msg) = @_; 1342 my ($self, $msg) = @_;
1136 1343
1137 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1344 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1138 $self->{textview}->scroll_to_bottom; 1345 $self->{textview}->scroll_to_bottom;
1139 1346
1140 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1347 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1141} 1348}
1142 1349
1143sub destroy { 1350sub destroy {
1144 my ($self) = @_; 1351 my ($self) = @_;
1145 1352
1146 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1353 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1147 1354
1148 if ($self->{conn}) { 1355 if ($self->{conn}) {
1149 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1356 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1150 delete $self->{conn}{npc_dialog}; 1357 delete $self->{conn}{npc_dialog};
1151 $self->{conn}->disconnect_ext ($self->{id}); 1358 $self->{conn}->disconnect_ext ($self->{id});
1152 } 1359 }
1153 1360
1154 $self->SUPER::destroy; 1361 $self->SUPER::destroy;

Diff Legend

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