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.77 by root, Mon Aug 14 04:15:04 2006 UTC vs.
Revision 1.157 by root, Tue Aug 21 02:39:17 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;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_); 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 );
18 30
19 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
20 32
21 my @cmd_help = map { 33 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 45 for @args;
34 46
35 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
37 @args 49 @args
38 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
40 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
41 $self->{map_widget}->add_command (@$_) 244 $self->{map_widget}->add_command (@$_)
42 for @cmd_help; 245 for @cmd_help;
43 246
247 {
248 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
249 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
250 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
251 }
252
253 {
44 $self->{noface} = new_from_file CFPlus::Texture 254 $self->{noface} = my $tex = new_from_file CFPlus::Texture
45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 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 }
46 258
47 $self->{open_container} = 0; 259 $self->{open_container} = 0;
48 260
49 # "global"
50 $self->{tilecache} = CFPlus::db_table "tilecache";
51 $self->{facemap} = CFPlus::db_table "facemap";
52
53 # per server 261 # per server
54 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
55 263
56 $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 });
57} 303}
58 304
59sub logprint { 305sub logprint {
60 my ($self, @a) = @_; 306 my ($self, @a) = @_;
61 307
62 $self->{log_fh} ||= do { 308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
63 my $path = "$Crossfire::VARDIR/log.$self->{host}";
64
65 open my $fh, ">>:utf8", $path
66 or die "Couldn't open logfile $path: $!";
67
68 $fh->autoflush (1);
69
70 $fh;
71 };
72
73 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
74
75 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
76 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
77
78 print {$self->{log_fh}} "$ts ", @a, "\n";
79} 309}
80 310
81sub _stat_numdiff { 311sub _stat_numdiff {
82 my ($self, $name, $old, $new) = @_; 312 my ($self, $name, $old, $new) = @_;
83 313
… …
216 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
217 $::GAUGES->{food} ->set_value ($fo, $fo_m); 447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
218 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
219 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
220 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 450 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
221 my $rng = $stats->{+CS_STAT_RANGE}; 451 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
222 $rng =~ s/^Range: //; # thank you so much dear server 452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
223 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
224 my $title = $stats->{+CS_STAT_TITLE}; 453 my $title = $stats->{+CS_STAT_TITLE};
225 $title =~ s/^Player: //; 454 $title =~ s/^Player: //;
226 $::STATWIDS->{title} ->set_text ("Title: " . $title); 455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
227 456
228 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 457 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
248 my @skills = keys %{ $self->{skill_info} }; 477 my @skills = keys %{ $self->{skill_info} };
249 478
250 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
251 $sktbl->clear; 480 $sktbl->clear;
252 481
482 my @add;
483
484 push @add,
253 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 485 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
254 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 486 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
487 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
255 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 488 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
256 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 489 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
257 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 490 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
491 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
258 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 492 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
493 ;
259 494
260 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>";
261 496
262 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);
263 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);
… …
277 if ($ev->{button} == 1) { 512 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 513 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 514 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 515 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 516 } elsif ($ev->{button} == 3) {
517 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 518 (new CFPlus::UI::Menu
283 items => [ 519 items => [
284 ["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"] }],
285 ["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"] }],
286 ], 522 ],
287 )->popup ($ev); 523 )->popup ($ev);
288 } else { 524 } else {
289 return 0; 525 return 0;
290 } 526 }
291 527
292 1 528 1
293 }; 529 };
294 530
531 push @add,
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 532 $x * 4 + 0, $y, ($self->{stat_widget_exp}{$idx} ||= new CFPlus::UI::Label
296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 533 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
297 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 534 $x * 4 + 1, $y, ($self->{stat_widget_lvl}{$idx} ||= new CFPlus::UI::Label
298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 535 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 536 $x * 4 + 2, $y, ($self->{stat_widget_prg}{$idx} ||= new CFPlus::UI::ExperienceProgress),
537 $x * 4 + 3, $y, ($self->{stat_widget_lbl}{$idx} ||= new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
300 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 538 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ;
301 540
302 $x++ and ($x, $y) = (0, $y + 1); 541 $x++ and ($x, $y) = (0, $y + 1);
303 } 542 }
543
544 $sktbl->add_at (@add);
304 } 545 }
305 546
306 for (grep exists $stats->{$_}, @skills) { 547 for (grep exists $stats->{$_}, @skills) {
307 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 548 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
308 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 549 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
550 $self->{stat_widget_prg}{$_}->set_value (@{$stats->{$_}});
551 }
552}
553
554sub macro_send {
555 my ($self, $macro) = @_;
556
557 for my $cmd (@{ $macro->{action} }) {
558 $self->send_command ($cmd);
309 } 559 }
310} 560}
311 561
312sub user_send { 562sub user_send {
313 my ($self, $command) = @_; 563 my ($self, $command) = @_;
314 564
565 $self->{record}->($command)
315 if ($self->{record}) { 566 if $self->{record};
316 push @{$self->{record}}, $command;
317 }
318 567
319 $self->logprint ("send: ", $command); 568 $self->logprint ("send: ", $command);
320 $self->send_command ($command); 569 $self->send_command ($command);
321 ::status ($command); 570 ::status ($command);
322} 571}
323 572
324sub start_record { 573sub record {
325 my ($self) = @_; 574 my ($self, $cb) = @_;
326 575
327 $self->{record} = []; 576 $self->{record} = $cb;
328}
329
330sub stop_record {
331 my ($self) = @_;
332 return delete $self->{record};
333} 577}
334 578
335sub map_scroll { 579sub map_scroll {
336 my ($self, $dx, $dy) = @_; 580 my ($self, $dx, $dy) = @_;
337 581
… …
339} 583}
340 584
341sub feed_map1a { 585sub feed_map1a {
342 my ($self, $data) = @_; 586 my ($self, $data) = @_;
343 587
344 $self->{map}->map1a_update ($data); 588 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
589 my $delay;
590
591 for my $tile (@$missing) {
592 next if $self->{delay}{$tile};
593
594 $delay = 1;
595
596 if (my $tex = $::CONN->{texture}[$tile]) {
597 $tex->upload;
598 } else {
599 $self->{delay}{$tile} = 1;
600
601 # we assume the face is in-flight and will eventually come
602 push @{$self->{tile_cb}{$tile}}, sub {
603 delete $self->{delay}{$tile};
604 $_[0]->upload;
605 };
606 }
607 }
608
609 if ($delay) {
610 # delay the map drawing a tiny bit in the hope of getting the missing fetched
611 Event->timer (after => 0.03, cb => sub {
612 $_[0]->w->cancel;
613 $self->{map_widget}->update;
614 });
615 } else {
345 $self->{map_widget}->update; 616 $self->{map_widget}->update;
617 }
346} 618}
347 619
348sub magicmap { 620sub magicmap {
349 my ($self, $w, $h, $x, $y, $data) = @_; 621 my ($self, $w, $h, $x, $y, $data) = @_;
350 622
… …
357 my $map_info = delete $self->{map_info} 629 my $map_info = delete $self->{map_info}
358 or return; 630 or return;
359 631
360 my ($hash, $x, $y, $w, $h) = @$map_info; 632 my ($hash, $x, $y, $w, $h) = @$map_info;
361 633
362 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 634 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
363 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 635 $self->{map_cache_new}{$hash} = \$data;
364 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 636 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
365} 637}
366 638
367sub map_clear { 639sub map_clear {
368 my ($self) = @_; 640 my ($self) = @_;
369 641
… …
372 644
373 $self->{map}->clear; 645 $self->{map}->clear;
374 delete $self->{map_widget}{magicmap}; 646 delete $self->{map_widget}{magicmap};
375} 647}
376 648
649sub bg_fetch {
650 my ($self) = @_;
651
652 my $tile;
653
654 do {
655 $tile = pop @{$self->{bg_fetch}}
656 or return;
657 } while $self->{texture}[$tile];
658
659 CFPlus::DB::get tilecache => $tile, sub {
660 my ($data) = @_;
661
662 return unless $self->{map}; # stop when destroyed
663
664 if (defined $data) {
665 $self->have_tile ($tile, $data);
666 $self->{texture}[$tile]->upload;
667 }
668
669 $self->bg_fetch;
670 };
671}
377 672
378sub load_map($$$) { 673sub load_map($$$) {
379 my ($self, $hash, $x, $y) = @_; 674 my ($self, $hash, $x, $y) = @_;
380 675
381 if (defined (my $data = $self->{mapcache}->get ($hash))) { 676 my $gen = $self->{map_change_gen};
677
678 my $cb = sub {
679 return unless $gen == $self->{map_change_gen};
680
681 my ($data) = @_;
682
683 if (defined $data) {
684 $self->{map_cache_new}{$hash} = \$data;
685
382 $data = Compress::LZF::decompress $data; 686 my $data = Compress::LZF::decompress $data;
383 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
384 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
385 my $data = $self->{tilecache}->get ($id)
386 or next;
387 687
388 $self->set_texture ($id => $data); 688 my $inprogress = @{ $self->{bg_fetch} || [] };
689 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
690 $self->bg_fetch unless $inprogress;
389 } 691 }
692 };
693
694 if (my $rdata = $self->{map_cache_old}{$hash}) {
695 $cb->($$rdata);
696 } else {
697 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
390 } 698 }
391} 699}
392 700
393# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 701# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
394# (server resource,s latency, bandwidth), so this hack is warranted. 702# (server resource,s latency, bandwidth), so this hack is warranted.
… …
459 767
460 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 768 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
461 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 769 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
462 770
463 } else { 771 } else {
772 my $gen = $self->{map_change_gen};
464 $self->send_mapinfo ("spatial $path$tile", sub { 773 $self->send_mapinfo ("spatial $path$tile", sub {
774 return unless $gen == $self->{map_change_gen};
775
465 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 776 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
466 777
467 return if $mode ne "spatial"; 778 return if $mode ne "spatial";
468 779
469 $x += $self->{map}->ox; 780 $x += $self->{map}->ox;
… …
483 794
484sub map_change { 795sub map_change {
485 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 796 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
486 797
487 $self->flush_map; 798 $self->flush_map;
799
800 ++$self->{map_change_gen};
801 $self->{map_cache_old} = delete $self->{map_cache_new};
488 802
489 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 803 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
490 804
491 my $mapmapw = $self->{mapmap}->{w}; 805 my $mapmapw = $self->{mapmap}->{w};
492 my $mapmaph = $self->{mapmap}->{h}; 806 my $mapmaph = $self->{mapmap}->{h};
… …
509 $self->load_map ($hash, $x, $y); 823 $self->load_map ($hash, $x, $y);
510 $self->flood_fill (0, 0, 0, "", $hash, $flags); 824 $self->flood_fill (0, 0, 0, "", $hash, $flags);
511} 825}
512 826
513sub face_find { 827sub face_find {
514 my ($self, $facenum, $face) = @_; 828 my ($self, $facenum, $face, $cb) = @_;
515 829
516 my $hash = "$face->{chksum},$face->{name}"; 830 if ($face->{type} == 0) { # FT_FACE
831 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
517 832
518 my $id = $self->{facemap}->get ($hash);
519
520 unless ($id) {
521 # create new id for face
522 # I love transactions
523 for (1..100) {
524 my $txn = $CFPlus::DB_ENV->txn_begin;
525 my $status = $self->{facemap}->db_get (id => $id);
526 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
527 $id = ($id || 64) + 1;
528 if ($self->{facemap}->put (id => $id) == 0
529 && $self->{facemap}->put ($hash => $id) == 0) {
530 $txn->txn_commit;
531
532 goto gotid;
533 }
534 }
535 $txn->txn_abort;
536 }
537
538 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
539 }
540
541gotid:
542 $face->{id} = $id; 833 $face->{id} = $id;
543 $self->{map}->set_face ($facenum => $id); 834 $self->{map}->set_tileid ($facenum => $id);
544 $self->{faceid}[$facenum] = $id;#d#
545 835
546 my $face = $self->{tilecache}->get ($id); 836 CFPlus::DB::get tilecache => $id, $cb;
547 837
548 if ($face) { 838 } elsif ($face->{type} & 1) { # with metadata
549 #$self->face_prefetch; 839 CFPlus::DB::get res_meta => $face->{name}, $cb;
550 $face 840
551 } else { 841 } else { # no metadata
552 my $tex = $self->{noface}; 842 CFPlus::DB::get res_data => $face->{name}, $cb;
553 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554 undef
555 }; 843 }
556} 844}
557 845
558sub face_update { 846sub face_update {
559 my ($self, $facenum, $face, $changed) = @_; 847 my ($self, $facenum, $face, $changed) = @_;
560 848
561 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 849 if ($face->{type} == 0) {
850 # image, FT_FACE
851 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
852 if $changed;
562 853
563 $self->set_texture ($face->{id} => delete $face->{image}); 854 $self->have_tile ($face->{id}, delete $face->{data});
564}
565 855
566sub set_texture { 856 } elsif ($face->{type} & 1) {
857 # split metadata case, FT_MUSIC, FT_SOUND
858 if ($changed) { # new data
859 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
860 $face->{data} = $meta;
861
862 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
863 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
864 }
865
866 $face->{data} = $self->{json_coder}->decode ($face->{data});
867
868 ::add_license ($face);
869
870 if ($face->{type} == 3) { # FT_MUSIC
871 ::message ({ markup => "downloaded song #$facenum" })
872 if $changed;
873
874 &::audio_music_push ($facenum);
875 } elsif ($face->{type} == 5) { # FT_SOUND
876 ::message ({ markup => "downloaded sound #$facenum" })
877 if $changed;
878
879 &::audio_sound_push ($facenum);
880 }
881
882 } else {
883 # flat resource case, FT_RSRC
884 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
885 if $changed;
886 }
887
888 if (my $cbs = $self->{face_cb}{$facenum}) {
889 $_->($face, $changed) for @$cbs;
890 }
891}
892
893sub smooth_update {
894 my ($self, $facenum, $face) = @_;
895
896 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
897}
898
899sub have_tile {
567 my ($self, $id, $data) = @_; 900 my ($self, $tile, $data) = @_;
568 901
569 $self->{texture}[$id] ||= do { 902 return unless $self->{map};
570 my $tex = 903
904 my $tex = $self->{texture}[$tile] ||=
571 new_from_image CFPlus::Texture 905 new CFPlus::Texture
906 tile => $tile,
907 image => $data, delete_image => 1,
572 $data, minify => 1, mipmap => 1; 908 minify => 1, mipmap => 1;
573 909
574 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 910 if (my $cbs = delete $self->{tile_cb}{$tile}) {
575 $self->{map_widget}->update; 911 $_->($tex) for @$cbs;
576
577 $tex
578 }; 912 }
913}
914
915# call in non-void context registers a temporary
916# hook with handle, otherwise its permanent
917sub on_face_change {
918 my ($self, $num, $cb) = @_;
919
920 push @{$self->{face_cb}{$num}}, $cb;
921
922 defined wantarray
923 ? CFPlus::guard {
924 @{$self->{face_cb}{$num}}
925 = grep $_ != $cb,
926 @{$self->{face_cb}{$num}};
927 }
928 : ()
929}
930
931# call in non-void context registers a temporary
932# hook with handle, otherwise its permanent
933sub register_face_handler {
934 my ($self, $num, $cb) = @_;
935
936 return unless $num;
937
938 # invoke if available right now
939 $cb->($self->{face}[$num], 0)
940 unless exists $self->{face}[$num]{loading};
941
942 # future changes
943 $self->on_face_change ($num => $cb)
579} 944}
580 945
581sub sound_play { 946sub sound_play {
582 my ($self, $x, $y, $soundnum, $type) = @_; 947 my ($self, $type, $face, $dx, $dy, $vol) = @_;
583 948
584 $self->{sound_play}->($x, $y, $soundnum, $type); 949 &::audio_sound_play ($face, $dx, $dy, $vol)
950 unless $type & 1; # odd types are silent for future expansion
585} 951}
586 952
587my $LAST_QUERY; # server is stupid, stupid, stupid 953my $LAST_QUERY; # server is stupid, stupid, stupid
588 954
589sub query { 955sub query {
… …
593 $LAST_QUERY = $prompt; 959 $LAST_QUERY = $prompt;
594 960
595 $self->{query}-> ($self, $flags, $prompt); 961 $self->{query}-> ($self, $flags, $prompt);
596} 962}
597 963
598sub drawinfo { 964sub sanitise_xml($) {
599 my ($self, $color, $text) = @_; 965 local $_ = shift;
600 966
601 my @color = ( 967 # we now weed out all tags we do not support
968 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
969 # now all entities
970 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
971
972 # handle some elements
973 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
974 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
975
976 $_
977}
978
979our %NAME_TO_COLOR = (
980 black => 0,
981 white => 1,
982 darkblue => 2,
983 red => 3,
984 orange => 4,
985 lightblue => 5,
986 darkorange => 6,
987 green => 7,
988 darkgreen => 8,
989 grey => 9,
990 brown => 10,
991 yellow => 11,
992 tan => 12,
993);
994
995our @CF_COLOR = (
602 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 996 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
603 [1.00, 1.00, 1.00], 997 [1.00, 1.00, 1.00],
604 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 998 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
605 [1.00, 0.00, 0.00], 999 [1.00, 0.00, 0.00],
606 [1.00, 0.54, 0.00], 1000 [1.00, 0.54, 0.00],
607 [0.11, 0.56, 1.00], 1001 [0.11, 0.56, 1.00],
608 [0.93, 0.46, 0.00], 1002 [0.93, 0.46, 0.00],
609 [0.18, 0.54, 0.34], 1003 [0.18, 0.54, 0.34],
610 [0.56, 0.73, 0.56], 1004 [0.56, 0.73, 0.56],
611 [0.80, 0.80, 0.80], 1005 [0.80, 0.80, 0.80],
612 [0.75, 0.61, 0.20], 1006 [0.75, 0.61, 0.20],
613 [0.99, 0.77, 0.26], 1007 [0.99, 0.77, 0.26],
614 [0.74, 0.65, 0.41], 1008 [0.74, 0.65, 0.41],
615 ); 1009);
616 1010
1011sub msg {
1012 my ($self, $color, $type, $text, @extra) = @_;
1013
1014 $text = sanitise_xml $text;
1015
1016 if (my $cb = $self->{cb_msg}{$type}) {
1017 $_->($self, $color, $type, $text, @extra) for values %$cb;
1018 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1019 $type =~ s/-/_/g;
1020 $self->{$type} = $text;
1021 } else {
617 $self->logprint ("info: ", $text); 1022 $self->logprint ("msg: ", $text);
1023 return if $color < 0; # negative color == ignore if not understood
618 1024
619 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1025 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
620 1026
621 # try to create single paragraphs of multiple lines sent by the server 1027 ## try to create single paragraphs of multiple lines sent by the server
1028 # no longer neecssary with TRT servers
622 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1029 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
623 1030
624 $text = CFPlus::asxml $text; 1031 ::message ({
625 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1032 fg => $fg,
626 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1033 markup => $_,
1034 type => $type,
1035 extra => [@extra],
1036 color_flags => $color
1037 }) for split /\n/, $text;
627 1038
628 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
629 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
630 $self->{logview}->scroll_to_bottom;
631
632 $self->{statusbox}->add ($text, 1039 $self->{statusbox}->add ($text,
633 group => $text, 1040 group => $text,
634 fg => $color[$color], 1041 fg => $fg,
635 timeout => $color >= 2 ? 180 : 10, 1042 timeout => $color >= 2 ? 180 : 10,
636 tooltip_font => $::FONT_FIXED, 1043 tooltip_font => $::FONT_FIXED,
637 ); 1044 );
638} 1045 }
639
640sub drawextinfo {
641 my ($self, $color, $type, $subtype, $message) = @_;
642
643 $self->drawinfo ($color, $message);
644} 1046}
645 1047
646sub spell_add { 1048sub spell_add {
647 my ($self, $spell) = @_; 1049 my ($self, $spell) = @_;
648 1050
649 # try to create single paragraphs out of the multiple lines sent by the server 1051 # try to create single paragraphs out of the multiple lines sent by the server
650 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1052 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
651 $spell->{message} =~ s/\n+$//; 1053 $spell->{message} =~ s/\n+$//;
652 $spell->{message} ||= "Server did not provide a description for this spell."; 1054 $spell->{message} ||= "Server did not provide a description for this spell.";
653 1055
654 $::SPELL_PAGE->add_spell ($spell); 1056 $::SPELL_LIST->add_spell ($spell);
655 1057
656 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1058 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
657 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1059 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
658} 1060}
659 1061
660sub spell_delete { 1062sub spell_delete {
661 my ($self, $spell) = @_; 1063 my ($self, $spell) = @_;
662 1064
663 $::SPELL_PAGE->remove_spell ($spell); 1065 $::SPELL_LIST->remove_spell ($spell);
1066}
1067
1068sub setup {
1069 my ($self, $setup) = @_;
1070
1071 $self->{map_widget}->set_tilesize ($self->{tilesize});
1072 $::MAP->resize ($self->{mapw}, $self->{maph});
664} 1073}
665 1074
666sub addme_success { 1075sub addme_success {
667 my ($self) = @_; 1076 my ($self) = @_;
668 1077
… …
689 $self->{map_widget}->clr_commands; 1098 $self->{map_widget}->clr_commands;
690 1099
691 ::stop_game (); 1100 ::stop_game ();
692} 1101}
693 1102
694sub image_info {
695 my ($self, $numfaces) = @_;
696
697 $self->{num_faces} = $numfaces;
698 $self->{face_prefetch} = [1 .. $numfaces];
699 $self->face_prefetch;
700}
701
702sub face_prefetch {
703 my ($self) = @_;
704
705 return unless $::CFG->{face_prefetch};
706
707 if ($self->{num_faces}) {
708 return if @{ $self->{send_queue} || [] };
709 my $todo = @{ $self->{face_prefetch} }
710 or return;
711
712 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
713
714 $self->send ("requestinfo image_sums $face $face");
715
716 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
717 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
718 } elsif (!exists $self->{num_faces}) {
719 $self->send ("requestinfo image_info");
720
721 $self->{num_faces} = 0;
722
723 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
724 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
725 }
726}
727
728sub update_floorbox { 1103sub update_floorbox {
729 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1104 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
730 return unless $::CONN; 1105 return unless $::CONN;
731 1106
732 $::FLOORBOX->clear; 1107 $::FLOORBOX->clear;
1108
1109 my @add;
733 1110
734 my $row; 1111 my $row;
735 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1112 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
736 if ($row < 6) { 1113 if ($row < 6) {
737 local $_->{face_widget}; # hack to force recreation of widget 1114 local $_->{face_widget}; # hack to force recreation of widget
738 local $_->{desc_widget}; # hack to force recreation of widget 1115 local $_->{desc_widget}; # hack to force recreation of widget
739 CFPlus::Item::update_widgets $_; 1116 CFPlus::Item::update_widgets $_;
740 1117
1118 push @add,
741 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1119 0, $row, $_->{face_widget},
742 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1120 1, $row, $_->{desc_widget};
743 1121
744 $row++; 1122 $row++;
745 } else { 1123 } else {
746 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1124 push @add, 1, $row, new CFPlus::UI::Button
747 text => "More...", 1125 text => "More...",
748 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1126 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
749 ); 1127 ;
750 last; 1128 last;
751 } 1129 }
752 } 1130 }
753 if ($::CONN->{open_container}) { 1131 if ($::CONN->{open_container}) {
754 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1132 push @add, 1, $row++, new CFPlus::UI::Button
755 text => "Close container", 1133 text => "Close container",
756 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1134 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
757 ); 1135 ;
758 } 1136 }
759 });
760 1137
1138 $::FLOORBOX->add_at (@add);
1139 });
1140
761 $::WANT_REFRESH++; 1141 $::WANT_REFRESH->start;
762} 1142}
763 1143
764sub set_opencont { 1144sub set_opencont {
765 my ($conn, $tag, $name) = @_; 1145 my ($conn, $tag, $name) = @_;
766 $conn->{open_container} = $tag; 1146 $conn->{open_container} = $tag;
767 update_floorbox; 1147 update_floorbox;
768 1148
769 $::INV_RIGHT_HB->clear (); 1149 $::INVR_HB->clear ();
770 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1150 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
771 1151
772 if ($tag != 0) { # Floor isn't closable, is it? 1152 if ($tag != 0) { # Floor isn't closable, is it?
773 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1153 $::INVR_HB->add (new CFPlus::UI::Button
774 text => "Close container", 1154 text => "Close container",
775 tooltip => "Close the currently open container (if one is open)", 1155 tooltip => "Close the currently open container (if one is open)",
776 on_activate => sub { 1156 on_activate => sub {
777 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1157 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
778 if $tag != 0; 1158 if $tag != 0;
779 #if $CONN->{open_container} != 0;
780 0 1159 0
781 }, 1160 },
782 ); 1161 );
783 } 1162 }
784 1163
… …
874 $::SERVER_INFO->set_markup ( 1253 $::SERVER_INFO->set_markup (
875 "server <tt>$self->{host}:$self->{port}</tt>\n" 1254 "server <tt>$self->{host}:$self->{port}</tt>\n"
876 . "protocol version <tt>$self->{version}</tt>\n" 1255 . "protocol version <tt>$self->{version}</tt>\n"
877 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1256 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
878 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1257 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1258 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1259 . "editing support $yesno[!!$self->{editor_support}]\n"
1260 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1261 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
879 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1262 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
880 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1263 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
881 . "map size $self->{mapw}×$self->{maph}\n" 1264 . "map size $self->{mapw}×$self->{maph}\n"
882 ); 1265 );
1266
883} 1267}
884 1268
885sub logged_in { 1269sub logged_in {
886 my ($self) = @_; 1270 my ($self) = @_;
887 1271
888 $self->send_ext_req (cfplus_support => version => 1, sub { 1272 $self->send_ext_req (cfplus_support => version => 2, sub {
1273 my (%msg) = @_;
1274
889 $self->{cfplus_ext} = $_[0]{version}; 1275 $self->{cfplus_ext} = $msg{version};
890 $self->update_server_info; 1276 $self->update_server_info;
1277
1278 if ($self->{cfplus_ext} >= 2) {
1279 $self->send_ext_req ("editor_support", sub {
1280 $self->{editor_support} = { @_ };
1281 $self->update_server_info;
1282
1283 0
1284 });
1285 }
891 1286
892 0 1287 0
893 }); 1288 });
894 1289
895 $self->update_server_info; 1290 $self->update_server_info;
896 1291
897 $self->send_command ("output-sync $::CFG->{output_sync}"); 1292 $self->send_command ("output-sync $::CFG->{output_sync}");
898 $self->send_command ("output-count $::CFG->{output_count}"); 1293 $self->send_command ("output-count $::CFG->{output_count}");
1294 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
899 $self->send_command ("pickup $::CFG->{pickup}"); 1295 $self->send_command ("pickup $::CFG->{pickup}");
900} 1296}
901 1297
902sub lookat { 1298sub lookat {
903 my ($self, $x, $y) = @_; 1299 my ($self, $x, $y) = @_;
904 1300
905 if ($self->{cfplus_ext}) { 1301 if ($self->{cfplus_ext}) {
906 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1302 $self->send_ext_req (lookat => $x, $y, sub {
907 my ($msg) = @_; 1303 my (%msg) = @_;
908 1304
909 if (exists $msg->{npc_dialog}) { 1305 if (exists $msg{npc_dialog}) {
910 # start npc chat dialog 1306 # start npc chat dialog
911 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1307 $self->{npc_dialog} = new CFPlus::NPCDialog::
912 dx => $x, 1308 token => $msg{npc_dialog},
913 dy => $y,
914 title => "$msg->{npc_dialog} (NPC)", 1309 title => "$msg{npc_dialog}[0] (NPC)",
915 conn => $self, 1310 conn => $self,
916 ; 1311 ;
917 } 1312 }
918 }); 1313 });
919 } 1314 }
… …
922} 1317}
923 1318
924sub destroy { 1319sub destroy {
925 my ($self) = @_; 1320 my ($self) = @_;
926 1321
927 $self->{npc_dialog}->destroy 1322 (delete $self->{npc_dialog})->destroy
928 if $self->{npc_dialog}; 1323 if $self->{npc_dialog};
929 1324
930 $self->SUPER::destroy; 1325 $self->SUPER::destroy;
1326
1327 %$self = ();
931} 1328}
932 1329
933package CFPlus::NPCDialog; 1330package CFPlus::NPCDialog;
934 1331
935our @ISA = 'CFPlus::UI::Toplevel'; 1332our @ISA = 'CFPlus::UI::Toplevel';
… …
947 kw => { hi => 0, yes => 0, no => 0 }, 1344 kw => { hi => 0, yes => 0, no => 0 },
948 has_close_button => 1, 1345 has_close_button => 1,
949 @_, 1346 @_,
950 ); 1347 );
951 1348
952 Scalar::Util::weaken (my $this = $self); 1349 CFPlus::weaken (my $this = $self);
953 1350
954 $self->connect (delete => sub { $this->destroy; 1 }); 1351 $self->connect (delete => sub { $this->destroy; 1 });
955 1352
956 # better use a pane... 1353 # better use a pane...
957 $self->add (my $hbox = new CFPlus::UI::HBox); 1354 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
982 on_activate => sub { $this->destroy; 1 }, 1379 on_activate => sub { $this->destroy; 1 },
983 ; 1380 ;
984 1381
985 $self->update_options; 1382 $self->update_options;
986 1383
987 $self->{id} = $self->{conn}->send_ext_req ( 1384 $self->{id} = "npc-channel-" . $self->{conn}->token;
988 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1385 $self->{conn}->connect_ext ($self->{id} => sub {
989 sub { $this && $this->feed (@_) } 1386 $this->feed (@_) if $this;
990 ); 1387 });
1388
1389 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
991 1390
992 $self->{entry}->grab_focus; 1391 $self->{entry}->grab_focus;
993 1392
994 $self->{textview}->add_paragraph ({ 1393 $self->{textview}->add_paragraph ({
995 fg => [1, 1, 0, 1], 1394 fg => [1, 1, 0, 1],
… …
1001}; 1400};
1002 1401
1003sub update_options { 1402sub update_options {
1004 my ($self) = @_; 1403 my ($self) = @_;
1005 1404
1006 Scalar::Util::weaken $self; 1405 CFPlus::weaken $self;
1007 1406
1008 $self->{options}->clear; 1407 $self->{options}->clear;
1009 $self->{options}->add ($self->{bye_button}); 1408 $self->{options}->add ($self->{bye_button});
1010 1409
1011 for my $kw (sort keys %{ $self->{kw} }) { 1410 for my $kw (sort keys %{ $self->{kw} }) {
… …
1018 ); 1417 );
1019 } 1418 }
1020} 1419}
1021 1420
1022sub feed { 1421sub feed {
1023 my ($self, $msg) = @_; 1422 my ($self, $type, @arg) = @_;
1024 1423
1025 Scalar::Util::weaken $self; 1424 CFPlus::weaken $self;
1026 1425
1027 if ($msg->{msgtype} eq "reply") { 1426 if ($type eq "update") {
1427 my (%info) = @arg;
1428
1028 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1429 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1029 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1430 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1030
1031 my $text = "\n" . CFPlus::asxml $msg->{msg};
1032 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1033 my @link;
1034 $text =~ s{
1035 ($match)
1036 }{
1037 my $kw = $1;
1038
1039 push @link, new CFPlus::UI::Label
1040 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1041 can_hover => 1,
1042 can_events => 1,
1043 padding_x => 0,
1044 padding_y => 0,
1045 on_button_up => sub {
1046 $self->send ($kw);
1047 };
1048
1049 "\x{fffc}"
1050 }giex;
1051 1431
1432 if (exists $info{msg}) {
1433 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1434 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1435 my @link;
1436 $text =~ s{
1437 ($match)
1438 }{
1439 my $kw = $1;
1440
1441 push @link, new CFPlus::UI::Label
1442 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1443 can_hover => 1,
1444 can_events => 1,
1445 padding_x => 0,
1446 padding_y => 0,
1447 on_button_up => sub {
1448 $self->send ($kw);
1449 };
1450
1451 "\x{fffc}"
1452 }giex;
1453
1052 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1454 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1053 $self->{textview}->scroll_to_bottom; 1455 $self->{textview}->scroll_to_bottom;
1456 }
1457
1054 $self->update_options; 1458 $self->update_options;
1055 } else { 1459 } else {
1056 $self->destroy; 1460 $self->destroy;
1057 } 1461 }
1058 1462
… …
1063 my ($self, $msg) = @_; 1467 my ($self, $msg) = @_;
1064 1468
1065 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1469 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1066 $self->{textview}->scroll_to_bottom; 1470 $self->{textview}->scroll_to_bottom;
1067 1471
1068 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1472 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1069} 1473}
1070 1474
1071sub destroy { 1475sub destroy {
1072 my ($self) = @_; 1476 my ($self) = @_;
1073 1477
1074 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1478 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1075 1479
1076 if ($self->{conn}) { 1480 if ($self->{conn}) {
1077 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1481 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1078 delete $self->{conn}{npc_dialog}; 1482 delete $self->{conn}{npc_dialog};
1079 $self->{conn}->disconnect_ext ($self->{id}); 1483 $self->{conn}->disconnect_ext ($self->{id});
1080 } 1484 }
1081 1485
1082 $self->SUPER::destroy; 1486 $self->SUPER::destroy;
1083} 1487}
1084 1488
10851 14891
1490

Diff Legend

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