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.1 by root, Fri May 26 18:56:14 2006 UTC vs.
Revision 1.21 by root, Mon Jun 5 21:10:04 2006 UTC

1package CFClient::Protocol; 1package CFClient::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants;
7
8use CFClient;
6use CFClient::UI; 9use CFClient::UI;
7 10
8use base 'Crossfire::Protocol::Base'; 11use base 'Crossfire::Protocol::Base';
9 12
10sub new { 13sub new {
… …
12 15
13 my $self = $class->SUPER::new (@_); 16 my $self = $class->SUPER::new (@_);
14 17
15 $self->{map_widget}->clr_commands; 18 $self->{map_widget}->clr_commands;
16 19
17 my $parser = new Pod::POM; 20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
18 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod"); 21 my ($pom) = @_;
19 22
23 my @cmd_help;
24
20 for my $head2 ($pod->head1->[-2]->head2) { 25 for my $head2 ($pom->head1->[-2]->head2) {
21 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
22 or next; 27 or next;
23 28
24 my $cmd = $1; 29 my $cmd = $1;
25 my @args = split /\|/, $2; 30 my @args = split /\|/, $2;
26 @args = (".*") unless @args; 31 @args = (".*") unless @args;
27 32
33 $_ = $_ eq ".*" ? "" : " $_"
34 for @args;
35
28 my $text = CFClient::pod_to_pango $head2->content; 36 my $text = CFClient::pod_to_pango $head2->content;
29 37
30 for my $arg (@args) { 38 push @cmd_help, ["$cmd$_", $text]
31 $arg = $arg eq ".*" ? "" : " $arg"; 39 for sort { (length $a) <=> (length $b) }
32 40 @args;
33 $self->{map_widget}->add_command ("$cmd$arg", $text);
34 } 41 }
42
43 \@cmd_help
35 } 44 };
45
46 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help;
36 48
37 $self->{noface} = new_from_file CFClient::Texture 49 $self->{noface} = new_from_file CFClient::Texture
38 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
39 51
40 $self->{open_container} = 0; 52 $self->{open_container} = 0;
… …
50} 62}
51 63
52sub stats_update { 64sub stats_update {
53 my ($self, $stats) = @_; 65 my ($self, $stats) = @_;
54 66
55 if (my $exp = $stats->{Crossfire::Protocol::Base::CS_STAT_EXP64}) { 67 if (my $exp = $stats->{+CS_STAT_EXP64}) {
56 my $diff = $exp - $self->{prev_exp}; 68 my $diff = $exp - $self->{prev_exp};
57 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 69 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
58 if exists $self->{prev_exp} && $diff; 70 if exists $self->{prev_exp} && $diff;
59 $self->{prev_exp} = $exp; 71 $self->{prev_exp} = $exp;
60 } 72 }
… …
63} 75}
64 76
65sub user_send { 77sub user_send {
66 my ($self, $command) = @_; 78 my ($self, $command) = @_;
67 79
80 if ($self->{record}) {
81 push @{$self->{record}}, $command;
82 }
83
68 $self->send_command ($command); 84 $self->send_command ($command);
69 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};
70} 97}
71 98
72sub map_scroll { 99sub map_scroll {
73 my ($self, $dx, $dy) = @_; 100 my ($self, $dx, $dy) = @_;
74 101
… …
250 unless ($id) { 277 unless ($id) {
251 # create new id for face 278 # create new id for face
252 # I love transactions 279 # I love transactions
253 for (1..100) { 280 for (1..100) {
254 my $txn = $CFClient::DB_ENV->txn_begin; 281 my $txn = $CFClient::DB_ENV->txn_begin;
255 my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW); 282 my $status = $self->{facemap}->db_get (id => $id);
256 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 283 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
257 $id = ($id || 16) + 1; 284 $id = ($id || 16) + 1;
258 if ($self->{facemap}->put (id => $id) == 0 285 if ($self->{facemap}->put (id => $id) == 0
259 && $self->{facemap}->put ($hash => $id) == 0) { 286 && $self->{facemap}->put ($hash => $id) == 0) {
260 $txn->txn_commit; 287 $txn->txn_commit;
261 288
262 goto gotid; 289 goto gotid;
263 } 290 }
264 } 291 }
265 $txn->abort; 292 $txn->txn_abort;
266 } 293 }
267 294
268 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 295 CFClient::fatal "maximum number of transaction retries reached - database problems?";
269 } 296 }
270 297
… …
321 348
322 $prompt = $LAST_QUERY unless length $prompt; 349 $prompt = $LAST_QUERY unless length $prompt;
323 $LAST_QUERY = $prompt; 350 $LAST_QUERY = $prompt;
324 351
325 my $dialog = new CFClient::UI::FancyFrame 352 my $dialog = new CFClient::UI::FancyFrame
353 x => "center",
354 y => "center",
326 title => "Query", 355 title => "Query",
327 child => my $vbox = new CFClient::UI::VBox; 356 child => my $vbox = new CFClient::UI::VBox,
357 ;
328 358
329 $vbox->add (new CFClient::UI::Label 359 $vbox->add (new CFClient::UI::Label
330 max_w => $::WIDTH * 0.4, 360 max_w => $::WIDTH * 0.4,
331 ellipsise => 0, 361 ellipsise => 0,
332 text => $prompt); 362 text => $prompt);
333 363
334 if ($flags & Crossfire::Protocol::Base::CS_QUERY_YESNO) { 364 if ($flags & CS_QUERY_YESNO) {
335 $vbox->add (my $hbox = new CFClient::UI::HBox); 365 $vbox->add (my $hbox = new CFClient::UI::HBox);
336 $hbox->add (new CFClient::UI::Button 366 $hbox->add (new CFClient::UI::Button
337 text => "No", 367 text => "No",
338 connect_activate => sub { 368 on_activate => sub {
339 $self->send ("reply n"); 369 $self->send ("reply n");
340 $dialog->destroy; 370 $dialog->destroy;
341 $self->{map_widget}->focus_in; 371 $self->{map_widget}->focus_in;
342 } 372 }
343 ); 373 );
344 $hbox->add (new CFClient::UI::Button 374 $hbox->add (new CFClient::UI::Button
345 text => "Yes", 375 text => "Yes",
346 connect_activate => sub { 376 on_activate => sub {
347 $self->send ("reply y"); 377 $self->send ("reply y");
348 $dialog->destroy; 378 $dialog->destroy;
349 }, 379 },
350 ); 380 );
351 381
352 $dialog->focus_in; 382 $dialog->focus_in;
353 383
354 } elsif ($flags & Crossfire::Protocol::Base::CS_QUERY_SINGLECHAR) { 384 } elsif ($flags & CS_QUERY_SINGLECHAR) {
355 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 385 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
356 $vbox->add (my $entry = new CFClient::UI::Entry 386 $vbox->add (my $entry = new CFClient::UI::Entry
357 connect_changed => sub { 387 on_changed => sub {
358 $self->send ("reply $_[1]"); 388 $self->send ("reply $_[1]");
359 $dialog->destroy; 389 $dialog->destroy;
360 }, 390 },
361 ); 391 );
362 392
… …
364 394
365 } else { 395 } else {
366 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 396 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
367 397
368 $vbox->add (my $entry = new CFClient::UI::Entry 398 $vbox->add (my $entry = new CFClient::UI::Entry
369 $flags & Crossfire::Protocol::Base::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (), 399 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
370 connect_activate => sub { 400 on_activate => sub {
371 $self->send ("reply $_[1]"); 401 $self->send ("reply $_[1]");
372 $dialog->destroy; 402 $dialog->destroy;
373 }, 403 },
374 ); 404 );
375 405
376 $entry->focus_in; 406 $entry->focus_in;
377 } 407 }
378 408
379 $dialog->show_centered; 409 $dialog->show;
380} 410}
381 411
382sub drawinfo { 412sub drawinfo {
383 my ($self, $color, $text) = @_; 413 my ($self, $color, $text) = @_;
384 414
… …
408 join "\n", map "$time $_", split /\n/, $text); 438 join "\n", map "$time $_", split /\n/, $text);
409 439
410 $self->{statusbox}->add ($text, 440 $self->{statusbox}->add ($text,
411 group => $text, 441 group => $text,
412 fg => $color[$color], 442 fg => $color[$color],
413 timeout => 10, 443 timeout => $color >= 2 ? 60 : 10,
414 tooltip_font => $::FONT_FIXED, 444 tooltip_font => $::FONT_FIXED,
415 ); 445 );
416} 446}
417 447
418sub drawextinfo { 448sub drawextinfo {
… …
424sub spell_add { 454sub spell_add {
425 my ($self, $spell) = @_; 455 my ($self, $spell) = @_;
426 456
427 # TODO 457 # TODO
428 # 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
429 $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});
430 $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});
431} 463}
432 464
433sub spell_delete { 465sub spell_delete {
434 my ($self, $spell) = @_; 466 my ($self, $spell) = @_;
467 $::SETUP_SPELLS->remove_spell ($spell);
435} 468}
436 469
437sub addme_success { 470sub addme_success {
438 my ($self) = @_; 471 my ($self) = @_;
439 472
440 $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 {
441 $self->send ("command output-count $::CFG->{output_count}"); 474 my ($pom) = @_;
442 475
443 my $parser = new Pod::POM;
444 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
445
446 my %skill_tooltip; 476 my %skill_help;
447 477
448 for my $head2 ($pod->head1->[-2]->head2) { 478 for my $head2 ($pom->head1->[3]->head2) {
449 $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
450 } 483 };
451 484
452 for my $skill (values %{$self->{skill_info}}) { 485 for my $skill (values %{$self->{skill_info}}) {
453 $self->{map_widget}->add_command ("ready_skill $skill", 486 $self->{map_widget}->add_command ("ready_skill $skill",
454 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 487 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
455 . $skill_tooltip{$skill}); 488 . $skill_help->{$skill});
456 $self->{map_widget}->add_command ("use_skill $skill", 489 $self->{map_widget}->add_command ("use_skill $skill",
457 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 490 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
458 . $skill_tooltip{$skill}); 491 . $skill_help->{$skill});
459 } 492 }
460} 493}
461 494
462sub eof { 495sub eof {
463 my ($self) = @_; 496 my ($self) = @_;
… …
488 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 521 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
489 522
490 $self->send ("requestinfo image_sums $face $face"); 523 $self->send ("requestinfo image_sums $face $face");
491 524
492 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 525 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
493 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 526 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
494 } elsif (!exists $self->{num_faces}) { 527 } elsif (!exists $self->{num_faces}) {
495 $self->send ("requestinfo image_info"); 528 $self->send ("requestinfo image_info");
496 529
497 $self->{num_faces} = 0; 530 $self->{num_faces} = 0;
498 531
499 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 532 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
500 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 533 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
501 } 534 }
502} 535}
503 536
504sub update_floorbox { 537sub update_floorbox {
505 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 538 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
… …
529} 562}
530 563
531sub set_opencont { 564sub set_opencont {
532 my ($conn, $tag, $name) = @_; 565 my ($conn, $tag, $name) = @_;
533 $conn->{open_container} = $tag; 566 $conn->{open_container} = $tag;
534 $::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
535 $::INVR->set_items ($conn->{container}{$tag}); 583 $::INVR->set_items ($conn->{container}{$tag});
536} 584}
537 585
538sub update_container { 586sub update_container {
539 my ($tag) = @_; 587 my ($tag) = @_;
… …
568 if ($tag == 0) { 616 if ($tag == 0) {
569 update_floorbox; 617 update_floorbox;
570 update_container (0); 618 update_container (0);
571 } elsif ($tag == $self->{player}{tag}) { 619 } elsif ($tag == $self->{player}{tag}) {
572 $::INV->set_items ($self->{container}{$tag}) 620 $::INV->set_items ($self->{container}{$tag})
621 } else {
622 update_container ($tag);
573 } 623 }
574 624
575# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 625# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
576} 626}
577 627
… …
585 update_floorbox; 635 update_floorbox;
586 update_container ($_->{tag}); 636 update_container ($_->{tag});
587 } elsif ($_->{container} == $self->{player}{tag}) { 637 } elsif ($_->{container} == $self->{player}{tag}) {
588 $::INV->set_items ($self->{container}{$self->{player}{tag}}) 638 $::INV->set_items ($self->{container}{$self->{player}{tag}})
589 } else { 639 } else {
590 update_container ($_->{tag}); 640 update_container ($_->{container});
591 } 641 }
592 } 642 }
593} 643}
594 644
595sub item_update { 645sub item_update {
… …
602 return; 652 return;
603 } 653 }
604 654
605 CFClient::Item::update_widgets $item; 655 CFClient::Item::update_widgets $item;
606 656
607 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & Crossfire::Protocol::Base::F_OPEN)) { 657 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
608 set_opencont ($::CONN, 0, "Floor"); 658 set_opencont ($::CONN, 0, "Floor");
609 659
610 } elsif ($item->{flags} & Crossfire::Protocol::Base::F_OPEN) { 660 } elsif ($item->{flags} & F_OPEN) {
611 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 661 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
612 } else { 662 } else {
613 if ($item->{container} == 0) { 663 if ($item->{container} == 0) {
614 update_floorbox; 664 update_floorbox;
615 update_container (0); 665 update_container (0);
… …
617 $::INV->set_items ($self->{container}{$item->{container}}) 667 $::INV->set_items ($self->{container}{$item->{container}})
618 } 668 }
619 } 669 }
620} 670}
621 671
672sub player_update {
673 my ($self, $player) = @_;
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}");
679}
680
6221; 6811;

Diff Legend

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