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.10 by elmex, Mon May 29 20:22:33 2006 UTC vs.
Revision 1.30 by root, Sun Jun 11 18:41:30 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
… …
338 my ($self, $flags, $prompt) = @_; 347 my ($self, $flags, $prompt) = @_;
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 $self->{query}-> ($self, $flags, $prompt);
344 title => "Query",
345 child => my $vbox = new CFClient::UI::VBox,
346 on_visibility_change => sub {
347 my ($self, $visible) = @_;
348 $self->center if $visible;
349 },
350 ;
351
352 $vbox->add (new CFClient::UI::Label
353 max_w => $::WIDTH * 0.4,
354 ellipsise => 0,
355 text => $prompt);
356
357 if ($flags & CS_QUERY_YESNO) {
358 $vbox->add (my $hbox = new CFClient::UI::HBox);
359 $hbox->add (new CFClient::UI::Button
360 text => "No",
361 on_activate => sub {
362 $self->send ("reply n");
363 $dialog->destroy;
364 $self->{map_widget}->focus_in;
365 }
366 );
367 $hbox->add (new CFClient::UI::Button
368 text => "Yes",
369 on_activate => sub {
370 $self->send ("reply y");
371 $dialog->destroy;
372 },
373 );
374
375 $dialog->focus_in;
376
377 } elsif ($flags & CS_QUERY_SINGLECHAR) {
378 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
379 $vbox->add (my $entry = new CFClient::UI::Entry
380 on_changed => sub {
381 $self->send ("reply $_[1]");
382 $dialog->destroy;
383 },
384 );
385
386 $entry->focus_in;
387
388 } else {
389 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
390
391 $vbox->add (my $entry = new CFClient::UI::Entry
392 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
393 on_activate => sub {
394 $self->send ("reply $_[1]");
395 $dialog->destroy;
396 },
397 );
398
399 $entry->focus_in;
400 }
401
402 $dialog->show;
403} 353}
404 354
405sub drawinfo { 355sub drawinfo {
406 my ($self, $color, $text) = @_; 356 my ($self, $color, $text) = @_;
407 357
… …
421 [0.74, 0.65, 0.41], 371 [0.74, 0.65, 0.41],
422 ); 372 );
423 373
424 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 374 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
425 375
376 # try to create single paragraphs of multiple lines sent by the server
377 $text =~ s/(?<=\S)\n(?=\w)/ /g;
378
426 $text = CFClient::UI::Label::escape $text; 379 $text = CFClient::UI::Label::escape $text;
427 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 380 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
428 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 381 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
429 382
430 $self->{logview}->add_paragraph ($color[$color], 383 $self->{logview}->add_paragraph ($color[$color],
431 join "\n", map "$time $_", split /\n/, $text); 384 join "\n", map "$time $_", split /\n/, $text);
432 385
433 $self->{statusbox}->add ($text, 386 $self->{statusbox}->add ($text,
434 group => $text, 387 group => $text,
435 fg => $color[$color], 388 fg => $color[$color],
436 timeout => 10, 389 timeout => $color >= 2 ? 60 : 10,
437 tooltip_font => $::FONT_FIXED, 390 tooltip_font => $::FONT_FIXED,
438 ); 391 );
439} 392}
440 393
441sub drawextinfo { 394sub drawextinfo {
… …
445} 398}
446 399
447sub spell_add { 400sub spell_add {
448 my ($self, $spell) = @_; 401 my ($self, $spell) = @_;
449 402
450 # TODO 403 # try to create single paragraphs of multiple lines sent by the server
451 # create a widget dynamically, using spell face (CF::Protocol downloads them) 404 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
405 $spell->{message} =~ s/\n+$//;
406 $spell->{message} ||= "Server did not provide a description for this spell.";
407
408 $::SETUP_SPELLS->add_spell ($spell);
409
452 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 410 $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}); 411 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
454} 412}
455 413
456sub spell_delete { 414sub spell_delete {
457 my ($self, $spell) = @_; 415 my ($self, $spell) = @_;
416 $::SETUP_SPELLS->remove_spell ($spell);
458} 417}
459 418
460sub addme_success { 419sub addme_success {
461 my ($self) = @_; 420 my ($self) = @_;
462 421
463 $self->send ("command output-sync $::CFG->{output_sync}"); 422 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}"); 423 my ($pom) = @_;
465 424
466 my $parser = new Pod::POM;
467 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
468
469 my %skill_tooltip; 425 my %skill_help;
470 426
471 for my $head2 ($pod->head1->[-2]->head2) { 427 for my $head2 ($pom->head1->[3]->head2) {
472 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content; 428 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;
429 }
430
431 \%skill_help
473 } 432 };
474 433
475 for my $skill (values %{$self->{skill_info}}) { 434 for my $skill (values %{$self->{skill_info}}) {
476 $self->{map_widget}->add_command ("ready_skill $skill", 435 $self->{map_widget}->add_command ("ready_skill $skill",
477 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 436 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
478 . $skill_tooltip{$skill}); 437 . $skill_help->{$skill});
479 $self->{map_widget}->add_command ("use_skill $skill", 438 $self->{map_widget}->add_command ("use_skill $skill",
480 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 439 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
481 . $skill_tooltip{$skill}); 440 . $skill_help->{$skill});
482 } 441 }
483} 442}
484 443
485sub eof { 444sub eof {
486 my ($self) = @_; 445 my ($self) = @_;
… …
511 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 470 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
512 471
513 $self->send ("requestinfo image_sums $face $face"); 472 $self->send ("requestinfo image_sums $face $face");
514 473
515 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 474 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
516 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 475 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
517 } elsif (!exists $self->{num_faces}) { 476 } elsif (!exists $self->{num_faces}) {
518 $self->send ("requestinfo image_info"); 477 $self->send ("requestinfo image_info");
519 478
520 $self->{num_faces} = 0; 479 $self->{num_faces} = 0;
521 480
522 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 481 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
523 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 482 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
524 } 483 }
525} 484}
526 485
527sub update_floorbox { 486sub update_floorbox {
528 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 487 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
… …
530 489
531 $::FLOORBOX->clear; 490 $::FLOORBOX->clear;
532 491
533 my $row; 492 my $row;
534 for (@{ $::CONN->{container}{0} }) { 493 for (@{ $::CONN->{container}{0} }) {
535 if ($row < 7) { 494 if ($row < 6) {
536 local $_->{face_widget}; # hack to force recreation of widget 495 local $_->{face_widget}; # hack to force recreation of widget
537 local $_->{desc_widget}; # hack to force recreation of widget 496 local $_->{desc_widget}; # hack to force recreation of widget
538 CFClient::Item::update_widgets $_; 497 CFClient::Item::update_widgets $_;
539 498
540 $::FLOORBOX->add (0, $row, $_->{face_widget}); 499 $::FLOORBOX->add (0, $row, $_->{face_widget});
541 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 500 $::FLOORBOX->add (1, $row, $_->{desc_widget});
542 501
543 $row++; 502 $row++;
544 } else { 503 } else {
545 $::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More..."); 504 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
505 text => "More...",
506 on_activate => sub { $::INV_WINDOW->toggle_visibility },
507 );
546 last; 508 last;
547 } 509 }
548 } 510 }
549 }); 511 });
550 512
… …
606 if ($tag == 0) { 568 if ($tag == 0) {
607 update_floorbox; 569 update_floorbox;
608 update_container (0); 570 update_container (0);
609 } elsif ($tag == $self->{player}{tag}) { 571 } elsif ($tag == $self->{player}{tag}) {
610 $::INV->set_items ($self->{container}{$tag}) 572 $::INV->set_items ($self->{container}{$tag})
573 } else {
574 update_container ($tag);
611 } 575 }
612 576
613# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 577# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
614} 578}
615 579
… …
623 update_floorbox; 587 update_floorbox;
624 update_container ($_->{tag}); 588 update_container ($_->{tag});
625 } elsif ($_->{container} == $self->{player}{tag}) { 589 } elsif ($_->{container} == $self->{player}{tag}) {
626 $::INV->set_items ($self->{container}{$self->{player}{tag}}) 590 $::INV->set_items ($self->{container}{$self->{player}{tag}})
627 } else { 591 } else {
628 update_container ($_->{tag}); 592 update_container ($_->{container});
629 } 593 }
630 } 594 }
631} 595}
632 596
633sub item_update { 597sub item_update {
… …
657 } 621 }
658} 622}
659 623
660sub player_update { 624sub player_update {
661 my ($self, $player) = @_; 625 my ($self, $player) = @_;
626
662 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 627 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
663} 628}
664 629
630sub logged_in {
631 my ($self) = @_;
632
633 $self->send_ext_req (cfplus => "version", "1", sub {
634 $self->{cfplus_ext} = $_[0];
635 });
636
637 $self->send_command ("output-sync $::CFG->{output_sync}");
638 $self->send_command ("output-count $::CFG->{output_count}");
639 $self->send_command ("pickup $::CFG->{pickup}");
640
641 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
642
643 $::SERVER_INFO->set_markup (
644 "server <tt>$self->{host}:$self->{port}</tt>\n"
645 . "protocol version <tt>$self->{version}</tt>\n"
646 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
647 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
648 . "cfplus support $yesno[$self->{cfplus_ext} > 0]\n"
649 . "map size $self->{mapw}×$self->{maph}\n"
650 );
651}
652
6651; 6531;

Diff Legend

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