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

Diff Legend

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