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.9 by elmex, Mon May 29 19:30:28 2006 UTC vs.
Revision 1.21 by root, Mon Jun 5 21:10:04 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient;
8use CFClient::UI; 9use CFClient::UI;
9 10
10use base 'Crossfire::Protocol::Base'; 11use base 'Crossfire::Protocol::Base';
11 12
12sub new { 13sub new {
… …
14 15
15 my $self = $class->SUPER::new (@_); 16 my $self = $class->SUPER::new (@_);
16 17
17 $self->{map_widget}->clr_commands; 18 $self->{map_widget}->clr_commands;
18 19
19 my $parser = new Pod::POM; 20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
20 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod"); 21 my ($pom) = @_;
21 22
23 my @cmd_help;
24
22 for my $head2 ($pod->head1->[-2]->head2) { 25 for my $head2 ($pom->head1->[-2]->head2) {
23 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
24 or next; 27 or next;
25 28
26 my $cmd = $1; 29 my $cmd = $1;
27 my @args = split /\|/, $2; 30 my @args = split /\|/, $2;
28 @args = (".*") unless @args; 31 @args = (".*") unless @args;
29 32
30 $_ = $_ eq ".*" ? "" : " $_" 33 $_ = $_ eq ".*" ? "" : " $_"
31 for @args; 34 for @args;
32 35
33 my $text = CFClient::pod_to_pango $head2->content; 36 my $text = CFClient::pod_to_pango $head2->content;
34 37
35 $self->{map_widget}->add_command ("$cmd$_", $text) 38 push @cmd_help, ["$cmd$_", $text]
36 for sort { (length $a) <=> (length $b) } 39 for sort { (length $a) <=> (length $b) }
37 @args; 40 @args;
41 }
42
43 \@cmd_help
38 } 44 };
45
46 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help;
39 48
40 $self->{noface} = new_from_file CFClient::Texture 49 $self->{noface} = new_from_file CFClient::Texture
41 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
42 51
43 $self->{open_container} = 0; 52 $self->{open_container} = 0;
… …
268 unless ($id) { 277 unless ($id) {
269 # create new id for face 278 # create new id for face
270 # I love transactions 279 # I love transactions
271 for (1..100) { 280 for (1..100) {
272 my $txn = $CFClient::DB_ENV->txn_begin; 281 my $txn = $CFClient::DB_ENV->txn_begin;
273 my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW); 282 my $status = $self->{facemap}->db_get (id => $id);
274 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 283 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
275 $id = ($id || 16) + 1; 284 $id = ($id || 16) + 1;
276 if ($self->{facemap}->put (id => $id) == 0 285 if ($self->{facemap}->put (id => $id) == 0
277 && $self->{facemap}->put ($hash => $id) == 0) { 286 && $self->{facemap}->put ($hash => $id) == 0) {
278 $txn->txn_commit; 287 $txn->txn_commit;
279 288
280 goto gotid; 289 goto gotid;
281 } 290 }
282 } 291 }
283 $txn->abort; 292 $txn->txn_abort;
284 } 293 }
285 294
286 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 295 CFClient::fatal "maximum number of transaction retries reached - database problems?";
287 } 296 }
288 297
… …
339 348
340 $prompt = $LAST_QUERY unless length $prompt; 349 $prompt = $LAST_QUERY unless length $prompt;
341 $LAST_QUERY = $prompt; 350 $LAST_QUERY = $prompt;
342 351
343 my $dialog = new CFClient::UI::FancyFrame 352 my $dialog = new CFClient::UI::FancyFrame
353 x => "center",
354 y => "center",
344 title => "Query", 355 title => "Query",
345 child => my $vbox = new CFClient::UI::VBox, 356 child => my $vbox = new CFClient::UI::VBox,
346 on_visibility_change => sub {
347 my ($self, $visible) = @_;
348 $self->center if $visible;
349 },
350 ; 357 ;
351 358
352 $vbox->add (new CFClient::UI::Label 359 $vbox->add (new CFClient::UI::Label
353 max_w => $::WIDTH * 0.4, 360 max_w => $::WIDTH * 0.4,
354 ellipsise => 0, 361 ellipsise => 0,
… …
431 join "\n", map "$time $_", split /\n/, $text); 438 join "\n", map "$time $_", split /\n/, $text);
432 439
433 $self->{statusbox}->add ($text, 440 $self->{statusbox}->add ($text,
434 group => $text, 441 group => $text,
435 fg => $color[$color], 442 fg => $color[$color],
436 timeout => 10, 443 timeout => $color >= 2 ? 60 : 10,
437 tooltip_font => $::FONT_FIXED, 444 tooltip_font => $::FONT_FIXED,
438 ); 445 );
439} 446}
440 447
441sub drawextinfo { 448sub drawextinfo {
… …
447sub spell_add { 454sub spell_add {
448 my ($self, $spell) = @_; 455 my ($self, $spell) = @_;
449 456
450 # TODO 457 # TODO
451 # create a widget dynamically, using spell face (CF::Protocol downloads them) 458 # create a widget dynamically, using spell face (CF::Protocol downloads them)
459 $::SETUP_SPELLS->add_spell ($spell);
460
452 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 461 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
453 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 462 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
454} 463}
455 464
456sub spell_delete { 465sub spell_delete {
457 my ($self, $spell) = @_; 466 my ($self, $spell) = @_;
467 $::SETUP_SPELLS->remove_spell ($spell);
458} 468}
459 469
460sub addme_success { 470sub addme_success {
461 my ($self) = @_; 471 my ($self) = @_;
462 472
463 $self->send ("command output-sync $::CFG->{output_sync}"); 473 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
464 $self->send ("command output-count $::CFG->{output_count}"); 474 my ($pom) = @_;
465 475
466 my $parser = new Pod::POM;
467 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
468
469 my %skill_tooltip; 476 my %skill_help;
470 477
471 for my $head2 ($pod->head1->[-2]->head2) { 478 for my $head2 ($pom->head1->[3]->head2) {
472 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content; 479 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;
480 }
481
482 \%skill_help
473 } 483 };
474 484
475 for my $skill (values %{$self->{skill_info}}) { 485 for my $skill (values %{$self->{skill_info}}) {
476 $self->{map_widget}->add_command ("ready_skill $skill", 486 $self->{map_widget}->add_command ("ready_skill $skill",
477 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 487 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
478 . $skill_tooltip{$skill}); 488 . $skill_help->{$skill});
479 $self->{map_widget}->add_command ("use_skill $skill", 489 $self->{map_widget}->add_command ("use_skill $skill",
480 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 490 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
481 . $skill_tooltip{$skill}); 491 . $skill_help->{$skill});
482 } 492 }
483} 493}
484 494
485sub eof { 495sub eof {
486 my ($self) = @_; 496 my ($self) = @_;
… …
511 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 521 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
512 522
513 $self->send ("requestinfo image_sums $face $face"); 523 $self->send ("requestinfo image_sums $face $face");
514 524
515 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 525 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
516 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 526 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
517 } elsif (!exists $self->{num_faces}) { 527 } elsif (!exists $self->{num_faces}) {
518 $self->send ("requestinfo image_info"); 528 $self->send ("requestinfo image_info");
519 529
520 $self->{num_faces} = 0; 530 $self->{num_faces} = 0;
521 531
522 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 532 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
523 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 533 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
524 } 534 }
525} 535}
526 536
527sub update_floorbox { 537sub update_floorbox {
528 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 538 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
… …
552} 562}
553 563
554sub set_opencont { 564sub set_opencont {
555 my ($conn, $tag, $name) = @_; 565 my ($conn, $tag, $name) = @_;
556 $conn->{open_container} = $tag; 566 $conn->{open_container} = $tag;
557 $::INVR_LBL->set_text ($name); 567
568 $::INV_RIGHT_HB->clear ();
569 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);
570
571 if ($tag != 0) { # Floor isn't closable, is it?
572 $::INV_RIGHT_HB->add (new CFClient::UI::Button
573 text => "Close container",
574 tooltip => "Close the currently open container (if one is open)",
575 on_activate => sub {
576 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
577 if $tag != 0;
578 #if $CONN->{open_container} != 0;
579 },
580 );
581 }
582
558 $::INVR->set_items ($conn->{container}{$tag}); 583 $::INVR->set_items ($conn->{container}{$tag});
559} 584}
560 585
561sub update_container { 586sub update_container {
562 my ($tag) = @_; 587 my ($tag) = @_;
… …
591 if ($tag == 0) { 616 if ($tag == 0) {
592 update_floorbox; 617 update_floorbox;
593 update_container (0); 618 update_container (0);
594 } elsif ($tag == $self->{player}{tag}) { 619 } elsif ($tag == $self->{player}{tag}) {
595 $::INV->set_items ($self->{container}{$tag}) 620 $::INV->set_items ($self->{container}{$tag})
621 } else {
622 update_container ($tag);
596 } 623 }
597 624
598# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 625# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
599} 626}
600 627
… …
608 update_floorbox; 635 update_floorbox;
609 update_container ($_->{tag}); 636 update_container ($_->{tag});
610 } elsif ($_->{container} == $self->{player}{tag}) { 637 } elsif ($_->{container} == $self->{player}{tag}) {
611 $::INV->set_items ($self->{container}{$self->{player}{tag}}) 638 $::INV->set_items ($self->{container}{$self->{player}{tag}})
612 } else { 639 } else {
613 update_container ($_->{tag}); 640 update_container ($_->{container});
614 } 641 }
615 } 642 }
616} 643}
617 644
618sub item_update { 645sub item_update {
… …
643} 670}
644 671
645sub player_update { 672sub player_update {
646 my ($self, $player) = @_; 673 my ($self, $player) = @_;
647 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 674 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
675
676 # do it here because it is ignored earlier, and there is no "login" event
677 $self->send_command ("output-sync $::CFG->{output_sync}");
678 $self->send_command ("output-count $::CFG->{output_count}");
648} 679}
649 680
6501; 6811;

Diff Legend

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