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.109 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.155 by root, Fri Aug 17 21:18:01 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 xwidget1 => 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) {
109 my $rid = $args->{$ev};
94 $args->{$ev} = sub { 110 $args->{$ev} = sub {
95 my $id = shift->{s_id}; 111 my $id = shift->{s_id};
96 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 112 $self->send_exti_msg (w_e => $id, $rid, @_);
97 113
98 1 114 1
99 }; 115 };
100 } 116 }
101 117
102 if (my $widget = eval { 118 $self->widget_associate (
119 $ws, $id => scalar eval {
120 local $SIG{__DIE__};
103 "CFPlus::UI::$arg->{class}"->new ( 121 "CFPlus::UI::$class"->new (%$args)
104 %$args,
105 s_ws => $arg->{ws},
106 s_id => $arg->{id},
107 )
108 } 122 }
123 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
124 });
125
126 # widgetset associate
127 $self->connect_ext (ws_a => sub {
128 my (%ass) = @_;
129
130 # everything that has a name, wether conceivably useful or not
131 my %wkw = (
132 root => $CFPlus::UI::ROOT,
133 tooltip => $CFPlus::UI::TOOLTIP,
134
135 mapwidget => $::MAPWIDGET,
136 buttonbar => $::BUTTONBAR,
137 metaserver => $::METASERVER,
138 buttonbar => $::BUTTONBAR,
139 login_button => $::LOGIN_BUTTON,
140 quit_dialog => $::QUIT_DIALOG,
141 host_entry => $::HOST_ENTRY,
142 metaserver => $::METASERVER,
143 server_info => $::SERVER_INFO,
144
145 setup_dialog => $::SETUP_DIALOG,
146 setup_notebook => $::SETUP_NOTEBOOK,
147 setup_server => $::SETUP_SERVER,
148 setup_keyboard => $::SETUP_KEYBOARD,
149
150 pl_notebook => $::PL_NOTEBOOK,
151 pl_window => $::PL_WINDOW,
152 inventory_page => $::INVENTORY_PAGE,
153 stats_page => $::STATS_PAGE,
154 skill_page => $::SKILL_PAGE,
155 spell_page => $::SPELL_PAGE,
156 spell_list => $::SPELL_LIST,
157
158 floorbox => $::FLOORBOX,
159 help_window => $::HELP_WINDOW,
160 message_window => $::MESSAGE_WINDOW,
161 statusbox => $::SDTATUSBOX,
162
163 inv => $::INV,
164 invr => $::INVR,
165 invr_hb => $::INVR_HB,
166
109 ) { 167 );
168
169 while (my ($id, $name) = each %ass) {
170 $self->widget_associate (undef, $id => $wkw{$name})
171 or warn "server failed to associate non-existent well-known widget $name\n";
172 }
173 });
174
175 # widget call
176 $self->connect_ext (w_c => sub {
177 my ($id, $rid, $method, @args) = @_;
178
110 $self->{widget}{$arg->{id}} 179 my $w = $self->{widget}{$id}
111 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 180 or return;
112 = $widget;
113 181
114 $widget->connect (on_destroy => sub { 182 if ($rid) {
115 my ($widget) = @_; 183 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
116
117 delete $self->{widget}{$widget->{s_id}};
118 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
119 });
120 } else { 184 } else {
121 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 185 $w->$method (@args);
122 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
123 } 186 }
124 }); 187 });
125 188
189 # widget set
126 $self->connect_ext (w_c => sub { 190 $self->connect_ext (w_s => sub {
127 my ($arg) = @_; 191 my ($id, $attr) = @_;
128 192
129 my $w = $self->{widget}{$arg->{id}} 193 my $w = $self->{widget}{$id}
130 or return; 194 or return;
131 my $m = $arg->{name};
132 195
133 my @a = map { 196 for (my $i = 0; $i < $#$attr; $i += 2) {
134 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__} 197 my ($member, $value) = @$attr[$i, $i+1];
135 ? $self->{widget}{$_->{__widget_ref__}} 198 if (defined $value) {
136 : $_ 199 $w->{$member} = $value;
137 } @{ $arg->{args} || [] };
138
139 if (exists $arg->{rid}) {
140 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]);
141 } else { 200 } else {
142 $w->$m (@a); 201 delete $w->{$member};
143 } 202 }
203 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
204 }
144 }); 205 });
145 206
207 # widget get
146 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_g => sub {
147 my ($arg) = @_; 209 my ($id, $rid, $attr) = @_;
148 210
149 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$id}
150 or return; 212 or return;
151 213
152 $w->{$arg->{name}} = $arg->{value}; 214 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
153 }); 215 });
154 216
217 # message window
155 $self->connect_ext (w_g => sub { 218 $self->connect_ext (channel_info => sub {
156 my ($arg) = @_; 219 my ($info) = @_;
157 220 $self->{channels}->{$info->{id}} = $info;
158 my $w = $self->{widget}{$arg->{id}} 221 $::MESSAGE_WINDOW->add_channel ($info);
159 or return;
160
161 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
162 }); 222 });
163 223
224 # destroy widgets on logout
164 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 225 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
165 for my $ws (values %{delete $self->{widgetset} || {}}) { 226 for my $ws (values %{delete $self->{widgetset} || {}}) {
166 $_->destroy 227 $_->destroy
167 for values %{delete $ws->{w} || {}}; 228 for values %{delete $ws->{w} || {}};
168 } 229 }
… …
189 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 250 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
190 251
191 $self 252 $self
192} 253}
193 254
255sub widget_associate {
256 my ($self, $ws, $id, $widget) = @_;
257
258 if ($widget) {
259 $widget->{s_id} = $id;
260 $self->{widget}{$id} = $widget;
261
262 if ($ws) {
263 $widget->{s_ws} = $ws;
264 $self->{widgetset}{$ws}{w}{$id} = $widget;
265 }
266
267 $widget->connect (on_destroy => sub {
268 my ($widget) = @_;
269
270 delete $self->{widget}{$widget->{s_id}};
271 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
272 if exists $widget->{s_ws};
273 });
274
275 1
276 } else {
277 $self->send_exti_msg (w_e => $id, undef);
278
279 0
280 }
281}
282
283sub update_fx_want {
284 my ($self) = @_;
285
286 $self->send_exti_msg (fx_want => {
287 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
288 5 => !!$::CFG->{audio_enable}, # FT_SOUND
289 });
290}
291
194sub logprint { 292sub logprint {
195 my ($self, @a) = @_; 293 my ($self, @a) = @_;
196 294
197 $self->{log_fh} ||= do { 295 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
198 my $path = "$Crossfire::VARDIR/log.$self->{host}";
199
200 open my $fh, ">>:utf8", $path
201 or die "Couldn't open logfile $path: $!";
202
203 $fh->autoflush (1);
204
205 $fh;
206 };
207
208 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
209
210 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
211 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
212
213 print {$self->{log_fh}} "$ts ", @a, "\n";
214} 296}
215 297
216sub _stat_numdiff { 298sub _stat_numdiff {
217 my ($self, $name, $old, $new) = @_; 299 my ($self, $name, $old, $new) = @_;
218 300
… …
381 my @skills = keys %{ $self->{skill_info} }; 463 my @skills = keys %{ $self->{skill_info} };
382 464
383 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 465 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
384 $sktbl->clear; 466 $sktbl->clear;
385 467
468 my @add;
469
470 push @add,
386 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 471 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
387 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 472 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
388 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 473 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
389 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 474 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
390 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 475 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
391 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 476 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
477 ;
392 478
393 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 479 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
394 480
395 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 481 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
396 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 482 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
424 } 510 }
425 511
426 1 512 1
427 }; 513 };
428 514
515 push @add,
429 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 516 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
430 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 517 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
431 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 518 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
432 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 519 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
433 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 520 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
434 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 521 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
522 ;
435 523
436 $x++ and ($x, $y) = (0, $y + 1); 524 $x++ and ($x, $y) = (0, $y + 1);
437 } 525 }
526
527 $sktbl->add_at (@add);
438 } 528 }
439 529
440 for (grep exists $stats->{$_}, @skills) { 530 for (grep exists $stats->{$_}, @skills) {
441 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 531 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
442 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 532 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
475} 565}
476 566
477sub feed_map1a { 567sub feed_map1a {
478 my ($self, $data) = @_; 568 my ($self, $data) = @_;
479 569
480 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 570 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
571 my $delay;
572
573 for my $tile (@$missing) {
574 next if $self->{delay}{$tile};
575
576 $delay = 1;
577
578 if (my $tex = $::CONN->{texture}[$tile]) {
579 $tex->upload;
580 } else {
581 $self->{delay}{$tile} = 1;
582
583 # we assume the face is in-flight and will eventually come
584 push @{$self->{face_cb}{$tile}}, sub {
585 delete $self->{delay}{$tile};
586 $_[0]->upload;
587 };
588 }
589 }
590
591 if ($delay) {
592 # delay the map drawing a tiny bit in the hope of getting the missing fetched
593 Event->timer (after => 0.03, cb => sub {
594 $_[0]->w->cancel;
595 $self->{map_widget}->update;
596 });
597 } else {
481 $self->{map_widget}->update; 598 $self->{map_widget}->update;
599 }
482} 600}
483 601
484sub magicmap { 602sub magicmap {
485 my ($self, $w, $h, $x, $y, $data) = @_; 603 my ($self, $w, $h, $x, $y, $data) = @_;
486 604
… …
493 my $map_info = delete $self->{map_info} 611 my $map_info = delete $self->{map_info}
494 or return; 612 or return;
495 613
496 my ($hash, $x, $y, $w, $h) = @$map_info; 614 my ($hash, $x, $y, $w, $h) = @$map_info;
497 615
498 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 616 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
617 $self->{map_cache_new}{$hash} = \$data;
499 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 618 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
500 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
501} 619}
502 620
503sub map_clear { 621sub map_clear {
504 my ($self) = @_; 622 my ($self) = @_;
505 623
… …
518 do { 636 do {
519 $id = pop @{$self->{bg_fetch}} 637 $id = pop @{$self->{bg_fetch}}
520 or return; 638 or return;
521 } while $self->{texture}[$id]; 639 } while $self->{texture}[$id];
522 640
523 CFPlus::DB::get tilecache => $id, sub { 641 CFPlus::DB::exists tilecache => $id, sub {
524 my ($data) = @_; 642 my ($exists) = @_;
525 643
526 return unless $self->{map}; # stop when destroyed 644 return unless $self->{map}; # stop when destroyed
527 645
528 $self->set_texture ($id => $data) 646 if ($exists) {
529 if defined $data; 647 $self->have_tile ($id);
648 $self->{texture}[$id]->upload;
649 }
530 650
531 $self->bg_fetch; 651 $self->bg_fetch;
532 }; 652 };
533} 653}
534 654
535sub load_map($$$) { 655sub load_map($$$) {
536 my ($self, $hash, $x, $y) = @_; 656 my ($self, $hash, $x, $y) = @_;
537 657
538 my $gen = $self->{map_change_gen}; 658 my $gen = $self->{map_change_gen};
539 659
540 CFPlus::DB::get $self->{mapcache} => $hash, sub { 660 my $cb = sub {
541 return unless $gen == $self->{map_change_gen}; 661 return unless $gen == $self->{map_change_gen};
542 662
543 my ($data) = @_; 663 my ($data) = @_;
544 664
545 if (defined $data) { 665 if (defined $data) {
666 $self->{map_cache_new}{$hash} = \$data;
667
546 $data = Compress::LZF::decompress $data; 668 my $data = Compress::LZF::decompress $data;
547 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
548 669
549 my $inprogress = @{ $self->{bg_fetch} || [] }; 670 my $inprogress = @{ $self->{bg_fetch} || [] };
550 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 671 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
551 $self->bg_fetch unless $inprogress; 672 $self->bg_fetch unless $inprogress;
552 } 673 }
553 }; 674 };
675
676 if (my $rdata = $self->{map_cache_old}{$hash}) {
677 $cb->($$rdata);
678 } else {
679 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
680 }
554} 681}
555 682
556# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 683# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
557# (server resource,s latency, bandwidth), so this hack is warranted. 684# (server resource,s latency, bandwidth), so this hack is warranted.
558# the right fix is to make real tiled maps with an overview file 685# the right fix is to make real tiled maps with an overview file
… …
651 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 778 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
652 779
653 $self->flush_map; 780 $self->flush_map;
654 781
655 ++$self->{map_change_gen}; 782 ++$self->{map_change_gen};
783 $self->{map_cache_old} = delete $self->{map_cache_new};
656 784
657 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 785 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
658 786
659 my $mapmapw = $self->{mapmap}->{w}; 787 my $mapmapw = $self->{mapmap}->{w};
660 my $mapmaph = $self->{mapmap}->{h}; 788 my $mapmaph = $self->{mapmap}->{h};
… …
679} 807}
680 808
681sub face_find { 809sub face_find {
682 my ($self, $facenum, $face, $cb) = @_; 810 my ($self, $facenum, $face, $cb) = @_;
683 811
684 my $hash = "$face->{chksum},$face->{name}"; 812 if ($face->{type} == 0) { # FT_FACE
685
686 my $id = CFPlus::DB::get_tile_id_sync $hash; 813 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
687 814
688 $face->{id} = $id; 815 $face->{id} = $id;
689 $self->{faceid}[$facenum] = $id; 816 $self->{faceid}[$facenum] = $id;
690 817
691 $self->{map}->set_tileid ($facenum => $id); 818 $self->{map}->set_tileid ($facenum => $id);
692 819
693 CFPlus::DB::get tilecache => $id, $cb; 820 CFPlus::DB::get tilecache => $id, $cb;
821
822 } elsif ($face->{type} & 1) { # with metadata
823 CFPlus::DB::get res_meta => $face->{name}, $cb;
824 }
694} 825}
695 826
696sub face_update { 827sub face_update {
697 my ($self, $facenum, $face, $changed) = @_; 828 my ($self, $facenum, $face, $changed) = @_;
698 829
830 if ($face->{type} == 0) { # FT_FACE
699 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 831 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
700 if $changed; 832 if $changed;
701 833
702 $self->set_texture ($face->{id} => delete $face->{image}); 834 $self->have_tile ($face->{id});
835
836 } elsif ($face->{type} & 1) { # split metadata
837 if ($changed) { # new data
838 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
839 $face->{meta} = $self->{json_coder}->decode ($meta_json);
840
841 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
842 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
843 } else {
844 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
845 }
846
847 ::add_license ($face);
848
849 if ($face->{type} == 3) { # FT_MUSIC
850 $self->{music_meta}{$facenum} = $face;
851
852 ::message ({ markup => "downloaded song #$facenum" })
853 if $changed;
854
855 &::audio_music_push ($facenum);
856 } elsif ($face->{type} == 5) { # FT_SOUND
857 $self->{sound_meta}{$facenum} = $face;
858
859 ::message ({ markup => "downloaded sound #$facenum" })
860 if $changed;
861
862 &::audio_sound_push ($facenum);
863 }
864
865 }
703} 866}
704 867
705sub smooth_update { 868sub smooth_update {
706 my ($self, $facenum, $face) = @_; 869 my ($self, $facenum, $face) = @_;
707 870
708 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 871 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
709} 872}
710 873
711sub set_texture { 874sub have_tile {
875 my ($self, $tile) = @_;
876
877 return unless $self->{map};
878
879 my $tex = $self->{texture}[$tile] ||=
880 new CFPlus::Texture
881 tile => $tile, minify => 1, mipmap => 1, delay => 1;
882
883 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
884}
885
886sub connect_face_update {
712 my ($self, $id, $data) = @_; 887 my ($self, $id, $cb) = @_;
713 888
714 $self->{texture}[$id] = my $tex = 889 push @{$self->{face_cb}{$id}}, $cb;
715 new_from_image CFPlus::Texture
716 $data, minify => 1, mipmap => 1;
717 890
718 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 891 CFPlus::guard {
719 $self->{map_widget}->update; 892 @{$self->{face_cb}{$id}}
893 = grep $_ != $cb,
894 @{$self->{face_cb}{$id}};
895 }
720} 896}
721 897
722sub sound_play { 898sub sound_play {
723 my ($self, $x, $y, $soundnum, $type) = @_; 899 my ($self, $type, $face, $dx, $dy, $vol) = @_;
724 900
725 $self->{sound_play}->($x, $y, $soundnum, $type); 901 &::audio_sound_play ($face, $dx, $dy, $vol)
902 unless $type & 1; # odd types are silent for future expansion
726} 903}
727 904
728my $LAST_QUERY; # server is stupid, stupid, stupid 905my $LAST_QUERY; # server is stupid, stupid, stupid
729 906
730sub query { 907sub query {
… …
795 $self->{$type} = $text; 972 $self->{$type} = $text;
796 } else { 973 } else {
797 $self->logprint ("msg: ", $text); 974 $self->logprint ("msg: ", $text);
798 return if $color < 0; # negative color == ignore if not understood 975 return if $color < 0; # negative color == ignore if not understood
799 976
800 my $fg = $CF_COLOR[$color % @CF_COLOR]; 977 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
801 978
802 ## try to create single paragraphs of multiple lines sent by the server 979 ## try to create single paragraphs of multiple lines sent by the server
803 # no longer neecssary with TRT servers 980 # no longer neecssary with TRT servers
804 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 981 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
805 982
806 ::message ({ fg => $fg, markup => $_ }) 983 ::message ({
984 fg => $fg,
985 markup => $_,
986 type => $type,
987 extra => [@extra],
988 color_flags => $color
807 for split /\n/, $text; 989 }) for split /\n/, $text;
808 990
809 $self->{statusbox}->add ($text, 991 $self->{statusbox}->add ($text,
810 group => $text, 992 group => $text,
811 fg => $fg, 993 fg => $fg,
812 timeout => $color >= 2 ? 180 : 10, 994 timeout => $color >= 2 ? 180 : 10,
… …
868 $self->{map_widget}->clr_commands; 1050 $self->{map_widget}->clr_commands;
869 1051
870 ::stop_game (); 1052 ::stop_game ();
871} 1053}
872 1054
873sub image_info {
874 my ($self, $numfaces) = @_;
875
876 $self->{num_faces} = $numfaces;
877 $self->{face_prefetch} = [1 .. $numfaces];
878 $self->face_prefetch;
879}
880
881sub face_prefetch {
882 my ($self) = @_;
883
884 return unless $::CFG->{face_prefetch};
885
886 if ($self->{num_faces}) {
887 return if @{ $self->{send_queue} || [] };
888 my $todo = @{ $self->{face_prefetch} }
889 or return;
890
891 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
892
893 $self->send ("requestinfo image_sums $face $face");
894
895 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
896 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
897 } elsif (!exists $self->{num_faces}) {
898 $self->send ("requestinfo image_info");
899
900 $self->{num_faces} = 0;
901
902 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
903 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
904 }
905}
906
907sub update_floorbox { 1055sub update_floorbox {
908 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1056 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
909 return unless $::CONN; 1057 return unless $::CONN;
910 1058
911 $::FLOORBOX->clear; 1059 $::FLOORBOX->clear;
1060
1061 my @add;
912 1062
913 my $row; 1063 my $row;
914 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1064 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
915 if ($row < 6) { 1065 if ($row < 6) {
916 local $_->{face_widget}; # hack to force recreation of widget 1066 local $_->{face_widget}; # hack to force recreation of widget
917 local $_->{desc_widget}; # hack to force recreation of widget 1067 local $_->{desc_widget}; # hack to force recreation of widget
918 CFPlus::Item::update_widgets $_; 1068 CFPlus::Item::update_widgets $_;
919 1069
1070 push @add,
920 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1071 0, $row, $_->{face_widget},
921 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1072 1, $row, $_->{desc_widget};
922 1073
923 $row++; 1074 $row++;
924 } else { 1075 } else {
925 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1076 push @add, 1, $row, new CFPlus::UI::Button
926 text => "More...", 1077 text => "More...",
927 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1078 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
928 ); 1079 ;
929 last; 1080 last;
930 } 1081 }
931 } 1082 }
932 if ($::CONN->{open_container}) { 1083 if ($::CONN->{open_container}) {
933 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1084 push @add, 1, $row++, new CFPlus::UI::Button
934 text => "Close container", 1085 text => "Close container",
935 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1086 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
936 ); 1087 ;
937 } 1088 }
938 });
939 1089
1090 $::FLOORBOX->add_at (@add);
1091 });
1092
940 $::WANT_REFRESH++; 1093 $::WANT_REFRESH->start;
941} 1094}
942 1095
943sub set_opencont { 1096sub set_opencont {
944 my ($conn, $tag, $name) = @_; 1097 my ($conn, $tag, $name) = @_;
945 $conn->{open_container} = $tag; 1098 $conn->{open_container} = $tag;
946 update_floorbox; 1099 update_floorbox;
947 1100
948 $::INV_RIGHT_HB->clear (); 1101 $::INVR_HB->clear ();
949 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1102 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
950 1103
951 if ($tag != 0) { # Floor isn't closable, is it? 1104 if ($tag != 0) { # Floor isn't closable, is it?
952 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1105 $::INVR_HB->add (new CFPlus::UI::Button
953 text => "Close container", 1106 text => "Close container",
954 tooltip => "Close the currently open container (if one is open)", 1107 tooltip => "Close the currently open container (if one is open)",
955 on_activate => sub { 1108 on_activate => sub {
956 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1109 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
957 if $tag != 0; 1110 if $tag != 0;
958 #if $CONN->{open_container} != 0;
959 0 1111 0
960 }, 1112 },
961 ); 1113 );
962 } 1114 }
963 1115
… …
1062 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1214 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1063 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1215 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1064 . "map size $self->{mapw}×$self->{maph}\n" 1216 . "map size $self->{mapw}×$self->{maph}\n"
1065 ); 1217 );
1066 1218
1067 ::setup_build_button ($self->{editor_support}->{builder_ui});
1068} 1219}
1069 1220
1070sub logged_in { 1221sub logged_in {
1071 my ($self) = @_; 1222 my ($self) = @_;
1072 1223
1073 $self->send_ext_req (cfplus_support => version => 1, sub { 1224 $self->send_ext_req (cfplus_support => version => 2, sub {
1225 my (%msg) = @_;
1226
1074 $self->{cfplus_ext} = $_[0]{version}; 1227 $self->{cfplus_ext} = $msg{version};
1075 $self->update_server_info; 1228 $self->update_server_info;
1076 1229
1077 if ($self->{cfplus_ext} >= 2) { 1230 if ($self->{cfplus_ext} >= 2) {
1078 $self->send_ext_req ("editor_support", sub { 1231 $self->send_ext_req ("editor_support", sub {
1079 $self->{editor_support} = $_[0]; 1232 $self->{editor_support} = { @_ };
1080 $self->update_server_info; 1233 $self->update_server_info;
1081 1234
1082 0 1235 0
1083 }); 1236 });
1084 } 1237 }
… …
1092 $self->send_command ("output-count $::CFG->{output_count}"); 1245 $self->send_command ("output-count $::CFG->{output_count}");
1093 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1246 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1094 $self->send_command ("pickup $::CFG->{pickup}"); 1247 $self->send_command ("pickup $::CFG->{pickup}");
1095} 1248}
1096 1249
1097sub buildat {
1098 my ($self, $builditem, $x, $y) = @_;
1099
1100 if ($self->{cfplus_ext}) {
1101 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1102 }
1103}
1104
1105sub lookat { 1250sub lookat {
1106 my ($self, $x, $y) = @_; 1251 my ($self, $x, $y) = @_;
1107 1252
1108 if ($self->{cfplus_ext}) { 1253 if ($self->{cfplus_ext}) {
1109 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1254 $self->send_ext_req (lookat => $x, $y, sub {
1110 my ($msg) = @_; 1255 my (%msg) = @_;
1111 1256
1112 if (exists $msg->{npc_dialog}) { 1257 if (exists $msg{npc_dialog}) {
1113 # start npc chat dialog 1258 # start npc chat dialog
1114 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1259 $self->{npc_dialog} = new CFPlus::NPCDialog::
1115 dx => $x, 1260 token => $msg{npc_dialog},
1116 dy => $y,
1117 title => "$msg->{npc_dialog} (NPC)", 1261 title => "$msg{npc_dialog}[0] (NPC)",
1118 conn => $self, 1262 conn => $self,
1119 ; 1263 ;
1120 } 1264 }
1121 }); 1265 });
1122 } 1266 }
… …
1129 1273
1130 (delete $self->{npc_dialog})->destroy 1274 (delete $self->{npc_dialog})->destroy
1131 if $self->{npc_dialog}; 1275 if $self->{npc_dialog};
1132 1276
1133 $self->SUPER::destroy; 1277 $self->SUPER::destroy;
1278
1279 %$self = ();
1134} 1280}
1135 1281
1136package CFPlus::NPCDialog; 1282package CFPlus::NPCDialog;
1137 1283
1138our @ISA = 'CFPlus::UI::Toplevel'; 1284our @ISA = 'CFPlus::UI::Toplevel';
… …
1185 on_activate => sub { $this->destroy; 1 }, 1331 on_activate => sub { $this->destroy; 1 },
1186 ; 1332 ;
1187 1333
1188 $self->update_options; 1334 $self->update_options;
1189 1335
1190 $self->{id} = $self->{conn}->send_ext_req ( 1336 $self->{id} = "npc-channel-" . $self->{conn}->token;
1191 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1337 $self->{conn}->connect_ext ($self->{id} => sub {
1192 sub { $this && $this->feed (@_) } 1338 $this->feed (@_) if $this;
1193 ); 1339 });
1340
1341 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1194 1342
1195 $self->{entry}->grab_focus; 1343 $self->{entry}->grab_focus;
1196 1344
1197 $self->{textview}->add_paragraph ({ 1345 $self->{textview}->add_paragraph ({
1198 fg => [1, 1, 0, 1], 1346 fg => [1, 1, 0, 1],
… …
1221 ); 1369 );
1222 } 1370 }
1223} 1371}
1224 1372
1225sub feed { 1373sub feed {
1226 my ($self, $msg) = @_; 1374 my ($self, $type, @arg) = @_;
1227 1375
1228 CFPlus::weaken $self; 1376 CFPlus::weaken $self;
1229 1377
1230 if ($msg->{msgtype} eq "reply") { 1378 if ($type eq "update") {
1379 my (%info) = @arg;
1380
1231 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1381 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1232 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1382 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1233
1234 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1235 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1236 my @link;
1237 $text =~ s{
1238 ($match)
1239 }{
1240 my $kw = $1;
1241
1242 push @link, new CFPlus::UI::Label
1243 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1244 can_hover => 1,
1245 can_events => 1,
1246 padding_x => 0,
1247 padding_y => 0,
1248 on_button_up => sub {
1249 $self->send ($kw);
1250 };
1251
1252 "\x{fffc}"
1253 }giex;
1254 1383
1384 if (exists $info{msg}) {
1385 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1386 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1387 my @link;
1388 $text =~ s{
1389 ($match)
1390 }{
1391 my $kw = $1;
1392
1393 push @link, new CFPlus::UI::Label
1394 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1395 can_hover => 1,
1396 can_events => 1,
1397 padding_x => 0,
1398 padding_y => 0,
1399 on_button_up => sub {
1400 $self->send ($kw);
1401 };
1402
1403 "\x{fffc}"
1404 }giex;
1405
1255 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1406 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1256 $self->{textview}->scroll_to_bottom; 1407 $self->{textview}->scroll_to_bottom;
1408 }
1409
1257 $self->update_options; 1410 $self->update_options;
1258 } else { 1411 } else {
1259 $self->destroy; 1412 $self->destroy;
1260 } 1413 }
1261 1414
… …
1266 my ($self, $msg) = @_; 1419 my ($self, $msg) = @_;
1267 1420
1268 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1421 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1269 $self->{textview}->scroll_to_bottom; 1422 $self->{textview}->scroll_to_bottom;
1270 1423
1271 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1424 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1272} 1425}
1273 1426
1274sub destroy { 1427sub destroy {
1275 my ($self) = @_; 1428 my ($self) = @_;
1276 1429
1277 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1430 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1278 1431
1279 if ($self->{conn}) { 1432 if ($self->{conn}) {
1280 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1433 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1281 delete $self->{conn}{npc_dialog}; 1434 delete $self->{conn}{npc_dialog};
1282 $self->{conn}->disconnect_ext ($self->{id}); 1435 $self->{conn}->disconnect_ext ($self->{id});
1283 } 1436 }
1284 1437
1285 $self->SUPER::destroy; 1438 $self->SUPER::destroy;

Diff Legend

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