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

Diff Legend

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