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.65 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.146 by root, Mon Aug 6 05:06:33 2007 UTC

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

Diff Legend

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