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.142 by root, Tue Jul 31 00:50:04 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_ambient ($self->{songs} = $ev->{ambient})
57 if $ev->{ambient};
58 });
59
60 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_;
62
63 #$self->send ("setup sound 0"); # we use a different protocol
64
65 $self->send_exti_msg (fx_want => {
66 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
67 5 => !!$::CFG->{audio_enable}, # FT_SOUND
68 });
69
70 if (my $ts = $cap{tileset}) {
71 if (my ($default) = grep $_->[2] & 1, @$ts) {
72 $self->{tileset} = $default;
73 $self->{tilesize} = $default->[3];
74 $self->setup_req (tileset => $default->[0]);
75
76 my $w = int $self->{mapw} * 32 / $self->{tilesize};
77 my $h = int $self->{maph} * 32 / $self->{tilesize};
78
79 $self->setup_req (mapsize => "${w}x${h}");
80 }
81 }
82 });
83
84 $self->{json_coder}
85 ->convert_blessed
86 ->filter_json_single_key_object (__w_ => sub {
87 $self->{widget}{$_[0]}
88 });
89
90 # widgetset new
91 $self->connect_ext (ws_n => sub {
92 my ($id) = @_;
93
94 $self->{widgetset}{$id} = {
95 w => {},
41 } 96 };
42
43 \@cmd_help
44 }; 97 });
98
99 # widgetset destroy
100 $self->connect_ext (ws_d => sub {
101 my ($id) = @_;
102
103 my $ws = delete $self->{widgetset}{$id}
104 or return;
105
106 $_->destroy
107 for values %{$ws->{w}};
108 });
109
110 # widgetset create
111 $self->connect_ext (ws_c => sub {
112 my ($ws, $id, $class, $args) = @_;
113
114 for my $ev (grep /^on_/, keys %$args) {
115 $args->{$ev} = sub {
116 my $id = shift->{s_id};
117 $self->send_exti_msg (w_e => $id, $ev, \@_);
118
119 1
120 };
121 }
122
123 if (my $widget = eval {
124 local $SIG{__DIE__};
125 "CFPlus::UI::$class"->new (
126 %$args,
127 s_ws => $ws,
128 s_id => $id,
129 )
130 }
131 ) {
132 $self->{widget}{$id}
133 = $self->{widgetset}{$ws}{w}{$id}
134 = $widget;
135
136 $widget->connect (on_destroy => sub {
137 my ($widget) = @_;
138
139 delete $self->{widget}{$widget->{s_id}};
140 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
141 });
142 } else {
143 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
144 $self->send_exti_msg (w_e => $id, "destroy");
145 }
146 });
147
148 # widget call
149 $self->connect_ext (w_c => sub {
150 my ($id, $rid, $method, $args) = @_;
151
152 my $w = $self->{widget}{$id}
153 or return;
154
155 $args ||= [];
156
157 if ($rid) {
158 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
159 } else {
160 $w->$method (@$args);
161 }
162 });
163
164 # widget set
165 $self->connect_ext (w_s => sub {
166 my ($id, $attr) = @_;
167
168 my $w = $self->{widget}{$id}
169 or return;
170
171 for (my $i = 0; $i < $#$attr; $i += 2) {
172 my ($member, $value) = @$attr[$i, $i+1];
173 if (defined $value) {
174 $w->{$member} = $value;
175 } else {
176 delete $w->{$member};
177 }
178 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
179 }
180 });
181
182 # widget get
183 $self->connect_ext (w_g => sub {
184 my ($id, $rid, $attr) = @_;
185
186 my $w = $self->{widget}{$id}
187 or return;
188
189 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
190 });
191
192 # message window
193 $self->connect_ext (channel_info => sub {
194 my ($info) = @_;
195 $self->{channels}->{$info->{id}} = $info;
196 $::MESSAGE_WINDOW->add_channel ($info);
197 });
198
199 # destroy widgets on logout
200 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
201 for my $ws (values %{delete $self->{widgetset} || {}}) {
202 $_->destroy
203 for values %{delete $ws->{w} || {}};
204 }
205 });
45 206
46 $self->{map_widget}->add_command (@$_) 207 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help; 208 for @cmd_help;
48 209
210 {
211 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
212 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
213 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
214 }
215
216 {
49 $self->{noface} = new_from_file CFClient::Texture 217 $self->{noface} = my $tex = new_from_file CFPlus::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 218 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
219 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
220 }
51 221
52 $self->{open_container} = 0; 222 $self->{open_container} = 0;
53 223
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server 224 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 225 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
60 226
61 $self 227 $self
62} 228}
63 229
64sub logprint { 230sub logprint {
221 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 387 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
222 $::GAUGES->{food} ->set_value ($fo, $fo_m); 388 $::GAUGES->{food} ->set_value ($fo, $fo_m);
223 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 389 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
224 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 390 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
225 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 391 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
226 my $rng = $stats->{+CS_STAT_RANGE}; 392 $::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}; 393 my $title = $stats->{+CS_STAT_TITLE};
230 $title =~ s/^Player: //; 394 $title =~ s/^Player: //;
231 $::STATWIDS->{title} ->set_text ("Title: " . $title); 395 $::STATWIDS->{title} ->set_text ("Title: " . $title);
232 396
233 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 397 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 406 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 407 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 408 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 409 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 410
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 411 $self->update_weight;
248 412
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 413 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 414 for keys %RES_TBL;
251 415
252 my $sktbl = $::STATWIDS->{skill_tbl}; 416 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 417 my @skills = keys %{ $self->{skill_info} };
254 418
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 419 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
256 $sktbl->clear; 420 $sktbl->clear;
257 421
422 my @add;
423
424 push @add,
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 425 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 426 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 427 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 428 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 429 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 430 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
431 ;
264 432
433 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
434
435 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
436 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
437
265 my ($x, $y) = (1, 0); 438 my ($x, $y) = (0, 1);
266 for ( 439 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 440 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 441 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_}, 442 grep exists $stats->{$_},
270 @skills 443 @skills
271 ) { 444 ) {
272 my ($idx, $name) = @$_; 445 my ($idx, $name) = @$_;
273 446
447 my $spell_cb = sub {
448 my ($widget, $ev) = @_;
449
450 if ($ev->{button} == 1) {
451 $::CONN->user_send ("ready_skill $name");
452 } elsif ($ev->{button} == 2) {
453 $::CONN->user_send ("use_skill $name");
454 } elsif ($ev->{button} == 3) {
455 my $shortname = CFPlus::shorten $name, 14;
456 (new CFPlus::UI::Menu
457 items => [
458 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
459 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
460 ],
461 )->popup ($ev);
462 } else {
463 return 0;
464 }
465
466 1
467 };
468
469 push @add,
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 470 $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]); 471 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 472 $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); 473 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); 474 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
475 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
476 ;
279 477
280 $x++ and ($x, $y) = (0, $y + 1); 478 $x++ and ($x, $y) = (0, $y + 1);
281 } 479 }
480
481 $sktbl->add_at (@add);
282 } 482 }
283 483
284 for (grep exists $stats->{$_}, @skills) { 484 for (grep exists $stats->{$_}, @skills) {
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 485 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 486 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
287 } 487 }
288} 488}
289 489
490sub macro_send {
491 my ($self, $macro) = @_;
492
493 for my $cmd (@{ $macro->{action} }) {
494 $self->send_command ($cmd);
495 }
496}
497
290sub user_send { 498sub user_send {
291 my ($self, $command) = @_; 499 my ($self, $command) = @_;
292 500
501 $self->{record}->($command)
293 if ($self->{record}) { 502 if $self->{record};
294 push @{$self->{record}}, $command;
295 }
296 503
297 $self->logprint ("send: ", $command); 504 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 505 $self->send_command ($command);
299 ::status ($command); 506 ::status ($command);
300} 507}
301 508
302sub start_record { 509sub record {
303 my ($self) = @_; 510 my ($self, $cb) = @_;
304 511
305 $self->{record} = []; 512 $self->{record} = $cb;
306}
307
308sub stop_record {
309 my ($self) = @_;
310 return delete $self->{record};
311} 513}
312 514
313sub map_scroll { 515sub map_scroll {
314 my ($self, $dx, $dy) = @_; 516 my ($self, $dx, $dy) = @_;
315 517
317} 519}
318 520
319sub feed_map1a { 521sub feed_map1a {
320 my ($self, $data) = @_; 522 my ($self, $data) = @_;
321 523
322 $self->{map}->map1a_update ($data); 524 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
323 $self->{map_widget}->update; 525 $self->{map_widget}->update;
324} 526}
325 527
326sub magicmap { 528sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 529 my ($self, $w, $h, $x, $y, $data) = @_;
336 or return; 538 or return;
337 539
338 my ($hash, $x, $y, $w, $h) = @$map_info; 540 my ($hash, $x, $y, $w, $h) = @$map_info;
339 541
340 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 542 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
341 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 543 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
342 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 544 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
343} 545}
344 546
345sub map_clear { 547sub map_clear {
346 my ($self) = @_; 548 my ($self) = @_;
350 552
351 $self->{map}->clear; 553 $self->{map}->clear;
352 delete $self->{map_widget}{magicmap}; 554 delete $self->{map_widget}{magicmap};
353} 555}
354 556
557sub bg_fetch {
558 my ($self) = @_;
559
560 my $id;
561
562 do {
563 $id = pop @{$self->{bg_fetch}}
564 or return;
565 } while $self->{texture}[$id];
566
567 CFPlus::DB::get tilecache => $id, sub {
568 my ($data) = @_;
569
570 return unless $self->{map}; # stop when destroyed
571
572 $self->set_texture ($id => $data)
573 if defined $data;
574
575 $self->bg_fetch;
576 };
577}
355 578
356sub load_map($$$) { 579sub load_map($$$) {
357 my ($self, $hash, $x, $y) = @_; 580 my ($self, $hash, $x, $y) = @_;
358 581
359 if (defined (my $data = $self->{mapcache}->get ($hash))) { 582 my $gen = $self->{map_change_gen};
583
584 CFPlus::DB::get $self->{mapcache} => $hash, sub {
585 return unless $gen == $self->{map_change_gen};
586
587 my ($data) = @_;
588
589 if (defined $data) {
360 $data = Compress::LZF::decompress $data; 590 $data = Compress::LZF::decompress $data;
361 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 591 #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 592
366 $self->set_texture ($id => $data); 593 my $inprogress = @{ $self->{bg_fetch} || [] };
594 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
595 $self->bg_fetch unless $inprogress;
367 } 596 }
368 } 597 };
369} 598}
370 599
371# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 600# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
372# (server resource,s latency, bandwidth), so this hack is warranted. 601# (server resource,s latency, bandwidth), so this hack is warranted.
373# the right fix is to make real tiled maps with an overview file 602# the right fix is to make real tiled maps with an overview file
437 666
438 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 667 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
439 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 668 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
440 669
441 } else { 670 } else {
671 my $gen = $self->{map_change_gen};
442 $self->send_mapinfo ("spatial $path$tile", sub { 672 $self->send_mapinfo ("spatial $path$tile", sub {
673 return unless $gen == $self->{map_change_gen};
674
443 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 675 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
444 676
445 return if $mode ne "spatial"; 677 return if $mode ne "spatial";
446 678
447 $x += $self->{map}->ox; 679 $x += $self->{map}->ox;
461 693
462sub map_change { 694sub map_change {
463 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 695 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
464 696
465 $self->flush_map; 697 $self->flush_map;
698
699 ++$self->{map_change_gen};
466 700
467 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 701 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
468 702
469 my $mapmapw = $self->{mapmap}->{w}; 703 my $mapmapw = $self->{mapmap}->{w};
470 my $mapmaph = $self->{mapmap}->{h}; 704 my $mapmaph = $self->{mapmap}->{h};
487 $self->load_map ($hash, $x, $y); 721 $self->load_map ($hash, $x, $y);
488 $self->flood_fill (0, 0, 0, "", $hash, $flags); 722 $self->flood_fill (0, 0, 0, "", $hash, $flags);
489} 723}
490 724
491sub face_find { 725sub face_find {
492 my ($self, $facenum, $face) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
493 727
494 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
495 730
496 my $id = $self->{facemap}->get ($hash); 731 $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# 732 $self->{faceid}[$facenum] = $id;
523 733
524 my $face = $self->{tilecache}->get ($id); 734 $self->{map}->set_tileid ($facenum => $id);
525 735
526 if ($face) { 736 CFPlus::DB::get tilecache => $id, $cb;
527 #$self->face_prefetch; 737
528 $face 738 } elsif ($face->{type} & 1) { # with metadata
529 } else { 739 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
530 my $tex = $self->{noface}; 740 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 }; 741 }
534} 742}
535 743
536sub face_update { 744sub face_update {
537 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
538 746
539 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 747 if ($face->{type} == 0) { # FT_FACE
748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
749 if $changed;
540 750
541 $self->set_texture ($face->{id} => delete $face->{image}); 751 $self->set_texture ($face->{id} => delete $face->{data});
752
753 } elsif ($face->{type} & 1) { # split metadata
754 my $cb = sub { };
755
756 if ($face->{type} == 3) { # FT_MUSIC
757 $cb = sub {
758 $self->{music_meta}{$facenum} = $face;
759
760 ::message ({ markup => "downloaded song #$facenum" })
761 if $changed;
762
763 &::audio_music_set_ambient ($self->{songs});
764 };
765 } elsif ($face->{type} == 5) { # FT_SOUND
766 $cb = sub {
767 $self->{sound_meta}{$facenum} = $face;
768
769 ::message ({ markup => "downloaded sound #$facenum" })
770 if $changed;
771
772 &::audio_sound_push ($facenum);
773 };
774 }
775
776 if ($changed) { # new data
777 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
778
779 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
780 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
781 $face->{meta} = $self->{json_coder}->decode ($meta_json);
782 $cb->();
783 };
784
785 } else {
786 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
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 "$time $_", 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 }
833} 1104}
834 1105
835sub player_update { 1106sub player_update {
836 my ($self, $player) = @_; 1107 my ($self, $player) = @_;
1108
1109 $self->update_weight;
1110}
1111
1112sub update_weight {
1113 my ($self) = @_;
1114
1115 my $weight = .001 * $self->{player}{weight};
1116 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1117
837 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 1118 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1119 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
1120 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
838} 1121}
839 1122
840sub update_server_info { 1123sub update_server_info {
841 my ($self) = @_; 1124 my ($self) = @_;
842 1125
845 $::SERVER_INFO->set_markup ( 1128 $::SERVER_INFO->set_markup (
846 "server <tt>$self->{host}:$self->{port}</tt>\n" 1129 "server <tt>$self->{host}:$self->{port}</tt>\n"
847 . "protocol version <tt>$self->{version}</tt>\n" 1130 . "protocol version <tt>$self->{version}</tt>\n"
848 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1131 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
849 . "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"
850 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1137 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
851 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1138 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
852 . "map size $self->{mapw}×$self->{maph}\n" 1139 . "map size $self->{mapw}×$self->{maph}\n"
853 ); 1140 );
1141
854} 1142}
855 1143
856sub logged_in { 1144sub logged_in {
857 my ($self) = @_; 1145 my ($self) = @_;
858 1146
859 $self->send_ext_req (cfplus_support => "1", sub { 1147 $self->send_ext_req (cfplus_support => version => 2, sub {
1148 my (%msg) = @_;
1149
860 $self->{cfplus_ext} = $_[0]; 1150 $self->{cfplus_ext} = $msg{version};
861 $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
862 }); 1163 });
863 1164
864 $self->update_server_info; 1165 $self->update_server_info;
865 1166
866 $self->send_command ("output-sync $::CFG->{output_sync}"); 1167 $self->send_command ("output-sync $::CFG->{output_sync}");
867 $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;
868 $self->send_command ("pickup $::CFG->{pickup}"); 1170 $self->send_command ("pickup $::CFG->{pickup}");
869} 1171}
870 1172
871sub lookat { 1173sub lookat {
872 my ($self, $x, $y) = @_; 1174 my ($self, $x, $y) = @_;
873 1175
874 if ($self->{cfplus_ext}) { 1176 if ($self->{cfplus_ext}) {
875 $self->send_ext_req (lookat => "$x $y", sub { 1177 $self->send_ext_req (lookat => $x, $y, sub {
876 my %res = split /\x00/, $_[0]; 1178 my (%msg) = @_;
877 1179
878 if (exists $res{npc_dialog}) { 1180 if (exists $msg{npc_dialog}) {
879 # start npc chat dialog 1181 # start npc chat dialog
880 $self->{npc_dialog} = new CFClient::NPCDialog:: 1182 $self->{npc_dialog} = new CFPlus::NPCDialog::
881 dx => $x, 1183 token => $msg{npc_dialog},
882 dy => $y,
883 title => "$res{npc_dialog} (NPC)", 1184 title => "$msg{npc_dialog}[0] (NPC)",
884 conn => $self, 1185 conn => $self,
885 ; 1186 ;
886 } 1187 }
887 }); 1188 });
888 } 1189 }
891} 1192}
892 1193
893sub destroy { 1194sub destroy {
894 my ($self) = @_; 1195 my ($self) = @_;
895 1196
896 $self->{npc_dialog}->destroy 1197 (delete $self->{npc_dialog})->destroy
897 if $self->{npc_dialog}; 1198 if $self->{npc_dialog};
898 1199
899 $self->SUPER::destroy; 1200 $self->SUPER::destroy;
900}
901 1201
1202 %$self = ();
1203}
1204
902package CFClient::NPCDialog; 1205package CFPlus::NPCDialog;
903 1206
904our @ISA = 'CFClient::UI::FancyFrame'; 1207our @ISA = 'CFPlus::UI::Toplevel';
905 1208
906sub new { 1209sub new {
907 my $class = shift; 1210 my $class = shift;
908 1211
909 my $self = $class->SUPER::new ( 1212 my $self = $class->SUPER::new (
912 name => "npc_dialog", 1215 name => "npc_dialog",
913 force_w => $::WIDTH * 0.7, 1216 force_w => $::WIDTH * 0.7,
914 force_h => $::HEIGHT * 0.7, 1217 force_h => $::HEIGHT * 0.7,
915 title => "NPC Dialog", 1218 title => "NPC Dialog",
916 kw => { hi => 0, yes => 0, no => 0 }, 1219 kw => { hi => 0, yes => 0, no => 0 },
1220 has_close_button => 1,
917 @_, 1221 @_,
918 ); 1222 );
919 1223
920 Scalar::Util::weaken (my $this = $self); 1224 CFPlus::weaken (my $this = $self);
1225
1226 $self->connect (delete => sub { $this->destroy; 1 });
921 1227
922 # better use a pane... 1228 # better use a pane...
923 $self->add (my $hbox = new CFClient::UI::HBox); 1229 $self->add (my $hbox = new CFPlus::UI::HBox);
924 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1230 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
925 1231
926 $hbox->add (my $vbox = new CFClient::UI::VBox); 1232 $hbox->add (my $vbox = new CFPlus::UI::VBox);
927 1233
928 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1234 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
929 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1235 $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" 1236 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 { 1237 on_activate => sub {
936 my ($entry, $text) = @_; 1238 my ($entry, $text) = @_;
937 1239
938 return unless $text =~ /\S/; 1240 return unless $text =~ /\S/;
939 1241
942 1244
943 0 1245 0
944 }, 1246 },
945 ); 1247 );
946 1248
947 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1249 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
948 1250
949 $self->{bye_button} = new CFClient::UI::Button 1251 $self->{bye_button} = new CFPlus::UI::Button
950 text => "Bye (close)", 1252 text => "Bye (close)",
951 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.",
952 on_activate => sub { $this->destroy; 0 }, 1254 on_activate => sub { $this->destroy; 1 },
953 ; 1255 ;
954 1256
955 $self->update_options; 1257 $self->update_options;
956 1258
957 $self->{token} = $self->{conn}->ext_token; 1259 $self->{id} = "npc-channel-" . $self->{conn}->token;
958 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1260 $self->{conn}->connect_ext ($self->{id} => sub {
959 $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});
960 1265
961 $self->{entry}->grab_focus; 1266 $self->{entry}->grab_focus;
962 1267
963 $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 });
964 1272
965 $self->show; 1273 $self->show;
966 $self 1274 $self
967}; 1275};
968 1276
969sub update_options { 1277sub update_options {
970 my ($self) = @_; 1278 my ($self) = @_;
971 1279
972 Scalar::Util::weaken $self; 1280 CFPlus::weaken $self;
973 1281
974 $self->{options}->clear; 1282 $self->{options}->clear;
975 $self->{options}->add ($self->{bye_button}); 1283 $self->{options}->add ($self->{bye_button});
976 1284
977 for my $kw (sort keys %{ $self->{kw} }) { 1285 for my $kw (sort keys %{ $self->{kw} }) {
978 $self->{options}->add (new CFClient::UI::Button 1286 $self->{options}->add (new CFPlus::UI::Button
979 text => $kw, 1287 text => $kw,
980 on_activate => sub { 1288 on_activate => sub {
981 $self->send ($kw); 1289 $self->send ($kw);
982 0 1290 0
983 }, 1291 },
984 ); 1292 );
985 } 1293 }
986} 1294}
987 1295
988sub feed { 1296sub feed {
989 my ($self, $data) = @_; 1297 my ($self, $type, @arg) = @_;
990 1298
991 Scalar::Util::weaken $self; 1299 CFPlus::weaken $self;
992 1300
993 my ($type, $msg) = split / /, $data, 2;
994
995 if ($type eq "msg") { 1301 if ($type eq "update") {
996 my ($msg, @kw) = split /\x00/, $msg; 1302 my (%info) = @arg;
997 1303
998 utf8::decode $_ for ($msg, @kw); 1304 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1305 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
999 1306
1000 $self->{kw}{$_} = 1 for @kw; 1307 if (exists $info{msg}) {
1001 1308 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} }; 1309 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1004 my @link; 1310 my @link;
1005 $msg =~ s{ 1311 $text =~ s{
1006 ($match) 1312 ($match)
1007 }{ 1313 }{
1008 my $kw = $1; 1314 my $kw = $1;
1009 1315
1010 push @link, new CFClient::UI::Label 1316 push @link, new CFPlus::UI::Label
1011 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1317 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1012 can_hover => 1, 1318 can_hover => 1,
1013 can_events => 1, 1319 can_events => 1,
1014 padding_x => 0, 1320 padding_x => 0,
1015 padding_y => 0, 1321 padding_y => 0,
1016 on_button_up => sub { 1322 on_button_up => sub {
1017 $self->send ($kw); 1323 $self->send ($kw);
1018 }; 1324 };
1019 1325
1020 chr 0xfffc 1326 "\x{fffc}"
1021 }giex; 1327 }giex;
1022 1328
1023 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1329 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1024 $self->{textview}->scroll_to_bottom; 1330 $self->{textview}->scroll_to_bottom;
1331 }
1332
1025 $self->update_options; 1333 $self->update_options;
1026 } else { 1334 } else {
1027 $self->destroy; 1335 $self->destroy;
1028 } 1336 }
1029 1337
1031} 1339}
1032 1340
1033sub send { 1341sub send {
1034 my ($self, $msg) = @_; 1342 my ($self, $msg) = @_;
1035 1343
1036 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1344 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1037 $self->{textview}->scroll_to_bottom; 1345 $self->{textview}->scroll_to_bottom;
1038 1346
1039 utf8::encode $msg;
1040 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1347 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1041} 1348}
1042 1349
1043sub destroy { 1350sub destroy {
1044 my ($self) = @_; 1351 my ($self) = @_;
1045 1352
1046 #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
1047 1354
1355 if ($self->{conn}) {
1048 $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};
1049 delete $self->{conn}{npc_dialog}; 1357 delete $self->{conn}{npc_dialog};
1050 $self->{conn}->disconnect_ext ($self->{token}); 1358 $self->{conn}->disconnect_ext ($self->{id});
1359 }
1051 1360
1052 $self->SUPER::destroy; 1361 $self->SUPER::destroy;
1053} 1362}
1054 1363
10551; 13641
1365

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines