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.88 by root, Sun Nov 19 20:31:29 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;
11 14
12use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
13 16
14use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
15 18
16sub new { 19sub new {
17 my $class = shift; 20 my ($class, %arg) = @_;
18 21
19 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 xwidget1 => 1,#d#
27 %{$arg{setup_req} || {}},
28 },
29 );
20 30
21 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
22 32
23 my @cmd_help = map { 33 my @cmd_help = map {
24 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
35 for @args; 45 for @args;
36 46
37 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
38 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
39 @args 49 @args
40 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
41 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
42 52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71
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
43 $self->{map_widget}->add_command (@$_) 246 $self->{map_widget}->add_command (@$_)
44 for @cmd_help; 247 for @cmd_help;
45
46 $self->{noface} = new_from_file CFPlus::Texture
47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48 248
49 { 249 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 250 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 251 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $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}});
53 } 253 }
54 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
55 $self->{open_container} = 0; 261 $self->{open_container} = 0;
56 262
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 263 # per server
64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 264 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
66 265
67 $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 });
68} 305}
69 306
70sub logprint { 307sub logprint {
71 my ($self, @a) = @_; 308 my ($self, @a) = @_;
72 309
73 $self->{log_fh} ||= do { 310 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} 311}
91 312
92sub _stat_numdiff { 313sub _stat_numdiff {
93 my ($self, $name, $old, $new) = @_; 314 my ($self, $name, $old, $new) = @_;
94 315
… …
227 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 448 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
228 $::GAUGES->{food} ->set_value ($fo, $fo_m); 449 $::GAUGES->{food} ->set_value ($fo, $fo_m);
229 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 450 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
230 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 451 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
231 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 452 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
232 my $rng = $stats->{+CS_STAT_RANGE}; 453 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
233 $rng =~ s/^Range: //; # thank you so much dear server
234 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
235 my $title = $stats->{+CS_STAT_TITLE}; 454 my $title = $stats->{+CS_STAT_TITLE};
236 $title =~ s/^Player: //; 455 $title =~ s/^Player: //;
237 $::STATWIDS->{title} ->set_text ("Title: " . $title); 456 $::STATWIDS->{title} ->set_text ("Title: " . $title);
238 457
239 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 458 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
259 my @skills = keys %{ $self->{skill_info} }; 478 my @skills = keys %{ $self->{skill_info} };
260 479
261 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 480 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
262 $sktbl->clear; 481 $sktbl->clear;
263 482
483 my @add;
484
485 push @add,
264 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 486 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
265 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 487 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
266 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 488 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
267 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 489 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
268 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 490 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
269 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 491 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
492 ;
270 493
271 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>";
272 495
273 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);
274 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);
… …
288 if ($ev->{button} == 1) { 511 if ($ev->{button} == 1) {
289 $::CONN->user_send ("ready_skill $name"); 512 $::CONN->user_send ("ready_skill $name");
290 } elsif ($ev->{button} == 2) { 513 } elsif ($ev->{button} == 2) {
291 $::CONN->user_send ("use_skill $name"); 514 $::CONN->user_send ("use_skill $name");
292 } elsif ($ev->{button} == 3) { 515 } elsif ($ev->{button} == 3) {
516 my $shortname = CFPlus::shorten $name, 14;
293 (new CFPlus::UI::Menu 517 (new CFPlus::UI::Menu
294 items => [ 518 items => [
295 ["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"] }],
296 ["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"] }],
297 ], 521 ],
298 )->popup ($ev); 522 )->popup ($ev);
299 } else { 523 } else {
300 return 0; 524 return 0;
301 } 525 }
302 526
303 1 527 1
304 }; 528 };
305 529
530 push @add,
306 $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
307 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),
308 $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
309 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),
310 $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,
311 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 ;
312 538
313 $x++ and ($x, $y) = (0, $y + 1); 539 $x++ and ($x, $y) = (0, $y + 1);
314 } 540 }
541
542 $sktbl->add_at (@add);
315 } 543 }
316 544
317 for (grep exists $stats->{$_}, @skills) { 545 for (grep exists $stats->{$_}, @skills) {
318 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 546 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
319 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 547 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
320 } 548 }
321} 549}
322 550
551sub macro_send {
552 my ($self, $macro) = @_;
553
554 for my $cmd (@{ $macro->{action} }) {
555 $self->send_command ($cmd);
556 }
557}
558
323sub user_send { 559sub user_send {
324 my ($self, $command) = @_; 560 my ($self, $command) = @_;
325 561
326 push @{$self->{record}}, $command 562 $self->{record}->($command)
327 if $self->{record}; 563 if $self->{record};
328 564
329 $self->logprint ("send: ", $command); 565 $self->logprint ("send: ", $command);
330 $self->send_command ($command); 566 $self->send_command ($command);
331 ::status ($command); 567 ::status ($command);
332} 568}
333 569
334sub start_record { 570sub record {
335 my ($self) = @_; 571 my ($self, $cb) = @_;
336 572
337 $self->{record} = []; 573 $self->{record} = $cb;
338}
339
340sub stop_record {
341 my ($self) = @_;
342 return delete $self->{record};
343} 574}
344 575
345sub map_scroll { 576sub map_scroll {
346 my ($self, $dx, $dy) = @_; 577 my ($self, $dx, $dy) = @_;
347 578
… …
349} 580}
350 581
351sub feed_map1a { 582sub feed_map1a {
352 my ($self, $data) = @_; 583 my ($self, $data) = @_;
353 584
354 $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 {
355 $self->{map_widget}->update; 613 $self->{map_widget}->update;
614 }
356} 615}
357 616
358sub magicmap { 617sub magicmap {
359 my ($self, $w, $h, $x, $y, $data) = @_; 618 my ($self, $w, $h, $x, $y, $data) = @_;
360 619
… …
367 my $map_info = delete $self->{map_info} 626 my $map_info = delete $self->{map_info}
368 or return; 627 or return;
369 628
370 my ($hash, $x, $y, $w, $h) = @$map_info; 629 my ($hash, $x, $y, $w, $h) = @$map_info;
371 630
372 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 631 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
373 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 632 $self->{map_cache_new}{$hash} = \$data;
374 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 633 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
375} 634}
376 635
377sub map_clear { 636sub map_clear {
378 my ($self) = @_; 637 my ($self) = @_;
379 638
… …
382 641
383 $self->{map}->clear; 642 $self->{map}->clear;
384 delete $self->{map_widget}{magicmap}; 643 delete $self->{map_widget}{magicmap};
385} 644}
386 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}
387 669
388sub load_map($$$) { 670sub load_map($$$) {
389 my ($self, $hash, $x, $y) = @_; 671 my ($self, $hash, $x, $y) = @_;
390 672
391 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
392 $data = Compress::LZF::decompress $data; 683 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 684
398 $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;
399 } 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;
400 } 695 }
401} 696}
402 697
403# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 698# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
404# (server resource,s latency, bandwidth), so this hack is warranted. 699# (server resource,s latency, bandwidth), so this hack is warranted.
… …
469 764
470 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 765 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
471 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 766 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
472 767
473 } else { 768 } else {
769 my $gen = $self->{map_change_gen};
474 $self->send_mapinfo ("spatial $path$tile", sub { 770 $self->send_mapinfo ("spatial $path$tile", sub {
771 return unless $gen == $self->{map_change_gen};
772
475 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 773 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
476 774
477 return if $mode ne "spatial"; 775 return if $mode ne "spatial";
478 776
479 $x += $self->{map}->ox; 777 $x += $self->{map}->ox;
… …
493 791
494sub map_change { 792sub map_change {
495 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 793 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
496 794
497 $self->flush_map; 795 $self->flush_map;
796
797 ++$self->{map_change_gen};
798 $self->{map_cache_old} = delete $self->{map_cache_new};
498 799
499 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 800 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
500 801
501 my $mapmapw = $self->{mapmap}->{w}; 802 my $mapmapw = $self->{mapmap}->{w};
502 my $mapmaph = $self->{mapmap}->{h}; 803 my $mapmaph = $self->{mapmap}->{h};
… …
519 $self->load_map ($hash, $x, $y); 820 $self->load_map ($hash, $x, $y);
520 $self->flood_fill (0, 0, 0, "", $hash, $flags); 821 $self->flood_fill (0, 0, 0, "", $hash, $flags);
521} 822}
522 823
523sub face_find { 824sub face_find {
524 my ($self, $facenum, $face) = @_; 825 my ($self, $facenum, $face, $cb) = @_;
525 826
526 my $hash = "$face->{chksum},$face->{name}"; 827 if ($face->{type} == 0) { # FT_FACE
828 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
527 829
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; 830 $face->{id} = $id;
553 $self->{map}->set_face ($facenum => $id); 831 $self->{map}->set_tileid ($facenum => $id);
554 $self->{faceid}[$facenum] = $id;#d#
555 832
556 my $face = $self->{tilecache}->get ($id); 833 CFPlus::DB::get tilecache => $id, $cb;
557 834
558 if ($face) { 835 } elsif ($face->{type} & 1) { # with metadata
559 #$self->face_prefetch; 836 CFPlus::DB::get res_meta => $face->{name}, $cb;
560 $face 837
561 } else { 838 } else { # no metadata
562 my $tex = $self->{noface}; 839 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 }; 840 }
566} 841}
567 842
568sub face_update { 843sub face_update {
569 my ($self, $facenum, $face, $changed) = @_; 844 my ($self, $facenum, $face, $changed) = @_;
570 845
571 $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;
572 850
573 $self->set_texture ($face->{id} => delete $face->{image}); 851 $self->have_tile ($face->{id}, delete $face->{data});
574}
575 852
576sub 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 {
577 my ($self, $id, $data) = @_; 897 my ($self, $tile, $data) = @_;
578 898
579 $self->{texture}[$id] ||= do { 899 return unless $self->{map};
580 my $tex = 900
901 my $tex = $self->{texture}[$tile] ||=
581 new_from_image CFPlus::Texture 902 new CFPlus::Texture
903 tile => $tile,
904 image => $data, delete_image => 1,
582 $data, minify => 1, mipmap => 1; 905 minify => 1, mipmap => 1;
583 906
584 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 907 if (my $cbs = delete $self->{tile_cb}{$tile}) {
585 $self->{map_widget}->update; 908 $_->($tex) for @$cbs;
586
587 $tex
588 }; 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)
589} 939}
590 940
591sub sound_play { 941sub sound_play {
592 my ($self, $x, $y, $soundnum, $type) = @_; 942 my ($self, $type, $face, $dx, $dy, $vol) = @_;
593 943
594 $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
595} 946}
596 947
597my $LAST_QUERY; # server is stupid, stupid, stupid 948my $LAST_QUERY; # server is stupid, stupid, stupid
598 949
599sub query { 950sub query {
… …
603 $LAST_QUERY = $prompt; 954 $LAST_QUERY = $prompt;
604 955
605 $self->{query}-> ($self, $flags, $prompt); 956 $self->{query}-> ($self, $flags, $prompt);
606} 957}
607 958
608sub drawinfo { 959sub sanitise_xml($) {
609 my ($self, $color, $text) = @_; 960 local $_ = shift;
610 961
611 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 = (
612 [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],
613 [1.00, 1.00, 1.00], 992 [1.00, 1.00, 1.00],
614 [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]
615 [1.00, 0.00, 0.00], 994 [1.00, 0.00, 0.00],
616 [1.00, 0.54, 0.00], 995 [1.00, 0.54, 0.00],
617 [0.11, 0.56, 1.00], 996 [0.11, 0.56, 1.00],
618 [0.93, 0.46, 0.00], 997 [0.93, 0.46, 0.00],
619 [0.18, 0.54, 0.34], 998 [0.18, 0.54, 0.34],
620 [0.56, 0.73, 0.56], 999 [0.56, 0.73, 0.56],
621 [0.80, 0.80, 0.80], 1000 [0.80, 0.80, 0.80],
622 [0.75, 0.61, 0.20], 1001 [0.75, 0.61, 0.20],
623 [0.99, 0.77, 0.26], 1002 [0.99, 0.77, 0.26],
624 [0.74, 0.65, 0.41], 1003 [0.74, 0.65, 0.41],
625 ); 1004);
626 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 {
627 $self->logprint ("info: ", $text); 1017 $self->logprint ("msg: ", $text);
1018 return if $color < 0; # negative color == ignore if not understood
628 1019
1020 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1021
629 # 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
630 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1024 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
631 1025
632 $text = CFPlus::asxml $text; 1026 ::message ({
633 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1027 fg => $fg,
634 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1028 markup => $_,
635 1029 type => $type,
636 ::message ({ fg => $color[$color], markup => $_ }) 1030 extra => [@extra],
1031 color_flags => $color
637 for split /\n/, $text; 1032 }) for split /\n/, $text;
638 1033
639 $self->{statusbox}->add ($text, 1034 $self->{statusbox}->add ($text,
640 group => $text, 1035 group => $text,
641 fg => $color[$color], 1036 fg => $fg,
642 timeout => $color >= 2 ? 180 : 10, 1037 timeout => $color >= 2 ? 180 : 10,
643 tooltip_font => $::FONT_FIXED, 1038 tooltip_font => $::FONT_FIXED,
644 ); 1039 );
645} 1040 }
646
647sub drawextinfo {
648 my ($self, $color, $type, $subtype, $message) = @_;
649
650 $self->drawinfo ($color, $message);
651} 1041}
652 1042
653sub spell_add { 1043sub spell_add {
654 my ($self, $spell) = @_; 1044 my ($self, $spell) = @_;
655 1045
… …
671} 1061}
672 1062
673sub setup { 1063sub setup {
674 my ($self, $setup) = @_; 1064 my ($self, $setup) = @_;
675 1065
1066 $self->{map_widget}->set_tilesize ($self->{tilesize});
676 $::MAP->resize ($self->{mapw}, $self->{maph}); 1067 $::MAP->resize ($self->{mapw}, $self->{maph});
677} 1068}
678 1069
679sub addme_success { 1070sub addme_success {
680 my ($self) = @_; 1071 my ($self) = @_;
… …
702 $self->{map_widget}->clr_commands; 1093 $self->{map_widget}->clr_commands;
703 1094
704 ::stop_game (); 1095 ::stop_game ();
705} 1096}
706 1097
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 { 1098sub update_floorbox {
742 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1099 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
743 return unless $::CONN; 1100 return unless $::CONN;
744 1101
745 $::FLOORBOX->clear; 1102 $::FLOORBOX->clear;
1103
1104 my @add;
746 1105
747 my $row; 1106 my $row;
748 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} }) {
749 if ($row < 6) { 1108 if ($row < 6) {
750 local $_->{face_widget}; # hack to force recreation of widget 1109 local $_->{face_widget}; # hack to force recreation of widget
751 local $_->{desc_widget}; # hack to force recreation of widget 1110 local $_->{desc_widget}; # hack to force recreation of widget
752 CFPlus::Item::update_widgets $_; 1111 CFPlus::Item::update_widgets $_;
753 1112
1113 push @add,
754 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1114 0, $row, $_->{face_widget},
755 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1115 1, $row, $_->{desc_widget};
756 1116
757 $row++; 1117 $row++;
758 } else { 1118 } else {
759 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1119 push @add, 1, $row, new CFPlus::UI::Button
760 text => "More...", 1120 text => "More...",
761 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1121 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
762 ); 1122 ;
763 last; 1123 last;
764 } 1124 }
765 } 1125 }
766 if ($::CONN->{open_container}) { 1126 if ($::CONN->{open_container}) {
767 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1127 push @add, 1, $row++, new CFPlus::UI::Button
768 text => "Close container", 1128 text => "Close container",
769 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1129 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
770 ); 1130 ;
771 } 1131 }
772 });
773 1132
1133 $::FLOORBOX->add_at (@add);
1134 });
1135
774 $::WANT_REFRESH++; 1136 $::WANT_REFRESH->start;
775} 1137}
776 1138
777sub set_opencont { 1139sub set_opencont {
778 my ($conn, $tag, $name) = @_; 1140 my ($conn, $tag, $name) = @_;
779 $conn->{open_container} = $tag; 1141 $conn->{open_container} = $tag;
780 update_floorbox; 1142 update_floorbox;
781 1143
782 $::INV_RIGHT_HB->clear (); 1144 $::INVR_HB->clear ();
783 $::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);
784 1146
785 if ($tag != 0) { # Floor isn't closable, is it? 1147 if ($tag != 0) { # Floor isn't closable, is it?
786 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1148 $::INVR_HB->add (new CFPlus::UI::Button
787 text => "Close container", 1149 text => "Close container",
788 tooltip => "Close the currently open container (if one is open)", 1150 tooltip => "Close the currently open container (if one is open)",
789 on_activate => sub { 1151 on_activate => sub {
790 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1152 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
791 if $tag != 0; 1153 if $tag != 0;
792 #if $CONN->{open_container} != 0;
793 0 1154 0
794 }, 1155 },
795 ); 1156 );
796 } 1157 }
797 1158
… …
887 $::SERVER_INFO->set_markup ( 1248 $::SERVER_INFO->set_markup (
888 "server <tt>$self->{host}:$self->{port}</tt>\n" 1249 "server <tt>$self->{host}:$self->{port}</tt>\n"
889 . "protocol version <tt>$self->{version}</tt>\n" 1250 . "protocol version <tt>$self->{version}</tt>\n"
890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1251 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
891 . "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"
892 . "editing support $yesno[!!$self->{editor_support}]\n" 1254 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "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"
894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1257 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1258 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
896 . "map size $self->{mapw}×$self->{maph}\n" 1259 . "map size $self->{mapw}×$self->{maph}\n"
897 ); 1260 );
1261
898} 1262}
899 1263
900sub logged_in { 1264sub logged_in {
901 my ($self) = @_; 1265 my ($self) = @_;
902 1266
903 $self->send_ext_req (cfplus_support => version => 1, sub { 1267 $self->send_ext_req (cfplus_support => version => 2, sub {
1268 my (%msg) = @_;
1269
904 $self->{cfplus_ext} = $_[0]{version}; 1270 $self->{cfplus_ext} = $msg{version};
905 $self->update_server_info; 1271 $self->update_server_info;
906 1272
907 if ($self->{cfplus_ext} >= 2) { 1273 if ($self->{cfplus_ext} >= 2) {
908 $self->send_ext_req ("editor_support", sub { 1274 $self->send_ext_req ("editor_support", sub {
909 $self->{editor_support} = $_[0]; 1275 $self->{editor_support} = { @_ };
910 $self->update_server_info; 1276 $self->update_server_info;
911 1277
912 0 1278 0
913 }); 1279 });
914 } 1280 }
… …
918 1284
919 $self->update_server_info; 1285 $self->update_server_info;
920 1286
921 $self->send_command ("output-sync $::CFG->{output_sync}"); 1287 $self->send_command ("output-sync $::CFG->{output_sync}");
922 $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;
923 $self->send_command ("pickup $::CFG->{pickup}"); 1290 $self->send_command ("pickup $::CFG->{pickup}");
924} 1291}
925 1292
926sub lookat { 1293sub lookat {
927 my ($self, $x, $y) = @_; 1294 my ($self, $x, $y) = @_;
928 1295
929 if ($self->{cfplus_ext}) { 1296 if ($self->{cfplus_ext}) {
930 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1297 $self->send_ext_req (lookat => $x, $y, sub {
931 my ($msg) = @_; 1298 my (%msg) = @_;
932 1299
933 if (exists $msg->{npc_dialog}) { 1300 if (exists $msg{npc_dialog}) {
934 # start npc chat dialog 1301 # start npc chat dialog
935 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1302 $self->{npc_dialog} = new CFPlus::NPCDialog::
936 dx => $x, 1303 token => $msg{npc_dialog},
937 dy => $y,
938 title => "$msg->{npc_dialog} (NPC)", 1304 title => "$msg{npc_dialog}[0] (NPC)",
939 conn => $self, 1305 conn => $self,
940 ; 1306 ;
941 } 1307 }
942 }); 1308 });
943 } 1309 }
… …
950 1316
951 (delete $self->{npc_dialog})->destroy 1317 (delete $self->{npc_dialog})->destroy
952 if $self->{npc_dialog}; 1318 if $self->{npc_dialog};
953 1319
954 $self->SUPER::destroy; 1320 $self->SUPER::destroy;
1321
1322 %$self = ();
955} 1323}
956 1324
957package CFPlus::NPCDialog; 1325package CFPlus::NPCDialog;
958 1326
959our @ISA = 'CFPlus::UI::Toplevel'; 1327our @ISA = 'CFPlus::UI::Toplevel';
… …
971 kw => { hi => 0, yes => 0, no => 0 }, 1339 kw => { hi => 0, yes => 0, no => 0 },
972 has_close_button => 1, 1340 has_close_button => 1,
973 @_, 1341 @_,
974 ); 1342 );
975 1343
976 Scalar::Util::weaken (my $this = $self); 1344 CFPlus::weaken (my $this = $self);
977 1345
978 $self->connect (delete => sub { $this->destroy; 1 }); 1346 $self->connect (delete => sub { $this->destroy; 1 });
979 1347
980 # better use a pane... 1348 # better use a pane...
981 $self->add (my $hbox = new CFPlus::UI::HBox); 1349 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1006 on_activate => sub { $this->destroy; 1 }, 1374 on_activate => sub { $this->destroy; 1 },
1007 ; 1375 ;
1008 1376
1009 $self->update_options; 1377 $self->update_options;
1010 1378
1011 $self->{id} = $self->{conn}->send_ext_req ( 1379 $self->{id} = "npc-channel-" . $self->{conn}->token;
1012 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1380 $self->{conn}->connect_ext ($self->{id} => sub {
1013 sub { $this && $this->feed (@_) } 1381 $this->feed (@_) if $this;
1014 ); 1382 });
1383
1384 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1015 1385
1016 $self->{entry}->grab_focus; 1386 $self->{entry}->grab_focus;
1017 1387
1018 $self->{textview}->add_paragraph ({ 1388 $self->{textview}->add_paragraph ({
1019 fg => [1, 1, 0, 1], 1389 fg => [1, 1, 0, 1],
… …
1025}; 1395};
1026 1396
1027sub update_options { 1397sub update_options {
1028 my ($self) = @_; 1398 my ($self) = @_;
1029 1399
1030 Scalar::Util::weaken $self; 1400 CFPlus::weaken $self;
1031 1401
1032 $self->{options}->clear; 1402 $self->{options}->clear;
1033 $self->{options}->add ($self->{bye_button}); 1403 $self->{options}->add ($self->{bye_button});
1034 1404
1035 for my $kw (sort keys %{ $self->{kw} }) { 1405 for my $kw (sort keys %{ $self->{kw} }) {
… …
1042 ); 1412 );
1043 } 1413 }
1044} 1414}
1045 1415
1046sub feed { 1416sub feed {
1047 my ($self, $msg) = @_; 1417 my ($self, $type, @arg) = @_;
1048 1418
1049 Scalar::Util::weaken $self; 1419 CFPlus::weaken $self;
1050 1420
1051 if ($msg->{msgtype} eq "reply") { 1421 if ($type eq "update") {
1422 my (%info) = @arg;
1423
1052 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1424 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1053 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1425 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1054
1055 my $text = "\n" . CFPlus::asxml $msg->{msg};
1056 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1057 my @link;
1058 $text =~ s{
1059 ($match)
1060 }{
1061 my $kw = $1;
1062
1063 push @link, new CFPlus::UI::Label
1064 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1065 can_hover => 1,
1066 can_events => 1,
1067 padding_x => 0,
1068 padding_y => 0,
1069 on_button_up => sub {
1070 $self->send ($kw);
1071 };
1072
1073 "\x{fffc}"
1074 }giex;
1075 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
1076 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1449 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1077 $self->{textview}->scroll_to_bottom; 1450 $self->{textview}->scroll_to_bottom;
1451 }
1452
1078 $self->update_options; 1453 $self->update_options;
1079 } else { 1454 } else {
1080 $self->destroy; 1455 $self->destroy;
1081 } 1456 }
1082 1457
… …
1087 my ($self, $msg) = @_; 1462 my ($self, $msg) = @_;
1088 1463
1089 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1464 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1090 $self->{textview}->scroll_to_bottom; 1465 $self->{textview}->scroll_to_bottom;
1091 1466
1092 $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);
1093} 1468}
1094 1469
1095sub destroy { 1470sub destroy {
1096 my ($self) = @_; 1471 my ($self) = @_;
1097 1472
1098 #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
1099 1474
1100 if ($self->{conn}) { 1475 if ($self->{conn}) {
1101 $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};
1102 delete $self->{conn}{npc_dialog}; 1477 delete $self->{conn}{npc_dialog};
1103 $self->{conn}->disconnect_ext ($self->{id}); 1478 $self->{conn}->disconnect_ext ($self->{id});
1104 } 1479 }
1105 1480
1106 $self->SUPER::destroy; 1481 $self->SUPER::destroy;

Diff Legend

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