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.5 by elmex, Sat May 27 10:32:35 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
33 $_ = $_ eq ".*" ? "" : " $_"
34 for @args;
35
30 my $text = CFClient::pod_to_pango $head2->content; 36 my $text = CFClient::pod_to_pango $head2->content;
31 37
32 for my $arg (@args) { 38 push @cmd_help, ["$cmd$_", $text]
33 $arg = $arg eq ".*" ? "" : " $arg"; 39 for sort { (length $a) <=> (length $b) }
34 40 @args;
35 $self->{map_widget}->add_command ("$cmd$arg", $text);
36 } 41 }
42
43 \@cmd_help
37 } 44 };
45
46 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help;
38 48
39 $self->{noface} = new_from_file CFClient::Texture 49 $self->{noface} = new_from_file CFClient::Texture
40 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
41 51
42 $self->{open_container} = 0; 52 $self->{open_container} = 0;
… …
65} 75}
66 76
67sub user_send { 77sub user_send {
68 my ($self, $command) = @_; 78 my ($self, $command) = @_;
69 79
80 if ($self->{record}) {
81 push @{$self->{record}}, $command;
82 }
83
70 $self->send_command ($command); 84 $self->send_command ($command);
71 ::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};
72} 97}
73 98
74sub map_scroll { 99sub map_scroll {
75 my ($self, $dx, $dy) = @_; 100 my ($self, $dx, $dy) = @_;
76 101
… …
252 unless ($id) { 277 unless ($id) {
253 # create new id for face 278 # create new id for face
254 # I love transactions 279 # I love transactions
255 for (1..100) { 280 for (1..100) {
256 my $txn = $CFClient::DB_ENV->txn_begin; 281 my $txn = $CFClient::DB_ENV->txn_begin;
257 my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW); 282 my $status = $self->{facemap}->db_get (id => $id);
258 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 283 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
259 $id = ($id || 16) + 1; 284 $id = ($id || 16) + 1;
260 if ($self->{facemap}->put (id => $id) == 0 285 if ($self->{facemap}->put (id => $id) == 0
261 && $self->{facemap}->put ($hash => $id) == 0) { 286 && $self->{facemap}->put ($hash => $id) == 0) {
262 $txn->txn_commit; 287 $txn->txn_commit;
263 288
264 goto gotid; 289 goto gotid;
265 } 290 }
266 } 291 }
267 $txn->abort; 292 $txn->txn_abort;
268 } 293 }
269 294
270 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 295 CFClient::fatal "maximum number of transaction retries reached - database problems?";
271 } 296 }
272 297
… …
323 348
324 $prompt = $LAST_QUERY unless length $prompt; 349 $prompt = $LAST_QUERY unless length $prompt;
325 $LAST_QUERY = $prompt; 350 $LAST_QUERY = $prompt;
326 351
327 my $dialog = new CFClient::UI::FancyFrame 352 my $dialog = new CFClient::UI::FancyFrame
353 x => "center",
354 y => "center",
328 title => "Query", 355 title => "Query",
329 child => my $vbox = new CFClient::UI::VBox; 356 child => my $vbox = new CFClient::UI::VBox,
357 ;
330 358
331 $vbox->add (new CFClient::UI::Label 359 $vbox->add (new CFClient::UI::Label
332 max_w => $::WIDTH * 0.4, 360 max_w => $::WIDTH * 0.4,
333 ellipsise => 0, 361 ellipsise => 0,
334 text => $prompt); 362 text => $prompt);
335 363
336 if ($flags & CS_QUERY_YESNO) { 364 if ($flags & CS_QUERY_YESNO) {
337 $vbox->add (my $hbox = new CFClient::UI::HBox); 365 $vbox->add (my $hbox = new CFClient::UI::HBox);
338 $hbox->add (new CFClient::UI::Button 366 $hbox->add (new CFClient::UI::Button
339 text => "No", 367 text => "No",
340 connect_activate => sub { 368 on_activate => sub {
341 $self->send ("reply n"); 369 $self->send ("reply n");
342 $dialog->destroy; 370 $dialog->destroy;
343 $self->{map_widget}->focus_in; 371 $self->{map_widget}->focus_in;
344 } 372 }
345 ); 373 );
346 $hbox->add (new CFClient::UI::Button 374 $hbox->add (new CFClient::UI::Button
347 text => "Yes", 375 text => "Yes",
348 connect_activate => sub { 376 on_activate => sub {
349 $self->send ("reply y"); 377 $self->send ("reply y");
350 $dialog->destroy; 378 $dialog->destroy;
351 }, 379 },
352 ); 380 );
353 381
354 $dialog->focus_in; 382 $dialog->focus_in;
355 383
356 } elsif ($flags & CS_QUERY_SINGLECHAR) { 384 } elsif ($flags & CS_QUERY_SINGLECHAR) {
357 $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)";
358 $vbox->add (my $entry = new CFClient::UI::Entry 386 $vbox->add (my $entry = new CFClient::UI::Entry
359 connect_changed => sub { 387 on_changed => sub {
360 $self->send ("reply $_[1]"); 388 $self->send ("reply $_[1]");
361 $dialog->destroy; 389 $dialog->destroy;
362 }, 390 },
363 ); 391 );
364 392
… …
367 } else { 395 } else {
368 $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)";
369 397
370 $vbox->add (my $entry = new CFClient::UI::Entry 398 $vbox->add (my $entry = new CFClient::UI::Entry
371 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (), 399 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
372 connect_activate => sub { 400 on_activate => sub {
373 $self->send ("reply $_[1]"); 401 $self->send ("reply $_[1]");
374 $dialog->destroy; 402 $dialog->destroy;
375 }, 403 },
376 ); 404 );
377 405
378 $entry->focus_in; 406 $entry->focus_in;
379 } 407 }
380 408
381 $dialog->show_centered; 409 $dialog->show;
382} 410}
383 411
384sub drawinfo { 412sub drawinfo {
385 my ($self, $color, $text) = @_; 413 my ($self, $color, $text) = @_;
386 414
… …
410 join "\n", map "$time $_", split /\n/, $text); 438 join "\n", map "$time $_", split /\n/, $text);
411 439
412 $self->{statusbox}->add ($text, 440 $self->{statusbox}->add ($text,
413 group => $text, 441 group => $text,
414 fg => $color[$color], 442 fg => $color[$color],
415 timeout => 10, 443 timeout => $color >= 2 ? 60 : 10,
416 tooltip_font => $::FONT_FIXED, 444 tooltip_font => $::FONT_FIXED,
417 ); 445 );
418} 446}
419 447
420sub drawextinfo { 448sub drawextinfo {
… …
426sub spell_add { 454sub spell_add {
427 my ($self, $spell) = @_; 455 my ($self, $spell) = @_;
428 456
429 # TODO 457 # TODO
430 # 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
431 $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});
432 $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});
433} 463}
434 464
435sub spell_delete { 465sub spell_delete {
436 my ($self, $spell) = @_; 466 my ($self, $spell) = @_;
467 $::SETUP_SPELLS->remove_spell ($spell);
437} 468}
438 469
439sub addme_success { 470sub addme_success {
440 my ($self) = @_; 471 my ($self) = @_;
441 472
442 $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 {
443 $self->send ("command output-count $::CFG->{output_count}"); 474 my ($pom) = @_;
444 475
445 my $parser = new Pod::POM;
446 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
447
448 my %skill_tooltip; 476 my %skill_help;
449 477
450 for my $head2 ($pod->head1->[-2]->head2) { 478 for my $head2 ($pom->head1->[3]->head2) {
451 $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
452 } 483 };
453 484
454 for my $skill (values %{$self->{skill_info}}) { 485 for my $skill (values %{$self->{skill_info}}) {
455 $self->{map_widget}->add_command ("ready_skill $skill", 486 $self->{map_widget}->add_command ("ready_skill $skill",
456 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 487 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
457 . $skill_tooltip{$skill}); 488 . $skill_help->{$skill});
458 $self->{map_widget}->add_command ("use_skill $skill", 489 $self->{map_widget}->add_command ("use_skill $skill",
459 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 490 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
460 . $skill_tooltip{$skill}); 491 . $skill_help->{$skill});
461 } 492 }
462} 493}
463 494
464sub eof { 495sub eof {
465 my ($self) = @_; 496 my ($self) = @_;
… …
490 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 521 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
491 522
492 $self->send ("requestinfo image_sums $face $face"); 523 $self->send ("requestinfo image_sums $face $face");
493 524
494 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 525 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
495 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 526 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
496 } elsif (!exists $self->{num_faces}) { 527 } elsif (!exists $self->{num_faces}) {
497 $self->send ("requestinfo image_info"); 528 $self->send ("requestinfo image_info");
498 529
499 $self->{num_faces} = 0; 530 $self->{num_faces} = 0;
500 531
501 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 532 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
502 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 533 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
503 } 534 }
504} 535}
505 536
506sub update_floorbox { 537sub update_floorbox {
507 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 538 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
… …
531} 562}
532 563
533sub set_opencont { 564sub set_opencont {
534 my ($conn, $tag, $name) = @_; 565 my ($conn, $tag, $name) = @_;
535 $conn->{open_container} = $tag; 566 $conn->{open_container} = $tag;
536 $::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
537 $::INVR->set_items ($conn->{container}{$tag}); 583 $::INVR->set_items ($conn->{container}{$tag});
538} 584}
539 585
540sub update_container { 586sub update_container {
541 my ($tag) = @_; 587 my ($tag) = @_;
… …
570 if ($tag == 0) { 616 if ($tag == 0) {
571 update_floorbox; 617 update_floorbox;
572 update_container (0); 618 update_container (0);
573 } elsif ($tag == $self->{player}{tag}) { 619 } elsif ($tag == $self->{player}{tag}) {
574 $::INV->set_items ($self->{container}{$tag}) 620 $::INV->set_items ($self->{container}{$tag})
621 } else {
622 update_container ($tag);
575 } 623 }
576 624
577# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 625# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
578} 626}
579 627
… …
587 update_floorbox; 635 update_floorbox;
588 update_container ($_->{tag}); 636 update_container ($_->{tag});
589 } elsif ($_->{container} == $self->{player}{tag}) { 637 } elsif ($_->{container} == $self->{player}{tag}) {
590 $::INV->set_items ($self->{container}{$self->{player}{tag}}) 638 $::INV->set_items ($self->{container}{$self->{player}{tag}})
591 } else { 639 } else {
592 update_container ($_->{tag}); 640 update_container ($_->{container});
593 } 641 }
594 } 642 }
595} 643}
596 644
597sub item_update { 645sub item_update {
… …
622} 670}
623 671
624sub player_update { 672sub player_update {
625 my ($self, $player) = @_; 673 my ($self, $player) = @_;
626 $::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}");
627} 679}
628 680
6291; 6811;

Diff Legend

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