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.118 by root, Fri Jul 13 15:44:48 2007 UTC vs.
Revision 1.148 by root, Fri Aug 10 04:02:13 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 (ambient_music => sub {
54 my ($ev) = @_; 54 my ($songs) = @_;
55 55 &::audio_music_set_ambient ($songs);
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 "res-metadata" => $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 "res-metadata" => $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]);
97 }
98 }); 56 });
99 57
100 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
101 my ($cap) = @_; 59 my (%cap) = @_;
102 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
103 if (my $ts = $cap->{tileset}) { 64 if (my $ts = $cap{tileset}) {
104 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
105 $self->{tileset} = $default; 66 $self->{tileset} = $default;
106 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
107 $self->setup_req (tileset => $default->[0]); 68 $self->setup_req (tileset => $default->[0]);
108 69
… …
114 } 75 }
115 }); 76 });
116 77
117 $self->{json_coder} 78 $self->{json_coder}
118 ->convert_blessed 79 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub { 80 ->filter_json_single_key_object (__w_ => sub {
120 $self->{widget}{$_[0]} 81 $self->{widget}{$_[0]}
121 }); 82 });
122 83
84 # widgetset new
123 $self->connect_ext (ws_n => sub { 85 $self->connect_ext (ws_n => sub {
124 my ($arg) = @_; 86 my ($id) = @_;
125 87
126 $self->{widgetset}{$arg{id}} = { 88 $self->{widgetset}{$id} = {
127 w => {}, 89 w => {},
128 }; 90 };
129 }); 91 });
130 92
93 # widgetset destroy
131 $self->connect_ext (ws_d => sub { 94 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_; 95 my ($id) = @_;
133 96
134 my $ws = delete $self->{widgetset}{$arg{id}} 97 my $ws = delete $self->{widgetset}{$id}
135 or return; 98 or return;
136 99
137 $_->destroy 100 $_->destroy
138 for values %{$ws->{w}}; 101 for values %{$ws->{w}};
139 }); 102 });
140 103
104 # widgetset create
141 $self->connect_ext (ws_c => sub { 105 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_; 106 my ($ws, $id, $class, $args) = @_;
143
144 my $args = $arg->{args} || {};
145 107
146 for my $ev (grep /^on_/, keys %$args) { 108 for my $ev (grep /^on_/, keys %$args) {
147 $args->{$ev} = sub { 109 $args->{$ev} = sub {
148 my $id = shift->{s_id}; 110 my $id = shift->{s_id};
149 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 111 $self->send_exti_msg (w_e => $id, $ev, \@_);
150 112
151 1 113 1
152 }; 114 };
153 } 115 }
154 116
155 if (my $widget = eval { 117 if (my $widget = eval {
156 local $SIG{__DIE__}; 118 local $SIG{__DIE__};
157 "CFPlus::UI::$arg->{class}"->new ( 119 "CFPlus::UI::$class"->new (
158 %$args, 120 %$args,
159 s_ws => $arg->{ws}, 121 s_ws => $ws,
160 s_id => $arg->{id}, 122 s_id => $id,
161 ) 123 )
162 } 124 }
163 ) { 125 ) {
164 $self->{widget}{$arg->{id}} 126 $self->{widget}{$id}
165 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 127 = $self->{widgetset}{$ws}{w}{$id}
166 = $widget; 128 = $widget;
167 129
168 $widget->connect (on_destroy => sub { 130 $widget->connect (on_destroy => sub {
169 my ($widget) = @_; 131 my ($widget) = @_;
170 132
171 delete $self->{widget}{$widget->{s_id}}; 133 delete $self->{widget}{$widget->{s_id}};
172 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
173 }); 135 });
174 } else { 136 } else {
175 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 138 $self->send_exti_msg (w_e => $id, "destroy");
177 } 139 }
178 }); 140 });
179 141
142 # widget call
180 $self->connect_ext (w_c => sub { 143 $self->connect_ext (w_c => sub {
181 my ($arg) = @_; 144 my ($id, $rid, $method, $args) = @_;
182 145
183 my $w = $self->{widget}{$arg->{id}} 146 my $w = $self->{widget}{$id}
184 or return; 147 or return;
185 my $m = $arg->{name};
186 148
187 my $a = $arg->{args} || []; 149 $args ||= [];
188 150
189 if (exists $arg->{rid}) { 151 if ($rid) {
190 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
191 } else { 153 } else {
192 $w->$m (@$a); 154 $w->$method (@$args);
193 } 155 }
194 }); 156 });
195 157
158 # widget set
196 $self->connect_ext (w_s => sub { 159 $self->connect_ext (w_s => sub {
197 my ($arg) = @_; 160 my ($id, $attr) = @_;
198 161
199 my $w = $self->{widget}{$arg->{id}} 162 my $w = $self->{widget}{$id}
200 or return; 163 or return;
201 164
202 $w->{$arg->{name}} = $arg->{value}; 165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
203 }); 174 });
204 175
176 # widget get
205 $self->connect_ext (w_g => sub { 177 $self->connect_ext (w_g => sub {
206 my ($arg) = @_; 178 my ($id, $rid, $attr) = @_;
207 179
208 my $w = $self->{widget}{$arg->{id}} 180 my $w = $self->{widget}{$id}
209 or return; 181 or return;
210 182
211 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
212 }); 184 });
213 185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
191 });
192
193 # destroy widgets on logout
214 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
215 for my $ws (values %{delete $self->{widgetset} || {}}) { 195 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy 196 $_->destroy
217 for values %{delete $ws->{w} || {}}; 197 for values %{delete $ws->{w} || {}};
218 } 198 }
… …
239 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
240 220
241 $self 221 $self
242} 222}
243 223
224sub update_fx_want {
225 my ($self) = @_;
226
227 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND
230 });
231}
232
244sub logprint { 233sub logprint {
245 my ($self, @a) = @_; 234 my ($self, @a) = @_;
246 235
247 $self->{log_fh} ||= do { 236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
248 my $path = "$Crossfire::VARDIR/log.$self->{host}";
249
250 open my $fh, ">>:utf8", $path
251 or die "Couldn't open logfile $path: $!";
252
253 $fh->autoflush (1);
254
255 $fh;
256 };
257
258 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
259
260 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
261 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
262
263 print {$self->{log_fh}} "$ts ", @a, "\n";
264} 237}
265 238
266sub _stat_numdiff { 239sub _stat_numdiff {
267 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
268 241
… …
431 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
432 405
433 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
434 $sktbl->clear; 407 $sktbl->clear;
435 408
409 my @add;
410
411 push @add,
436 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
437 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
438 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
439 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
440 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
441 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
442 419
443 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 420 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
444 421
445 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 422 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
446 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 423 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
474 } 451 }
475 452
476 1 453 1
477 }; 454 };
478 455
456 push @add,
479 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 457 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
480 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 458 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
481 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 459 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
482 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 460 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
483 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 461 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
484 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ;
485 464
486 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
487 } 466 }
467
468 $sktbl->add_at (@add);
488 } 469 }
489 470
490 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
491 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
492 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
525} 506}
526 507
527sub feed_map1a { 508sub feed_map1a {
528 my ($self, $data) = @_; 509 my ($self, $data) = @_;
529 510
530 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 511 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
512 my $delay;
513
514 for my $tile (@$missing) {
515 next if $self->{delay}{$tile};
516
517 $delay = 1;
518
519 if (my $tex = $::CONN->{texture}[$tile]) {
520 $tex->upload;
521 } else {
522 $self->{delay}{$tile} = 1;
523
524 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile};
527 $_[0]->upload;
528 };
529 }
530 }
531
532 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update;
537 });
538 } else {
531 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
532} 541}
533 542
534sub magicmap { 543sub magicmap {
535 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
536 545
… …
568 do { 577 do {
569 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
570 or return; 579 or return;
571 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
572 581
573 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
574 my ($data) = @_; 583 my ($exists) = @_;
575 584
576 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
577 586
578 $self->set_texture ($id => $data) 587 $self->have_tile ($id)
579 if defined $data; 588 if $exists;
580 589
581 $self->bg_fetch; 590 $self->bg_fetch;
582 }; 591 };
583} 592}
584 593
… …
729} 738}
730 739
731sub face_find { 740sub face_find {
732 my ($self, $facenum, $face, $cb) = @_; 741 my ($self, $facenum, $face, $cb) = @_;
733 742
734 my $hash = "$face->{chksum},$face->{name}"; 743 if ($face->{type} == 0) { # FT_FACE
735
736 my $id = CFPlus::DB::get_tile_id_sync $hash; 744 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
737 745
738 $face->{id} = $id; 746 $face->{id} = $id;
739 $self->{faceid}[$facenum] = $id; 747 $self->{faceid}[$facenum] = $id;
740 748
741 $self->{map}->set_tileid ($facenum => $id); 749 $self->{map}->set_tileid ($facenum => $id);
742 750
743 CFPlus::DB::get tilecache => $id, $cb; 751 CFPlus::DB::get tilecache => $id, $cb;
752
753 } elsif ($face->{type} & 1) { # with metadata
754 CFPlus::DB::get res_meta => $face->{name}, $cb;
755 }
744} 756}
745 757
746sub face_update { 758sub face_update {
747 my ($self, $facenum, $face, $changed) = @_; 759 my ($self, $facenum, $face, $changed) = @_;
748 760
761 if ($face->{type} == 0) { # FT_FACE
749 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 762 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
750 if $changed; 763 if $changed;
751 764
752 $self->set_texture ($face->{id} => delete $face->{image}); 765 $self->have_tile ($face->{id});
766
767 } elsif ($face->{type} & 1) { # split metadata
768 if ($changed) { # new data
769 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
770 $face->{meta} = $self->{json_coder}->decode ($meta_json);
771
772 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
773 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
774 } else {
775 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
776 }
777
778 ::add_license ($face);
779
780 if ($face->{type} == 3) { # FT_MUSIC
781 $self->{music_meta}{$facenum} = $face;
782
783 ::message ({ markup => "downloaded song #$facenum" })
784 if $changed;
785
786 &::audio_music_push ($facenum);
787 } elsif ($face->{type} == 5) { # FT_SOUND
788 $self->{sound_meta}{$facenum} = $face;
789
790 ::message ({ markup => "downloaded sound #$facenum" })
791 if $changed;
792
793 &::audio_sound_push ($facenum);
794 }
795
796 }
753} 797}
754 798
755sub smooth_update { 799sub smooth_update {
756 my ($self, $facenum, $face) = @_; 800 my ($self, $facenum, $face) = @_;
757 801
758 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 802 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
759} 803}
760 804
761sub set_texture { 805sub have_tile {
762 my ($self, $id, $data) = @_; 806 my ($self, $tile) = @_;
763 807
764 return unless $self->{map}; 808 return unless $self->{map};
765 809
766 $self->{texture}[$id] = my $tex = 810 my $tex = $self->{texture}[$tile] ||=
767 new_from_image CFPlus::Texture 811 new CFPlus::Texture
768 $data, minify => 1, mipmap => 1; 812 tile => $tile, minify => 1, mipmap => 1, delay => 1;
769 813
770 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 814 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
771 $self->{map_widget}->update; 815}
816
817sub connect_face_update {
818 my ($self, $id, $cb) = @_;
819
820 push @{$self->{face_cb}{$id}}, $cb;
821
822 CFPlus::guard {
823 @{$self->{face_cb}{$id}}
824 = grep $_ != $cb,
825 @{$self->{face_cb}{$id}};
826 }
772} 827}
773 828
774sub sound_play { 829sub sound_play {
775 my ($self, $x, $y, $soundnum, $type) = @_; 830 my ($self, $type, $face, $dx, $dy, $vol) = @_;
776 831
777 $self->{sound_play}->($x, $y, $soundnum, $type); 832 &::audio_sound_play ($face, $dx, $dy, $vol)
833 unless $type & 1; # odd types are silent for future expansion
778} 834}
779 835
780my $LAST_QUERY; # server is stupid, stupid, stupid 836my $LAST_QUERY; # server is stupid, stupid, stupid
781 837
782sub query { 838sub query {
… …
847 $self->{$type} = $text; 903 $self->{$type} = $text;
848 } else { 904 } else {
849 $self->logprint ("msg: ", $text); 905 $self->logprint ("msg: ", $text);
850 return if $color < 0; # negative color == ignore if not understood 906 return if $color < 0; # negative color == ignore if not understood
851 907
852 my $fg = $CF_COLOR[$color % @CF_COLOR]; 908 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
853 909
854 ## try to create single paragraphs of multiple lines sent by the server 910 ## try to create single paragraphs of multiple lines sent by the server
855 # no longer neecssary with TRT servers 911 # no longer neecssary with TRT servers
856 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 912 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
857 913
858 ::message ({ fg => $fg, markup => $_ }) 914 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
859 for split /\n/, $text; 915 for split /\n/, $text;
860 916
861 $self->{statusbox}->add ($text, 917 $self->{statusbox}->add ($text,
862 group => $text, 918 group => $text,
863 fg => $fg, 919 fg => $fg,
… …
920 $self->{map_widget}->clr_commands; 976 $self->{map_widget}->clr_commands;
921 977
922 ::stop_game (); 978 ::stop_game ();
923} 979}
924 980
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 { 981sub update_floorbox {
960 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 982 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
961 return unless $::CONN; 983 return unless $::CONN;
962 984
963 $::FLOORBOX->clear; 985 $::FLOORBOX->clear;
986
987 my @add;
964 988
965 my $row; 989 my $row;
966 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 990 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
967 if ($row < 6) { 991 if ($row < 6) {
968 local $_->{face_widget}; # hack to force recreation of widget 992 local $_->{face_widget}; # hack to force recreation of widget
969 local $_->{desc_widget}; # hack to force recreation of widget 993 local $_->{desc_widget}; # hack to force recreation of widget
970 CFPlus::Item::update_widgets $_; 994 CFPlus::Item::update_widgets $_;
971 995
996 push @add,
972 $::FLOORBOX->add (0, $row, $_->{face_widget}); 997 0, $row, $_->{face_widget},
973 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 998 1, $row, $_->{desc_widget};
974 999
975 $row++; 1000 $row++;
976 } else { 1001 } else {
977 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1002 push @add, 1, $row, new CFPlus::UI::Button
978 text => "More...", 1003 text => "More...",
979 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1004 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
980 ); 1005 ;
981 last; 1006 last;
982 } 1007 }
983 } 1008 }
984 if ($::CONN->{open_container}) { 1009 if ($::CONN->{open_container}) {
985 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1010 push @add, 1, $row++, new CFPlus::UI::Button
986 text => "Close container", 1011 text => "Close container",
987 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1012 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
988 ); 1013 ;
989 } 1014 }
990 });
991 1015
1016 $::FLOORBOX->add_at (@add);
1017 });
1018
992 $::WANT_REFRESH++; 1019 $::WANT_REFRESH->start;
993} 1020}
994 1021
995sub set_opencont { 1022sub set_opencont {
996 my ($conn, $tag, $name) = @_; 1023 my ($conn, $tag, $name) = @_;
997 $conn->{open_container} = $tag; 1024 $conn->{open_container} = $tag;
… …
1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1141 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1142 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1116 . "map size $self->{mapw}×$self->{maph}\n" 1143 . "map size $self->{mapw}×$self->{maph}\n"
1117 ); 1144 );
1118 1145
1119 ::setup_build_button ($self->{editor_support}->{builder_ui});
1120} 1146}
1121 1147
1122sub logged_in { 1148sub logged_in {
1123 my ($self) = @_; 1149 my ($self) = @_;
1124 1150
1125 $self->send_ext_req (cfplus_support => version => 1, sub { 1151 $self->send_ext_req (cfplus_support => version => 2, sub {
1152 my (%msg) = @_;
1153
1126 $self->{cfplus_ext} = $_[0]{version}; 1154 $self->{cfplus_ext} = $msg{version};
1127 $self->update_server_info; 1155 $self->update_server_info;
1128 1156
1129 if ($self->{cfplus_ext} >= 2) { 1157 if ($self->{cfplus_ext} >= 2) {
1130 $self->send_ext_req ("editor_support", sub { 1158 $self->send_ext_req ("editor_support", sub {
1131 $self->{editor_support} = $_[0]; 1159 $self->{editor_support} = { @_ };
1132 $self->update_server_info; 1160 $self->update_server_info;
1133 1161
1134 0 1162 0
1135 }); 1163 });
1136 } 1164 }
… …
1144 $self->send_command ("output-count $::CFG->{output_count}"); 1172 $self->send_command ("output-count $::CFG->{output_count}");
1145 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1173 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1146 $self->send_command ("pickup $::CFG->{pickup}"); 1174 $self->send_command ("pickup $::CFG->{pickup}");
1147} 1175}
1148 1176
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 { 1177sub lookat {
1158 my ($self, $x, $y) = @_; 1178 my ($self, $x, $y) = @_;
1159 1179
1160 if ($self->{cfplus_ext}) { 1180 if ($self->{cfplus_ext}) {
1161 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1181 $self->send_ext_req (lookat => $x, $y, sub {
1162 my ($msg) = @_; 1182 my (%msg) = @_;
1163 1183
1164 if (exists $msg->{npc_dialog}) { 1184 if (exists $msg{npc_dialog}) {
1165 # start npc chat dialog 1185 # start npc chat dialog
1166 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1186 $self->{npc_dialog} = new CFPlus::NPCDialog::
1167 dx => $x, 1187 token => $msg{npc_dialog},
1168 dy => $y,
1169 title => "$msg->{npc_dialog} (NPC)", 1188 title => "$msg{npc_dialog}[0] (NPC)",
1170 conn => $self, 1189 conn => $self,
1171 ; 1190 ;
1172 } 1191 }
1173 }); 1192 });
1174 } 1193 }
… …
1239 on_activate => sub { $this->destroy; 1 }, 1258 on_activate => sub { $this->destroy; 1 },
1240 ; 1259 ;
1241 1260
1242 $self->update_options; 1261 $self->update_options;
1243 1262
1244 $self->{id} = $self->{conn}->send_ext_req ( 1263 $self->{id} = "npc-channel-" . $self->{conn}->token;
1245 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1264 $self->{conn}->connect_ext ($self->{id} => sub {
1246 sub { $this && $this->feed (@_) } 1265 $this->feed (@_) if $this;
1247 ); 1266 });
1267
1268 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1248 1269
1249 $self->{entry}->grab_focus; 1270 $self->{entry}->grab_focus;
1250 1271
1251 $self->{textview}->add_paragraph ({ 1272 $self->{textview}->add_paragraph ({
1252 fg => [1, 1, 0, 1], 1273 fg => [1, 1, 0, 1],
… …
1275 ); 1296 );
1276 } 1297 }
1277} 1298}
1278 1299
1279sub feed { 1300sub feed {
1280 my ($self, $msg) = @_; 1301 my ($self, $type, @arg) = @_;
1281 1302
1282 CFPlus::weaken $self; 1303 CFPlus::weaken $self;
1283 1304
1284 if ($msg->{msgtype} eq "reply") { 1305 if ($type eq "update") {
1306 my (%info) = @arg;
1307
1285 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1308 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1286 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1309 $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 1310
1311 if (exists $info{msg}) {
1312 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1313 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1314 my @link;
1315 $text =~ s{
1316 ($match)
1317 }{
1318 my $kw = $1;
1319
1320 push @link, new CFPlus::UI::Label
1321 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1322 can_hover => 1,
1323 can_events => 1,
1324 padding_x => 0,
1325 padding_y => 0,
1326 on_button_up => sub {
1327 $self->send ($kw);
1328 };
1329
1330 "\x{fffc}"
1331 }giex;
1332
1309 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1333 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1310 $self->{textview}->scroll_to_bottom; 1334 $self->{textview}->scroll_to_bottom;
1335 }
1336
1311 $self->update_options; 1337 $self->update_options;
1312 } else { 1338 } else {
1313 $self->destroy; 1339 $self->destroy;
1314 } 1340 }
1315 1341
… …
1320 my ($self, $msg) = @_; 1346 my ($self, $msg) = @_;
1321 1347
1322 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1348 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1323 $self->{textview}->scroll_to_bottom; 1349 $self->{textview}->scroll_to_bottom;
1324 1350
1325 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1351 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1326} 1352}
1327 1353
1328sub destroy { 1354sub destroy {
1329 my ($self) = @_; 1355 my ($self) = @_;
1330 1356
1331 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1357 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1332 1358
1333 if ($self->{conn}) { 1359 if ($self->{conn}) {
1334 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1360 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1335 delete $self->{conn}{npc_dialog}; 1361 delete $self->{conn}{npc_dialog};
1336 $self->{conn}->disconnect_ext ($self->{id}); 1362 $self->{conn}->disconnect_ext ($self->{id});
1337 } 1363 }
1338 1364
1339 $self->SUPER::destroy; 1365 $self->SUPER::destroy;

Diff Legend

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