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.106 by root, Sun Apr 29 20:03:08 2007 UTC vs.
Revision 1.145 by root, Mon Aug 6 02:11: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 xwidget => 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
… …
64 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
65 } 78 }
66 } 79 }
67 }); 80 });
68 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} || {}};
202 }
203 });
204
69 $self->{map_widget}->add_command (@$_) 205 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 206 for @cmd_help;
71 207
72 { 208 {
73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
… …
90} 226}
91 227
92sub logprint { 228sub logprint {
93 my ($self, @a) = @_; 229 my ($self, @a) = @_;
94 230
95 $self->{log_fh} ||= do { 231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
96 my $path = "$Crossfire::VARDIR/log.$self->{host}";
97
98 open my $fh, ">>:utf8", $path
99 or die "Couldn't open logfile $path: $!";
100
101 $fh->autoflush (1);
102
103 $fh;
104 };
105
106 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
107
108 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
109 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
110
111 print {$self->{log_fh}} "$ts ", @a, "\n";
112} 232}
113 233
114sub _stat_numdiff { 234sub _stat_numdiff {
115 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
116 236
… …
279 my @skills = keys %{ $self->{skill_info} }; 399 my @skills = keys %{ $self->{skill_info} };
280 400
281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 401 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
282 $sktbl->clear; 402 $sktbl->clear;
283 403
404 my @add;
405
406 push @add,
284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
285 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
288 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
289 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ;
290 414
291 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 415 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
292 416
293 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 417 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
294 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 418 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
322 } 446 }
323 447
324 1 448 1
325 }; 449 };
326 450
451 push @add,
327 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 452 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
328 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 453 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
329 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 454 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
330 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 455 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
331 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 456 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
332 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 457 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458 ;
333 459
334 $x++ and ($x, $y) = (0, $y + 1); 460 $x++ and ($x, $y) = (0, $y + 1);
335 } 461 }
462
463 $sktbl->add_at (@add);
336 } 464 }
337 465
338 for (grep exists $stats->{$_}, @skills) { 466 for (grep exists $stats->{$_}, @skills) {
339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
577} 705}
578 706
579sub face_find { 707sub face_find {
580 my ($self, $facenum, $face, $cb) = @_; 708 my ($self, $facenum, $face, $cb) = @_;
581 709
582 my $hash = "$face->{chksum},$face->{name}"; 710 if ($face->{type} == 0) { # FT_FACE
583
584 my $id = CFPlus::DB::get_tile_id_sync $hash; 711 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
585 712
586 $face->{id} = $id; 713 $face->{id} = $id;
587 $self->{faceid}[$facenum] = $id; 714 $self->{faceid}[$facenum] = $id;
588 715
589 $self->{map}->set_tileid ($facenum => $id); 716 $self->{map}->set_tileid ($facenum => $id);
590 717
591 CFPlus::DB::get tilecache => $id, $cb; 718 CFPlus::DB::get tilecache => $id, $cb;
719
720 } elsif ($face->{type} & 1) { # with metadata
721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
722 CFPlus::DB::get res_meta => $face->{name}, $cb;
723 }
592} 724}
593 725
594sub face_update { 726sub face_update {
595 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
596 728
729 if ($face->{type} == 0) { # FT_FACE
597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
598 if $changed; 731 if $changed;
599 732
600 $self->set_texture ($face->{id} => delete $face->{image}); 733 $self->set_texture ($face->{id} => delete $face->{data});
734
735 } elsif ($face->{type} & 1) { # split metadata
736 my $cb = sub { };
737
738 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed;
744
745 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed;
753
754 &::audio_sound_push ($facenum);
755 };
756 }
757
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
764 ::add_license ($face);
765 $cb->();
766 };
767
768 } else {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
770 ::add_license ($face);
771 $cb->();
772 }
773 }
601} 774}
602 775
603sub smooth_update { 776sub smooth_update {
604 my ($self, $facenum, $face) = @_; 777 my ($self, $facenum, $face) = @_;
605 778
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
607} 780}
608 781
609sub set_texture { 782sub set_texture {
610 my ($self, $id, $data) = @_; 783 my ($self, $id, $data) = @_;
784
785 return unless $self->{map};
611 786
612 $self->{texture}[$id] = my $tex = 787 $self->{texture}[$id] = my $tex =
613 new_from_image CFPlus::Texture 788 new_from_image CFPlus::Texture
614 $data, minify => 1, mipmap => 1; 789 $data, minify => 1, mipmap => 1;
615 790
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 791 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
617 $self->{map_widget}->update; 792 $self->{map_widget}->update;
793
794 $_->() for @{(delete $self->{face_cb}{$id}) || []};
795}
796
797sub connect_face_update {
798 my ($self, $id, $cb) = @_;
799
800 push @{$self->{face_cb}{$id}}, $cb;
801
802 CFPlus::guard {
803 @{$self->{face_cb}{$id}}
804 = grep $_ != $cb,
805 @{$self->{face_cb}{$id}};
806 }
618} 807}
619 808
620sub sound_play { 809sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 810 my ($self, $type, $face, $dx, $dy, $vol) = @_;
622 811
623 $self->{sound_play}->($x, $y, $soundnum, $type); 812 &::audio_sound_play ($face, $dx, $dy, $vol)
813 unless $type & 1; # odd types are silent for future expansion
624} 814}
625 815
626my $LAST_QUERY; # server is stupid, stupid, stupid 816my $LAST_QUERY; # server is stupid, stupid, stupid
627 817
628sub query { 818sub query {
… …
630 820
631 $prompt = $LAST_QUERY unless length $prompt; 821 $prompt = $LAST_QUERY unless length $prompt;
632 $LAST_QUERY = $prompt; 822 $LAST_QUERY = $prompt;
633 823
634 $self->{query}-> ($self, $flags, $prompt); 824 $self->{query}-> ($self, $flags, $prompt);
825}
826
827sub sanitise_xml($) {
828 local $_ = shift;
829
830 # we now weed out all tags we do not support
831 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
832 # now all entities
833 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
834
835 # handle some elements
836 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
837 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
838
839 $_
635} 840}
636 841
637our %NAME_TO_COLOR = ( 842our %NAME_TO_COLOR = (
638 black => 0, 843 black => 0,
639 white => 1, 844 white => 1,
… …
667); 872);
668 873
669sub msg { 874sub msg {
670 my ($self, $color, $type, $text, @extra) = @_; 875 my ($self, $color, $type, $text, @extra) = @_;
671 876
877 $text = sanitise_xml $text;
878
672 if (my $cb = $self->{cb_msg}{$type}) { 879 if (my $cb = $self->{cb_msg}{$type}) {
673 $_->($self, $color, $type, $text, @extra) for values %$cb; 880 $_->($self, $color, $type, $text, @extra) for values %$cb;
674 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 881 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
675 $type =~ s/-/_/g; 882 $type =~ s/-/_/g;
676 $self->{$type} = $text; 883 $self->{$type} = $text;
677 } else { 884 } else {
678 $self->logprint ("msg: ", $text); 885 $self->logprint ("msg: ", $text);
679 return if $color < 0; # negative color == ignore if not understood 886 return if $color < 0; # negative color == ignore if not understood
680 887
681 my $fg = $CF_COLOR[$color % @CF_COLOR]; 888 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
682 889
683 ## try to create single paragraphs of multiple lines sent by the server 890 ## try to create single paragraphs of multiple lines sent by the server
684 # no longer neecssary with TRT servers 891 # no longer neecssary with TRT servers
685 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 892 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
686 893
687 ::message ({ fg => $fg, markup => $_ }) 894 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
688 for split /\n/, $text; 895 for split /\n/, $text;
689 896
690 $self->{statusbox}->add ($text, 897 $self->{statusbox}->add ($text,
691 group => $text, 898 group => $text,
692 fg => $fg, 899 fg => $fg,
… …
749 $self->{map_widget}->clr_commands; 956 $self->{map_widget}->clr_commands;
750 957
751 ::stop_game (); 958 ::stop_game ();
752} 959}
753 960
754sub image_info {
755 my ($self, $numfaces) = @_;
756
757 $self->{num_faces} = $numfaces;
758 $self->{face_prefetch} = [1 .. $numfaces];
759 $self->face_prefetch;
760}
761
762sub face_prefetch {
763 my ($self) = @_;
764
765 return unless $::CFG->{face_prefetch};
766
767 if ($self->{num_faces}) {
768 return if @{ $self->{send_queue} || [] };
769 my $todo = @{ $self->{face_prefetch} }
770 or return;
771
772 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
773
774 $self->send ("requestinfo image_sums $face $face");
775
776 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
777 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
778 } elsif (!exists $self->{num_faces}) {
779 $self->send ("requestinfo image_info");
780
781 $self->{num_faces} = 0;
782
783 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
784 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
785 }
786}
787
788sub update_floorbox { 961sub update_floorbox {
789 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 962 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
790 return unless $::CONN; 963 return unless $::CONN;
791 964
792 $::FLOORBOX->clear; 965 $::FLOORBOX->clear;
966
967 my @add;
793 968
794 my $row; 969 my $row;
795 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 970 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
796 if ($row < 6) { 971 if ($row < 6) {
797 local $_->{face_widget}; # hack to force recreation of widget 972 local $_->{face_widget}; # hack to force recreation of widget
798 local $_->{desc_widget}; # hack to force recreation of widget 973 local $_->{desc_widget}; # hack to force recreation of widget
799 CFPlus::Item::update_widgets $_; 974 CFPlus::Item::update_widgets $_;
800 975
976 push @add,
801 $::FLOORBOX->add (0, $row, $_->{face_widget}); 977 0, $row, $_->{face_widget},
802 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 978 1, $row, $_->{desc_widget};
803 979
804 $row++; 980 $row++;
805 } else { 981 } else {
806 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 982 push @add, 1, $row, new CFPlus::UI::Button
807 text => "More...", 983 text => "More...",
808 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 984 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
809 ); 985 ;
810 last; 986 last;
811 } 987 }
812 } 988 }
813 if ($::CONN->{open_container}) { 989 if ($::CONN->{open_container}) {
814 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 990 push @add, 1, $row++, new CFPlus::UI::Button
815 text => "Close container", 991 text => "Close container",
816 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 992 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
817 ); 993 ;
818 } 994 }
995
996 $::FLOORBOX->add_at (@add);
819 }); 997 });
820 998
821 $::WANT_REFRESH++; 999 $::WANT_REFRESH++;
822} 1000}
823 1001
… …
943 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1121 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
944 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1122 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
945 . "map size $self->{mapw}×$self->{maph}\n" 1123 . "map size $self->{mapw}×$self->{maph}\n"
946 ); 1124 );
947 1125
948 ::setup_build_button ($self->{editor_support}->{builder_ui});
949} 1126}
950 1127
951sub logged_in { 1128sub logged_in {
952 my ($self) = @_; 1129 my ($self) = @_;
953 1130
954 $self->send_ext_req (cfplus_support => version => 1, sub { 1131 $self->send_ext_req (cfplus_support => version => 2, sub {
1132 my (%msg) = @_;
1133
955 $self->{cfplus_ext} = $_[0]{version}; 1134 $self->{cfplus_ext} = $msg{version};
956 $self->update_server_info; 1135 $self->update_server_info;
957 1136
958 if ($self->{cfplus_ext} >= 2) { 1137 if ($self->{cfplus_ext} >= 2) {
959 $self->send_ext_req ("editor_support", sub { 1138 $self->send_ext_req ("editor_support", sub {
960 $self->{editor_support} = $_[0]; 1139 $self->{editor_support} = { @_ };
961 $self->update_server_info; 1140 $self->update_server_info;
962 1141
963 0 1142 0
964 }); 1143 });
965 } 1144 }
… …
973 $self->send_command ("output-count $::CFG->{output_count}"); 1152 $self->send_command ("output-count $::CFG->{output_count}");
974 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1153 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
975 $self->send_command ("pickup $::CFG->{pickup}"); 1154 $self->send_command ("pickup $::CFG->{pickup}");
976} 1155}
977 1156
978sub buildat {
979 my ($self, $builditem, $x, $y) = @_;
980
981 if ($self->{cfplus_ext}) {
982 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
983 }
984}
985
986sub lookat { 1157sub lookat {
987 my ($self, $x, $y) = @_; 1158 my ($self, $x, $y) = @_;
988 1159
989 if ($self->{cfplus_ext}) { 1160 if ($self->{cfplus_ext}) {
990 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1161 $self->send_ext_req (lookat => $x, $y, sub {
991 my ($msg) = @_; 1162 my (%msg) = @_;
992 1163
993 if (exists $msg->{npc_dialog}) { 1164 if (exists $msg{npc_dialog}) {
994 # start npc chat dialog 1165 # start npc chat dialog
995 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1166 $self->{npc_dialog} = new CFPlus::NPCDialog::
996 dx => $x, 1167 token => $msg{npc_dialog},
997 dy => $y,
998 title => "$msg->{npc_dialog} (NPC)", 1168 title => "$msg{npc_dialog}[0] (NPC)",
999 conn => $self, 1169 conn => $self,
1000 ; 1170 ;
1001 } 1171 }
1002 }); 1172 });
1003 } 1173 }
… …
1010 1180
1011 (delete $self->{npc_dialog})->destroy 1181 (delete $self->{npc_dialog})->destroy
1012 if $self->{npc_dialog}; 1182 if $self->{npc_dialog};
1013 1183
1014 $self->SUPER::destroy; 1184 $self->SUPER::destroy;
1185
1186 %$self = ();
1015} 1187}
1016 1188
1017package CFPlus::NPCDialog; 1189package CFPlus::NPCDialog;
1018 1190
1019our @ISA = 'CFPlus::UI::Toplevel'; 1191our @ISA = 'CFPlus::UI::Toplevel';
… …
1066 on_activate => sub { $this->destroy; 1 }, 1238 on_activate => sub { $this->destroy; 1 },
1067 ; 1239 ;
1068 1240
1069 $self->update_options; 1241 $self->update_options;
1070 1242
1071 $self->{id} = $self->{conn}->send_ext_req ( 1243 $self->{id} = "npc-channel-" . $self->{conn}->token;
1072 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1244 $self->{conn}->connect_ext ($self->{id} => sub {
1073 sub { $this && $this->feed (@_) } 1245 $this->feed (@_) if $this;
1074 ); 1246 });
1247
1248 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1075 1249
1076 $self->{entry}->grab_focus; 1250 $self->{entry}->grab_focus;
1077 1251
1078 $self->{textview}->add_paragraph ({ 1252 $self->{textview}->add_paragraph ({
1079 fg => [1, 1, 0, 1], 1253 fg => [1, 1, 0, 1],
… …
1102 ); 1276 );
1103 } 1277 }
1104} 1278}
1105 1279
1106sub feed { 1280sub feed {
1107 my ($self, $msg) = @_; 1281 my ($self, $type, @arg) = @_;
1108 1282
1109 CFPlus::weaken $self; 1283 CFPlus::weaken $self;
1110 1284
1111 if ($msg->{msgtype} eq "reply") { 1285 if ($type eq "update") {
1286 my (%info) = @arg;
1287
1112 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1288 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1113 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1289 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1114
1115 my $text = "\n" . CFPlus::asxml $msg->{msg};
1116 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1117 my @link;
1118 $text =~ s{
1119 ($match)
1120 }{
1121 my $kw = $1;
1122
1123 push @link, new CFPlus::UI::Label
1124 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1125 can_hover => 1,
1126 can_events => 1,
1127 padding_x => 0,
1128 padding_y => 0,
1129 on_button_up => sub {
1130 $self->send ($kw);
1131 };
1132
1133 "\x{fffc}"
1134 }giex;
1135 1290
1291 if (exists $info{msg}) {
1292 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1293 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1294 my @link;
1295 $text =~ s{
1296 ($match)
1297 }{
1298 my $kw = $1;
1299
1300 push @link, new CFPlus::UI::Label
1301 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1302 can_hover => 1,
1303 can_events => 1,
1304 padding_x => 0,
1305 padding_y => 0,
1306 on_button_up => sub {
1307 $self->send ($kw);
1308 };
1309
1310 "\x{fffc}"
1311 }giex;
1312
1136 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1313 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1137 $self->{textview}->scroll_to_bottom; 1314 $self->{textview}->scroll_to_bottom;
1315 }
1316
1138 $self->update_options; 1317 $self->update_options;
1139 } else { 1318 } else {
1140 $self->destroy; 1319 $self->destroy;
1141 } 1320 }
1142 1321
… …
1147 my ($self, $msg) = @_; 1326 my ($self, $msg) = @_;
1148 1327
1149 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1328 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1150 $self->{textview}->scroll_to_bottom; 1329 $self->{textview}->scroll_to_bottom;
1151 1330
1152 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1331 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1153} 1332}
1154 1333
1155sub destroy { 1334sub destroy {
1156 my ($self) = @_; 1335 my ($self) = @_;
1157 1336
1158 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1337 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1159 1338
1160 if ($self->{conn}) { 1339 if ($self->{conn}) {
1161 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1340 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1162 delete $self->{conn}{npc_dialog}; 1341 delete $self->{conn}{npc_dialog};
1163 $self->{conn}->disconnect_ext ($self->{id}); 1342 $self->{conn}->disconnect_ext ($self->{id});
1164 } 1343 }
1165 1344
1166 $self->SUPER::destroy; 1345 $self->SUPER::destroy;

Diff Legend

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