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.115 by root, Thu Jul 12 19:10:52 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, 26 ywidget => 1,#d#
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (event_music => sub { 53 $self->connect_ext (music => sub {
54 my ($ev) = @_; 54 my ($ev) = @_;
55 55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get resmap => $chksum, sub {
72 my ($meta) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put resmap => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs});
89 });
90 }
91 }
92 }
93 }
94
95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); 56 &::audio_music_set ($self->{songs} = $ev->{play})
97 use Data::Dumper; 57 if $ev->{play};
98 warn Dumper $self->{songs};#d#
99 }
100 }); 58 });
101 59
102 $self->connect_ext (event_capabilities => sub { 60 $self->connect_ext (capabilities => sub {
103 my ($cap) = @_; 61 my (%cap) = @_;
104 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
105 if (my $ts = $cap->{tileset}) { 70 if (my $ts = $cap{tileset}) {
106 if (my ($default) = grep $_->[2] & 1, @$ts) { 71 if (my ($default) = grep $_->[2] & 1, @$ts) {
107 $self->{tileset} = $default; 72 $self->{tileset} = $default;
108 $self->{tilesize} = $default->[3]; 73 $self->{tilesize} = $default->[3];
109 $self->setup_req (tileset => $default->[0]); 74 $self->setup_req (tileset => $default->[0]);
110 75
… …
116 } 81 }
117 }); 82 });
118 83
119 $self->{json_coder} 84 $self->{json_coder}
120 ->convert_blessed 85 ->convert_blessed
121 ->filter_json_single_key_object (__widget_ref__ => sub { 86 ->filter_json_single_key_object (__w_ => sub {
122 $self->{widget}{$_[0]} 87 $self->{widget}{$_[0]}
123 }); 88 });
124 89
90 # widgetset new
125 $self->connect_ext (ws_n => sub { 91 $self->connect_ext (ws_n => sub {
126 my ($arg) = @_; 92 my ($id) = @_;
127 93
128 $self->{widgetset}{$arg{id}} = { 94 $self->{widgetset}{$id} = {
129 w => {}, 95 w => {},
130 }; 96 };
131 }); 97 });
132 98
99 # widgetset destroy
133 $self->connect_ext (ws_d => sub { 100 $self->connect_ext (ws_d => sub {
134 my ($arg) = @_; 101 my ($id) = @_;
135 102
136 my $ws = delete $self->{widgetset}{$arg{id}} 103 my $ws = delete $self->{widgetset}{$id}
137 or return; 104 or return;
138 105
139 $_->destroy 106 $_->destroy
140 for values %{$ws->{w}}; 107 for values %{$ws->{w}};
141 }); 108 });
142 109
110 # widgetset create
143 $self->connect_ext (ws_c => sub { 111 $self->connect_ext (ws_c => sub {
144 my ($arg) = @_; 112 my ($ws, $id, $class, $args) = @_;
145
146 my $args = $arg->{args} || {};
147 113
148 for my $ev (grep /^on_/, keys %$args) { 114 for my $ev (grep /^on_/, keys %$args) {
149 $args->{$ev} = sub { 115 $args->{$ev} = sub {
150 my $id = shift->{s_id}; 116 my $id = shift->{s_id};
151 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 117 $self->send_exti_msg (w_e => $id, $ev, \@_);
152 118
153 1 119 1
154 }; 120 };
155 } 121 }
156 122
157 if (my $widget = eval { 123 if (my $widget = eval {
158 local $SIG{__DIE__}; 124 local $SIG{__DIE__};
159 "CFPlus::UI::$arg->{class}"->new ( 125 "CFPlus::UI::$class"->new (
160 %$args, 126 %$args,
161 s_ws => $arg->{ws}, 127 s_ws => $ws,
162 s_id => $arg->{id}, 128 s_id => $id,
163 ) 129 )
164 } 130 }
165 ) { 131 ) {
166 $self->{widget}{$arg->{id}} 132 $self->{widget}{$id}
167 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 133 = $self->{widgetset}{$ws}{w}{$id}
168 = $widget; 134 = $widget;
169 135
170 $widget->connect (on_destroy => sub { 136 $widget->connect (on_destroy => sub {
171 my ($widget) = @_; 137 my ($widget) = @_;
172 138
173 delete $self->{widget}{$widget->{s_id}}; 139 delete $self->{widget}{$widget->{s_id}};
174 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 140 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
175 }); 141 });
176 } else { 142 } else {
177 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 143 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
178 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 144 $self->send_exti_msg (w_e => $id, "destroy");
179 } 145 }
180 }); 146 });
181 147
148 # widget call
182 $self->connect_ext (w_c => sub { 149 $self->connect_ext (w_c => sub {
183 my ($arg) = @_; 150 my ($id, $rid, $method, $args) = @_;
184 151
185 my $w = $self->{widget}{$arg->{id}} 152 my $w = $self->{widget}{$id}
186 or return; 153 or return;
187 my $m = $arg->{name};
188 154
189 my $a = $arg->{args} || []; 155 $args ||= [];
190 156
191 if (exists $arg->{rid}) { 157 if ($rid) {
192 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 158 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
193 } else { 159 } else {
194 $w->$m (@$a); 160 $w->$method (@$args);
195 } 161 }
196 }); 162 });
197 163
164 # widget set
198 $self->connect_ext (w_s => sub { 165 $self->connect_ext (w_s => sub {
199 my ($arg) = @_; 166 my ($id, $attr) = @_;
200 167
201 my $w = $self->{widget}{$arg->{id}} 168 my $w = $self->{widget}{$id}
202 or return; 169 or return;
203 170
204 $w->{$arg->{name}} = $arg->{value}; 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 }
205 }); 180 });
206 181
182 # widget get
207 $self->connect_ext (w_g => sub { 183 $self->connect_ext (w_g => sub {
208 my ($arg) = @_; 184 my ($id, $rid, $attr) = @_;
209 185
210 my $w = $self->{widget}{$arg->{id}} 186 my $w = $self->{widget}{$id}
211 or return; 187 or return;
212 188
213 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 189 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
214 }); 190 });
215 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
216 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 200 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
217 for my $ws (values %{delete $self->{widgetset} || {}}) { 201 for my $ws (values %{delete $self->{widgetset} || {}}) {
218 $_->destroy 202 $_->destroy
219 for values %{delete $ws->{w} || {}}; 203 for values %{delete $ws->{w} || {}};
220 } 204 }
… …
433 my @skills = keys %{ $self->{skill_info} }; 417 my @skills = keys %{ $self->{skill_info} };
434 418
435 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 419 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
436 $sktbl->clear; 420 $sktbl->clear;
437 421
422 my @add;
423
424 push @add,
438 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 425 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
439 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 426 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
440 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 427 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
441 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 428 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
442 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 429 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
443 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 430 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
431 ;
444 432
445 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>";
446 434
447 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);
448 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);
… …
476 } 464 }
477 465
478 1 466 1
479 }; 467 };
480 468
469 push @add,
481 $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
482 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),
483 $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
484 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),
485 $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,
486 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 ;
487 477
488 $x++ and ($x, $y) = (0, $y + 1); 478 $x++ and ($x, $y) = (0, $y + 1);
489 } 479 }
480
481 $sktbl->add_at (@add);
490 } 482 }
491 483
492 for (grep exists $stats->{$_}, @skills) { 484 for (grep exists $stats->{$_}, @skills) {
493 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 485 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
494 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 486 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
731} 723}
732 724
733sub face_find { 725sub face_find {
734 my ($self, $facenum, $face, $cb) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
735 727
736 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
737
738 my $id = CFPlus::DB::get_tile_id_sync $hash; 729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
739 730
740 $face->{id} = $id; 731 $face->{id} = $id;
741 $self->{faceid}[$facenum] = $id; 732 $self->{faceid}[$facenum] = $id;
742 733
743 $self->{map}->set_tileid ($facenum => $id); 734 $self->{map}->set_tileid ($facenum => $id);
744 735
745 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 }
746} 742}
747 743
748sub face_update { 744sub face_update {
749 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
750 746
747 if ($face->{type} == 0) { # FT_FACE
751 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
752 if $changed; 749 if $changed;
753 750
754 $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 }
755} 803}
756 804
757sub smooth_update { 805sub smooth_update {
758 my ($self, $facenum, $face) = @_; 806 my ($self, $facenum, $face) = @_;
759 807
760 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 808 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
761} 809}
762 810
763sub set_texture { 811sub set_texture {
764 my ($self, $id, $data) = @_; 812 my ($self, $id, $data) = @_;
813
814 return unless $self->{map};
765 815
766 $self->{texture}[$id] = my $tex = 816 $self->{texture}[$id] = my $tex =
767 new_from_image CFPlus::Texture 817 new_from_image CFPlus::Texture
768 $data, minify => 1, mipmap => 1; 818 $data, minify => 1, mipmap => 1;
769 819
770 $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}});
771 $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 }
772} 836}
773 837
774sub sound_play { 838sub sound_play {
775 my ($self, $x, $y, $soundnum, $type) = @_; 839 my ($self, $x, $y, $soundnum, $type) = @_;
840 warn "sound play <@_>\n";#d#
776 841
777 $self->{sound_play}->($x, $y, $soundnum, $type); 842 #$self->{sound_play}->($x, $y, $soundnum, $type);
778} 843}
779 844
780my $LAST_QUERY; # server is stupid, stupid, stupid 845my $LAST_QUERY; # server is stupid, stupid, stupid
781 846
782sub query { 847sub query {
… …
847 $self->{$type} = $text; 912 $self->{$type} = $text;
848 } else { 913 } else {
849 $self->logprint ("msg: ", $text); 914 $self->logprint ("msg: ", $text);
850 return if $color < 0; # negative color == ignore if not understood 915 return if $color < 0; # negative color == ignore if not understood
851 916
852 my $fg = $CF_COLOR[$color % @CF_COLOR]; 917 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
853 918
854 ## 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
855 # no longer neecssary with TRT servers 920 # no longer neecssary with TRT servers
856 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 921 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
857 922
858 ::message ({ fg => $fg, markup => $_ }) 923 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
859 for split /\n/, $text; 924 for split /\n/, $text;
860 925
861 $self->{statusbox}->add ($text, 926 $self->{statusbox}->add ($text,
862 group => $text, 927 group => $text,
863 fg => $fg, 928 fg => $fg,
… …
920 $self->{map_widget}->clr_commands; 985 $self->{map_widget}->clr_commands;
921 986
922 ::stop_game (); 987 ::stop_game ();
923} 988}
924 989
925sub image_info {
926 my ($self, $numfaces) = @_;
927
928 $self->{num_faces} = $numfaces;
929 $self->{face_prefetch} = [1 .. $numfaces];
930 $self->face_prefetch;
931}
932
933sub face_prefetch {
934 my ($self) = @_;
935
936 return unless $::CFG->{face_prefetch};
937
938 if ($self->{num_faces}) {
939 return if @{ $self->{send_queue} || [] };
940 my $todo = @{ $self->{face_prefetch} }
941 or return;
942
943 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
944
945 $self->send ("requestinfo image_sums $face $face");
946
947 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
948 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
949 } elsif (!exists $self->{num_faces}) {
950 $self->send ("requestinfo image_info");
951
952 $self->{num_faces} = 0;
953
954 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
955 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
956 }
957}
958
959sub update_floorbox { 990sub update_floorbox {
960 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 991 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
961 return unless $::CONN; 992 return unless $::CONN;
962 993
963 $::FLOORBOX->clear; 994 $::FLOORBOX->clear;
995
996 my @add;
964 997
965 my $row; 998 my $row;
966 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} }) {
967 if ($row < 6) { 1000 if ($row < 6) {
968 local $_->{face_widget}; # hack to force recreation of widget 1001 local $_->{face_widget}; # hack to force recreation of widget
969 local $_->{desc_widget}; # hack to force recreation of widget 1002 local $_->{desc_widget}; # hack to force recreation of widget
970 CFPlus::Item::update_widgets $_; 1003 CFPlus::Item::update_widgets $_;
971 1004
1005 push @add,
972 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1006 0, $row, $_->{face_widget},
973 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1007 1, $row, $_->{desc_widget};
974 1008
975 $row++; 1009 $row++;
976 } else { 1010 } else {
977 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1011 push @add, 1, $row, new CFPlus::UI::Button
978 text => "More...", 1012 text => "More...",
979 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1013 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
980 ); 1014 ;
981 last; 1015 last;
982 } 1016 }
983 } 1017 }
984 if ($::CONN->{open_container}) { 1018 if ($::CONN->{open_container}) {
985 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1019 push @add, 1, $row++, new CFPlus::UI::Button
986 text => "Close container", 1020 text => "Close container",
987 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1021 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
988 ); 1022 ;
989 } 1023 }
1024
1025 $::FLOORBOX->add_at (@add);
990 }); 1026 });
991 1027
992 $::WANT_REFRESH++; 1028 $::WANT_REFRESH++;
993} 1029}
994 1030
… …
1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1150 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1151 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1116 . "map size $self->{mapw}×$self->{maph}\n" 1152 . "map size $self->{mapw}×$self->{maph}\n"
1117 ); 1153 );
1118 1154
1119 ::setup_build_button ($self->{editor_support}->{builder_ui});
1120} 1155}
1121 1156
1122sub logged_in { 1157sub logged_in {
1123 my ($self) = @_; 1158 my ($self) = @_;
1124 1159
1125 $self->send_ext_req (cfplus_support => version => 1, sub { 1160 $self->send_ext_req (cfplus_support => version => 2, sub {
1161 my (%msg) = @_;
1162
1126 $self->{cfplus_ext} = $_[0]{version}; 1163 $self->{cfplus_ext} = $msg{version};
1127 $self->update_server_info; 1164 $self->update_server_info;
1128 1165
1129 if ($self->{cfplus_ext} >= 2) { 1166 if ($self->{cfplus_ext} >= 2) {
1130 $self->send_ext_req ("editor_support", sub { 1167 $self->send_ext_req ("editor_support", sub {
1131 $self->{editor_support} = $_[0]; 1168 $self->{editor_support} = { @_ };
1132 $self->update_server_info; 1169 $self->update_server_info;
1133 1170
1134 0 1171 0
1135 }); 1172 });
1136 } 1173 }
… …
1144 $self->send_command ("output-count $::CFG->{output_count}"); 1181 $self->send_command ("output-count $::CFG->{output_count}");
1145 $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;
1146 $self->send_command ("pickup $::CFG->{pickup}"); 1183 $self->send_command ("pickup $::CFG->{pickup}");
1147} 1184}
1148 1185
1149sub buildat {
1150 my ($self, $builditem, $x, $y) = @_;
1151
1152 if ($self->{cfplus_ext}) {
1153 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1154 }
1155}
1156
1157sub lookat { 1186sub lookat {
1158 my ($self, $x, $y) = @_; 1187 my ($self, $x, $y) = @_;
1159 1188
1160 if ($self->{cfplus_ext}) { 1189 if ($self->{cfplus_ext}) {
1161 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1190 $self->send_ext_req (lookat => $x, $y, sub {
1162 my ($msg) = @_; 1191 my (%msg) = @_;
1163 1192
1164 if (exists $msg->{npc_dialog}) { 1193 if (exists $msg{npc_dialog}) {
1165 # start npc chat dialog 1194 # start npc chat dialog
1166 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1195 $self->{npc_dialog} = new CFPlus::NPCDialog::
1167 dx => $x, 1196 token => $msg{npc_dialog},
1168 dy => $y,
1169 title => "$msg->{npc_dialog} (NPC)", 1197 title => "$msg{npc_dialog}[0] (NPC)",
1170 conn => $self, 1198 conn => $self,
1171 ; 1199 ;
1172 } 1200 }
1173 }); 1201 });
1174 } 1202 }
… …
1239 on_activate => sub { $this->destroy; 1 }, 1267 on_activate => sub { $this->destroy; 1 },
1240 ; 1268 ;
1241 1269
1242 $self->update_options; 1270 $self->update_options;
1243 1271
1244 $self->{id} = $self->{conn}->send_ext_req ( 1272 $self->{id} = "npc-channel-" . $self->{conn}->token;
1245 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1273 $self->{conn}->connect_ext ($self->{id} => sub {
1246 sub { $this && $this->feed (@_) } 1274 $this->feed (@_) if $this;
1247 ); 1275 });
1276
1277 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1248 1278
1249 $self->{entry}->grab_focus; 1279 $self->{entry}->grab_focus;
1250 1280
1251 $self->{textview}->add_paragraph ({ 1281 $self->{textview}->add_paragraph ({
1252 fg => [1, 1, 0, 1], 1282 fg => [1, 1, 0, 1],
… …
1275 ); 1305 );
1276 } 1306 }
1277} 1307}
1278 1308
1279sub feed { 1309sub feed {
1280 my ($self, $msg) = @_; 1310 my ($self, $type, @arg) = @_;
1281 1311
1282 CFPlus::weaken $self; 1312 CFPlus::weaken $self;
1283 1313
1284 if ($msg->{msgtype} eq "reply") { 1314 if ($type eq "update") {
1315 my (%info) = @arg;
1316
1285 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1317 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1286 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1318 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1287
1288 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1289 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1290 my @link;
1291 $text =~ s{
1292 ($match)
1293 }{
1294 my $kw = $1;
1295
1296 push @link, new CFPlus::UI::Label
1297 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1298 can_hover => 1,
1299 can_events => 1,
1300 padding_x => 0,
1301 padding_y => 0,
1302 on_button_up => sub {
1303 $self->send ($kw);
1304 };
1305
1306 "\x{fffc}"
1307 }giex;
1308 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
1309 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1342 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1310 $self->{textview}->scroll_to_bottom; 1343 $self->{textview}->scroll_to_bottom;
1344 }
1345
1311 $self->update_options; 1346 $self->update_options;
1312 } else { 1347 } else {
1313 $self->destroy; 1348 $self->destroy;
1314 } 1349 }
1315 1350
… …
1320 my ($self, $msg) = @_; 1355 my ($self, $msg) = @_;
1321 1356
1322 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1357 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1323 $self->{textview}->scroll_to_bottom; 1358 $self->{textview}->scroll_to_bottom;
1324 1359
1325 $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);
1326} 1361}
1327 1362
1328sub destroy { 1363sub destroy {
1329 my ($self) = @_; 1364 my ($self) = @_;
1330 1365
1331 #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
1332 1367
1333 if ($self->{conn}) { 1368 if ($self->{conn}) {
1334 $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};
1335 delete $self->{conn}{npc_dialog}; 1370 delete $self->{conn}{npc_dialog};
1336 $self->{conn}->disconnect_ext ($self->{id}); 1371 $self->{conn}->disconnect_ext ($self->{id});
1337 } 1372 }
1338 1373
1339 $self->SUPER::destroy; 1374 $self->SUPER::destroy;

Diff Legend

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