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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines