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.67 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.102 by root, Wed Apr 18 18:16:16 2007 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFPlus::DB;
9use CFClient::UI; 10use CFPlus::UI;
10use CFClient::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 %{$arg{setup_req} || {}},
26 },
27 );
18 28
19 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
20 30
21 my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 31 my @cmd_help = map {
22 my ($pom) = @_;
23
24 my @cmd_help;
25
26 for my $head2 ($pom->head1->[-2]->head2) {
27 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 33 or die "unparseable command help: $_->{kw}[0]";
29 34
30 my $cmd = $1; 35 my $cmd = $1;
31 my @args = split /\|/, $2; 36 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 37 @args = (".*") unless @args;
33 38
39 my (undef, @par) = CFPlus::Pod::section_of $_;
40 my $text = CFPlus::Pod::as_label @par;
41
34 $_ = $_ eq ".*" ? "" : " $_" 42 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 43 for @args;
36 44
37 my $text = CFClient::Pod::as_markup $head2->content; 45 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
41 @args; 47 @args
48 } sort { $a->{par} <=> $b->{par} }
49 CFPlus::Pod::find command => "*";
50
51 $self->connect_ext (event_capabilities => sub {
52 my ($cap) = @_;
53
54 if (my $ts = $cap->{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) {
56 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]);
59
60 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize};
62
63 $self->setup_req (mapsize => "${w}x${h}");
64 }
42 } 65 }
43
44 \@cmd_help
45 }; 66 });
46 67
47 $self->{map_widget}->add_command (@$_) 68 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 69 for @cmd_help;
49 70
71 {
72 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
73 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
74 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
75 }
76
77 {
50 $self->{noface} = new_from_file CFClient::Texture 78 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 79 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
80 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
81 }
52 82
53 $self->{open_container} = 0; 83 $self->{open_container} = 0;
54 84
55 # "global"
56 $self->{tilecache} = CFClient::db_table "tilecache";
57 $self->{facemap} = CFClient::db_table "facemap";
58
59 # per server 85 # per server
60 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 86 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61 87
62 $self 88 $self
63} 89}
64 90
65sub logprint { 91sub logprint {
… …
254 my @skills = keys %{ $self->{skill_info} }; 280 my @skills = keys %{ $self->{skill_info} };
255 281
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 282 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257 $sktbl->clear; 283 $sktbl->clear;
258 284
259 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 285 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
260 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 286 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
261 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 287 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
262 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 288 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
263 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 289 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
264 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 290 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
291
292 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
293
294 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
295 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
265 296
266 my ($x, $y) = (0, 1); 297 my ($x, $y) = (0, 1);
267 for ( 298 for (
268 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 299 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
269 map [$_, $self->{skill_info}{$_}], 300 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_}, 301 grep exists $stats->{$_},
271 @skills 302 @skills
272 ) { 303 ) {
273 my ($idx, $name) = @$_; 304 my ($idx, $name) = @$_;
274 305
306 my $spell_cb = sub {
307 my ($widget, $ev) = @_;
308
309 if ($ev->{button} == 1) {
310 $::CONN->user_send ("ready_skill $name");
311 } elsif ($ev->{button} == 2) {
312 $::CONN->user_send ("use_skill $name");
313 } elsif ($ev->{button} == 3) {
314 my $shortname = CFPlus::shorten $name, 14;
315 (new CFPlus::UI::Menu
316 items => [
317 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
318 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
319 ],
320 )->popup ($ev);
321 } else {
322 return 0;
323 }
324
325 1
326 };
327
275 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 328 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
276 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 329 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
277 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 330 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
278 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 331 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
279 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 332 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
333 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
280 334
281 $x++ and ($x, $y) = (0, $y + 1); 335 $x++ and ($x, $y) = (0, $y + 1);
282 } 336 }
283 } 337 }
284 338
… …
286 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
287 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
288 } 342 }
289} 343}
290 344
345sub macro_send {
346 my ($self, $macro) = @_;
347
348 for my $cmd (@{ $macro->{action} }) {
349 $self->send_command ($cmd);
350 }
351}
352
291sub user_send { 353sub user_send {
292 my ($self, $command) = @_; 354 my ($self, $command) = @_;
293 355
356 $self->{record}->($command)
294 if ($self->{record}) { 357 if $self->{record};
295 push @{$self->{record}}, $command;
296 }
297 358
298 $self->logprint ("send: ", $command); 359 $self->logprint ("send: ", $command);
299 $self->send_command ($command); 360 $self->send_command ($command);
300 ::status ($command); 361 ::status ($command);
301} 362}
302 363
303sub start_record { 364sub record {
304 my ($self) = @_; 365 my ($self, $cb) = @_;
305 366
306 $self->{record} = []; 367 $self->{record} = $cb;
307}
308
309sub stop_record {
310 my ($self) = @_;
311 return delete $self->{record};
312} 368}
313 369
314sub map_scroll { 370sub map_scroll {
315 my ($self, $dx, $dy) = @_; 371 my ($self, $dx, $dy) = @_;
316 372
… …
318} 374}
319 375
320sub feed_map1a { 376sub feed_map1a {
321 my ($self, $data) = @_; 377 my ($self, $data) = @_;
322 378
323 $self->{map}->map1a_update ($data); 379 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
324 $self->{map_widget}->update; 380 $self->{map_widget}->update;
325} 381}
326 382
327sub magicmap { 383sub magicmap {
328 my ($self, $w, $h, $x, $y, $data) = @_; 384 my ($self, $w, $h, $x, $y, $data) = @_;
… …
337 or return; 393 or return;
338 394
339 my ($hash, $x, $y, $w, $h) = @$map_info; 395 my ($hash, $x, $y, $w, $h) = @$map_info;
340 396
341 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 397 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
342 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 398 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
343 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 399 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
344} 400}
345 401
346sub map_clear { 402sub map_clear {
347 my ($self) = @_; 403 my ($self) = @_;
… …
351 407
352 $self->{map}->clear; 408 $self->{map}->clear;
353 delete $self->{map_widget}{magicmap}; 409 delete $self->{map_widget}{magicmap};
354} 410}
355 411
412sub bg_fetch {
413 my ($self) = @_;
414
415 my $id;
416
417 do {
418 $id = pop @{$self->{bg_fetch}}
419 or return;
420 } while $self->{texture}[$id];
421
422 CFPlus::DB::get tilecache => $id, sub {
423 my ($data) = @_;
424
425 return unless $self->{map}; # stop when destroyed
426
427 $self->set_texture ($id => $data)
428 if defined $data;
429
430 $self->bg_fetch;
431 };
432}
356 433
357sub load_map($$$) { 434sub load_map($$$) {
358 my ($self, $hash, $x, $y) = @_; 435 my ($self, $hash, $x, $y) = @_;
359 436
360 if (defined (my $data = $self->{mapcache}->get ($hash))) { 437 my $gen = $self->{map_change_gen};
438
439 CFPlus::DB::get $self->{mapcache} => $hash, sub {
440 return unless $gen == $self->{map_change_gen};
441
442 my ($data) = @_;
443
444 if (defined $data) {
361 $data = Compress::LZF::decompress $data; 445 $data = Compress::LZF::decompress $data;
362 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 446 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
363 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
364 my $data = $self->{tilecache}->get ($id)
365 or next;
366 447
367 $self->set_texture ($id => $data); 448 my $inprogress = @{ $self->{bg_fetch} || [] };
449 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
450 $self->bg_fetch unless $inprogress;
368 } 451 }
369 } 452 };
370} 453}
371 454
372# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 455# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
373# (server resource,s latency, bandwidth), so this hack is warranted. 456# (server resource,s latency, bandwidth), so this hack is warranted.
374# the right fix is to make real tiled maps with an overview file 457# the right fix is to make real tiled maps with an overview file
… …
438 521
439 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 522 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
440 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 523 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
441 524
442 } else { 525 } else {
526 my $gen = $self->{map_change_gen};
443 $self->send_mapinfo ("spatial $path$tile", sub { 527 $self->send_mapinfo ("spatial $path$tile", sub {
528 return unless $gen == $self->{map_change_gen};
529
444 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 530 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
445 531
446 return if $mode ne "spatial"; 532 return if $mode ne "spatial";
447 533
448 $x += $self->{map}->ox; 534 $x += $self->{map}->ox;
… …
462 548
463sub map_change { 549sub map_change {
464 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 550 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 551
466 $self->flush_map; 552 $self->flush_map;
553
554 ++$self->{map_change_gen};
467 555
468 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 556 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
469 557
470 my $mapmapw = $self->{mapmap}->{w}; 558 my $mapmapw = $self->{mapmap}->{w};
471 my $mapmaph = $self->{mapmap}->{h}; 559 my $mapmaph = $self->{mapmap}->{h};
… …
488 $self->load_map ($hash, $x, $y); 576 $self->load_map ($hash, $x, $y);
489 $self->flood_fill (0, 0, 0, "", $hash, $flags); 577 $self->flood_fill (0, 0, 0, "", $hash, $flags);
490} 578}
491 579
492sub face_find { 580sub face_find {
493 my ($self, $facenum, $face) = @_; 581 my ($self, $facenum, $face, $cb) = @_;
494 582
495 my $hash = "$face->{chksum},$face->{name}"; 583 my $hash = "$face->{chksum},$face->{name}";
496 584
497 my $id = $self->{facemap}->get ($hash); 585 my $id = CFPlus::DB::get_tile_id_sync $hash;
498 586
499 unless ($id) {
500 # create new id for face
501 # I love transactions
502 for (1..100) {
503 my $txn = $CFClient::DB_ENV->txn_begin;
504 my $status = $self->{facemap}->db_get (id => $id);
505 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
506 $id = ($id || 64) + 1;
507 if ($self->{facemap}->put (id => $id) == 0
508 && $self->{facemap}->put ($hash => $id) == 0) {
509 $txn->txn_commit;
510
511 goto gotid;
512 }
513 }
514 $txn->txn_abort;
515 }
516
517 CFClient::fatal "maximum number of transaction retries reached - database problems?";
518 }
519
520gotid:
521 $face->{id} = $id; 587 $face->{id} = $id;
522 $self->{map}->set_face ($facenum => $id);
523 $self->{faceid}[$facenum] = $id;#d# 588 $self->{faceid}[$facenum] = $id;
524 589
525 my $face = $self->{tilecache}->get ($id); 590 $self->{map}->set_tileid ($facenum => $id);
526 591
527 if ($face) { 592 CFPlus::DB::get tilecache => $id, $cb;
528 #$self->face_prefetch;
529 $face
530 } else {
531 my $tex = $self->{noface};
532 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
533 undef
534 };
535} 593}
536 594
537sub face_update { 595sub face_update {
538 my ($self, $facenum, $face, $changed) = @_; 596 my ($self, $facenum, $face, $changed) = @_;
539 597
540 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 598 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
599 if $changed;
541 600
542 $self->set_texture ($face->{id} => delete $face->{image}); 601 $self->set_texture ($face->{id} => delete $face->{image});
602}
603
604sub smooth_update {
605 my ($self, $facenum, $face) = @_;
606
607 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
543} 608}
544 609
545sub set_texture { 610sub set_texture {
546 my ($self, $id, $data) = @_; 611 my ($self, $id, $data) = @_;
547 612
548 $self->{texture}[$id] ||= do { 613 $self->{texture}[$id] = my $tex =
549 my $tex =
550 new_from_image CFClient::Texture 614 new_from_image CFPlus::Texture
551 $data, minify => 1, mipmap => 1; 615 $data, minify => 1, mipmap => 1;
552 616
553 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 617 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554 $self->{map_widget}->update; 618 $self->{map_widget}->update;
555
556 $tex
557 };
558} 619}
559 620
560sub sound_play { 621sub sound_play {
561 my ($self, $x, $y, $soundnum, $type) = @_; 622 my ($self, $x, $y, $soundnum, $type) = @_;
562 623
… …
591 [0.75, 0.61, 0.20], 652 [0.75, 0.61, 0.20],
592 [0.99, 0.77, 0.26], 653 [0.99, 0.77, 0.26],
593 [0.74, 0.65, 0.41], 654 [0.74, 0.65, 0.41],
594 ); 655 );
595 656
657 my $fg = $color[$color % @color];
658
596 $self->logprint ("info: ", $text); 659 $self->logprint ("info: ", $text);
597 660
598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
599
600 # try to create single paragraphs of multiple lines sent by the server 661 ## try to create single paragraphs of multiple lines sent by the server
662 # no longer neecssary with TRT servers
601 $text =~ s/(?<=\S)\n(?=\w)/ /g; 663 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
602 664
603 $text = CFClient::asxml $text; 665 $text = CFPlus::asxml $text;
604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 666 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 667 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
606 668
607 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 669 ::message ({ fg => $fg, markup => $_ })
608 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 670 for split /\n/, $text;
609 $self->{logview}->scroll_to_bottom;
610 671
611 $self->{statusbox}->add ($text, 672 $self->{statusbox}->add ($text,
612 group => $text, 673 group => $text,
613 fg => $color[$color], 674 fg => $fg,
614 timeout => $color >= 2 ? 60 : 10, 675 timeout => $color >= 2 ? 180 : 10,
615 tooltip_font => $::FONT_FIXED, 676 tooltip_font => $::FONT_FIXED,
616 ); 677 );
617} 678}
618 679
619sub drawextinfo { 680sub drawextinfo {
… …
628 # try to create single paragraphs out of the multiple lines sent by the server 689 # try to create single paragraphs out of the multiple lines sent by the server
629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 690 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
630 $spell->{message} =~ s/\n+$//; 691 $spell->{message} =~ s/\n+$//;
631 $spell->{message} ||= "Server did not provide a description for this spell."; 692 $spell->{message} ||= "Server did not provide a description for this spell.";
632 693
633 $::SPELL_PAGE->add_spell ($spell); 694 $::SPELL_LIST->add_spell ($spell);
634 695
635 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); 696 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
636 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message}); 697 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
637} 698}
638 699
639sub spell_delete { 700sub spell_delete {
640 my ($self, $spell) = @_; 701 my ($self, $spell) = @_;
641 702
642 $::SPELL_PAGE->remove_spell ($spell); 703 $::SPELL_LIST->remove_spell ($spell);
704}
705
706sub setup {
707 my ($self, $setup) = @_;
708
709 $self->{map_widget}->set_tilesize ($self->{tilesize});
710 $::MAP->resize ($self->{mapw}, $self->{maph});
643} 711}
644 712
645sub addme_success { 713sub addme_success {
646 my ($self) = @_; 714 my ($self) = @_;
647 715
648 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
649 my ($pom) = @_;
650
651 my %skill_help; 716 my %skill_help;
652 717
653 for my $head2 ($pom->head1->[3]->head2) { 718 for my $node (CFPlus::Pod::find skill_description => "*") {
654 $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content; 719 my (undef, @par) = CFPlus::Pod::section_of $node;
655 } 720 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
656
657 \%skill_help
658 }; 721 };
659 722
660 for my $skill (values %{$self->{skill_info}}) { 723 for my $skill (values %{$self->{skill_info}}) {
661 $self->{map_widget}->add_command ("ready_skill $skill", 724 $self->{map_widget}->add_command ("ready_skill $skill",
662 (CFClient::asxml "Ready the skill '$skill'\n\n") 725 (CFPlus::asxml "Ready the skill '$skill'\n\n")
663 . $skill_help->{$skill}); 726 . $skill_help{$skill});
664 $self->{map_widget}->add_command ("use_skill $skill", 727 $self->{map_widget}->add_command ("use_skill $skill",
665 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 728 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
666 . $skill_help->{$skill}); 729 . $skill_help{$skill});
667 } 730 }
668} 731}
669 732
670sub eof { 733sub eof {
671 my ($self) = @_; 734 my ($self) = @_;
… …
695 758
696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 759 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
697 760
698 $self->send ("requestinfo image_sums $face $face"); 761 $self->send ("requestinfo image_sums $face $face");
699 762
700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 763 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 764 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
702 } elsif (!exists $self->{num_faces}) { 765 } elsif (!exists $self->{num_faces}) {
703 $self->send ("requestinfo image_info"); 766 $self->send ("requestinfo image_info");
704 767
705 $self->{num_faces} = 0; 768 $self->{num_faces} = 0;
706 769
707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 770 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 771 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
709 } 772 }
710} 773}
711 774
712sub update_floorbox { 775sub update_floorbox {
713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 776 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
714 return unless $::CONN; 777 return unless $::CONN;
715 778
716 $::FLOORBOX->clear; 779 $::FLOORBOX->clear;
717 780
718 my $row; 781 my $row;
719 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 782 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
720 if ($row < 6) { 783 if ($row < 6) {
721 local $_->{face_widget}; # hack to force recreation of widget 784 local $_->{face_widget}; # hack to force recreation of widget
722 local $_->{desc_widget}; # hack to force recreation of widget 785 local $_->{desc_widget}; # hack to force recreation of widget
723 CFClient::Item::update_widgets $_; 786 CFPlus::Item::update_widgets $_;
724 787
725 $::FLOORBOX->add (0, $row, $_->{face_widget}); 788 $::FLOORBOX->add (0, $row, $_->{face_widget});
726 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 789 $::FLOORBOX->add (1, $row, $_->{desc_widget});
727 790
728 $row++; 791 $row++;
729 } else { 792 } else {
730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 793 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
731 text => "More...", 794 text => "More...",
732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 795 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
733 ); 796 );
734 last; 797 last;
735 } 798 }
736 } 799 }
737 if ($::CONN->{open_container}) { 800 if ($::CONN->{open_container}) {
738 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 801 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
739 text => "Close container", 802 text => "Close container",
740 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 803 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
741 ); 804 );
742 } 805 }
743 }); 806 });
… …
749 my ($conn, $tag, $name) = @_; 812 my ($conn, $tag, $name) = @_;
750 $conn->{open_container} = $tag; 813 $conn->{open_container} = $tag;
751 update_floorbox; 814 update_floorbox;
752 815
753 $::INV_RIGHT_HB->clear (); 816 $::INV_RIGHT_HB->clear ();
754 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 817 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
755 818
756 if ($tag != 0) { # Floor isn't closable, is it? 819 if ($tag != 0) { # Floor isn't closable, is it?
757 $::INV_RIGHT_HB->add (new CFClient::UI::Button 820 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
758 text => "Close container", 821 text => "Close container",
759 tooltip => "Close the currently open container (if one is open)", 822 tooltip => "Close the currently open container (if one is open)",
760 on_activate => sub { 823 on_activate => sub {
761 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 824 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
762 if $tag != 0; 825 if $tag != 0;
… …
770} 833}
771 834
772sub update_containers { 835sub update_containers {
773 my ($self) = @_; 836 my ($self) = @_;
774 837
775 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 838 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
776 my $todo = delete $self->{update_container} 839 my $todo = delete $self->{update_container}
777 or return; 840 or return;
778 841
779 for my $tag (keys %$todo) { 842 for my $tag (keys %$todo) {
780 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 843 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
817sub item_update { 880sub item_update {
818 my ($self, $item) = @_; 881 my ($self, $item) = @_;
819 882
820 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 883 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
821 884
822 CFClient::Item::update_widgets $item; 885 CFPlus::Item::update_widgets $item;
823 886
824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 887 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
825 set_opencont ($::CONN, 0, "Floor"); 888 set_opencont ($::CONN, 0, "Floor");
826 889
827 } elsif ($item->{flags} & F_OPEN) { 890 } elsif ($item->{flags} & F_OPEN) {
828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 891 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
829 892
830 } else { 893 } else {
831 $self->{update_container}{$item->{container}}++; 894 $self->{update_container}{$item->{container}}++;
832 $self->update_containers; 895 $self->update_containers;
833 } 896 }
… …
858 $::SERVER_INFO->set_markup ( 921 $::SERVER_INFO->set_markup (
859 "server <tt>$self->{host}:$self->{port}</tt>\n" 922 "server <tt>$self->{host}:$self->{port}</tt>\n"
860 . "protocol version <tt>$self->{version}</tt>\n" 923 . "protocol version <tt>$self->{version}</tt>\n"
861 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 924 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
862 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 925 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
926 . "editing support $yesno[!!$self->{editor_support}]\n"
927 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
863 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 928 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
864 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 929 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
865 . "map size $self->{mapw}×$self->{maph}\n" 930 . "map size $self->{mapw}×$self->{maph}\n"
866 ); 931 );
932
933 ::setup_build_button ($self->{editor_support}->{builder_ui});
867} 934}
868 935
869sub logged_in { 936sub logged_in {
870 my ($self) = @_; 937 my ($self) = @_;
871 938
872 $self->send_ext_req (cfplus_support => "1", sub { 939 $self->send_ext_req (cfplus_support => version => 1, sub {
873 $self->{cfplus_ext} = $_[0]; 940 $self->{cfplus_ext} = $_[0]{version};
874 $self->update_server_info; 941 $self->update_server_info;
942
943 if ($self->{cfplus_ext} >= 2) {
944 $self->send_ext_req ("editor_support", sub {
945 $self->{editor_support} = $_[0];
946 $self->update_server_info;
947
948 0
949 });
950 }
951
952 0
875 }); 953 });
876 954
877 $self->update_server_info; 955 $self->update_server_info;
878 956
879 $self->send_command ("output-sync $::CFG->{output_sync}"); 957 $self->send_command ("output-sync $::CFG->{output_sync}");
880 $self->send_command ("output-count $::CFG->{output_count}"); 958 $self->send_command ("output-count $::CFG->{output_count}");
959 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
881 $self->send_command ("pickup $::CFG->{pickup}"); 960 $self->send_command ("pickup $::CFG->{pickup}");
961}
962
963sub buildat {
964 my ($self, $builditem, $x, $y) = @_;
965
966 if ($self->{cfplus_ext}) {
967 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
968 }
882} 969}
883 970
884sub lookat { 971sub lookat {
885 my ($self, $x, $y) = @_; 972 my ($self, $x, $y) = @_;
886 973
887 if ($self->{cfplus_ext}) { 974 if ($self->{cfplus_ext}) {
888 $self->send_ext_req (lookat => "$x $y", sub { 975 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
889 my %res = split /\x00/, $_[0]; 976 my ($msg) = @_;
890 977
891 if (exists $res{npc_dialog}) { 978 if (exists $msg->{npc_dialog}) {
892 # start npc chat dialog 979 # start npc chat dialog
893 $self->{npc_dialog} = new CFClient::NPCDialog:: 980 $self->{npc_dialog} = new CFPlus::NPCDialog::
894 dx => $x, 981 dx => $x,
895 dy => $y, 982 dy => $y,
896 title => "$res{npc_dialog} (NPC)", 983 title => "$msg->{npc_dialog} (NPC)",
897 conn => $self, 984 conn => $self,
898 ; 985 ;
899 } 986 }
900 }); 987 });
901 } 988 }
… …
904} 991}
905 992
906sub destroy { 993sub destroy {
907 my ($self) = @_; 994 my ($self) = @_;
908 995
909 $self->{npc_dialog}->destroy 996 (delete $self->{npc_dialog})->destroy
910 if $self->{npc_dialog}; 997 if $self->{npc_dialog};
911 998
912 $self->SUPER::destroy; 999 $self->SUPER::destroy;
913} 1000}
914 1001
915package CFClient::NPCDialog; 1002package CFPlus::NPCDialog;
916 1003
917our @ISA = 'CFClient::UI::FancyFrame'; 1004our @ISA = 'CFPlus::UI::Toplevel';
918 1005
919sub new { 1006sub new {
920 my $class = shift; 1007 my $class = shift;
921 1008
922 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
… …
929 kw => { hi => 0, yes => 0, no => 0 }, 1016 kw => { hi => 0, yes => 0, no => 0 },
930 has_close_button => 1, 1017 has_close_button => 1,
931 @_, 1018 @_,
932 ); 1019 );
933 1020
934 Scalar::Util::weaken (my $this = $self); 1021 CFPlus::weaken (my $this = $self);
935 1022
936 $self->connect (delete => sub { $this->destroy; 1 }); 1023 $self->connect (delete => sub { $this->destroy; 1 });
937 1024
938 # better use a pane... 1025 # better use a pane...
939 $self->add (my $hbox = new CFClient::UI::HBox); 1026 $self->add (my $hbox = new CFPlus::UI::HBox);
940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1027 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
941 1028
942 $hbox->add (my $vbox = new CFClient::UI::VBox); 1029 $hbox->add (my $vbox = new CFPlus::UI::VBox);
943 1030
944 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1031 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
945 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1032 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
946 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1033 tooltip => "#npc_message_entry",
947 . "Sometimes you have to tell an NPC something you cannot find out during "
948 . "a normal conversation (such as a password). In those cases you have to use "
949 . "this text entry. You can also enter responses manually instead of using the response "
950 . "buttons below.",
951 on_activate => sub { 1034 on_activate => sub {
952 my ($entry, $text) = @_; 1035 my ($entry, $text) = @_;
953 1036
954 return unless $text =~ /\S/; 1037 return unless $text =~ /\S/;
955 1038
… …
958 1041
959 0 1042 0
960 }, 1043 },
961 ); 1044 );
962 1045
963 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1046 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
964 1047
965 $self->{bye_button} = new CFClient::UI::Button 1048 $self->{bye_button} = new CFPlus::UI::Button
966 text => "Bye (close)", 1049 text => "Bye (close)",
967 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1050 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
968 on_activate => sub { $this->destroy; 1 }, 1051 on_activate => sub { $this->destroy; 1 },
969 ; 1052 ;
970 1053
971 $self->update_options; 1054 $self->update_options;
972 1055
973 $self->{token} = $self->{conn}->ext_token; 1056 $self->{id} = $self->{conn}->send_ext_req (
974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1057 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
975 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1058 sub { $this && $this->feed (@_) }
1059 );
976 1060
977 $self->{entry}->grab_focus; 1061 $self->{entry}->grab_focus;
978 1062
979 $self->{textview}->add_paragraph ({ 1063 $self->{textview}->add_paragraph ({
980 fg => [1, 1, 0, 1], 1064 fg => [1, 1, 0, 1],
… …
986}; 1070};
987 1071
988sub update_options { 1072sub update_options {
989 my ($self) = @_; 1073 my ($self) = @_;
990 1074
991 Scalar::Util::weaken $self; 1075 CFPlus::weaken $self;
992 1076
993 $self->{options}->clear; 1077 $self->{options}->clear;
994 $self->{options}->add ($self->{bye_button}); 1078 $self->{options}->add ($self->{bye_button});
995 1079
996 for my $kw (sort keys %{ $self->{kw} }) { 1080 for my $kw (sort keys %{ $self->{kw} }) {
997 $self->{options}->add (new CFClient::UI::Button 1081 $self->{options}->add (new CFPlus::UI::Button
998 text => $kw, 1082 text => $kw,
999 on_activate => sub { 1083 on_activate => sub {
1000 $self->send ($kw); 1084 $self->send ($kw);
1001 0 1085 0
1002 }, 1086 },
1003 ); 1087 );
1004 } 1088 }
1005} 1089}
1006 1090
1007sub feed { 1091sub feed {
1008 my ($self, $data) = @_; 1092 my ($self, $msg) = @_;
1009 1093
1010 Scalar::Util::weaken $self; 1094 CFPlus::weaken $self;
1011 1095
1012 my ($type, $msg) = split / /, $data, 2; 1096 if ($msg->{msgtype} eq "reply") {
1097 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1098 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1013 1099
1014 if ($type eq "msg") { 1100 my $text = "\n" . CFPlus::asxml $msg->{msg};
1015 my ($msg, @kw) = split /\x00/, $msg;
1016
1017 utf8::decode $_ for ($msg, @kw);
1018
1019 $self->{kw}{$_} = 1 for @kw;
1020
1021 $msg = "\n" . CFClient::UI::asxml $msg;
1022 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1101 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1023 my @link; 1102 my @link;
1024 $msg =~ s{ 1103 $text =~ s{
1025 ($match) 1104 ($match)
1026 }{ 1105 }{
1027 my $kw = $1; 1106 my $kw = $1;
1028 1107
1029 push @link, new CFClient::UI::Label 1108 push @link, new CFPlus::UI::Label
1030 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1109 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1031 can_hover => 1, 1110 can_hover => 1,
1032 can_events => 1, 1111 can_events => 1,
1033 padding_x => 0, 1112 padding_x => 0,
1034 padding_y => 0, 1113 padding_y => 0,
1035 on_button_up => sub { 1114 on_button_up => sub {
1036 $self->send ($kw); 1115 $self->send ($kw);
1037 }; 1116 };
1038 1117
1039 chr 0xfffc 1118 "\x{fffc}"
1040 }giex; 1119 }giex;
1041 1120
1042 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1121 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1043 $self->{textview}->scroll_to_bottom; 1122 $self->{textview}->scroll_to_bottom;
1044 $self->update_options; 1123 $self->update_options;
1045 } else { 1124 } else {
1046 $self->destroy; 1125 $self->destroy;
1047 } 1126 }
… …
1050} 1129}
1051 1130
1052sub send { 1131sub send {
1053 my ($self, $msg) = @_; 1132 my ($self, $msg) = @_;
1054 1133
1055 $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg }); 1134 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1056 $self->{textview}->scroll_to_bottom; 1135 $self->{textview}->scroll_to_bottom;
1057 1136
1058 utf8::encode $msg; 1137 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1059 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1060} 1138}
1061 1139
1062sub destroy { 1140sub destroy {
1063 my ($self) = @_; 1141 my ($self) = @_;
1064 1142
1065 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1143 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1066 1144
1145 if ($self->{conn}) {
1067 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1146 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1068 delete $self->{conn}{npc_dialog}; 1147 delete $self->{conn}{npc_dialog};
1069 $self->{conn}->disconnect_ext ($self->{token}); 1148 $self->{conn}->disconnect_ext ($self->{id});
1149 }
1070 1150
1071 $self->SUPER::destroy; 1151 $self->SUPER::destroy;
1072} 1152}
1073 1153
10741 11541
1155

Diff Legend

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