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.87 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.155 by root, Fri Aug 17 21:18:01 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 if (my $ts = $cap{tileset}) {
65 if (my ($default) = grep $_->[2] & 1, @$ts) {
66 $self->{tileset} = $default;
67 $self->{tilesize} = $default->[3];
68 $self->setup_req (tileset => $default->[0]);
69
70 my $w = int $self->{mapw} * 32 / $self->{tilesize};
71 my $h = int $self->{maph} * 32 / $self->{tilesize};
72
73 $self->setup_req (mapsize => "${w}x${h}");
74 }
75 }
76 });
77
78 $self->{json_coder}
79 ->convert_blessed
80 ->filter_json_single_key_object (__w_ => sub {
81 $self->{widget}{$_[0]}
82 });
83
84 # widgetset new
85 $self->connect_ext (ws_n => sub {
86 my ($id) = @_;
87
88 $self->{widgetset}{$id} = {
89 w => {},
90 };
91 });
92
93 # widgetset destroy
94 $self->connect_ext (ws_d => sub {
95 my ($id) = @_;
96
97 my $ws = delete $self->{widgetset}{$id}
98 or return;
99
100 $_->destroy
101 for values %{$ws->{w}};
102 });
103
104 # widgetset create
105 $self->connect_ext (ws_c => sub {
106 my ($ws, $id, $class, $args) = @_;
107
108 for my $ev (grep /^on_/, keys %$args) {
109 my $rid = $args->{$ev};
110 $args->{$ev} = sub {
111 my $id = shift->{s_id};
112 $self->send_exti_msg (w_e => $id, $rid, @_);
113
114 1
115 };
116 }
117
118 $self->widget_associate (
119 $ws, $id => scalar eval {
120 local $SIG{__DIE__};
121 "CFPlus::UI::$class"->new (%$args)
122 }
123 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
124 });
125
126 # widgetset associate
127 $self->connect_ext (ws_a => sub {
128 my (%ass) = @_;
129
130 # everything that has a name, wether conceivably useful or not
131 my %wkw = (
132 root => $CFPlus::UI::ROOT,
133 tooltip => $CFPlus::UI::TOOLTIP,
134
135 mapwidget => $::MAPWIDGET,
136 buttonbar => $::BUTTONBAR,
137 metaserver => $::METASERVER,
138 buttonbar => $::BUTTONBAR,
139 login_button => $::LOGIN_BUTTON,
140 quit_dialog => $::QUIT_DIALOG,
141 host_entry => $::HOST_ENTRY,
142 metaserver => $::METASERVER,
143 server_info => $::SERVER_INFO,
144
145 setup_dialog => $::SETUP_DIALOG,
146 setup_notebook => $::SETUP_NOTEBOOK,
147 setup_server => $::SETUP_SERVER,
148 setup_keyboard => $::SETUP_KEYBOARD,
149
150 pl_notebook => $::PL_NOTEBOOK,
151 pl_window => $::PL_WINDOW,
152 inventory_page => $::INVENTORY_PAGE,
153 stats_page => $::STATS_PAGE,
154 skill_page => $::SKILL_PAGE,
155 spell_page => $::SPELL_PAGE,
156 spell_list => $::SPELL_LIST,
157
158 floorbox => $::FLOORBOX,
159 help_window => $::HELP_WINDOW,
160 message_window => $::MESSAGE_WINDOW,
161 statusbox => $::SDTATUSBOX,
162
163 inv => $::INV,
164 invr => $::INVR,
165 invr_hb => $::INVR_HB,
166
167 );
168
169 while (my ($id, $name) = each %ass) {
170 $self->widget_associate (undef, $id => $wkw{$name})
171 or warn "server failed to associate non-existent well-known widget $name\n";
172 }
173 });
174
175 # widget call
176 $self->connect_ext (w_c => sub {
177 my ($id, $rid, $method, @args) = @_;
178
179 my $w = $self->{widget}{$id}
180 or return;
181
182 if ($rid) {
183 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
184 } else {
185 $w->$method (@args);
186 }
187 });
188
189 # widget set
190 $self->connect_ext (w_s => sub {
191 my ($id, $attr) = @_;
192
193 my $w = $self->{widget}{$id}
194 or return;
195
196 for (my $i = 0; $i < $#$attr; $i += 2) {
197 my ($member, $value) = @$attr[$i, $i+1];
198 if (defined $value) {
199 $w->{$member} = $value;
200 } else {
201 delete $w->{$member};
202 }
203 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
204 }
205 });
206
207 # widget get
208 $self->connect_ext (w_g => sub {
209 my ($id, $rid, $attr) = @_;
210
211 my $w = $self->{widget}{$id}
212 or return;
213
214 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
215 });
216
217 # message window
218 $self->connect_ext (channel_info => sub {
219 my ($info) = @_;
220 $self->{channels}->{$info->{id}} = $info;
221 $::MESSAGE_WINDOW->add_channel ($info);
222 });
223
224 # destroy widgets on logout
225 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
226 for my $ws (values %{delete $self->{widgetset} || {}}) {
227 $_->destroy
228 for values %{delete $ws->{w} || {}};
229 }
230 });
231
43 $self->{map_widget}->add_command (@$_) 232 $self->{map_widget}->add_command (@$_)
44 for @cmd_help; 233 for @cmd_help;
45
46 $self->{noface} = new_from_file CFPlus::Texture
47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48 234
49 { 235 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 236 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 237 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 238 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53 } 239 }
54 240
241 {
242 $self->{noface} = my $tex = new_from_file CFPlus::Texture
243 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
244 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
245 }
246
55 $self->{open_container} = 0; 247 $self->{open_container} = 0;
56 248
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 249 # per server
64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 250 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
66 251
67 $self 252 $self
253}
254
255sub widget_associate {
256 my ($self, $ws, $id, $widget) = @_;
257
258 if ($widget) {
259 $widget->{s_id} = $id;
260 $self->{widget}{$id} = $widget;
261
262 if ($ws) {
263 $widget->{s_ws} = $ws;
264 $self->{widgetset}{$ws}{w}{$id} = $widget;
265 }
266
267 $widget->connect (on_destroy => sub {
268 my ($widget) = @_;
269
270 delete $self->{widget}{$widget->{s_id}};
271 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
272 if exists $widget->{s_ws};
273 });
274
275 1
276 } else {
277 $self->send_exti_msg (w_e => $id, undef);
278
279 0
280 }
281}
282
283sub update_fx_want {
284 my ($self) = @_;
285
286 $self->send_exti_msg (fx_want => {
287 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
288 5 => !!$::CFG->{audio_enable}, # FT_SOUND
289 });
68} 290}
69 291
70sub logprint { 292sub logprint {
71 my ($self, @a) = @_; 293 my ($self, @a) = @_;
72 294
73 $self->{log_fh} ||= do { 295 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} 296}
91 297
92sub _stat_numdiff { 298sub _stat_numdiff {
93 my ($self, $name, $old, $new) = @_; 299 my ($self, $name, $old, $new) = @_;
94 300
… …
227 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 433 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
228 $::GAUGES->{food} ->set_value ($fo, $fo_m); 434 $::GAUGES->{food} ->set_value ($fo, $fo_m);
229 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 435 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
230 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 436 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
231 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 437 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
232 my $rng = $stats->{+CS_STAT_RANGE}; 438 $::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}; 439 my $title = $stats->{+CS_STAT_TITLE};
236 $title =~ s/^Player: //; 440 $title =~ s/^Player: //;
237 $::STATWIDS->{title} ->set_text ("Title: " . $title); 441 $::STATWIDS->{title} ->set_text ("Title: " . $title);
238 442
239 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 443 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
259 my @skills = keys %{ $self->{skill_info} }; 463 my @skills = keys %{ $self->{skill_info} };
260 464
261 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 465 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
262 $sktbl->clear; 466 $sktbl->clear;
263 467
468 my @add;
469
470 push @add,
264 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 471 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
265 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 472 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
266 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 473 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
267 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 474 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
268 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 475 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
269 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 476 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
477 ;
270 478
271 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 479 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
272 480
273 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 481 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); 482 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) { 496 if ($ev->{button} == 1) {
289 $::CONN->user_send ("ready_skill $name"); 497 $::CONN->user_send ("ready_skill $name");
290 } elsif ($ev->{button} == 2) { 498 } elsif ($ev->{button} == 2) {
291 $::CONN->user_send ("use_skill $name"); 499 $::CONN->user_send ("use_skill $name");
292 } elsif ($ev->{button} == 3) { 500 } elsif ($ev->{button} == 3) {
501 my $shortname = CFPlus::shorten $name, 14;
293 (new CFPlus::UI::Menu 502 (new CFPlus::UI::Menu
294 items => [ 503 items => [
295 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 504 ["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"]) }], 505 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
297 ], 506 ],
298 )->popup ($ev); 507 )->popup ($ev);
299 } else { 508 } else {
300 return 0; 509 return 0;
301 } 510 }
302 511
303 1 512 1
304 }; 513 };
305 514
515 push @add,
306 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 516 $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); 517 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 518 $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); 519 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, 520 $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); 521 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
522 ;
312 523
313 $x++ and ($x, $y) = (0, $y + 1); 524 $x++ and ($x, $y) = (0, $y + 1);
314 } 525 }
526
527 $sktbl->add_at (@add);
315 } 528 }
316 529
317 for (grep exists $stats->{$_}, @skills) { 530 for (grep exists $stats->{$_}, @skills) {
318 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 531 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
319 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 532 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
320 } 533 }
321} 534}
322 535
536sub macro_send {
537 my ($self, $macro) = @_;
538
539 for my $cmd (@{ $macro->{action} }) {
540 $self->send_command ($cmd);
541 }
542}
543
323sub user_send { 544sub user_send {
324 my ($self, $command) = @_; 545 my ($self, $command) = @_;
325 546
326 push @{$self->{record}}, $command 547 $self->{record}->($command)
327 if $self->{record}; 548 if $self->{record};
328 549
329 $self->logprint ("send: ", $command); 550 $self->logprint ("send: ", $command);
330 $self->send_command ($command); 551 $self->send_command ($command);
331 ::status ($command); 552 ::status ($command);
332} 553}
333 554
334sub start_record { 555sub record {
335 my ($self) = @_; 556 my ($self, $cb) = @_;
336 557
337 $self->{record} = []; 558 $self->{record} = $cb;
338}
339
340sub stop_record {
341 my ($self) = @_;
342 return delete $self->{record};
343} 559}
344 560
345sub map_scroll { 561sub map_scroll {
346 my ($self, $dx, $dy) = @_; 562 my ($self, $dx, $dy) = @_;
347 563
… …
349} 565}
350 566
351sub feed_map1a { 567sub feed_map1a {
352 my ($self, $data) = @_; 568 my ($self, $data) = @_;
353 569
354 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 570 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
571 my $delay;
572
573 for my $tile (@$missing) {
574 next if $self->{delay}{$tile};
575
576 $delay = 1;
577
578 if (my $tex = $::CONN->{texture}[$tile]) {
579 $tex->upload;
580 } else {
581 $self->{delay}{$tile} = 1;
582
583 # we assume the face is in-flight and will eventually come
584 push @{$self->{face_cb}{$tile}}, sub {
585 delete $self->{delay}{$tile};
586 $_[0]->upload;
587 };
588 }
589 }
590
591 if ($delay) {
592 # delay the map drawing a tiny bit in the hope of getting the missing fetched
593 Event->timer (after => 0.03, cb => sub {
594 $_[0]->w->cancel;
595 $self->{map_widget}->update;
596 });
597 } else {
355 $self->{map_widget}->update; 598 $self->{map_widget}->update;
599 }
356} 600}
357 601
358sub magicmap { 602sub magicmap {
359 my ($self, $w, $h, $x, $y, $data) = @_; 603 my ($self, $w, $h, $x, $y, $data) = @_;
360 604
… …
367 my $map_info = delete $self->{map_info} 611 my $map_info = delete $self->{map_info}
368 or return; 612 or return;
369 613
370 my ($hash, $x, $y, $w, $h) = @$map_info; 614 my ($hash, $x, $y, $w, $h) = @$map_info;
371 615
372 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 616 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
373 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 617 $self->{map_cache_new}{$hash} = \$data;
374 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 618 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
375} 619}
376 620
377sub map_clear { 621sub map_clear {
378 my ($self) = @_; 622 my ($self) = @_;
379 623
… …
382 626
383 $self->{map}->clear; 627 $self->{map}->clear;
384 delete $self->{map_widget}{magicmap}; 628 delete $self->{map_widget}{magicmap};
385} 629}
386 630
631sub bg_fetch {
632 my ($self) = @_;
633
634 my $id;
635
636 do {
637 $id = pop @{$self->{bg_fetch}}
638 or return;
639 } while $self->{texture}[$id];
640
641 CFPlus::DB::exists tilecache => $id, sub {
642 my ($exists) = @_;
643
644 return unless $self->{map}; # stop when destroyed
645
646 if ($exists) {
647 $self->have_tile ($id);
648 $self->{texture}[$id]->upload;
649 }
650
651 $self->bg_fetch;
652 };
653}
387 654
388sub load_map($$$) { 655sub load_map($$$) {
389 my ($self, $hash, $x, $y) = @_; 656 my ($self, $hash, $x, $y) = @_;
390 657
391 if (defined (my $data = $self->{mapcache}->get ($hash))) { 658 my $gen = $self->{map_change_gen};
659
660 my $cb = sub {
661 return unless $gen == $self->{map_change_gen};
662
663 my ($data) = @_;
664
665 if (defined $data) {
666 $self->{map_cache_new}{$hash} = \$data;
667
392 $data = Compress::LZF::decompress $data; 668 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 669
398 $self->set_texture ($id => $data); 670 my $inprogress = @{ $self->{bg_fetch} || [] };
671 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
672 $self->bg_fetch unless $inprogress;
399 } 673 }
674 };
675
676 if (my $rdata = $self->{map_cache_old}{$hash}) {
677 $cb->($$rdata);
678 } else {
679 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
400 } 680 }
401} 681}
402 682
403# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 683# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
404# (server resource,s latency, bandwidth), so this hack is warranted. 684# (server resource,s latency, bandwidth), so this hack is warranted.
… …
469 749
470 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 750 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
471 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 751 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
472 752
473 } else { 753 } else {
754 my $gen = $self->{map_change_gen};
474 $self->send_mapinfo ("spatial $path$tile", sub { 755 $self->send_mapinfo ("spatial $path$tile", sub {
756 return unless $gen == $self->{map_change_gen};
757
475 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 758 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
476 759
477 return if $mode ne "spatial"; 760 return if $mode ne "spatial";
478 761
479 $x += $self->{map}->ox; 762 $x += $self->{map}->ox;
… …
493 776
494sub map_change { 777sub map_change {
495 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 778 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
496 779
497 $self->flush_map; 780 $self->flush_map;
781
782 ++$self->{map_change_gen};
783 $self->{map_cache_old} = delete $self->{map_cache_new};
498 784
499 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 785 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
500 786
501 my $mapmapw = $self->{mapmap}->{w}; 787 my $mapmapw = $self->{mapmap}->{w};
502 my $mapmaph = $self->{mapmap}->{h}; 788 my $mapmaph = $self->{mapmap}->{h};
… …
519 $self->load_map ($hash, $x, $y); 805 $self->load_map ($hash, $x, $y);
520 $self->flood_fill (0, 0, 0, "", $hash, $flags); 806 $self->flood_fill (0, 0, 0, "", $hash, $flags);
521} 807}
522 808
523sub face_find { 809sub face_find {
524 my ($self, $facenum, $face) = @_; 810 my ($self, $facenum, $face, $cb) = @_;
525 811
526 my $hash = "$face->{chksum},$face->{name}"; 812 if ($face->{type} == 0) { # FT_FACE
813 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
527 814
528 my $id = $self->{facemap}->get ($hash); 815 $face->{id} = $id;
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;
553 $self->{map}->set_face ($facenum => $id);
554 $self->{faceid}[$facenum] = $id;#d# 816 $self->{faceid}[$facenum] = $id;
555 817
556 my $face = $self->{tilecache}->get ($id); 818 $self->{map}->set_tileid ($facenum => $id);
557 819
558 if ($face) { 820 CFPlus::DB::get tilecache => $id, $cb;
559 #$self->face_prefetch; 821
560 $face 822 } elsif ($face->{type} & 1) { # with metadata
561 } else { 823 CFPlus::DB::get res_meta => $face->{name}, $cb;
562 my $tex = $self->{noface};
563 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
564 undef
565 }; 824 }
566} 825}
567 826
568sub face_update { 827sub face_update {
569 my ($self, $facenum, $face, $changed) = @_; 828 my ($self, $facenum, $face, $changed) = @_;
570 829
571 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 830 if ($face->{type} == 0) { # FT_FACE
831 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
832 if $changed;
572 833
573 $self->set_texture ($face->{id} => delete $face->{image}); 834 $self->have_tile ($face->{id});
574}
575 835
576sub set_texture { 836 } elsif ($face->{type} & 1) { # split metadata
837 if ($changed) { # new data
838 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
839 $face->{meta} = $self->{json_coder}->decode ($meta_json);
840
841 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
842 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
843 } else {
844 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
845 }
846
847 ::add_license ($face);
848
849 if ($face->{type} == 3) { # FT_MUSIC
850 $self->{music_meta}{$facenum} = $face;
851
852 ::message ({ markup => "downloaded song #$facenum" })
853 if $changed;
854
855 &::audio_music_push ($facenum);
856 } elsif ($face->{type} == 5) { # FT_SOUND
857 $self->{sound_meta}{$facenum} = $face;
858
859 ::message ({ markup => "downloaded sound #$facenum" })
860 if $changed;
861
862 &::audio_sound_push ($facenum);
863 }
864
865 }
866}
867
868sub smooth_update {
869 my ($self, $facenum, $face) = @_;
870
871 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
872}
873
874sub have_tile {
875 my ($self, $tile) = @_;
876
877 return unless $self->{map};
878
879 my $tex = $self->{texture}[$tile] ||=
880 new CFPlus::Texture
881 tile => $tile, minify => 1, mipmap => 1, delay => 1;
882
883 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
884}
885
886sub connect_face_update {
577 my ($self, $id, $data) = @_; 887 my ($self, $id, $cb) = @_;
578 888
579 $self->{texture}[$id] ||= do { 889 push @{$self->{face_cb}{$id}}, $cb;
580 my $tex =
581 new_from_image CFPlus::Texture
582 $data, minify => 1, mipmap => 1;
583 890
584 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 891 CFPlus::guard {
585 $self->{map_widget}->update; 892 @{$self->{face_cb}{$id}}
586 893 = grep $_ != $cb,
587 $tex 894 @{$self->{face_cb}{$id}};
588 }; 895 }
589} 896}
590 897
591sub sound_play { 898sub sound_play {
592 my ($self, $x, $y, $soundnum, $type) = @_; 899 my ($self, $type, $face, $dx, $dy, $vol) = @_;
593 900
594 $self->{sound_play}->($x, $y, $soundnum, $type); 901 &::audio_sound_play ($face, $dx, $dy, $vol)
902 unless $type & 1; # odd types are silent for future expansion
595} 903}
596 904
597my $LAST_QUERY; # server is stupid, stupid, stupid 905my $LAST_QUERY; # server is stupid, stupid, stupid
598 906
599sub query { 907sub query {
… …
603 $LAST_QUERY = $prompt; 911 $LAST_QUERY = $prompt;
604 912
605 $self->{query}-> ($self, $flags, $prompt); 913 $self->{query}-> ($self, $flags, $prompt);
606} 914}
607 915
608sub drawinfo { 916sub sanitise_xml($) {
609 my ($self, $color, $text) = @_; 917 local $_ = shift;
610 918
611 my @color = ( 919 # we now weed out all tags we do not support
920 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
921 # now all entities
922 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
923
924 # handle some elements
925 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
926 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
927
928 $_
929}
930
931our %NAME_TO_COLOR = (
932 black => 0,
933 white => 1,
934 darkblue => 2,
935 red => 3,
936 orange => 4,
937 lightblue => 5,
938 darkorange => 6,
939 green => 7,
940 darkgreen => 8,
941 grey => 9,
942 brown => 10,
943 yellow => 11,
944 tan => 12,
945);
946
947our @CF_COLOR = (
612 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 948 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
613 [1.00, 1.00, 1.00], 949 [1.00, 1.00, 1.00],
614 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 950 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
615 [1.00, 0.00, 0.00], 951 [1.00, 0.00, 0.00],
616 [1.00, 0.54, 0.00], 952 [1.00, 0.54, 0.00],
617 [0.11, 0.56, 1.00], 953 [0.11, 0.56, 1.00],
618 [0.93, 0.46, 0.00], 954 [0.93, 0.46, 0.00],
619 [0.18, 0.54, 0.34], 955 [0.18, 0.54, 0.34],
620 [0.56, 0.73, 0.56], 956 [0.56, 0.73, 0.56],
621 [0.80, 0.80, 0.80], 957 [0.80, 0.80, 0.80],
622 [0.75, 0.61, 0.20], 958 [0.75, 0.61, 0.20],
623 [0.99, 0.77, 0.26], 959 [0.99, 0.77, 0.26],
624 [0.74, 0.65, 0.41], 960 [0.74, 0.65, 0.41],
625 ); 961);
626 962
963sub msg {
964 my ($self, $color, $type, $text, @extra) = @_;
965
966 $text = sanitise_xml $text;
967
968 if (my $cb = $self->{cb_msg}{$type}) {
969 $_->($self, $color, $type, $text, @extra) for values %$cb;
970 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
971 $type =~ s/-/_/g;
972 $self->{$type} = $text;
973 } else {
627 $self->logprint ("info: ", $text); 974 $self->logprint ("msg: ", $text);
975 return if $color < 0; # negative color == ignore if not understood
628 976
977 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
978
629 # try to create single paragraphs of multiple lines sent by the server 979 ## try to create single paragraphs of multiple lines sent by the server
980 # no longer neecssary with TRT servers
630 $text =~ s/(?<=\S)\n(?=\w)/ /g; 981 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
631 982
632 $text = CFPlus::asxml $text; 983 ::message ({
633 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 984 fg => $fg,
634 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 985 markup => $_,
635 986 type => $type,
636 ::message ({ fg => $color[$color], markup => $_ }) 987 extra => [@extra],
988 color_flags => $color
637 for split /\n/, $text; 989 }) for split /\n/, $text;
638 990
639 $self->{statusbox}->add ($text, 991 $self->{statusbox}->add ($text,
640 group => $text, 992 group => $text,
641 fg => $color[$color], 993 fg => $fg,
642 timeout => $color >= 2 ? 180 : 10, 994 timeout => $color >= 2 ? 180 : 10,
643 tooltip_font => $::FONT_FIXED, 995 tooltip_font => $::FONT_FIXED,
644 ); 996 );
645} 997 }
646
647sub drawextinfo {
648 my ($self, $color, $type, $subtype, $message) = @_;
649
650 $self->drawinfo ($color, $message);
651} 998}
652 999
653sub spell_add { 1000sub spell_add {
654 my ($self, $spell) = @_; 1001 my ($self, $spell) = @_;
655 1002
656 # try to create single paragraphs out of the multiple lines sent by the server 1003 # try to create single paragraphs out of the multiple lines sent by the server
657 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 1004 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
658 $spell->{message} =~ s/\n+$//; 1005 $spell->{message} =~ s/\n+$//;
659 $spell->{message} ||= "Server did not provide a description for this spell."; 1006 $spell->{message} ||= "Server did not provide a description for this spell.";
660 1007
661 $::SPELL_PAGE->add_spell ($spell); 1008 $::SPELL_LIST->add_spell ($spell);
662 1009
663 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1010 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
664 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1011 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
665} 1012}
666 1013
667sub spell_delete { 1014sub spell_delete {
668 my ($self, $spell) = @_; 1015 my ($self, $spell) = @_;
669 1016
670 $::SPELL_PAGE->remove_spell ($spell); 1017 $::SPELL_LIST->remove_spell ($spell);
671} 1018}
672 1019
673sub setup { 1020sub setup {
674 my ($self, $setup) = @_; 1021 my ($self, $setup) = @_;
675 1022
1023 $self->{map_widget}->set_tilesize ($self->{tilesize});
676 $::MAP->resize ($self->{mapw}, $self->{maph}); 1024 $::MAP->resize ($self->{mapw}, $self->{maph});
677} 1025}
678 1026
679sub addme_success { 1027sub addme_success {
680 my ($self) = @_; 1028 my ($self) = @_;
… …
702 $self->{map_widget}->clr_commands; 1050 $self->{map_widget}->clr_commands;
703 1051
704 ::stop_game (); 1052 ::stop_game ();
705} 1053}
706 1054
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 { 1055sub update_floorbox {
742 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1056 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
743 return unless $::CONN; 1057 return unless $::CONN;
744 1058
745 $::FLOORBOX->clear; 1059 $::FLOORBOX->clear;
1060
1061 my @add;
746 1062
747 my $row; 1063 my $row;
748 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1064 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
749 if ($row < 6) { 1065 if ($row < 6) {
750 local $_->{face_widget}; # hack to force recreation of widget 1066 local $_->{face_widget}; # hack to force recreation of widget
751 local $_->{desc_widget}; # hack to force recreation of widget 1067 local $_->{desc_widget}; # hack to force recreation of widget
752 CFPlus::Item::update_widgets $_; 1068 CFPlus::Item::update_widgets $_;
753 1069
1070 push @add,
754 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1071 0, $row, $_->{face_widget},
755 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1072 1, $row, $_->{desc_widget};
756 1073
757 $row++; 1074 $row++;
758 } else { 1075 } else {
759 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1076 push @add, 1, $row, new CFPlus::UI::Button
760 text => "More...", 1077 text => "More...",
761 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1078 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
762 ); 1079 ;
763 last; 1080 last;
764 } 1081 }
765 } 1082 }
766 if ($::CONN->{open_container}) { 1083 if ($::CONN->{open_container}) {
767 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1084 push @add, 1, $row++, new CFPlus::UI::Button
768 text => "Close container", 1085 text => "Close container",
769 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1086 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
770 ); 1087 ;
771 } 1088 }
772 });
773 1089
1090 $::FLOORBOX->add_at (@add);
1091 });
1092
774 $::WANT_REFRESH++; 1093 $::WANT_REFRESH->start;
775} 1094}
776 1095
777sub set_opencont { 1096sub set_opencont {
778 my ($conn, $tag, $name) = @_; 1097 my ($conn, $tag, $name) = @_;
779 $conn->{open_container} = $tag; 1098 $conn->{open_container} = $tag;
780 update_floorbox; 1099 update_floorbox;
781 1100
782 $::INV_RIGHT_HB->clear (); 1101 $::INVR_HB->clear ();
783 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1102 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
784 1103
785 if ($tag != 0) { # Floor isn't closable, is it? 1104 if ($tag != 0) { # Floor isn't closable, is it?
786 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1105 $::INVR_HB->add (new CFPlus::UI::Button
787 text => "Close container", 1106 text => "Close container",
788 tooltip => "Close the currently open container (if one is open)", 1107 tooltip => "Close the currently open container (if one is open)",
789 on_activate => sub { 1108 on_activate => sub {
790 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1109 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
791 if $tag != 0; 1110 if $tag != 0;
792 #if $CONN->{open_container} != 0;
793 0 1111 0
794 }, 1112 },
795 ); 1113 );
796 } 1114 }
797 1115
… …
887 $::SERVER_INFO->set_markup ( 1205 $::SERVER_INFO->set_markup (
888 "server <tt>$self->{host}:$self->{port}</tt>\n" 1206 "server <tt>$self->{host}:$self->{port}</tt>\n"
889 . "protocol version <tt>$self->{version}</tt>\n" 1207 . "protocol version <tt>$self->{version}</tt>\n"
890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1208 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
891 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1209 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1210 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
892 . "editing support $yesno[!!$self->{editor_support}]\n" 1211 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1212 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1213 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1214 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1215 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
896 . "map size $self->{mapw}×$self->{maph}\n" 1216 . "map size $self->{mapw}×$self->{maph}\n"
897 ); 1217 );
1218
898} 1219}
899 1220
900sub logged_in { 1221sub logged_in {
901 my ($self) = @_; 1222 my ($self) = @_;
902 1223
903 $self->send_ext_req (cfplus_support => version => 1, sub { 1224 $self->send_ext_req (cfplus_support => version => 2, sub {
1225 my (%msg) = @_;
1226
904 $self->{cfplus_ext} = $_[0]{version}; 1227 $self->{cfplus_ext} = $msg{version};
905 $self->update_server_info; 1228 $self->update_server_info;
906 1229
907 if ($self->{cfplus_ext} >= 2) { 1230 if ($self->{cfplus_ext} >= 2) {
908 $self->send_ext_req ("editor_support", sub { 1231 $self->send_ext_req ("editor_support", sub {
909 $self->{editor_support} = $_[0]; 1232 $self->{editor_support} = { @_ };
910 $self->update_server_info; 1233 $self->update_server_info;
911 1234
912 0 1235 0
913 }); 1236 });
914 } 1237 }
… …
918 1241
919 $self->update_server_info; 1242 $self->update_server_info;
920 1243
921 $self->send_command ("output-sync $::CFG->{output_sync}"); 1244 $self->send_command ("output-sync $::CFG->{output_sync}");
922 $self->send_command ("output-count $::CFG->{output_count}"); 1245 $self->send_command ("output-count $::CFG->{output_count}");
1246 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
923 $self->send_command ("pickup $::CFG->{pickup}"); 1247 $self->send_command ("pickup $::CFG->{pickup}");
924} 1248}
925 1249
926sub lookat { 1250sub lookat {
927 my ($self, $x, $y) = @_; 1251 my ($self, $x, $y) = @_;
928 1252
929 if ($self->{cfplus_ext}) { 1253 if ($self->{cfplus_ext}) {
930 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1254 $self->send_ext_req (lookat => $x, $y, sub {
931 my ($msg) = @_; 1255 my (%msg) = @_;
932 1256
933 if (exists $msg->{npc_dialog}) { 1257 if (exists $msg{npc_dialog}) {
934 # start npc chat dialog 1258 # start npc chat dialog
935 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1259 $self->{npc_dialog} = new CFPlus::NPCDialog::
936 dx => $x, 1260 token => $msg{npc_dialog},
937 dy => $y,
938 title => "$msg->{npc_dialog} (NPC)", 1261 title => "$msg{npc_dialog}[0] (NPC)",
939 conn => $self, 1262 conn => $self,
940 ; 1263 ;
941 } 1264 }
942 }); 1265 });
943 } 1266 }
… …
950 1273
951 (delete $self->{npc_dialog})->destroy 1274 (delete $self->{npc_dialog})->destroy
952 if $self->{npc_dialog}; 1275 if $self->{npc_dialog};
953 1276
954 $self->SUPER::destroy; 1277 $self->SUPER::destroy;
1278
1279 %$self = ();
955} 1280}
956 1281
957package CFPlus::NPCDialog; 1282package CFPlus::NPCDialog;
958 1283
959our @ISA = 'CFPlus::UI::Toplevel'; 1284our @ISA = 'CFPlus::UI::Toplevel';
… …
971 kw => { hi => 0, yes => 0, no => 0 }, 1296 kw => { hi => 0, yes => 0, no => 0 },
972 has_close_button => 1, 1297 has_close_button => 1,
973 @_, 1298 @_,
974 ); 1299 );
975 1300
976 Scalar::Util::weaken (my $this = $self); 1301 CFPlus::weaken (my $this = $self);
977 1302
978 $self->connect (delete => sub { $this->destroy; 1 }); 1303 $self->connect (delete => sub { $this->destroy; 1 });
979 1304
980 # better use a pane... 1305 # better use a pane...
981 $self->add (my $hbox = new CFPlus::UI::HBox); 1306 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1006 on_activate => sub { $this->destroy; 1 }, 1331 on_activate => sub { $this->destroy; 1 },
1007 ; 1332 ;
1008 1333
1009 $self->update_options; 1334 $self->update_options;
1010 1335
1011 $self->{id} = $self->{conn}->send_ext_req ( 1336 $self->{id} = "npc-channel-" . $self->{conn}->token;
1012 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1337 $self->{conn}->connect_ext ($self->{id} => sub {
1013 sub { $this && $this->feed (@_) } 1338 $this->feed (@_) if $this;
1014 ); 1339 });
1340
1341 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1015 1342
1016 $self->{entry}->grab_focus; 1343 $self->{entry}->grab_focus;
1017 1344
1018 $self->{textview}->add_paragraph ({ 1345 $self->{textview}->add_paragraph ({
1019 fg => [1, 1, 0, 1], 1346 fg => [1, 1, 0, 1],
… …
1025}; 1352};
1026 1353
1027sub update_options { 1354sub update_options {
1028 my ($self) = @_; 1355 my ($self) = @_;
1029 1356
1030 Scalar::Util::weaken $self; 1357 CFPlus::weaken $self;
1031 1358
1032 $self->{options}->clear; 1359 $self->{options}->clear;
1033 $self->{options}->add ($self->{bye_button}); 1360 $self->{options}->add ($self->{bye_button});
1034 1361
1035 for my $kw (sort keys %{ $self->{kw} }) { 1362 for my $kw (sort keys %{ $self->{kw} }) {
… …
1042 ); 1369 );
1043 } 1370 }
1044} 1371}
1045 1372
1046sub feed { 1373sub feed {
1047 my ($self, $msg) = @_; 1374 my ($self, $type, @arg) = @_;
1048 1375
1049 Scalar::Util::weaken $self; 1376 CFPlus::weaken $self;
1050 1377
1051 if ($msg->{msgtype} eq "reply") { 1378 if ($type eq "update") {
1379 my (%info) = @arg;
1380
1052 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1381 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1053 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1382 $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 1383
1384 if (exists $info{msg}) {
1385 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1386 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1387 my @link;
1388 $text =~ s{
1389 ($match)
1390 }{
1391 my $kw = $1;
1392
1393 push @link, new CFPlus::UI::Label
1394 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1395 can_hover => 1,
1396 can_events => 1,
1397 padding_x => 0,
1398 padding_y => 0,
1399 on_button_up => sub {
1400 $self->send ($kw);
1401 };
1402
1403 "\x{fffc}"
1404 }giex;
1405
1076 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1406 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1077 $self->{textview}->scroll_to_bottom; 1407 $self->{textview}->scroll_to_bottom;
1408 }
1409
1078 $self->update_options; 1410 $self->update_options;
1079 } else { 1411 } else {
1080 $self->destroy; 1412 $self->destroy;
1081 } 1413 }
1082 1414
… …
1087 my ($self, $msg) = @_; 1419 my ($self, $msg) = @_;
1088 1420
1089 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1421 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1090 $self->{textview}->scroll_to_bottom; 1422 $self->{textview}->scroll_to_bottom;
1091 1423
1092 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1424 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1093} 1425}
1094 1426
1095sub destroy { 1427sub destroy {
1096 my ($self) = @_; 1428 my ($self) = @_;
1097 1429
1098 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1430 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1099 1431
1100 if ($self->{conn}) { 1432 if ($self->{conn}) {
1101 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1433 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1102 delete $self->{conn}{npc_dialog}; 1434 delete $self->{conn}{npc_dialog};
1103 $self->{conn}->disconnect_ext ($self->{id}); 1435 $self->{conn}->disconnect_ext ($self->{id});
1104 } 1436 }
1105 1437
1106 $self->SUPER::destroy; 1438 $self->SUPER::destroy;

Diff Legend

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