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

Diff Legend

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