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.7 by root, Sat May 27 20:46:54 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;
… …
66} 75}
67 76
68sub user_send { 77sub user_send {
69 my ($self, $command) = @_; 78 my ($self, $command) = @_;
70 79
80 if ($self->{record}) {
81 push @{$self->{record}}, $command;
82 }
83
71 $self->send_command ($command); 84 $self->send_command ($command);
72 ::status $command; 85 ::status $command;
86}
87
88sub start_record {
89 my ($self) = @_;
90
91 $self->{record} = [];
92}
93
94sub stop_record {
95 my ($self) = @_;
96 return delete $self->{record};
73} 97}
74 98
75sub map_scroll { 99sub map_scroll {
76 my ($self, $dx, $dy) = @_; 100 my ($self, $dx, $dy) = @_;
77 101
… …
253 unless ($id) { 277 unless ($id) {
254 # create new id for face 278 # create new id for face
255 # I love transactions 279 # I love transactions
256 for (1..100) { 280 for (1..100) {
257 my $txn = $CFClient::DB_ENV->txn_begin; 281 my $txn = $CFClient::DB_ENV->txn_begin;
258 my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW); 282 my $status = $self->{facemap}->db_get (id => $id);
259 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 283 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
260 $id = ($id || 16) + 1; 284 $id = ($id || 16) + 1;
261 if ($self->{facemap}->put (id => $id) == 0 285 if ($self->{facemap}->put (id => $id) == 0
262 && $self->{facemap}->put ($hash => $id) == 0) { 286 && $self->{facemap}->put ($hash => $id) == 0) {
263 $txn->txn_commit; 287 $txn->txn_commit;
264 288
265 goto gotid; 289 goto gotid;
266 } 290 }
267 } 291 }
268 $txn->abort; 292 $txn->txn_abort;
269 } 293 }
270 294
271 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 295 CFClient::fatal "maximum number of transaction retries reached - database problems?";
272 } 296 }
273 297
… …
324 348
325 $prompt = $LAST_QUERY unless length $prompt; 349 $prompt = $LAST_QUERY unless length $prompt;
326 $LAST_QUERY = $prompt; 350 $LAST_QUERY = $prompt;
327 351
328 my $dialog = new CFClient::UI::FancyFrame 352 my $dialog = new CFClient::UI::FancyFrame
353 x => "center",
354 y => "center",
329 title => "Query", 355 title => "Query",
330 child => my $vbox = new CFClient::UI::VBox; 356 child => my $vbox = new CFClient::UI::VBox,
357 ;
331 358
332 $vbox->add (new CFClient::UI::Label 359 $vbox->add (new CFClient::UI::Label
333 max_w => $::WIDTH * 0.4, 360 max_w => $::WIDTH * 0.4,
334 ellipsise => 0, 361 ellipsise => 0,
335 text => $prompt); 362 text => $prompt);
… …
377 ); 404 );
378 405
379 $entry->focus_in; 406 $entry->focus_in;
380 } 407 }
381 408
382 $dialog->show_centered; 409 $dialog->show;
383} 410}
384 411
385sub drawinfo { 412sub drawinfo {
386 my ($self, $color, $text) = @_; 413 my ($self, $color, $text) = @_;
387 414
… …
411 join "\n", map "$time $_", split /\n/, $text); 438 join "\n", map "$time $_", split /\n/, $text);
412 439
413 $self->{statusbox}->add ($text, 440 $self->{statusbox}->add ($text,
414 group => $text, 441 group => $text,
415 fg => $color[$color], 442 fg => $color[$color],
416 timeout => 10, 443 timeout => $color >= 2 ? 60 : 10,
417 tooltip_font => $::FONT_FIXED, 444 tooltip_font => $::FONT_FIXED,
418 ); 445 );
419} 446}
420 447
421sub drawextinfo { 448sub drawextinfo {
… …
427sub spell_add { 454sub spell_add {
428 my ($self, $spell) = @_; 455 my ($self, $spell) = @_;
429 456
430 # TODO 457 # TODO
431 # 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
432 $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});
433 $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});
434} 463}
435 464
436sub spell_delete { 465sub spell_delete {
437 my ($self, $spell) = @_; 466 my ($self, $spell) = @_;
467 $::SETUP_SPELLS->remove_spell ($spell);
438} 468}
439 469
440sub addme_success { 470sub addme_success {
441 my ($self) = @_; 471 my ($self) = @_;
442 472
443 $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 {
444 $self->send ("command output-count $::CFG->{output_count}"); 474 my ($pom) = @_;
445 475
446 my $parser = new Pod::POM;
447 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
448
449 my %skill_tooltip; 476 my %skill_help;
450 477
451 for my $head2 ($pod->head1->[-2]->head2) { 478 for my $head2 ($pom->head1->[3]->head2) {
452 $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
453 } 483 };
454 484
455 for my $skill (values %{$self->{skill_info}}) { 485 for my $skill (values %{$self->{skill_info}}) {
456 $self->{map_widget}->add_command ("ready_skill $skill", 486 $self->{map_widget}->add_command ("ready_skill $skill",
457 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 487 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
458 . $skill_tooltip{$skill}); 488 . $skill_help->{$skill});
459 $self->{map_widget}->add_command ("use_skill $skill", 489 $self->{map_widget}->add_command ("use_skill $skill",
460 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 490 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
461 . $skill_tooltip{$skill}); 491 . $skill_help->{$skill});
462 } 492 }
463} 493}
464 494
465sub eof { 495sub eof {
466 my ($self) = @_; 496 my ($self) = @_;
… …
491 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 521 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
492 522
493 $self->send ("requestinfo image_sums $face $face"); 523 $self->send ("requestinfo image_sums $face $face");
494 524
495 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 525 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
496 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 526 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
497 } elsif (!exists $self->{num_faces}) { 527 } elsif (!exists $self->{num_faces}) {
498 $self->send ("requestinfo image_info"); 528 $self->send ("requestinfo image_info");
499 529
500 $self->{num_faces} = 0; 530 $self->{num_faces} = 0;
501 531
502 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 532 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
503 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 533 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
504 } 534 }
505} 535}
506 536
507sub update_floorbox { 537sub update_floorbox {
508 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 538 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
… …
532} 562}
533 563
534sub set_opencont { 564sub set_opencont {
535 my ($conn, $tag, $name) = @_; 565 my ($conn, $tag, $name) = @_;
536 $conn->{open_container} = $tag; 566 $conn->{open_container} = $tag;
537 $::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
538 $::INVR->set_items ($conn->{container}{$tag}); 583 $::INVR->set_items ($conn->{container}{$tag});
539} 584}
540 585
541sub update_container { 586sub update_container {
542 my ($tag) = @_; 587 my ($tag) = @_;
… …
571 if ($tag == 0) { 616 if ($tag == 0) {
572 update_floorbox; 617 update_floorbox;
573 update_container (0); 618 update_container (0);
574 } elsif ($tag == $self->{player}{tag}) { 619 } elsif ($tag == $self->{player}{tag}) {
575 $::INV->set_items ($self->{container}{$tag}) 620 $::INV->set_items ($self->{container}{$tag})
621 } else {
622 update_container ($tag);
576 } 623 }
577 624
578# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 625# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
579} 626}
580 627
… …
588 update_floorbox; 635 update_floorbox;
589 update_container ($_->{tag}); 636 update_container ($_->{tag});
590 } elsif ($_->{container} == $self->{player}{tag}) { 637 } elsif ($_->{container} == $self->{player}{tag}) {
591 $::INV->set_items ($self->{container}{$self->{player}{tag}}) 638 $::INV->set_items ($self->{container}{$self->{player}{tag}})
592 } else { 639 } else {
593 update_container ($_->{tag}); 640 update_container ($_->{container});
594 } 641 }
595 } 642 }
596} 643}
597 644
598sub item_update { 645sub item_update {
… …
623} 670}
624 671
625sub player_update { 672sub player_update {
626 my ($self, $player) = @_; 673 my ($self, $player) = @_;
627 $::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}");
628} 679}
629 680
6301; 6811;

Diff Legend

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