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.70 by root, Sun Jul 30 17:43:27 2006 UTC vs.
Revision 1.153 by root, Mon Aug 13 14:24:17 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 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 = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub { 33 my @cmd_help = map {
22 my ($pom) = @_;
23
24 my @cmd_help;
25
26 for my $head2 ($pom->head1->[-2]->head2) {
27 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 35 or die "unparseable command help: $_->{kw}[0]";
29 36
30 my $cmd = $1; 37 my $cmd = $1;
31 my @args = split /\|/, $2; 38 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 39 @args = (".*") unless @args;
33 40
41 my (undef, @par) = CFPlus::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par;
43
34 $_ = $_ eq ".*" ? "" : " $_" 44 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 45 for @args;
36 46
37 my $text = CFPlus::Pod::as_markup $head2->content; 47 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
41 @args; 49 @args
50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*";
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 => {},
42 } 90 };
43
44 \@cmd_help
45 }; 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 $args->{$ev} = sub {
110 my $id = shift->{s_id};
111 $self->send_exti_msg (w_e => $id, $ev, \@_);
112
113 1
114 };
115 }
116
117 if (my $widget = eval {
118 local $SIG{__DIE__};
119 "CFPlus::UI::$class"->new (
120 %$args,
121 s_ws => $ws,
122 s_id => $id,
123 )
124 }
125 ) {
126 $self->{widget}{$id}
127 = $self->{widgetset}{$ws}{w}{$id}
128 = $widget;
129
130 $widget->connect (on_destroy => sub {
131 my ($widget) = @_;
132
133 delete $self->{widget}{$widget->{s_id}};
134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
135 });
136 } else {
137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 $self->send_exti_msg (w_e => $id, "destroy");
139 }
140 });
141
142 # widget call
143 $self->connect_ext (w_c => sub {
144 my ($id, $rid, $method, $args) = @_;
145
146 my $w = $self->{widget}{$id}
147 or return;
148
149 $args ||= [];
150
151 if ($rid) {
152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
153 } else {
154 $w->$method (@$args);
155 }
156 });
157
158 # widget set
159 $self->connect_ext (w_s => sub {
160 my ($id, $attr) = @_;
161
162 my $w = $self->{widget}{$id}
163 or return;
164
165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
174 });
175
176 # widget get
177 $self->connect_ext (w_g => sub {
178 my ($id, $rid, $attr) = @_;
179
180 my $w = $self->{widget}{$id}
181 or return;
182
183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
184 });
185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
191 });
192
193 # destroy widgets on logout
194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
195 for my $ws (values %{delete $self->{widgetset} || {}}) {
196 $_->destroy
197 for values %{delete $ws->{w} || {}};
198 }
199 });
46 200
47 $self->{map_widget}->add_command (@$_) 201 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 202 for @cmd_help;
49 203
204 {
205 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
206 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
207 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
208 }
209
210 {
50 $self->{noface} = new_from_file CFPlus::Texture 211 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 212 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
213 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
214 }
52 215
53 $self->{open_container} = 0; 216 $self->{open_container} = 0;
54 217
55 # "global"
56 $self->{tilecache} = CFPlus::db_table "tilecache";
57 $self->{facemap} = CFPlus::db_table "facemap";
58
59 # per server 218 # per server
60 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61 220
62 $self 221 $self
222}
223
224sub update_fx_want {
225 my ($self) = @_;
226
227 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND
230 });
63} 231}
64 232
65sub logprint { 233sub logprint {
66 my ($self, @a) = @_; 234 my ($self, @a) = @_;
67 235
68 $self->{log_fh} ||= do { 236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
69 my $path = "$Crossfire::VARDIR/log.$self->{host}";
70
71 open my $fh, ">>:utf8", $path
72 or die "Couldn't open logfile $path: $!";
73
74 $fh->autoflush (1);
75
76 $fh;
77 };
78
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83
84 print {$self->{log_fh}} "$ts ", @a, "\n";
85} 237}
86 238
87sub _stat_numdiff { 239sub _stat_numdiff {
88 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
89 241
… …
222 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 374 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
223 $::GAUGES->{food} ->set_value ($fo, $fo_m); 375 $::GAUGES->{food} ->set_value ($fo, $fo_m);
224 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 376 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
225 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 377 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
226 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 378 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
227 my $rng = $stats->{+CS_STAT_RANGE}; 379 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
228 $rng =~ s/^Range: //; # thank you so much dear server
229 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
230 my $title = $stats->{+CS_STAT_TITLE}; 380 my $title = $stats->{+CS_STAT_TITLE};
231 $title =~ s/^Player: //; 381 $title =~ s/^Player: //;
232 $::STATWIDS->{title} ->set_text ("Title: " . $title); 382 $::STATWIDS->{title} ->set_text ("Title: " . $title);
233 383
234 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 384 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
254 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
255 405
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257 $sktbl->clear; 407 $sktbl->clear;
258 408
409 my @add;
410
411 push @add,
259 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
260 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
261 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
262 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
263 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
264 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
265 419
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 420 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 421
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 422 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
269 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 423 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
270 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271 424
272 my ($x, $y) = (0, 1); 425 my ($x, $y) = (0, 1);
273 for ( 426 for (
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 427 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}], 428 map [$_, $self->{skill_info}{$_}],
… …
284 if ($ev->{button} == 1) { 437 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 438 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 439 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 440 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 441 } elsif ($ev->{button} == 3) {
442 my $shortname = CFPlus::shorten $name, 14;
289 (new CFPlus::UI::Menu 443 (new CFPlus::UI::Menu
290 items => [ 444 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 445 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
292 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 446 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293 ], 447 ],
294 )->popup ($ev); 448 )->popup ($ev);
295 } else { 449 } else {
296 return 0; 450 return 0;
297 } 451 }
298 452
299 1 453 1
300 }; 454 };
301 455
456 push @add,
302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 457 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
303 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 458 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
304 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 459 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
305 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 460 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
306 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 461 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ;
307 464
308 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
309 } 466 }
467
468 $sktbl->add_at (@add);
310 } 469 }
311 470
312 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
313 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
314 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
315 } 474 }
316} 475}
317 476
477sub macro_send {
478 my ($self, $macro) = @_;
479
480 for my $cmd (@{ $macro->{action} }) {
481 $self->send_command ($cmd);
482 }
483}
484
318sub user_send { 485sub user_send {
319 my ($self, $command) = @_; 486 my ($self, $command) = @_;
320 487
488 $self->{record}->($command)
321 if ($self->{record}) { 489 if $self->{record};
322 push @{$self->{record}}, $command;
323 }
324 490
325 $self->logprint ("send: ", $command); 491 $self->logprint ("send: ", $command);
326 $self->send_command ($command); 492 $self->send_command ($command);
327 ::status ($command); 493 ::status ($command);
328} 494}
329 495
330sub start_record { 496sub record {
331 my ($self) = @_; 497 my ($self, $cb) = @_;
332 498
333 $self->{record} = []; 499 $self->{record} = $cb;
334}
335
336sub stop_record {
337 my ($self) = @_;
338 return delete $self->{record};
339} 500}
340 501
341sub map_scroll { 502sub map_scroll {
342 my ($self, $dx, $dy) = @_; 503 my ($self, $dx, $dy) = @_;
343 504
… …
345} 506}
346 507
347sub feed_map1a { 508sub feed_map1a {
348 my ($self, $data) = @_; 509 my ($self, $data) = @_;
349 510
350 $self->{map}->map1a_update ($data); 511 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
512 my $delay;
513
514 for my $tile (@$missing) {
515 next if $self->{delay}{$tile};
516
517 $delay = 1;
518
519 if (my $tex = $::CONN->{texture}[$tile]) {
520 $tex->upload;
521 } else {
522 $self->{delay}{$tile} = 1;
523
524 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile};
527 $_[0]->upload;
528 };
529 }
530 }
531
532 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update;
537 });
538 } else {
351 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
352} 541}
353 542
354sub magicmap { 543sub magicmap {
355 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
356 545
… …
363 my $map_info = delete $self->{map_info} 552 my $map_info = delete $self->{map_info}
364 or return; 553 or return;
365 554
366 my ($hash, $x, $y, $w, $h) = @$map_info; 555 my ($hash, $x, $y, $w, $h) = @$map_info;
367 556
368 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 557 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
369 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 558 $self->{map_cache_new}{$hash} = \$data;
370 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 559 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
371} 560}
372 561
373sub map_clear { 562sub map_clear {
374 my ($self) = @_; 563 my ($self) = @_;
375 564
… …
378 567
379 $self->{map}->clear; 568 $self->{map}->clear;
380 delete $self->{map_widget}{magicmap}; 569 delete $self->{map_widget}{magicmap};
381} 570}
382 571
572sub bg_fetch {
573 my ($self) = @_;
574
575 my $id;
576
577 do {
578 $id = pop @{$self->{bg_fetch}}
579 or return;
580 } while $self->{texture}[$id];
581
582 CFPlus::DB::exists tilecache => $id, sub {
583 my ($exists) = @_;
584
585 return unless $self->{map}; # stop when destroyed
586
587 if ($exists) {
588 $self->have_tile ($id);
589 $self->{texture}[$id]->upload;
590 }
591
592 $self->bg_fetch;
593 };
594}
383 595
384sub load_map($$$) { 596sub load_map($$$) {
385 my ($self, $hash, $x, $y) = @_; 597 my ($self, $hash, $x, $y) = @_;
386 598
387 if (defined (my $data = $self->{mapcache}->get ($hash))) { 599 my $gen = $self->{map_change_gen};
600
601 my $cb = sub {
602 return unless $gen == $self->{map_change_gen};
603
604 my ($data) = @_;
605
606 if (defined $data) {
607 $self->{map_cache_new}{$hash} = \$data;
608
388 $data = Compress::LZF::decompress $data; 609 my $data = Compress::LZF::decompress $data;
389 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
390 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
391 my $data = $self->{tilecache}->get ($id)
392 or next;
393 610
394 $self->set_texture ($id => $data); 611 my $inprogress = @{ $self->{bg_fetch} || [] };
612 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
613 $self->bg_fetch unless $inprogress;
395 } 614 }
615 };
616
617 if (my $rdata = $self->{map_cache_old}{$hash}) {
618 $cb->($$rdata);
619 } else {
620 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
396 } 621 }
397} 622}
398 623
399# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 624# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
400# (server resource,s latency, bandwidth), so this hack is warranted. 625# (server resource,s latency, bandwidth), so this hack is warranted.
… …
465 690
466 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 691 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
467 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 692 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
468 693
469 } else { 694 } else {
695 my $gen = $self->{map_change_gen};
470 $self->send_mapinfo ("spatial $path$tile", sub { 696 $self->send_mapinfo ("spatial $path$tile", sub {
697 return unless $gen == $self->{map_change_gen};
698
471 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 699 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
472 700
473 return if $mode ne "spatial"; 701 return if $mode ne "spatial";
474 702
475 $x += $self->{map}->ox; 703 $x += $self->{map}->ox;
… …
489 717
490sub map_change { 718sub map_change {
491 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 719 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
492 720
493 $self->flush_map; 721 $self->flush_map;
722
723 ++$self->{map_change_gen};
724 $self->{map_cache_old} = delete $self->{map_cache_new};
494 725
495 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 726 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
496 727
497 my $mapmapw = $self->{mapmap}->{w}; 728 my $mapmapw = $self->{mapmap}->{w};
498 my $mapmaph = $self->{mapmap}->{h}; 729 my $mapmaph = $self->{mapmap}->{h};
… …
515 $self->load_map ($hash, $x, $y); 746 $self->load_map ($hash, $x, $y);
516 $self->flood_fill (0, 0, 0, "", $hash, $flags); 747 $self->flood_fill (0, 0, 0, "", $hash, $flags);
517} 748}
518 749
519sub face_find { 750sub face_find {
520 my ($self, $facenum, $face) = @_; 751 my ($self, $facenum, $face, $cb) = @_;
521 752
522 my $hash = "$face->{chksum},$face->{name}"; 753 if ($face->{type} == 0) { # FT_FACE
754 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
523 755
524 my $id = $self->{facemap}->get ($hash); 756 $face->{id} = $id;
525
526 unless ($id) {
527 # create new id for face
528 # I love transactions
529 for (1..100) {
530 my $txn = $CFPlus::DB_ENV->txn_begin;
531 my $status = $self->{facemap}->db_get (id => $id);
532 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
533 $id = ($id || 64) + 1;
534 if ($self->{facemap}->put (id => $id) == 0
535 && $self->{facemap}->put ($hash => $id) == 0) {
536 $txn->txn_commit;
537
538 goto gotid;
539 }
540 }
541 $txn->txn_abort;
542 }
543
544 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
545 }
546
547gotid:
548 $face->{id} = $id;
549 $self->{map}->set_face ($facenum => $id);
550 $self->{faceid}[$facenum] = $id;#d# 757 $self->{faceid}[$facenum] = $id;
551 758
552 my $face = $self->{tilecache}->get ($id); 759 $self->{map}->set_tileid ($facenum => $id);
553 760
554 if ($face) { 761 CFPlus::DB::get tilecache => $id, $cb;
555 #$self->face_prefetch; 762
556 $face 763 } elsif ($face->{type} & 1) { # with metadata
557 } else { 764 CFPlus::DB::get res_meta => $face->{name}, $cb;
558 my $tex = $self->{noface};
559 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
560 undef
561 }; 765 }
562} 766}
563 767
564sub face_update { 768sub face_update {
565 my ($self, $facenum, $face, $changed) = @_; 769 my ($self, $facenum, $face, $changed) = @_;
566 770
567 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 771 if ($face->{type} == 0) { # FT_FACE
772 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
773 if $changed;
568 774
569 $self->set_texture ($face->{id} => delete $face->{image}); 775 $self->have_tile ($face->{id});
570}
571 776
572sub set_texture { 777 } elsif ($face->{type} & 1) { # split metadata
778 if ($changed) { # new data
779 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
780 $face->{meta} = $self->{json_coder}->decode ($meta_json);
781
782 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
783 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
784 } else {
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
786 }
787
788 ::add_license ($face);
789
790 if ($face->{type} == 3) { # FT_MUSIC
791 $self->{music_meta}{$facenum} = $face;
792
793 ::message ({ markup => "downloaded song #$facenum" })
794 if $changed;
795
796 &::audio_music_push ($facenum);
797 } elsif ($face->{type} == 5) { # FT_SOUND
798 $self->{sound_meta}{$facenum} = $face;
799
800 ::message ({ markup => "downloaded sound #$facenum" })
801 if $changed;
802
803 &::audio_sound_push ($facenum);
804 }
805
806 }
807}
808
809sub smooth_update {
810 my ($self, $facenum, $face) = @_;
811
812 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
813}
814
815sub have_tile {
816 my ($self, $tile) = @_;
817
818 return unless $self->{map};
819
820 my $tex = $self->{texture}[$tile] ||=
821 new CFPlus::Texture
822 tile => $tile, minify => 1, mipmap => 1, delay => 1;
823
824 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
825}
826
827sub connect_face_update {
573 my ($self, $id, $data) = @_; 828 my ($self, $id, $cb) = @_;
574 829
575 $self->{texture}[$id] ||= do { 830 push @{$self->{face_cb}{$id}}, $cb;
576 my $tex =
577 new_from_image CFPlus::Texture
578 $data, minify => 1, mipmap => 1;
579 831
580 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 832 CFPlus::guard {
581 $self->{map_widget}->update; 833 @{$self->{face_cb}{$id}}
582 834 = grep $_ != $cb,
583 $tex 835 @{$self->{face_cb}{$id}};
584 }; 836 }
585} 837}
586 838
587sub sound_play { 839sub sound_play {
588 my ($self, $x, $y, $soundnum, $type) = @_; 840 my ($self, $type, $face, $dx, $dy, $vol) = @_;
589 841
590 $self->{sound_play}->($x, $y, $soundnum, $type); 842 &::audio_sound_play ($face, $dx, $dy, $vol)
843 unless $type & 1; # odd types are silent for future expansion
591} 844}
592 845
593my $LAST_QUERY; # server is stupid, stupid, stupid 846my $LAST_QUERY; # server is stupid, stupid, stupid
594 847
595sub query { 848sub query {
… …
599 $LAST_QUERY = $prompt; 852 $LAST_QUERY = $prompt;
600 853
601 $self->{query}-> ($self, $flags, $prompt); 854 $self->{query}-> ($self, $flags, $prompt);
602} 855}
603 856
604sub drawinfo { 857sub sanitise_xml($) {
605 my ($self, $color, $text) = @_; 858 local $_ = shift;
606 859
607 my @color = ( 860 # we now weed out all tags we do not support
861 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
862 # now all entities
863 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
864
865 # handle some elements
866 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
867 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
868
869 $_
870}
871
872our %NAME_TO_COLOR = (
873 black => 0,
874 white => 1,
875 darkblue => 2,
876 red => 3,
877 orange => 4,
878 lightblue => 5,
879 darkorange => 6,
880 green => 7,
881 darkgreen => 8,
882 grey => 9,
883 brown => 10,
884 yellow => 11,
885 tan => 12,
886);
887
888our @CF_COLOR = (
608 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 889 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
609 [1.00, 1.00, 1.00], 890 [1.00, 1.00, 1.00],
610 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 891 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
611 [1.00, 0.00, 0.00], 892 [1.00, 0.00, 0.00],
612 [1.00, 0.54, 0.00], 893 [1.00, 0.54, 0.00],
613 [0.11, 0.56, 1.00], 894 [0.11, 0.56, 1.00],
614 [0.93, 0.46, 0.00], 895 [0.93, 0.46, 0.00],
615 [0.18, 0.54, 0.34], 896 [0.18, 0.54, 0.34],
616 [0.56, 0.73, 0.56], 897 [0.56, 0.73, 0.56],
617 [0.80, 0.80, 0.80], 898 [0.80, 0.80, 0.80],
618 [0.75, 0.61, 0.20], 899 [0.75, 0.61, 0.20],
619 [0.99, 0.77, 0.26], 900 [0.99, 0.77, 0.26],
620 [0.74, 0.65, 0.41], 901 [0.74, 0.65, 0.41],
621 ); 902);
622 903
904sub msg {
905 my ($self, $color, $type, $text, @extra) = @_;
906
907 $text = sanitise_xml $text;
908
909 if (my $cb = $self->{cb_msg}{$type}) {
910 $_->($self, $color, $type, $text, @extra) for values %$cb;
911 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
912 $type =~ s/-/_/g;
913 $self->{$type} = $text;
914 } else {
623 $self->logprint ("info: ", $text); 915 $self->logprint ("msg: ", $text);
916 return if $color < 0; # negative color == ignore if not understood
624 917
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 918 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
626 919
627 # try to create single paragraphs of multiple lines sent by the server 920 ## try to create single paragraphs of multiple lines sent by the server
921 # no longer neecssary with TRT servers
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 922 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
629 923
630 $text = CFPlus::asxml $text; 924 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 925 for split /\n/, $text;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 926
634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
636 $self->{logview}->scroll_to_bottom;
637
638 $self->{statusbox}->add ($text, 927 $self->{statusbox}->add ($text,
639 group => $text, 928 group => $text,
640 fg => $color[$color], 929 fg => $fg,
641 timeout => $color >= 2 ? 60 : 10, 930 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 931 tooltip_font => $::FONT_FIXED,
643 ); 932 );
644} 933 }
645
646sub drawextinfo {
647 my ($self, $color, $type, $subtype, $message) = @_;
648
649 $self->drawinfo ($color, $message);
650} 934}
651 935
652sub spell_add { 936sub spell_add {
653 my ($self, $spell) = @_; 937 my ($self, $spell) = @_;
654 938
655 # try to create single paragraphs out of the multiple lines sent by the server 939 # try to create single paragraphs out of the multiple lines sent by the server
656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 940 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657 $spell->{message} =~ s/\n+$//; 941 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 942 $spell->{message} ||= "Server did not provide a description for this spell.";
659 943
660 $::SPELL_PAGE->add_spell ($spell); 944 $::SPELL_LIST->add_spell ($spell);
661 945
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 946 $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}); 947 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 948}
665 949
666sub spell_delete { 950sub spell_delete {
667 my ($self, $spell) = @_; 951 my ($self, $spell) = @_;
668 952
669 $::SPELL_PAGE->remove_spell ($spell); 953 $::SPELL_LIST->remove_spell ($spell);
954}
955
956sub setup {
957 my ($self, $setup) = @_;
958
959 $self->{map_widget}->set_tilesize ($self->{tilesize});
960 $::MAP->resize ($self->{mapw}, $self->{maph});
670} 961}
671 962
672sub addme_success { 963sub addme_success {
673 my ($self) = @_; 964 my ($self) = @_;
674 965
675 my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676 my ($pom) = @_;
677
678 my %skill_help; 966 my %skill_help;
679 967
680 for my $head2 ($pom->head1->[3]->head2) { 968 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content; 969 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 970 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 971 };
686 972
687 for my $skill (values %{$self->{skill_info}}) { 973 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 974 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFPlus::asxml "Ready the skill '$skill'\n\n") 975 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 976 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 977 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 978 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 979 . $skill_help{$skill});
694 } 980 }
695} 981}
696 982
697sub eof { 983sub eof {
698 my ($self) = @_; 984 my ($self) = @_;
699 985
700 $self->{map_widget}->clr_commands; 986 $self->{map_widget}->clr_commands;
701 987
702 ::stop_game (); 988 ::stop_game ();
703}
704
705sub image_info {
706 my ($self, $numfaces) = @_;
707
708 $self->{num_faces} = $numfaces;
709 $self->{face_prefetch} = [1 .. $numfaces];
710 $self->face_prefetch;
711}
712
713sub face_prefetch {
714 my ($self) = @_;
715
716 return unless $::CFG->{face_prefetch};
717
718 if ($self->{num_faces}) {
719 return if @{ $self->{send_queue} || [] };
720 my $todo = @{ $self->{face_prefetch} }
721 or return;
722
723 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
724
725 $self->send ("requestinfo image_sums $face $face");
726
727 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
728 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
729 } elsif (!exists $self->{num_faces}) {
730 $self->send ("requestinfo image_info");
731
732 $self->{num_faces} = 0;
733
734 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
735 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
736 }
737} 989}
738 990
739sub update_floorbox { 991sub update_floorbox {
740 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 992 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
741 return unless $::CONN; 993 return unless $::CONN;
742 994
743 $::FLOORBOX->clear; 995 $::FLOORBOX->clear;
996
997 my @add;
744 998
745 my $row; 999 my $row;
746 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1000 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
747 if ($row < 6) { 1001 if ($row < 6) {
748 local $_->{face_widget}; # hack to force recreation of widget 1002 local $_->{face_widget}; # hack to force recreation of widget
749 local $_->{desc_widget}; # hack to force recreation of widget 1003 local $_->{desc_widget}; # hack to force recreation of widget
750 CFPlus::Item::update_widgets $_; 1004 CFPlus::Item::update_widgets $_;
751 1005
1006 push @add,
752 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1007 0, $row, $_->{face_widget},
753 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1008 1, $row, $_->{desc_widget};
754 1009
755 $row++; 1010 $row++;
756 } else { 1011 } else {
757 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1012 push @add, 1, $row, new CFPlus::UI::Button
758 text => "More...", 1013 text => "More...",
759 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1014 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
760 ); 1015 ;
761 last; 1016 last;
762 } 1017 }
763 } 1018 }
764 if ($::CONN->{open_container}) { 1019 if ($::CONN->{open_container}) {
765 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1020 push @add, 1, $row++, new CFPlus::UI::Button
766 text => "Close container", 1021 text => "Close container",
767 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1022 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
768 ); 1023 ;
769 } 1024 }
770 });
771 1025
1026 $::FLOORBOX->add_at (@add);
1027 });
1028
772 $::WANT_REFRESH++; 1029 $::WANT_REFRESH->start;
773} 1030}
774 1031
775sub set_opencont { 1032sub set_opencont {
776 my ($conn, $tag, $name) = @_; 1033 my ($conn, $tag, $name) = @_;
777 $conn->{open_container} = $tag; 1034 $conn->{open_container} = $tag;
… …
885 $::SERVER_INFO->set_markup ( 1142 $::SERVER_INFO->set_markup (
886 "server <tt>$self->{host}:$self->{port}</tt>\n" 1143 "server <tt>$self->{host}:$self->{port}</tt>\n"
887 . "protocol version <tt>$self->{version}</tt>\n" 1144 . "protocol version <tt>$self->{version}</tt>\n"
888 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1145 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1146 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1147 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1148 . "editing support $yesno[!!$self->{editor_support}]\n"
1149 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1150 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
890 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1151 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1152 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892 . "map size $self->{mapw}×$self->{maph}\n" 1153 . "map size $self->{mapw}×$self->{maph}\n"
893 ); 1154 );
1155
894} 1156}
895 1157
896sub logged_in { 1158sub logged_in {
897 my ($self) = @_; 1159 my ($self) = @_;
898 1160
899 $self->send_ext_req (cfplus_support => version => 1, sub { 1161 $self->send_ext_req (cfplus_support => version => 2, sub {
1162 my (%msg) = @_;
1163
900 $self->{cfplus_ext} = $_[0]{version}; 1164 $self->{cfplus_ext} = $msg{version};
901 $self->update_server_info; 1165 $self->update_server_info;
1166
1167 if ($self->{cfplus_ext} >= 2) {
1168 $self->send_ext_req ("editor_support", sub {
1169 $self->{editor_support} = { @_ };
1170 $self->update_server_info;
1171
1172 0
1173 });
1174 }
902 1175
903 0 1176 0
904 }); 1177 });
905 1178
906 $self->update_server_info; 1179 $self->update_server_info;
907 1180
908 $self->send_command ("output-sync $::CFG->{output_sync}"); 1181 $self->send_command ("output-sync $::CFG->{output_sync}");
909 $self->send_command ("output-count $::CFG->{output_count}"); 1182 $self->send_command ("output-count $::CFG->{output_count}");
1183 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
910 $self->send_command ("pickup $::CFG->{pickup}"); 1184 $self->send_command ("pickup $::CFG->{pickup}");
911} 1185}
912 1186
913sub lookat { 1187sub lookat {
914 my ($self, $x, $y) = @_; 1188 my ($self, $x, $y) = @_;
915 1189
916 if ($self->{cfplus_ext}) { 1190 if ($self->{cfplus_ext}) {
917 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1191 $self->send_ext_req (lookat => $x, $y, sub {
918 my ($msg) = @_; 1192 my (%msg) = @_;
919 1193
920 if (exists $msg->{npc_dialog}) { 1194 if (exists $msg{npc_dialog}) {
921 # start npc chat dialog 1195 # start npc chat dialog
922 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1196 $self->{npc_dialog} = new CFPlus::NPCDialog::
923 dx => $x, 1197 token => $msg{npc_dialog},
924 dy => $y,
925 title => "$msg->{npc_dialog} (NPC)", 1198 title => "$msg{npc_dialog}[0] (NPC)",
926 conn => $self, 1199 conn => $self,
927 ; 1200 ;
928 } 1201 }
929 }); 1202 });
930 } 1203 }
… …
933} 1206}
934 1207
935sub destroy { 1208sub destroy {
936 my ($self) = @_; 1209 my ($self) = @_;
937 1210
938 $self->{npc_dialog}->destroy 1211 (delete $self->{npc_dialog})->destroy
939 if $self->{npc_dialog}; 1212 if $self->{npc_dialog};
940 1213
941 $self->SUPER::destroy; 1214 $self->SUPER::destroy;
1215
1216 %$self = ();
942} 1217}
943 1218
944package CFPlus::NPCDialog; 1219package CFPlus::NPCDialog;
945 1220
946our @ISA = 'CFPlus::UI::FancyFrame'; 1221our @ISA = 'CFPlus::UI::Toplevel';
947 1222
948sub new { 1223sub new {
949 my $class = shift; 1224 my $class = shift;
950 1225
951 my $self = $class->SUPER::new ( 1226 my $self = $class->SUPER::new (
… …
958 kw => { hi => 0, yes => 0, no => 0 }, 1233 kw => { hi => 0, yes => 0, no => 0 },
959 has_close_button => 1, 1234 has_close_button => 1,
960 @_, 1235 @_,
961 ); 1236 );
962 1237
963 Scalar::Util::weaken (my $this = $self); 1238 CFPlus::weaken (my $this = $self);
964 1239
965 $self->connect (delete => sub { $this->destroy; 1 }); 1240 $self->connect (delete => sub { $this->destroy; 1 });
966 1241
967 # better use a pane... 1242 # better use a pane...
968 $self->add (my $hbox = new CFPlus::UI::HBox); 1243 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
970 1245
971 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1246 $hbox->add (my $vbox = new CFPlus::UI::VBox);
972 1247
973 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1248 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
974 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1249 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
975 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1250 tooltip => "#npc_message_entry",
976 . "Sometimes you have to tell an NPC something you cannot find out during "
977 . "a normal conversation (such as a password). In those cases you have to use "
978 . "this text entry. You can also enter responses manually instead of using the response "
979 . "buttons below.",
980 on_activate => sub { 1251 on_activate => sub {
981 my ($entry, $text) = @_; 1252 my ($entry, $text) = @_;
982 1253
983 return unless $text =~ /\S/; 1254 return unless $text =~ /\S/;
984 1255
… …
997 on_activate => sub { $this->destroy; 1 }, 1268 on_activate => sub { $this->destroy; 1 },
998 ; 1269 ;
999 1270
1000 $self->update_options; 1271 $self->update_options;
1001 1272
1002 $self->{id} = $self->{conn}->send_ext_req ( 1273 $self->{id} = "npc-channel-" . $self->{conn}->token;
1003 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1274 $self->{conn}->connect_ext ($self->{id} => sub {
1004 sub { $this && $this->feed (@_) } 1275 $this->feed (@_) if $this;
1005 ); 1276 });
1277
1278 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1006 1279
1007 $self->{entry}->grab_focus; 1280 $self->{entry}->grab_focus;
1008 1281
1009 $self->{textview}->add_paragraph ({ 1282 $self->{textview}->add_paragraph ({
1010 fg => [1, 1, 0, 1], 1283 fg => [1, 1, 0, 1],
… …
1016}; 1289};
1017 1290
1018sub update_options { 1291sub update_options {
1019 my ($self) = @_; 1292 my ($self) = @_;
1020 1293
1021 Scalar::Util::weaken $self; 1294 CFPlus::weaken $self;
1022 1295
1023 $self->{options}->clear; 1296 $self->{options}->clear;
1024 $self->{options}->add ($self->{bye_button}); 1297 $self->{options}->add ($self->{bye_button});
1025 1298
1026 for my $kw (sort keys %{ $self->{kw} }) { 1299 for my $kw (sort keys %{ $self->{kw} }) {
… …
1033 ); 1306 );
1034 } 1307 }
1035} 1308}
1036 1309
1037sub feed { 1310sub feed {
1038 my ($self, $msg) = @_; 1311 my ($self, $type, @arg) = @_;
1039 1312
1040 Scalar::Util::weaken $self; 1313 CFPlus::weaken $self;
1041 1314
1042 if ($msg->{msgtype} eq "reply") { 1315 if ($type eq "update") {
1316 my (%info) = @arg;
1317
1043 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1318 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1044 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1319 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1045
1046 my $text = "\n" . CFPlus::asxml $msg->{msg};
1047 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1048 my @link;
1049 $text =~ s{
1050 ($match)
1051 }{
1052 my $kw = $1;
1053
1054 push @link, new CFPlus::UI::Label
1055 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1056 can_hover => 1,
1057 can_events => 1,
1058 padding_x => 0,
1059 padding_y => 0,
1060 on_button_up => sub {
1061 $self->send ($kw);
1062 };
1063
1064 chr 0xfffc
1065 }giex;
1066 1320
1321 if (exists $info{msg}) {
1322 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1323 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1324 my @link;
1325 $text =~ s{
1326 ($match)
1327 }{
1328 my $kw = $1;
1329
1330 push @link, new CFPlus::UI::Label
1331 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1332 can_hover => 1,
1333 can_events => 1,
1334 padding_x => 0,
1335 padding_y => 0,
1336 on_button_up => sub {
1337 $self->send ($kw);
1338 };
1339
1340 "\x{fffc}"
1341 }giex;
1342
1067 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1343 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1068 $self->{textview}->scroll_to_bottom; 1344 $self->{textview}->scroll_to_bottom;
1345 }
1346
1069 $self->update_options; 1347 $self->update_options;
1070 } else { 1348 } else {
1071 $self->destroy; 1349 $self->destroy;
1072 } 1350 }
1073 1351
… …
1078 my ($self, $msg) = @_; 1356 my ($self, $msg) = @_;
1079 1357
1080 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1358 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1081 $self->{textview}->scroll_to_bottom; 1359 $self->{textview}->scroll_to_bottom;
1082 1360
1083 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1361 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1084} 1362}
1085 1363
1086sub destroy { 1364sub destroy {
1087 my ($self) = @_; 1365 my ($self) = @_;
1088 1366
1089 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1367 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1090 1368
1091 if ($self->{conn}) { 1369 if ($self->{conn}) {
1092 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1370 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1093 delete $self->{conn}{npc_dialog}; 1371 delete $self->{conn}{npc_dialog};
1094 $self->{conn}->disconnect_ext ($self->{id}); 1372 $self->{conn}->disconnect_ext ($self->{id});
1095 } 1373 }
1096 1374
1097 $self->SUPER::destroy; 1375 $self->SUPER::destroy;
1098} 1376}
1099 1377
11001 13781
1379

Diff Legend

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