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.108 by root, Sun Jun 24 04:11:22 2007 UTC vs.
Revision 1.139 by root, Sun Jul 29 18:22:34 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;
… …
279 my @skills = keys %{ $self->{skill_info} }; 417 my @skills = keys %{ $self->{skill_info} };
280 418
281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 419 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
282 $sktbl->clear; 420 $sktbl->clear;
283 421
422 my @add;
423
424 push @add,
284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 425 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
285 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 426 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 427 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 428 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
288 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 429 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
289 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 430 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
431 ;
290 432
291 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>";
292 434
293 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);
294 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);
… …
322 } 464 }
323 465
324 1 466 1
325 }; 467 };
326 468
469 push @add,
327 $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
328 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),
329 $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
330 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),
331 $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,
332 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 ;
333 477
334 $x++ and ($x, $y) = (0, $y + 1); 478 $x++ and ($x, $y) = (0, $y + 1);
335 } 479 }
480
481 $sktbl->add_at (@add);
336 } 482 }
337 483
338 for (grep exists $stats->{$_}, @skills) { 484 for (grep exists $stats->{$_}, @skills) {
339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 485 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 486 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
577} 723}
578 724
579sub face_find { 725sub face_find {
580 my ($self, $facenum, $face, $cb) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
581 727
582 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
583
584 my $id = CFPlus::DB::get_tile_id_sync $hash; 729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
585 730
586 $face->{id} = $id; 731 $face->{id} = $id;
587 $self->{faceid}[$facenum] = $id; 732 $self->{faceid}[$facenum] = $id;
588 733
589 $self->{map}->set_tileid ($facenum => $id); 734 $self->{map}->set_tileid ($facenum => $id);
590 735
591 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 }
592} 742}
593 743
594sub face_update { 744sub face_update {
595 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
596 746
747 if ($face->{type} == 0) { # FT_FACE
597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
598 if $changed; 749 if $changed;
599 750
600 $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 my $path;
756
757 if ($face->{type} == 3) { # FT_MUSIC
758 # store externally
759 $path = CFPlus::DB::path_of_res $face->{name};
760
761 $cb = sub {
762 $self->{music_meta}{$facenum} = $face;
763
764 ::message ({ markup => "downloaded song #$facenum" })
765 if $changed;
766
767 &::audio_music_set ($self->{songs});
768 };
769 } elsif ($face->{type} == 5) { # FT_SOUND
770 $cb = sub {
771 $self->{sound_meta}{$facenum} = $face;
772
773 use Data::Dumper; warn Dumper $face;#d#
774 ::message ({ markup => "downloaded sound #$facenum" })
775 if $changed;
776 };
777 }
778
779
780 if ($changed) { # new data
781 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
782
783 my $put_cb = sub {
784 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
785 $face->{meta} = $self->{json_coder}->decode ($meta_json);
786 $face->{path} = $path;
787
788 $cb->();
789 };
790 };
791
792 if (defined $path) {
793 CFPlus::DB::write_file $path, $data, $put_cb;
794 } else {
795 CFPlus::DB::put "res-data" => $face->{name} => $data, $put_cb;
796 }
797 } else {
798 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
799 $face->{path} = $path;
800 $cb->();
801 }
802 }
601} 803}
602 804
603sub smooth_update { 805sub smooth_update {
604 my ($self, $facenum, $face) = @_; 806 my ($self, $facenum, $face) = @_;
605 807
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 808 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
607} 809}
608 810
609sub set_texture { 811sub set_texture {
610 my ($self, $id, $data) = @_; 812 my ($self, $id, $data) = @_;
813
814 return unless $self->{map};
611 815
612 $self->{texture}[$id] = my $tex = 816 $self->{texture}[$id] = my $tex =
613 new_from_image CFPlus::Texture 817 new_from_image CFPlus::Texture
614 $data, minify => 1, mipmap => 1; 818 $data, minify => 1, mipmap => 1;
615 819
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 820 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
617 $self->{map_widget}->update; 821 $self->{map_widget}->update;
822
823 $_->() for @{(delete $self->{face_cb}{$id}) || []};
824}
825
826sub connect_face_update {
827 my ($self, $id, $cb) = @_;
828
829 push @{$self->{face_cb}{$id}}, $cb;
830
831 CFPlus::guard {
832 @{$self->{face_cb}{$id}}
833 = grep $_ != $cb,
834 @{$self->{face_cb}{$id}};
835 }
618} 836}
619 837
620sub sound_play { 838sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 839 my ($self, $x, $y, $soundnum, $type) = @_;
840 warn "sound play <@_>\n";#d#
622 841
623 $self->{sound_play}->($x, $y, $soundnum, $type); 842 #$self->{sound_play}->($x, $y, $soundnum, $type);
624} 843}
625 844
626my $LAST_QUERY; # server is stupid, stupid, stupid 845my $LAST_QUERY; # server is stupid, stupid, stupid
627 846
628sub query { 847sub query {
… …
693 $self->{$type} = $text; 912 $self->{$type} = $text;
694 } else { 913 } else {
695 $self->logprint ("msg: ", $text); 914 $self->logprint ("msg: ", $text);
696 return if $color < 0; # negative color == ignore if not understood 915 return if $color < 0; # negative color == ignore if not understood
697 916
698 my $fg = $CF_COLOR[$color % @CF_COLOR]; 917 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
699 918
700 ## try to create single paragraphs of multiple lines sent by the server 919 ## try to create single paragraphs of multiple lines sent by the server
701 # no longer neecssary with TRT servers 920 # no longer neecssary with TRT servers
702 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 921 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
703 922
704 ::message ({ fg => $fg, markup => $_ }) 923 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
705 for split /\n/, $text; 924 for split /\n/, $text;
706 925
707 $self->{statusbox}->add ($text, 926 $self->{statusbox}->add ($text,
708 group => $text, 927 group => $text,
709 fg => $fg, 928 fg => $fg,
… …
766 $self->{map_widget}->clr_commands; 985 $self->{map_widget}->clr_commands;
767 986
768 ::stop_game (); 987 ::stop_game ();
769} 988}
770 989
771sub image_info {
772 my ($self, $numfaces) = @_;
773
774 $self->{num_faces} = $numfaces;
775 $self->{face_prefetch} = [1 .. $numfaces];
776 $self->face_prefetch;
777}
778
779sub face_prefetch {
780 my ($self) = @_;
781
782 return unless $::CFG->{face_prefetch};
783
784 if ($self->{num_faces}) {
785 return if @{ $self->{send_queue} || [] };
786 my $todo = @{ $self->{face_prefetch} }
787 or return;
788
789 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
790
791 $self->send ("requestinfo image_sums $face $face");
792
793 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
794 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
795 } elsif (!exists $self->{num_faces}) {
796 $self->send ("requestinfo image_info");
797
798 $self->{num_faces} = 0;
799
800 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
801 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
802 }
803}
804
805sub update_floorbox { 990sub update_floorbox {
806 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 991 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
807 return unless $::CONN; 992 return unless $::CONN;
808 993
809 $::FLOORBOX->clear; 994 $::FLOORBOX->clear;
995
996 my @add;
810 997
811 my $row; 998 my $row;
812 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 999 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
813 if ($row < 6) { 1000 if ($row < 6) {
814 local $_->{face_widget}; # hack to force recreation of widget 1001 local $_->{face_widget}; # hack to force recreation of widget
815 local $_->{desc_widget}; # hack to force recreation of widget 1002 local $_->{desc_widget}; # hack to force recreation of widget
816 CFPlus::Item::update_widgets $_; 1003 CFPlus::Item::update_widgets $_;
817 1004
1005 push @add,
818 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1006 0, $row, $_->{face_widget},
819 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1007 1, $row, $_->{desc_widget};
820 1008
821 $row++; 1009 $row++;
822 } else { 1010 } else {
823 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1011 push @add, 1, $row, new CFPlus::UI::Button
824 text => "More...", 1012 text => "More...",
825 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1013 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
826 ); 1014 ;
827 last; 1015 last;
828 } 1016 }
829 } 1017 }
830 if ($::CONN->{open_container}) { 1018 if ($::CONN->{open_container}) {
831 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1019 push @add, 1, $row++, new CFPlus::UI::Button
832 text => "Close container", 1020 text => "Close container",
833 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1021 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
834 ); 1022 ;
835 } 1023 }
1024
1025 $::FLOORBOX->add_at (@add);
836 }); 1026 });
837 1027
838 $::WANT_REFRESH++; 1028 $::WANT_REFRESH++;
839} 1029}
840 1030
… …
960 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1150 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
961 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1151 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
962 . "map size $self->{mapw}×$self->{maph}\n" 1152 . "map size $self->{mapw}×$self->{maph}\n"
963 ); 1153 );
964 1154
965 ::setup_build_button ($self->{editor_support}->{builder_ui});
966} 1155}
967 1156
968sub logged_in { 1157sub logged_in {
969 my ($self) = @_; 1158 my ($self) = @_;
970 1159
971 $self->send_ext_req (cfplus_support => version => 1, sub { 1160 $self->send_ext_req (cfplus_support => version => 2, sub {
1161 my (%msg) = @_;
1162
972 $self->{cfplus_ext} = $_[0]{version}; 1163 $self->{cfplus_ext} = $msg{version};
973 $self->update_server_info; 1164 $self->update_server_info;
974 1165
975 if ($self->{cfplus_ext} >= 2) { 1166 if ($self->{cfplus_ext} >= 2) {
976 $self->send_ext_req ("editor_support", sub { 1167 $self->send_ext_req ("editor_support", sub {
977 $self->{editor_support} = $_[0]; 1168 $self->{editor_support} = { @_ };
978 $self->update_server_info; 1169 $self->update_server_info;
979 1170
980 0 1171 0
981 }); 1172 });
982 } 1173 }
… …
990 $self->send_command ("output-count $::CFG->{output_count}"); 1181 $self->send_command ("output-count $::CFG->{output_count}");
991 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1182 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
992 $self->send_command ("pickup $::CFG->{pickup}"); 1183 $self->send_command ("pickup $::CFG->{pickup}");
993} 1184}
994 1185
995sub buildat {
996 my ($self, $builditem, $x, $y) = @_;
997
998 if ($self->{cfplus_ext}) {
999 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1000 }
1001}
1002
1003sub lookat { 1186sub lookat {
1004 my ($self, $x, $y) = @_; 1187 my ($self, $x, $y) = @_;
1005 1188
1006 if ($self->{cfplus_ext}) { 1189 if ($self->{cfplus_ext}) {
1007 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1190 $self->send_ext_req (lookat => $x, $y, sub {
1008 my ($msg) = @_; 1191 my (%msg) = @_;
1009 1192
1010 if (exists $msg->{npc_dialog}) { 1193 if (exists $msg{npc_dialog}) {
1011 # start npc chat dialog 1194 # start npc chat dialog
1012 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1195 $self->{npc_dialog} = new CFPlus::NPCDialog::
1013 dx => $x, 1196 token => $msg{npc_dialog},
1014 dy => $y,
1015 title => "$msg->{npc_dialog} (NPC)", 1197 title => "$msg{npc_dialog}[0] (NPC)",
1016 conn => $self, 1198 conn => $self,
1017 ; 1199 ;
1018 } 1200 }
1019 }); 1201 });
1020 } 1202 }
… …
1027 1209
1028 (delete $self->{npc_dialog})->destroy 1210 (delete $self->{npc_dialog})->destroy
1029 if $self->{npc_dialog}; 1211 if $self->{npc_dialog};
1030 1212
1031 $self->SUPER::destroy; 1213 $self->SUPER::destroy;
1214
1215 %$self = ();
1032} 1216}
1033 1217
1034package CFPlus::NPCDialog; 1218package CFPlus::NPCDialog;
1035 1219
1036our @ISA = 'CFPlus::UI::Toplevel'; 1220our @ISA = 'CFPlus::UI::Toplevel';
… …
1083 on_activate => sub { $this->destroy; 1 }, 1267 on_activate => sub { $this->destroy; 1 },
1084 ; 1268 ;
1085 1269
1086 $self->update_options; 1270 $self->update_options;
1087 1271
1088 $self->{id} = $self->{conn}->send_ext_req ( 1272 $self->{id} = "npc-channel-" . $self->{conn}->token;
1089 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1273 $self->{conn}->connect_ext ($self->{id} => sub {
1090 sub { $this && $this->feed (@_) } 1274 $this->feed (@_) if $this;
1091 ); 1275 });
1276
1277 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1092 1278
1093 $self->{entry}->grab_focus; 1279 $self->{entry}->grab_focus;
1094 1280
1095 $self->{textview}->add_paragraph ({ 1281 $self->{textview}->add_paragraph ({
1096 fg => [1, 1, 0, 1], 1282 fg => [1, 1, 0, 1],
… …
1119 ); 1305 );
1120 } 1306 }
1121} 1307}
1122 1308
1123sub feed { 1309sub feed {
1124 my ($self, $msg) = @_; 1310 my ($self, $type, @arg) = @_;
1125 1311
1126 CFPlus::weaken $self; 1312 CFPlus::weaken $self;
1127 1313
1128 if ($msg->{msgtype} eq "reply") { 1314 if ($type eq "update") {
1315 my (%info) = @arg;
1316
1129 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1317 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1130 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1318 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1131
1132 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1133 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1134 my @link;
1135 $text =~ s{
1136 ($match)
1137 }{
1138 my $kw = $1;
1139
1140 push @link, new CFPlus::UI::Label
1141 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1142 can_hover => 1,
1143 can_events => 1,
1144 padding_x => 0,
1145 padding_y => 0,
1146 on_button_up => sub {
1147 $self->send ($kw);
1148 };
1149
1150 "\x{fffc}"
1151 }giex;
1152 1319
1320 if (exists $info{msg}) {
1321 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1322 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1323 my @link;
1324 $text =~ s{
1325 ($match)
1326 }{
1327 my $kw = $1;
1328
1329 push @link, new CFPlus::UI::Label
1330 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1331 can_hover => 1,
1332 can_events => 1,
1333 padding_x => 0,
1334 padding_y => 0,
1335 on_button_up => sub {
1336 $self->send ($kw);
1337 };
1338
1339 "\x{fffc}"
1340 }giex;
1341
1153 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1342 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1154 $self->{textview}->scroll_to_bottom; 1343 $self->{textview}->scroll_to_bottom;
1344 }
1345
1155 $self->update_options; 1346 $self->update_options;
1156 } else { 1347 } else {
1157 $self->destroy; 1348 $self->destroy;
1158 } 1349 }
1159 1350
… …
1164 my ($self, $msg) = @_; 1355 my ($self, $msg) = @_;
1165 1356
1166 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1357 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1167 $self->{textview}->scroll_to_bottom; 1358 $self->{textview}->scroll_to_bottom;
1168 1359
1169 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1360 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1170} 1361}
1171 1362
1172sub destroy { 1363sub destroy {
1173 my ($self) = @_; 1364 my ($self) = @_;
1174 1365
1175 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1366 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1176 1367
1177 if ($self->{conn}) { 1368 if ($self->{conn}) {
1178 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1369 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1179 delete $self->{conn}{npc_dialog}; 1370 delete $self->{conn}{npc_dialog};
1180 $self->{conn}->disconnect_ext ($self->{id}); 1371 $self->{conn}->disconnect_ext ($self->{id});
1181 } 1372 }
1182 1373
1183 $self->SUPER::destroy; 1374 $self->SUPER::destroy;

Diff Legend

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