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

Diff Legend

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