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.87 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
11 14
12use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
13 16
14use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
15 18
16sub new { 19sub new {
17 my $class = shift; 20 my ($class, %arg) = @_;
18 21
19 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 xwidget1 => 1,#d#
27 %{$arg{setup_req} || {}},
28 },
29 );
20 30
21 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
22 32
23 my @cmd_help = map { 33 my @cmd_help = map {
24 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
35 for @args; 45 for @args;
36 46
37 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
38 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
39 @args 49 @args
40 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
41 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
42 52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71 $_->() for values %{ $self->{on_exp_update} || {} };
72 });
73
74 ()
75 });
76
77 if (my $ts = $cap{tileset}) {
78 if (my ($default) = grep $_->[2] & 1, @$ts) {
79 $self->{tileset} = $default;
80 $self->{tilesize} = $default->[3];
81 $self->setup_req (tileset => $default->[0]);
82
83 my $w = int $self->{mapw} * 32 / $self->{tilesize};
84 my $h = int $self->{maph} * 32 / $self->{tilesize};
85
86 $self->setup_req (mapsize => "${w}x${h}");
87 }
88 }
89 });
90
91 $self->{json_coder}
92 ->convert_blessed
93 ->filter_json_single_key_object (__w_ => sub {
94 $self->{widget}{$_[0]}
95 });
96
97 # widgetset new
98 $self->connect_ext (ws_n => sub {
99 my ($id) = @_;
100
101 $self->{widgetset}{$id} = {
102 w => {},
103 };
104 });
105
106 # widgetset destroy
107 $self->connect_ext (ws_d => sub {
108 my ($id) = @_;
109
110 my $ws = delete $self->{widgetset}{$id}
111 or return;
112
113 $_->destroy
114 for values %{$ws->{w}};
115 });
116
117 # widgetset create
118 $self->connect_ext (ws_c => sub {
119 my ($ws, $id, $class, $args) = @_;
120
121 for my $ev (grep /^on_/, keys %$args) {
122 my $rid = $args->{$ev};
123 $args->{$ev} = sub {
124 my $id = shift->{s_id};
125 $self->send_exti_msg (w_e => $id, $rid, @_);
126
127 1
128 };
129 }
130
131 $self->widget_associate (
132 $ws, $id => scalar eval {
133 local $SIG{__DIE__};
134 "CFPlus::UI::$class"->new (%$args)
135 }
136 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
137 });
138
139 # widgetset associate
140 $self->connect_ext (ws_a => sub {
141 my (%ass) = @_;
142
143 # everything that has a name, wether conceivably useful or not
144 my %wkw = (
145 root => $CFPlus::UI::ROOT,
146 tooltip => $CFPlus::UI::TOOLTIP,
147
148 mapwidget => $::MAPWIDGET,
149 buttonbar => $::BUTTONBAR,
150 metaserver => $::METASERVER,
151 buttonbar => $::BUTTONBAR,
152 login_button => $::LOGIN_BUTTON,
153 quit_dialog => $::QUIT_DIALOG,
154 host_entry => $::HOST_ENTRY,
155 metaserver => $::METASERVER,
156 server_info => $::SERVER_INFO,
157
158 setup_dialog => $::SETUP_DIALOG,
159 setup_notebook => $::SETUP_NOTEBOOK,
160 setup_server => $::SETUP_SERVER,
161 setup_keyboard => $::SETUP_KEYBOARD,
162
163 pl_notebook => $::PL_NOTEBOOK,
164 pl_window => $::PL_WINDOW,
165 inventory_page => $::INVENTORY_PAGE,
166 stats_page => $::STATS_PAGE,
167 skill_page => $::SKILL_PAGE,
168 spell_page => $::SPELL_PAGE,
169 spell_list => $::SPELL_LIST,
170
171 floorbox => $::FLOORBOX,
172 help_window => $::HELP_WINDOW,
173 message_window => $::MESSAGE_WINDOW,
174 statusbox => $::SDTATUSBOX,
175
176 inv => $::INV,
177 invr => $::INVR,
178 invr_hb => $::INVR_HB,
179 );
180
181 while (my ($id, $name) = each %ass) {
182 $self->widget_associate (undef, $id => $wkw{$name})
183 or warn "server failed to associate non-existent well-known widget $name\n";
184 }
185 });
186
187 # widget call
188 $self->connect_ext (w_c => sub {
189 my ($id, $rid, $method, @args) = @_;
190
191 my $w = $self->{widget}{$id}
192 or return;
193
194 if ($rid) {
195 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
196 } else {
197 $w->$method (@args);
198 }
199 });
200
201 # widget set
202 $self->connect_ext (w_s => sub {
203 my ($id, $attr) = @_;
204
205 my $w = $self->{widget}{$id}
206 or return;
207
208 for (my $i = 0; $i < $#$attr; $i += 2) {
209 my ($member, $value) = @$attr[$i, $i+1];
210 if (defined $value) {
211 $w->{$member} = $value;
212 } else {
213 delete $w->{$member};
214 }
215 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
216 }
217 });
218
219 # widget get
220 $self->connect_ext (w_g => sub {
221 my ($id, $rid, $attr) = @_;
222
223 my $w = $self->{widget}{$id}
224 or return;
225
226 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
227 });
228
229 # message window
230 $self->connect_ext (channel_info => sub {
231 my ($info) = @_;
232 $self->{channels}->{$info->{id}} = $info;
233 $::MESSAGE_WINDOW->add_channel ($info);
234 });
235
236 # destroy widgets on logout
237 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
238 for my $ws (values %{delete $self->{widgetset} || {}}) {
239 $_->destroy
240 for values %{delete $ws->{w} || {}};
241 }
242 });
243
43 $self->{map_widget}->add_command (@$_) 244 $self->{map_widget}->add_command (@$_)
44 for @cmd_help; 245 for @cmd_help;
45
46 $self->{noface} = new_from_file CFPlus::Texture
47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48 246
49 { 247 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 248 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 249 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 250 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53 } 251 }
54 252
253 {
254 $self->{noface} = my $tex = new_from_file CFPlus::Texture
255 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
256 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
257 }
258
55 $self->{open_container} = 0; 259 $self->{open_container} = 0;
56 260
57 # "global"
58 $self->{tilecache} = CFPlus::db_table "tilecache"
59 or die "tilecache: unable to open database table";
60 $self->{facemap} = CFPlus::db_table "facemap"
61 or die "facemap: unable to open database table";
62
63 # per server 261 # per server
64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
66 263
67 $self 264 $self
265}
266
267sub widget_associate {
268 my ($self, $ws, $id, $widget) = @_;
269
270 if ($widget) {
271 $widget->{s_id} = $id;
272 $self->{widget}{$id} = $widget;
273
274 if ($ws) {
275 $widget->{s_ws} = $ws;
276 $self->{widgetset}{$ws}{w}{$id} = $widget;
277 }
278
279 $widget->connect (on_destroy => sub {
280 my ($widget) = @_;
281
282 delete $self->{widget}{$widget->{s_id}};
283 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
284 if exists $widget->{s_ws};
285 });
286
287 1
288 } else {
289 $self->send_exti_msg (w_e => $id, undef);
290
291 0
292 }
293}
294
295sub update_fx_want {
296 my ($self) = @_;
297
298 $self->send_exti_msg (fx_want => {
299 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
300 5 => !!$::CFG->{audio_enable}, # FT_SOUND
301 6 => 1, # FT_RSRC
302 });
68} 303}
69 304
70sub logprint { 305sub logprint {
71 my ($self, @a) = @_; 306 my ($self, @a) = @_;
72 307
73 $self->{log_fh} ||= do { 308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
74 my $path = "$Crossfire::VARDIR/log.$self->{host}";
75
76 open my $fh, ">>:utf8", $path
77 or die "Couldn't open logfile $path: $!";
78
79 $fh->autoflush (1);
80
81 $fh;
82 };
83
84 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
85
86 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
87 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
88
89 print {$self->{log_fh}} "$ts ", @a, "\n";
90} 309}
91 310
92sub _stat_numdiff { 311sub _stat_numdiff {
93 my ($self, $name, $old, $new) = @_; 312 my ($self, $name, $old, $new) = @_;
94 313
… …
227 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
228 $::GAUGES->{food} ->set_value ($fo, $fo_m); 447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
229 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
230 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
231 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 450 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
232 my $rng = $stats->{+CS_STAT_RANGE}; 451 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
233 $rng =~ s/^Range: //; # thank you so much dear server 452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
234 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
235 my $title = $stats->{+CS_STAT_TITLE}; 453 my $title = $stats->{+CS_STAT_TITLE};
236 $title =~ s/^Player: //; 454 $title =~ s/^Player: //;
237 $::STATWIDS->{title} ->set_text ("Title: " . $title); 455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
238 456
239 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 457 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
259 my @skills = keys %{ $self->{skill_info} }; 477 my @skills = keys %{ $self->{skill_info} };
260 478
261 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
262 $sktbl->clear; 480 $sktbl->clear;
263 481
482 my $sw = $self->{skillwid}{""} ||= [
264 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
265 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 484 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
485 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
266 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
267 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
268 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 488 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
489 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
269 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
491 ];
492
493 my @add = @$sw;
270 494
271 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
272 496
273 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 497 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
274 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 498 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
288 if ($ev->{button} == 1) { 512 if ($ev->{button} == 1) {
289 $::CONN->user_send ("ready_skill $name"); 513 $::CONN->user_send ("ready_skill $name");
290 } elsif ($ev->{button} == 2) { 514 } elsif ($ev->{button} == 2) {
291 $::CONN->user_send ("use_skill $name"); 515 $::CONN->user_send ("use_skill $name");
292 } elsif ($ev->{button} == 3) { 516 } elsif ($ev->{button} == 3) {
517 my $shortname = CFPlus::shorten $name, 14;
293 (new CFPlus::UI::Menu 518 (new CFPlus::UI::Menu
294 items => [ 519 items => [
295 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 520 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
296 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 521 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
297 ], 522 ],
298 )->popup ($ev); 523 )->popup ($ev);
299 } else { 524 } else {
300 return 0; 525 return 0;
301 } 526 }
302 527
303 1 528 1
304 }; 529 };
305 530
306 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 531 my $sw = $self->{skillwid}{$idx} ||= [
532 # exp
533 (new CFPlus::UI::Label
307 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 534 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
308 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 535
536 # level
537 (new CFPlus::UI::Label
309 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 538 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
539
540 # progress
541 (new CFPlus::UI::ExperienceProgress),
542
543 # label
310 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 544 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
311 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 545 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
546 ];
547
548 push @add,
549 $x * 4 + 0, $y, $sw->[0],
550 $x * 4 + 1, $y, $sw->[1],
551 $x * 4 + 2, $y, $sw->[2],
552 $x * 4 + 3, $y, $sw->[3],
553 ;
312 554
313 $x++ and ($x, $y) = (0, $y + 1); 555 $x++ and ($x, $y) = (0, $y + 1);
314 } 556 }
557
558 $sktbl->add_at (@add);
315 } 559 }
316 560
317 for (grep exists $stats->{$_}, @skills) { 561 for (grep exists $stats->{$_}, @skills) {
562 my $sw = $self->{skillwid}{$_};
318 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 563 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
319 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 564 $sw->[1]->set_text ($stats->{$_}[0] * 1);
565 $sw->[2]->set_value (@{$stats->{$_}});
566 }
567}
568
569sub macro_send {
570 my ($self, $macro) = @_;
571
572 for my $cmd (@{ $macro->{action} }) {
573 $self->send_command ($cmd);
320 } 574 }
321} 575}
322 576
323sub user_send { 577sub user_send {
324 my ($self, $command) = @_; 578 my ($self, $command) = @_;
325 579
326 push @{$self->{record}}, $command 580 $self->{record}->($command)
327 if $self->{record}; 581 if $self->{record};
328 582
329 $self->logprint ("send: ", $command); 583 $self->logprint ("send: ", $command);
330 $self->send_command ($command); 584 $self->send_command ($command);
331 ::status ($command); 585 ::status ($command);
332} 586}
333 587
334sub start_record { 588sub record {
335 my ($self) = @_; 589 my ($self, $cb) = @_;
336 590
337 $self->{record} = []; 591 $self->{record} = $cb;
338}
339
340sub stop_record {
341 my ($self) = @_;
342 return delete $self->{record};
343} 592}
344 593
345sub map_scroll { 594sub map_scroll {
346 my ($self, $dx, $dy) = @_; 595 my ($self, $dx, $dy) = @_;
347 596
… …
349} 598}
350 599
351sub feed_map1a { 600sub feed_map1a {
352 my ($self, $data) = @_; 601 my ($self, $data) = @_;
353 602
354 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 603 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
604 my $delay;
605
606 for my $tile (@$missing) {
607 next if $self->{delay}{$tile};
608
609 $delay = 1;
610
611 if (my $tex = $::CONN->{texture}[$tile]) {
612 $tex->upload;
613 } else {
614 $self->{delay}{$tile} = 1;
615
616 # we assume the face is in-flight and will eventually come
617 push @{$self->{tile_cb}{$tile}}, sub {
618 delete $self->{delay}{$tile};
619 $_[0]->upload;
620 };
621 }
622 }
623
624 if ($delay) {
625 # delay the map drawing a tiny bit in the hope of getting the missing fetched
626 Event->timer (after => 0.03, cb => sub {
627 $_[0]->w->cancel;
628 $self->{map_widget}->update;
629 });
630 } else {
355 $self->{map_widget}->update; 631 $self->{map_widget}->update;
632 }
356} 633}
357 634
358sub magicmap { 635sub magicmap {
359 my ($self, $w, $h, $x, $y, $data) = @_; 636 my ($self, $w, $h, $x, $y, $data) = @_;
360 637
… …
367 my $map_info = delete $self->{map_info} 644 my $map_info = delete $self->{map_info}
368 or return; 645 or return;
369 646
370 my ($hash, $x, $y, $w, $h) = @$map_info; 647 my ($hash, $x, $y, $w, $h) = @$map_info;
371 648
372 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 649 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
373 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 650 $self->{map_cache_new}{$hash} = \$data;
374 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 651 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
375} 652}
376 653
377sub map_clear { 654sub map_clear {
378 my ($self) = @_; 655 my ($self) = @_;
379 656
… …
382 659
383 $self->{map}->clear; 660 $self->{map}->clear;
384 delete $self->{map_widget}{magicmap}; 661 delete $self->{map_widget}{magicmap};
385} 662}
386 663
664sub bg_fetch {
665 my ($self) = @_;
666
667 my $tile;
668
669 do {
670 $tile = pop @{$self->{bg_fetch}}
671 or return;
672 } while $self->{texture}[$tile];
673
674 CFPlus::DB::get tilecache => $tile, sub {
675 my ($data) = @_;
676
677 return unless $self->{map}; # stop when destroyed
678
679 if (defined $data) {
680 $self->have_tile ($tile, $data);
681 $self->{texture}[$tile]->upload;
682 }
683
684 $self->bg_fetch;
685 };
686}
387 687
388sub load_map($$$) { 688sub load_map($$$) {
389 my ($self, $hash, $x, $y) = @_; 689 my ($self, $hash, $x, $y) = @_;
390 690
391 if (defined (my $data = $self->{mapcache}->get ($hash))) { 691 my $gen = $self->{map_change_gen};
692
693 my $cb = sub {
694 return unless $gen == $self->{map_change_gen};
695
696 my ($data) = @_;
697
698 if (defined $data) {
699 $self->{map_cache_new}{$hash} = \$data;
700
392 $data = Compress::LZF::decompress $data; 701 my $data = Compress::LZF::decompress $data;
393 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
394 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
395 my $data = $self->{tilecache}->get ($id)
396 or next;
397 702
398 $self->set_texture ($id => $data); 703 my $inprogress = @{ $self->{bg_fetch} || [] };
704 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
705 $self->bg_fetch unless $inprogress;
399 } 706 }
707 };
708
709 if (my $rdata = $self->{map_cache_old}{$hash}) {
710 $cb->($$rdata);
711 } else {
712 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
400 } 713 }
401} 714}
402 715
403# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 716# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
404# (server resource,s latency, bandwidth), so this hack is warranted. 717# (server resource,s latency, bandwidth), so this hack is warranted.
… …
469 782
470 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 783 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
471 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 784 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
472 785
473 } else { 786 } else {
787 my $gen = $self->{map_change_gen};
474 $self->send_mapinfo ("spatial $path$tile", sub { 788 $self->send_mapinfo ("spatial $path$tile", sub {
789 return unless $gen == $self->{map_change_gen};
790
475 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 791 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
476 792
477 return if $mode ne "spatial"; 793 return if $mode ne "spatial";
478 794
479 $x += $self->{map}->ox; 795 $x += $self->{map}->ox;
… …
493 809
494sub map_change { 810sub map_change {
495 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 811 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
496 812
497 $self->flush_map; 813 $self->flush_map;
814
815 ++$self->{map_change_gen};
816 $self->{map_cache_old} = delete $self->{map_cache_new};
498 817
499 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 818 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
500 819
501 my $mapmapw = $self->{mapmap}->{w}; 820 my $mapmapw = $self->{mapmap}->{w};
502 my $mapmaph = $self->{mapmap}->{h}; 821 my $mapmaph = $self->{mapmap}->{h};
… …
519 $self->load_map ($hash, $x, $y); 838 $self->load_map ($hash, $x, $y);
520 $self->flood_fill (0, 0, 0, "", $hash, $flags); 839 $self->flood_fill (0, 0, 0, "", $hash, $flags);
521} 840}
522 841
523sub face_find { 842sub face_find {
524 my ($self, $facenum, $face) = @_; 843 my ($self, $facenum, $face, $cb) = @_;
525 844
526 my $hash = "$face->{chksum},$face->{name}"; 845 if ($face->{type} == 0) { # FT_FACE
846 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
527 847
528 my $id = $self->{facemap}->get ($hash);
529
530 unless ($id) {
531 # create new id for face
532 # I love transactions
533 for (1..100) {
534 my $txn = $CFPlus::DB_ENV->txn_begin;
535 my $status = $self->{facemap}->db_get (id => $id);
536 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
537 $id = ($id || 64) + 1;
538 if ($self->{facemap}->put (id => $id) == 0
539 && $self->{facemap}->put ($hash => $id) == 0) {
540 $txn->txn_commit;
541
542 goto gotid;
543 }
544 }
545 $txn->txn_abort;
546 }
547
548 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
549 }
550
551gotid:
552 $face->{id} = $id; 848 $face->{id} = $id;
553 $self->{map}->set_face ($facenum => $id); 849 $self->{map}->set_tileid ($facenum => $id);
554 $self->{faceid}[$facenum] = $id;#d#
555 850
556 my $face = $self->{tilecache}->get ($id); 851 CFPlus::DB::get tilecache => $id, $cb;
557 852
558 if ($face) { 853 } elsif ($face->{type} & 1) { # with metadata
559 #$self->face_prefetch; 854 CFPlus::DB::get res_meta => $face->{name}, $cb;
560 $face 855
561 } else { 856 } else { # no metadata
562 my $tex = $self->{noface}; 857 CFPlus::DB::get res_data => $face->{name}, $cb;
563 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
564 undef
565 }; 858 }
566} 859}
567 860
568sub face_update { 861sub face_update {
569 my ($self, $facenum, $face, $changed) = @_; 862 my ($self, $facenum, $face, $changed) = @_;
570 863
571 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 864 if ($face->{type} == 0) {
865 # image, FT_FACE
866 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
867 if $changed;
572 868
573 $self->set_texture ($face->{id} => delete $face->{image}); 869 $self->have_tile ($face->{id}, delete $face->{data});
574}
575 870
576sub set_texture { 871 } elsif ($face->{type} & 1) {
872 # split metadata case, FT_MUSIC, FT_SOUND
873 if ($changed) { # new data
874 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
875 $face->{data} = $meta;
876
877 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
878 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
879 }
880
881 $face->{data} = $self->{json_coder}->decode ($face->{data});
882
883 ::add_license ($face);
884
885 if ($face->{type} == 3) { # FT_MUSIC
886 ::message ({ markup => "downloaded song #$facenum" })
887 if $changed;
888
889 &::audio_music_push ($facenum);
890 } elsif ($face->{type} == 5) { # FT_SOUND
891 ::message ({ markup => "downloaded sound #$facenum" })
892 if $changed;
893
894 &::audio_sound_push ($facenum);
895 }
896
897 } else {
898 # flat resource case, FT_RSRC
899 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
900 if $changed;
901 }
902
903 if (my $cbs = $self->{face_cb}{$facenum}) {
904 $_->($face, $changed) for @$cbs;
905 }
906}
907
908sub smooth_update {
909 my ($self, $facenum, $face) = @_;
910
911 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
912}
913
914sub have_tile {
577 my ($self, $id, $data) = @_; 915 my ($self, $tile, $data) = @_;
578 916
579 $self->{texture}[$id] ||= do { 917 return unless $self->{map};
580 my $tex = 918
919 my $tex = $self->{texture}[$tile] ||=
581 new_from_image CFPlus::Texture 920 new CFPlus::Texture
921 tile => $tile,
922 image => $data, delete_image => 1,
582 $data, minify => 1, mipmap => 1; 923 minify => 1, mipmap => 1;
583 924
584 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 925 if (my $cbs = delete $self->{tile_cb}{$tile}) {
585 $self->{map_widget}->update; 926 $_->($tex) for @$cbs;
586
587 $tex
588 }; 927 }
928}
929
930# call in non-void context registers a temporary
931# hook with handle, otherwise its permanent
932sub on_face_change {
933 my ($self, $num, $cb) = @_;
934
935 push @{$self->{face_cb}{$num}}, $cb;
936
937 defined wantarray
938 ? CFPlus::guard {
939 @{$self->{face_cb}{$num}}
940 = grep $_ != $cb,
941 @{$self->{face_cb}{$num}};
942 }
943 : ()
944}
945
946# call in non-void context registers a temporary
947# hook with handle, otherwise its permanent
948sub register_face_handler {
949 my ($self, $num, $cb) = @_;
950
951 return unless $num;
952
953 # invoke if available right now
954 $cb->($self->{face}[$num], 0)
955 unless exists $self->{face}[$num]{loading};
956
957 # future changes
958 $self->on_face_change ($num => $cb)
589} 959}
590 960
591sub sound_play { 961sub sound_play {
592 my ($self, $x, $y, $soundnum, $type) = @_; 962 my ($self, $type, $face, $dx, $dy, $vol) = @_;
593 963
594 $self->{sound_play}->($x, $y, $soundnum, $type); 964 &::audio_sound_play ($face, $dx, $dy, $vol)
965 unless $type & 1; # odd types are silent for future expansion
595} 966}
596 967
597my $LAST_QUERY; # server is stupid, stupid, stupid 968my $LAST_QUERY; # server is stupid, stupid, stupid
598 969
599sub query { 970sub query {
… …
603 $LAST_QUERY = $prompt; 974 $LAST_QUERY = $prompt;
604 975
605 $self->{query}-> ($self, $flags, $prompt); 976 $self->{query}-> ($self, $flags, $prompt);
606} 977}
607 978
608sub drawinfo { 979sub sanitise_xml($) {
609 my ($self, $color, $text) = @_; 980 local $_ = shift;
610 981
611 my @color = ( 982 # we now weed out all tags we do not support
983 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
984 # now all entities
985 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
986
987 # handle some elements
988 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
989 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
990
991 $_
992}
993
994our %NAME_TO_COLOR = (
995 black => 0,
996 white => 1,
997 darkblue => 2,
998 red => 3,
999 orange => 4,
1000 lightblue => 5,
1001 darkorange => 6,
1002 green => 7,
1003 darkgreen => 8,
1004 grey => 9,
1005 brown => 10,
1006 yellow => 11,
1007 tan => 12,
1008);
1009
1010our @CF_COLOR = (
612 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1011 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
613 [1.00, 1.00, 1.00], 1012 [1.00, 1.00, 1.00],
614 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1013 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
615 [1.00, 0.00, 0.00], 1014 [1.00, 0.00, 0.00],
616 [1.00, 0.54, 0.00], 1015 [1.00, 0.54, 0.00],
617 [0.11, 0.56, 1.00], 1016 [0.11, 0.56, 1.00],
618 [0.93, 0.46, 0.00], 1017 [0.93, 0.46, 0.00],
619 [0.18, 0.54, 0.34], 1018 [0.18, 0.54, 0.34],
620 [0.56, 0.73, 0.56], 1019 [0.56, 0.73, 0.56],
621 [0.80, 0.80, 0.80], 1020 [0.80, 0.80, 0.80],
622 [0.75, 0.61, 0.20], 1021 [0.75, 0.61, 0.20],
623 [0.99, 0.77, 0.26], 1022 [0.99, 0.77, 0.26],
624 [0.74, 0.65, 0.41], 1023 [0.74, 0.65, 0.41],
625 ); 1024);
626 1025
1026sub msg {
1027 my ($self, $color, $type, $text, @extra) = @_;
1028
1029 $text = sanitise_xml $text;
1030
1031 if (my $cb = $self->{cb_msg}{$type}) {
1032 $_->($self, $color, $type, $text, @extra) for values %$cb;
1033 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1034 $type =~ s/-/_/g;
1035 $self->{$type} = $text;
1036 } else {
627 $self->logprint ("info: ", $text); 1037 $self->logprint ("msg: ", $text);
1038 return if $color < 0; # negative color == ignore if not understood
628 1039
1040 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1041
629 # try to create single paragraphs of multiple lines sent by the server 1042 ## try to create single paragraphs of multiple lines sent by the server
1043 # no longer neecssary with TRT servers
630 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1044 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
631 1045
632 $text = CFPlus::asxml $text; 1046 ::message ({
633 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1047 fg => $fg,
634 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1048 markup => $_,
635 1049 type => $type,
636 ::message ({ fg => $color[$color], markup => $_ }) 1050 extra => [@extra],
1051 color_flags => $color
637 for split /\n/, $text; 1052 }) for split /\n/, $text;
638 1053
639 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
640 group => $text, 1055 group => $text,
641 fg => $color[$color], 1056 fg => $fg,
642 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
643 tooltip_font => $::FONT_FIXED, 1058 tooltip_font => $::FONT_FIXED,
644 ); 1059 );
645} 1060 }
646
647sub drawextinfo {
648 my ($self, $color, $type, $subtype, $message) = @_;
649
650 $self->drawinfo ($color, $message);
651} 1061}
652 1062
653sub spell_add { 1063sub spell_add {
654 my ($self, $spell) = @_; 1064 my ($self, $spell) = @_;
655 1065
656 # try to create single paragraphs out of the multiple lines sent by the server 1066 # try to create single paragraphs out of the multiple lines sent by the server
657 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1067 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
658 $spell->{message} =~ s/\n+$//; 1068 $spell->{message} =~ s/\n+$//;
659 $spell->{message} ||= "Server did not provide a description for this spell."; 1069 $spell->{message} ||= "Server did not provide a description for this spell.";
660 1070
661 $::SPELL_PAGE->add_spell ($spell); 1071 $::SPELL_LIST->add_spell ($spell);
662 1072
663 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1073 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
664 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1074 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
665} 1075}
666 1076
667sub spell_delete { 1077sub spell_delete {
668 my ($self, $spell) = @_; 1078 my ($self, $spell) = @_;
669 1079
670 $::SPELL_PAGE->remove_spell ($spell); 1080 $::SPELL_LIST->remove_spell ($spell);
671} 1081}
672 1082
673sub setup { 1083sub setup {
674 my ($self, $setup) = @_; 1084 my ($self, $setup) = @_;
675 1085
1086 $self->{map_widget}->set_tilesize ($self->{tilesize});
676 $::MAP->resize ($self->{mapw}, $self->{maph}); 1087 $::MAP->resize ($self->{mapw}, $self->{maph});
677} 1088}
678 1089
679sub addme_success { 1090sub addme_success {
680 my ($self) = @_; 1091 my ($self) = @_;
… …
702 $self->{map_widget}->clr_commands; 1113 $self->{map_widget}->clr_commands;
703 1114
704 ::stop_game (); 1115 ::stop_game ();
705} 1116}
706 1117
707sub image_info {
708 my ($self, $numfaces) = @_;
709
710 $self->{num_faces} = $numfaces;
711 $self->{face_prefetch} = [1 .. $numfaces];
712 $self->face_prefetch;
713}
714
715sub face_prefetch {
716 my ($self) = @_;
717
718 return unless $::CFG->{face_prefetch};
719
720 if ($self->{num_faces}) {
721 return if @{ $self->{send_queue} || [] };
722 my $todo = @{ $self->{face_prefetch} }
723 or return;
724
725 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
726
727 $self->send ("requestinfo image_sums $face $face");
728
729 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
730 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
731 } elsif (!exists $self->{num_faces}) {
732 $self->send ("requestinfo image_info");
733
734 $self->{num_faces} = 0;
735
736 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
737 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
738 }
739}
740
741sub update_floorbox { 1118sub update_floorbox {
742 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
743 return unless $::CONN; 1120 return unless $::CONN;
744 1121
745 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
1123
1124 my @add;
746 1125
747 my $row; 1126 my $row;
748 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
749 if ($row < 6) { 1128 if ($row < 6) {
750 local $_->{face_widget}; # hack to force recreation of widget 1129 local $_->{face_widget}; # hack to force recreation of widget
751 local $_->{desc_widget}; # hack to force recreation of widget 1130 local $_->{desc_widget}; # hack to force recreation of widget
752 CFPlus::Item::update_widgets $_; 1131 CFPlus::Item::update_widgets $_;
753 1132
1133 push @add,
754 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1134 0, $row, $_->{face_widget},
755 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1135 1, $row, $_->{desc_widget};
756 1136
757 $row++; 1137 $row++;
758 } else { 1138 } else {
759 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1139 push @add, 1, $row, new CFPlus::UI::Button
760 text => "More...", 1140 text => "More...",
761 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
762 ); 1142 ;
763 last; 1143 last;
764 } 1144 }
765 } 1145 }
766 if ($::CONN->{open_container}) { 1146 if ($::CONN->{open_container}) {
767 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1147 push @add, 1, $row++, new CFPlus::UI::Button
768 text => "Close container", 1148 text => "Close container",
769 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
770 ); 1150 ;
771 } 1151 }
772 });
773 1152
1153 $::FLOORBOX->add_at (@add);
1154 });
1155
774 $::WANT_REFRESH++; 1156 $::WANT_REFRESH->start;
775} 1157}
776 1158
777sub set_opencont { 1159sub set_opencont {
778 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
779 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
780 update_floorbox; 1162 update_floorbox;
781 1163
782 $::INV_RIGHT_HB->clear (); 1164 $::INVR_HB->clear ();
783 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1165 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
784 1166
785 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
786 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new CFPlus::UI::Button
787 text => "Close container", 1169 text => "Close container",
788 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
789 on_activate => sub { 1171 on_activate => sub {
790 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
791 if $tag != 0; 1173 if $tag != 0;
792 #if $CONN->{open_container} != 0;
793 0 1174 0
794 }, 1175 },
795 ); 1176 );
796 } 1177 }
797 1178
… …
887 $::SERVER_INFO->set_markup ( 1268 $::SERVER_INFO->set_markup (
888 "server <tt>$self->{host}:$self->{port}</tt>\n" 1269 "server <tt>$self->{host}:$self->{port}</tt>\n"
889 . "protocol version <tt>$self->{version}</tt>\n" 1270 . "protocol version <tt>$self->{version}</tt>\n"
890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1271 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
891 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1272 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1273 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
892 . "editing support $yesno[!!$self->{editor_support}]\n" 1274 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1275 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1276 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
896 . "map size $self->{mapw}×$self->{maph}\n" 1279 . "map size $self->{mapw}×$self->{maph}\n"
897 ); 1280 );
1281
898} 1282}
899 1283
900sub logged_in { 1284sub logged_in {
901 my ($self) = @_; 1285 my ($self) = @_;
902 1286
903 $self->send_ext_req (cfplus_support => version => 1, sub { 1287 $self->send_ext_req (cfplus_support => version => 2, sub {
1288 my (%msg) = @_;
1289
904 $self->{cfplus_ext} = $_[0]{version}; 1290 $self->{cfplus_ext} = $msg{version};
905 $self->update_server_info; 1291 $self->update_server_info;
906 1292
907 if ($self->{cfplus_ext} >= 2) { 1293 if ($self->{cfplus_ext} >= 2) {
908 $self->send_ext_req ("editor_support", sub { 1294 $self->send_ext_req ("editor_support", sub {
909 $self->{editor_support} = $_[0]; 1295 $self->{editor_support} = { @_ };
910 $self->update_server_info; 1296 $self->update_server_info;
911 1297
912 0 1298 0
913 }); 1299 });
914 } 1300 }
… …
918 1304
919 $self->update_server_info; 1305 $self->update_server_info;
920 1306
921 $self->send_command ("output-sync $::CFG->{output_sync}"); 1307 $self->send_command ("output-sync $::CFG->{output_sync}");
922 $self->send_command ("output-count $::CFG->{output_count}"); 1308 $self->send_command ("output-count $::CFG->{output_count}");
1309 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
923 $self->send_command ("pickup $::CFG->{pickup}"); 1310 $self->send_command ("pickup $::CFG->{pickup}");
924} 1311}
925 1312
926sub lookat { 1313sub lookat {
927 my ($self, $x, $y) = @_; 1314 my ($self, $x, $y) = @_;
928 1315
929 if ($self->{cfplus_ext}) { 1316 if ($self->{cfplus_ext}) {
930 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1317 $self->send_ext_req (lookat => $x, $y, sub {
931 my ($msg) = @_; 1318 my (%msg) = @_;
932 1319
933 if (exists $msg->{npc_dialog}) { 1320 if (exists $msg{npc_dialog}) {
934 # start npc chat dialog 1321 # start npc chat dialog
935 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1322 $self->{npc_dialog} = new CFPlus::NPCDialog::
936 dx => $x, 1323 token => $msg{npc_dialog},
937 dy => $y,
938 title => "$msg->{npc_dialog} (NPC)", 1324 title => "$msg{npc_dialog}[0] (NPC)",
939 conn => $self, 1325 conn => $self,
940 ; 1326 ;
941 } 1327 }
942 }); 1328 });
943 } 1329 }
… …
950 1336
951 (delete $self->{npc_dialog})->destroy 1337 (delete $self->{npc_dialog})->destroy
952 if $self->{npc_dialog}; 1338 if $self->{npc_dialog};
953 1339
954 $self->SUPER::destroy; 1340 $self->SUPER::destroy;
1341
1342 %$self = ();
955} 1343}
956 1344
957package CFPlus::NPCDialog; 1345package CFPlus::NPCDialog;
958 1346
959our @ISA = 'CFPlus::UI::Toplevel'; 1347our @ISA = 'CFPlus::UI::Toplevel';
… …
971 kw => { hi => 0, yes => 0, no => 0 }, 1359 kw => { hi => 0, yes => 0, no => 0 },
972 has_close_button => 1, 1360 has_close_button => 1,
973 @_, 1361 @_,
974 ); 1362 );
975 1363
976 Scalar::Util::weaken (my $this = $self); 1364 CFPlus::weaken (my $this = $self);
977 1365
978 $self->connect (delete => sub { $this->destroy; 1 }); 1366 $self->connect (delete => sub { $this->destroy; 1 });
979 1367
980 # better use a pane... 1368 # better use a pane...
981 $self->add (my $hbox = new CFPlus::UI::HBox); 1369 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1006 on_activate => sub { $this->destroy; 1 }, 1394 on_activate => sub { $this->destroy; 1 },
1007 ; 1395 ;
1008 1396
1009 $self->update_options; 1397 $self->update_options;
1010 1398
1011 $self->{id} = $self->{conn}->send_ext_req ( 1399 $self->{id} = "npc-channel-" . $self->{conn}->token;
1012 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1400 $self->{conn}->connect_ext ($self->{id} => sub {
1013 sub { $this && $this->feed (@_) } 1401 $this->feed (@_) if $this;
1014 ); 1402 });
1403
1404 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1015 1405
1016 $self->{entry}->grab_focus; 1406 $self->{entry}->grab_focus;
1017 1407
1018 $self->{textview}->add_paragraph ({ 1408 $self->{textview}->add_paragraph ({
1019 fg => [1, 1, 0, 1], 1409 fg => [1, 1, 0, 1],
… …
1025}; 1415};
1026 1416
1027sub update_options { 1417sub update_options {
1028 my ($self) = @_; 1418 my ($self) = @_;
1029 1419
1030 Scalar::Util::weaken $self; 1420 CFPlus::weaken $self;
1031 1421
1032 $self->{options}->clear; 1422 $self->{options}->clear;
1033 $self->{options}->add ($self->{bye_button}); 1423 $self->{options}->add ($self->{bye_button});
1034 1424
1035 for my $kw (sort keys %{ $self->{kw} }) { 1425 for my $kw (sort keys %{ $self->{kw} }) {
… …
1042 ); 1432 );
1043 } 1433 }
1044} 1434}
1045 1435
1046sub feed { 1436sub feed {
1047 my ($self, $msg) = @_; 1437 my ($self, $type, @arg) = @_;
1048 1438
1049 Scalar::Util::weaken $self; 1439 CFPlus::weaken $self;
1050 1440
1051 if ($msg->{msgtype} eq "reply") { 1441 if ($type eq "update") {
1442 my (%info) = @arg;
1443
1052 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1444 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1053 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1445 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1054
1055 my $text = "\n" . CFPlus::asxml $msg->{msg};
1056 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1057 my @link;
1058 $text =~ s{
1059 ($match)
1060 }{
1061 my $kw = $1;
1062
1063 push @link, new CFPlus::UI::Label
1064 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1065 can_hover => 1,
1066 can_events => 1,
1067 padding_x => 0,
1068 padding_y => 0,
1069 on_button_up => sub {
1070 $self->send ($kw);
1071 };
1072
1073 "\x{fffc}"
1074 }giex;
1075 1446
1447 if (exists $info{msg}) {
1448 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1449 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1450 my @link;
1451 $text =~ s{
1452 ($match)
1453 }{
1454 my $kw = $1;
1455
1456 push @link, new CFPlus::UI::Label
1457 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1458 can_hover => 1,
1459 can_events => 1,
1460 padding_x => 0,
1461 padding_y => 0,
1462 on_button_up => sub {
1463 $self->send ($kw);
1464 };
1465
1466 "\x{fffc}"
1467 }giex;
1468
1076 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1469 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1077 $self->{textview}->scroll_to_bottom; 1470 $self->{textview}->scroll_to_bottom;
1471 }
1472
1078 $self->update_options; 1473 $self->update_options;
1079 } else { 1474 } else {
1080 $self->destroy; 1475 $self->destroy;
1081 } 1476 }
1082 1477
… …
1087 my ($self, $msg) = @_; 1482 my ($self, $msg) = @_;
1088 1483
1089 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1484 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1090 $self->{textview}->scroll_to_bottom; 1485 $self->{textview}->scroll_to_bottom;
1091 1486
1092 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1487 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1093} 1488}
1094 1489
1095sub destroy { 1490sub destroy {
1096 my ($self) = @_; 1491 my ($self) = @_;
1097 1492
1098 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1493 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1099 1494
1100 if ($self->{conn}) { 1495 if ($self->{conn}) {
1101 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1496 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1102 delete $self->{conn}{npc_dialog}; 1497 delete $self->{conn}{npc_dialog};
1103 $self->{conn}->disconnect_ext ($self->{id}); 1498 $self->{conn}->disconnect_ext ($self->{id});
1104 } 1499 }
1105 1500
1106 $self->SUPER::destroy; 1501 $self->SUPER::destroy;

Diff Legend

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