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

Diff Legend

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