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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines