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.111 by root, Mon Jul 2 02:58:51 2007 UTC vs.
Revision 1.153 by root, Mon Aug 13 14:24:17 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, 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 (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
53 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
54 my ($cap) = @_; 59 my (%cap) = @_;
55 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
56 if (my $ts = $cap->{tileset}) { 64 if (my $ts = $cap{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default; 66 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]); 68 $self->setup_req (tileset => $default->[0]);
61 69
… …
67 } 75 }
68 }); 76 });
69 77
70 $self->{json_coder} 78 $self->{json_coder}
71 ->convert_blessed 79 ->convert_blessed
72 ->filter_json_single_key_object (__widget_ref__ => sub { 80 ->filter_json_single_key_object (__w_ => sub {
73 $self->{widget}{$_[0]} 81 $self->{widget}{$_[0]}
74 }); 82 });
75 83
84 # widgetset new
76 $self->connect_ext (ws_n => sub { 85 $self->connect_ext (ws_n => sub {
77 my ($arg) = @_; 86 my ($id) = @_;
78 87
79 $self->{widgetset}{$arg{id}} = { 88 $self->{widgetset}{$id} = {
80 w => {}, 89 w => {},
81 }; 90 };
82 }); 91 });
83 92
93 # widgetset destroy
84 $self->connect_ext (ws_d => sub { 94 $self->connect_ext (ws_d => sub {
85 my ($arg) = @_; 95 my ($id) = @_;
86 96
87 my $ws = delete $self->{widgetset}{$arg{id}} 97 my $ws = delete $self->{widgetset}{$id}
88 or return; 98 or return;
89 99
90 $_->destroy 100 $_->destroy
91 for values %{$ws->{w}}; 101 for values %{$ws->{w}};
92 }); 102 });
93 103
104 # widgetset create
94 $self->connect_ext (ws_c => sub { 105 $self->connect_ext (ws_c => sub {
95 my ($arg) = @_; 106 my ($ws, $id, $class, $args) = @_;
96
97 my $args = $arg->{args} || {};
98 107
99 for my $ev (grep /^on_/, keys %$args) { 108 for my $ev (grep /^on_/, keys %$args) {
100 $args->{$ev} = sub { 109 $args->{$ev} = sub {
101 my $id = shift->{s_id}; 110 my $id = shift->{s_id};
102 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 111 $self->send_exti_msg (w_e => $id, $ev, \@_);
103 112
104 1 113 1
105 }; 114 };
106 } 115 }
107 116
108 if (my $widget = eval { 117 if (my $widget = eval {
109 local $SIG{__DIE__}; 118 local $SIG{__DIE__};
110 "CFPlus::UI::$arg->{class}"->new ( 119 "CFPlus::UI::$class"->new (
111 %$args, 120 %$args,
112 s_ws => $arg->{ws}, 121 s_ws => $ws,
113 s_id => $arg->{id}, 122 s_id => $id,
114 ) 123 )
115 } 124 }
116 ) { 125 ) {
117 $self->{widget}{$arg->{id}} 126 $self->{widget}{$id}
118 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 127 = $self->{widgetset}{$ws}{w}{$id}
119 = $widget; 128 = $widget;
120 129
121 $widget->connect (on_destroy => sub { 130 $widget->connect (on_destroy => sub {
122 my ($widget) = @_; 131 my ($widget) = @_;
123 132
124 delete $self->{widget}{$widget->{s_id}}; 133 delete $self->{widget}{$widget->{s_id}};
125 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
126 }); 135 });
127 } else { 136 } else {
128 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";
129 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 138 $self->send_exti_msg (w_e => $id, "destroy");
130 } 139 }
131 }); 140 });
132 141
142 # widget call
133 $self->connect_ext (w_c => sub { 143 $self->connect_ext (w_c => sub {
134 my ($arg) = @_; 144 my ($id, $rid, $method, $args) = @_;
135 145
136 my $w = $self->{widget}{$arg->{id}} 146 my $w = $self->{widget}{$id}
137 or return; 147 or return;
138 my $m = $arg->{name};
139 148
140 my $a = $arg->{args} || []; 149 $args ||= [];
141 150
142 if (exists $arg->{rid}) { 151 if ($rid) {
143 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
144 } else { 153 } else {
145 $w->$m (@$a); 154 $w->$method (@$args);
146 } 155 }
147 }); 156 });
148 157
158 # widget set
149 $self->connect_ext (w_s => sub { 159 $self->connect_ext (w_s => sub {
150 my ($arg) = @_; 160 my ($id, $attr) = @_;
151 161
152 my $w = $self->{widget}{$arg->{id}} 162 my $w = $self->{widget}{$id}
153 or return; 163 or return;
154 164
155 $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 }
156 }); 174 });
157 175
176 # widget get
158 $self->connect_ext (w_g => sub { 177 $self->connect_ext (w_g => sub {
159 my ($arg) = @_; 178 my ($id, $rid, $attr) = @_;
160 179
161 my $w = $self->{widget}{$arg->{id}} 180 my $w = $self->{widget}{$id}
162 or return; 181 or return;
163 182
164 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
165 }); 184 });
166 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
167 $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 {
168 for my $ws (values %{delete $self->{widgetset} || {}}) { 195 for my $ws (values %{delete $self->{widgetset} || {}}) {
169 $_->destroy 196 $_->destroy
170 for values %{delete $ws->{w} || {}}; 197 for values %{delete $ws->{w} || {}};
171 } 198 }
… …
192 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
193 220
194 $self 221 $self
195} 222}
196 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
197sub logprint { 233sub logprint {
198 my ($self, @a) = @_; 234 my ($self, @a) = @_;
199 235
200 $self->{log_fh} ||= do { 236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
201 my $path = "$Crossfire::VARDIR/log.$self->{host}";
202
203 open my $fh, ">>:utf8", $path
204 or die "Couldn't open logfile $path: $!";
205
206 $fh->autoflush (1);
207
208 $fh;
209 };
210
211 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
212
213 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
214 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
215
216 print {$self->{log_fh}} "$ts ", @a, "\n";
217} 237}
218 238
219sub _stat_numdiff { 239sub _stat_numdiff {
220 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
221 241
… …
384 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
385 405
386 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
387 $sktbl->clear; 407 $sktbl->clear;
388 408
409 my @add;
410
411 push @add,
389 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
390 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
391 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
392 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
393 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
394 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
395 419
396 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>";
397 421
398 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);
399 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);
… …
427 } 451 }
428 452
429 1 453 1
430 }; 454 };
431 455
456 push @add,
432 $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
433 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),
434 $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
435 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),
436 $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,
437 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 ;
438 464
439 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
440 } 466 }
467
468 $sktbl->add_at (@add);
441 } 469 }
442 470
443 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
444 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
445 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
478} 506}
479 507
480sub feed_map1a { 508sub feed_map1a {
481 my ($self, $data) = @_; 509 my ($self, $data) = @_;
482 510
483 $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 {
484 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
485} 541}
486 542
487sub magicmap { 543sub magicmap {
488 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
489 545
… …
496 my $map_info = delete $self->{map_info} 552 my $map_info = delete $self->{map_info}
497 or return; 553 or return;
498 554
499 my ($hash, $x, $y, $w, $h) = @$map_info; 555 my ($hash, $x, $y, $w, $h) = @$map_info;
500 556
501 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 557 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
558 $self->{map_cache_new}{$hash} = \$data;
502 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 559 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
503 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
504} 560}
505 561
506sub map_clear { 562sub map_clear {
507 my ($self) = @_; 563 my ($self) = @_;
508 564
… …
521 do { 577 do {
522 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
523 or return; 579 or return;
524 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
525 581
526 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
527 my ($data) = @_; 583 my ($exists) = @_;
528 584
529 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
530 586
531 $self->set_texture ($id => $data) 587 if ($exists) {
532 if defined $data; 588 $self->have_tile ($id);
589 $self->{texture}[$id]->upload;
590 }
533 591
534 $self->bg_fetch; 592 $self->bg_fetch;
535 }; 593 };
536} 594}
537 595
538sub load_map($$$) { 596sub load_map($$$) {
539 my ($self, $hash, $x, $y) = @_; 597 my ($self, $hash, $x, $y) = @_;
540 598
541 my $gen = $self->{map_change_gen}; 599 my $gen = $self->{map_change_gen};
542 600
543 CFPlus::DB::get $self->{mapcache} => $hash, sub { 601 my $cb = sub {
544 return unless $gen == $self->{map_change_gen}; 602 return unless $gen == $self->{map_change_gen};
545 603
546 my ($data) = @_; 604 my ($data) = @_;
547 605
548 if (defined $data) { 606 if (defined $data) {
607 $self->{map_cache_new}{$hash} = \$data;
608
549 $data = Compress::LZF::decompress $data; 609 my $data = Compress::LZF::decompress $data;
550 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
551 610
552 my $inprogress = @{ $self->{bg_fetch} || [] }; 611 my $inprogress = @{ $self->{bg_fetch} || [] };
553 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 612 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
554 $self->bg_fetch unless $inprogress; 613 $self->bg_fetch unless $inprogress;
555 } 614 }
556 }; 615 };
616
617 if (my $rdata = $self->{map_cache_old}{$hash}) {
618 $cb->($$rdata);
619 } else {
620 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
621 }
557} 622}
558 623
559# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 624# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
560# (server resource,s latency, bandwidth), so this hack is warranted. 625# (server resource,s latency, bandwidth), so this hack is warranted.
561# the right fix is to make real tiled maps with an overview file 626# the right fix is to make real tiled maps with an overview file
… …
654 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 719 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
655 720
656 $self->flush_map; 721 $self->flush_map;
657 722
658 ++$self->{map_change_gen}; 723 ++$self->{map_change_gen};
724 $self->{map_cache_old} = delete $self->{map_cache_new};
659 725
660 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 726 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
661 727
662 my $mapmapw = $self->{mapmap}->{w}; 728 my $mapmapw = $self->{mapmap}->{w};
663 my $mapmaph = $self->{mapmap}->{h}; 729 my $mapmaph = $self->{mapmap}->{h};
… …
682} 748}
683 749
684sub face_find { 750sub face_find {
685 my ($self, $facenum, $face, $cb) = @_; 751 my ($self, $facenum, $face, $cb) = @_;
686 752
687 my $hash = "$face->{chksum},$face->{name}"; 753 if ($face->{type} == 0) { # FT_FACE
688
689 my $id = CFPlus::DB::get_tile_id_sync $hash; 754 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
690 755
691 $face->{id} = $id; 756 $face->{id} = $id;
692 $self->{faceid}[$facenum] = $id; 757 $self->{faceid}[$facenum] = $id;
693 758
694 $self->{map}->set_tileid ($facenum => $id); 759 $self->{map}->set_tileid ($facenum => $id);
695 760
696 CFPlus::DB::get tilecache => $id, $cb; 761 CFPlus::DB::get tilecache => $id, $cb;
762
763 } elsif ($face->{type} & 1) { # with metadata
764 CFPlus::DB::get res_meta => $face->{name}, $cb;
765 }
697} 766}
698 767
699sub face_update { 768sub face_update {
700 my ($self, $facenum, $face, $changed) = @_; 769 my ($self, $facenum, $face, $changed) = @_;
701 770
771 if ($face->{type} == 0) { # FT_FACE
702 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 772 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
703 if $changed; 773 if $changed;
704 774
705 $self->set_texture ($face->{id} => delete $face->{image}); 775 $self->have_tile ($face->{id});
776
777 } elsif ($face->{type} & 1) { # split metadata
778 if ($changed) { # new data
779 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
780 $face->{meta} = $self->{json_coder}->decode ($meta_json);
781
782 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
783 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
784 } else {
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
786 }
787
788 ::add_license ($face);
789
790 if ($face->{type} == 3) { # FT_MUSIC
791 $self->{music_meta}{$facenum} = $face;
792
793 ::message ({ markup => "downloaded song #$facenum" })
794 if $changed;
795
796 &::audio_music_push ($facenum);
797 } elsif ($face->{type} == 5) { # FT_SOUND
798 $self->{sound_meta}{$facenum} = $face;
799
800 ::message ({ markup => "downloaded sound #$facenum" })
801 if $changed;
802
803 &::audio_sound_push ($facenum);
804 }
805
806 }
706} 807}
707 808
708sub smooth_update { 809sub smooth_update {
709 my ($self, $facenum, $face) = @_; 810 my ($self, $facenum, $face) = @_;
710 811
711 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 812 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
712} 813}
713 814
714sub set_texture { 815sub have_tile {
816 my ($self, $tile) = @_;
817
818 return unless $self->{map};
819
820 my $tex = $self->{texture}[$tile] ||=
821 new CFPlus::Texture
822 tile => $tile, minify => 1, mipmap => 1, delay => 1;
823
824 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
825}
826
827sub connect_face_update {
715 my ($self, $id, $data) = @_; 828 my ($self, $id, $cb) = @_;
716 829
717 $self->{texture}[$id] = my $tex = 830 push @{$self->{face_cb}{$id}}, $cb;
718 new_from_image CFPlus::Texture
719 $data, minify => 1, mipmap => 1;
720 831
721 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 832 CFPlus::guard {
722 $self->{map_widget}->update; 833 @{$self->{face_cb}{$id}}
834 = grep $_ != $cb,
835 @{$self->{face_cb}{$id}};
836 }
723} 837}
724 838
725sub sound_play { 839sub sound_play {
726 my ($self, $x, $y, $soundnum, $type) = @_; 840 my ($self, $type, $face, $dx, $dy, $vol) = @_;
727 841
728 $self->{sound_play}->($x, $y, $soundnum, $type); 842 &::audio_sound_play ($face, $dx, $dy, $vol)
843 unless $type & 1; # odd types are silent for future expansion
729} 844}
730 845
731my $LAST_QUERY; # server is stupid, stupid, stupid 846my $LAST_QUERY; # server is stupid, stupid, stupid
732 847
733sub query { 848sub query {
… …
798 $self->{$type} = $text; 913 $self->{$type} = $text;
799 } else { 914 } else {
800 $self->logprint ("msg: ", $text); 915 $self->logprint ("msg: ", $text);
801 return if $color < 0; # negative color == ignore if not understood 916 return if $color < 0; # negative color == ignore if not understood
802 917
803 my $fg = $CF_COLOR[$color % @CF_COLOR]; 918 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
804 919
805 ## try to create single paragraphs of multiple lines sent by the server 920 ## try to create single paragraphs of multiple lines sent by the server
806 # no longer neecssary with TRT servers 921 # no longer neecssary with TRT servers
807 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 922 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
808 923
809 ::message ({ fg => $fg, markup => $_ }) 924 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
810 for split /\n/, $text; 925 for split /\n/, $text;
811 926
812 $self->{statusbox}->add ($text, 927 $self->{statusbox}->add ($text,
813 group => $text, 928 group => $text,
814 fg => $fg, 929 fg => $fg,
… …
871 $self->{map_widget}->clr_commands; 986 $self->{map_widget}->clr_commands;
872 987
873 ::stop_game (); 988 ::stop_game ();
874} 989}
875 990
876sub image_info {
877 my ($self, $numfaces) = @_;
878
879 $self->{num_faces} = $numfaces;
880 $self->{face_prefetch} = [1 .. $numfaces];
881 $self->face_prefetch;
882}
883
884sub face_prefetch {
885 my ($self) = @_;
886
887 return unless $::CFG->{face_prefetch};
888
889 if ($self->{num_faces}) {
890 return if @{ $self->{send_queue} || [] };
891 my $todo = @{ $self->{face_prefetch} }
892 or return;
893
894 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
895
896 $self->send ("requestinfo image_sums $face $face");
897
898 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
899 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
900 } elsif (!exists $self->{num_faces}) {
901 $self->send ("requestinfo image_info");
902
903 $self->{num_faces} = 0;
904
905 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
906 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
907 }
908}
909
910sub update_floorbox { 991sub update_floorbox {
911 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 992 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
912 return unless $::CONN; 993 return unless $::CONN;
913 994
914 $::FLOORBOX->clear; 995 $::FLOORBOX->clear;
996
997 my @add;
915 998
916 my $row; 999 my $row;
917 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1000 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
918 if ($row < 6) { 1001 if ($row < 6) {
919 local $_->{face_widget}; # hack to force recreation of widget 1002 local $_->{face_widget}; # hack to force recreation of widget
920 local $_->{desc_widget}; # hack to force recreation of widget 1003 local $_->{desc_widget}; # hack to force recreation of widget
921 CFPlus::Item::update_widgets $_; 1004 CFPlus::Item::update_widgets $_;
922 1005
1006 push @add,
923 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1007 0, $row, $_->{face_widget},
924 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1008 1, $row, $_->{desc_widget};
925 1009
926 $row++; 1010 $row++;
927 } else { 1011 } else {
928 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1012 push @add, 1, $row, new CFPlus::UI::Button
929 text => "More...", 1013 text => "More...",
930 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1014 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
931 ); 1015 ;
932 last; 1016 last;
933 } 1017 }
934 } 1018 }
935 if ($::CONN->{open_container}) { 1019 if ($::CONN->{open_container}) {
936 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1020 push @add, 1, $row++, new CFPlus::UI::Button
937 text => "Close container", 1021 text => "Close container",
938 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1022 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
939 ); 1023 ;
940 } 1024 }
941 });
942 1025
1026 $::FLOORBOX->add_at (@add);
1027 });
1028
943 $::WANT_REFRESH++; 1029 $::WANT_REFRESH->start;
944} 1030}
945 1031
946sub set_opencont { 1032sub set_opencont {
947 my ($conn, $tag, $name) = @_; 1033 my ($conn, $tag, $name) = @_;
948 $conn->{open_container} = $tag; 1034 $conn->{open_container} = $tag;
… …
1065 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1151 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1066 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1152 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1067 . "map size $self->{mapw}×$self->{maph}\n" 1153 . "map size $self->{mapw}×$self->{maph}\n"
1068 ); 1154 );
1069 1155
1070 ::setup_build_button ($self->{editor_support}->{builder_ui});
1071} 1156}
1072 1157
1073sub logged_in { 1158sub logged_in {
1074 my ($self) = @_; 1159 my ($self) = @_;
1075 1160
1076 $self->send_ext_req (cfplus_support => version => 1, sub { 1161 $self->send_ext_req (cfplus_support => version => 2, sub {
1162 my (%msg) = @_;
1163
1077 $self->{cfplus_ext} = $_[0]{version}; 1164 $self->{cfplus_ext} = $msg{version};
1078 $self->update_server_info; 1165 $self->update_server_info;
1079 1166
1080 if ($self->{cfplus_ext} >= 2) { 1167 if ($self->{cfplus_ext} >= 2) {
1081 $self->send_ext_req ("editor_support", sub { 1168 $self->send_ext_req ("editor_support", sub {
1082 $self->{editor_support} = $_[0]; 1169 $self->{editor_support} = { @_ };
1083 $self->update_server_info; 1170 $self->update_server_info;
1084 1171
1085 0 1172 0
1086 }); 1173 });
1087 } 1174 }
… …
1095 $self->send_command ("output-count $::CFG->{output_count}"); 1182 $self->send_command ("output-count $::CFG->{output_count}");
1096 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1183 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1097 $self->send_command ("pickup $::CFG->{pickup}"); 1184 $self->send_command ("pickup $::CFG->{pickup}");
1098} 1185}
1099 1186
1100sub buildat {
1101 my ($self, $builditem, $x, $y) = @_;
1102
1103 if ($self->{cfplus_ext}) {
1104 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1105 }
1106}
1107
1108sub lookat { 1187sub lookat {
1109 my ($self, $x, $y) = @_; 1188 my ($self, $x, $y) = @_;
1110 1189
1111 if ($self->{cfplus_ext}) { 1190 if ($self->{cfplus_ext}) {
1112 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1191 $self->send_ext_req (lookat => $x, $y, sub {
1113 my ($msg) = @_; 1192 my (%msg) = @_;
1114 1193
1115 if (exists $msg->{npc_dialog}) { 1194 if (exists $msg{npc_dialog}) {
1116 # start npc chat dialog 1195 # start npc chat dialog
1117 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1196 $self->{npc_dialog} = new CFPlus::NPCDialog::
1118 dx => $x, 1197 token => $msg{npc_dialog},
1119 dy => $y,
1120 title => "$msg->{npc_dialog} (NPC)", 1198 title => "$msg{npc_dialog}[0] (NPC)",
1121 conn => $self, 1199 conn => $self,
1122 ; 1200 ;
1123 } 1201 }
1124 }); 1202 });
1125 } 1203 }
… …
1190 on_activate => sub { $this->destroy; 1 }, 1268 on_activate => sub { $this->destroy; 1 },
1191 ; 1269 ;
1192 1270
1193 $self->update_options; 1271 $self->update_options;
1194 1272
1195 $self->{id} = $self->{conn}->send_ext_req ( 1273 $self->{id} = "npc-channel-" . $self->{conn}->token;
1196 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1274 $self->{conn}->connect_ext ($self->{id} => sub {
1197 sub { $this && $this->feed (@_) } 1275 $this->feed (@_) if $this;
1198 ); 1276 });
1277
1278 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1199 1279
1200 $self->{entry}->grab_focus; 1280 $self->{entry}->grab_focus;
1201 1281
1202 $self->{textview}->add_paragraph ({ 1282 $self->{textview}->add_paragraph ({
1203 fg => [1, 1, 0, 1], 1283 fg => [1, 1, 0, 1],
… …
1226 ); 1306 );
1227 } 1307 }
1228} 1308}
1229 1309
1230sub feed { 1310sub feed {
1231 my ($self, $msg) = @_; 1311 my ($self, $type, @arg) = @_;
1232 1312
1233 CFPlus::weaken $self; 1313 CFPlus::weaken $self;
1234 1314
1235 if ($msg->{msgtype} eq "reply") { 1315 if ($type eq "update") {
1316 my (%info) = @arg;
1317
1236 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1318 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1237 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1319 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1238
1239 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1240 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1241 my @link;
1242 $text =~ s{
1243 ($match)
1244 }{
1245 my $kw = $1;
1246
1247 push @link, new CFPlus::UI::Label
1248 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1249 can_hover => 1,
1250 can_events => 1,
1251 padding_x => 0,
1252 padding_y => 0,
1253 on_button_up => sub {
1254 $self->send ($kw);
1255 };
1256
1257 "\x{fffc}"
1258 }giex;
1259 1320
1321 if (exists $info{msg}) {
1322 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1323 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1324 my @link;
1325 $text =~ s{
1326 ($match)
1327 }{
1328 my $kw = $1;
1329
1330 push @link, new CFPlus::UI::Label
1331 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1332 can_hover => 1,
1333 can_events => 1,
1334 padding_x => 0,
1335 padding_y => 0,
1336 on_button_up => sub {
1337 $self->send ($kw);
1338 };
1339
1340 "\x{fffc}"
1341 }giex;
1342
1260 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1343 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1261 $self->{textview}->scroll_to_bottom; 1344 $self->{textview}->scroll_to_bottom;
1345 }
1346
1262 $self->update_options; 1347 $self->update_options;
1263 } else { 1348 } else {
1264 $self->destroy; 1349 $self->destroy;
1265 } 1350 }
1266 1351
… …
1271 my ($self, $msg) = @_; 1356 my ($self, $msg) = @_;
1272 1357
1273 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1358 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1274 $self->{textview}->scroll_to_bottom; 1359 $self->{textview}->scroll_to_bottom;
1275 1360
1276 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1361 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1277} 1362}
1278 1363
1279sub destroy { 1364sub destroy {
1280 my ($self) = @_; 1365 my ($self) = @_;
1281 1366
1282 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1367 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1283 1368
1284 if ($self->{conn}) { 1369 if ($self->{conn}) {
1285 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1370 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1286 delete $self->{conn}{npc_dialog}; 1371 delete $self->{conn}{npc_dialog};
1287 $self->{conn}->disconnect_ext ($self->{id}); 1372 $self->{conn}->disconnect_ext ($self->{id});
1288 } 1373 }
1289 1374
1290 $self->SUPER::destroy; 1375 $self->SUPER::destroy;

Diff Legend

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