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.30 by root, Sun Jun 11 18:41:30 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
… …
320 my ($self, $flags, $prompt) = @_; 347 my ($self, $flags, $prompt) = @_;
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 $self->{query}-> ($self, $flags, $prompt);
326 title => "Query",
327 child => my $vbox = new CFClient::UI::VBox;
328
329 $vbox->add (new CFClient::UI::Label
330 max_w => $::WIDTH * 0.4,
331 ellipsise => 0,
332 text => $prompt);
333
334 if ($flags & Crossfire::Protocol::Base::CS_QUERY_YESNO) {
335 $vbox->add (my $hbox = new CFClient::UI::HBox);
336 $hbox->add (new CFClient::UI::Button
337 text => "No",
338 connect_activate => sub {
339 $self->send ("reply n");
340 $dialog->destroy;
341 $self->{map_widget}->focus_in;
342 }
343 );
344 $hbox->add (new CFClient::UI::Button
345 text => "Yes",
346 connect_activate => sub {
347 $self->send ("reply y");
348 $dialog->destroy;
349 },
350 );
351
352 $dialog->focus_in;
353
354 } elsif ($flags & Crossfire::Protocol::Base::CS_QUERY_SINGLECHAR) {
355 $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
357 connect_changed => sub {
358 $self->send ("reply $_[1]");
359 $dialog->destroy;
360 },
361 );
362
363 $entry->focus_in;
364
365 } else {
366 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
367
368 $vbox->add (my $entry = new CFClient::UI::Entry
369 $flags & Crossfire::Protocol::Base::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
370 connect_activate => sub {
371 $self->send ("reply $_[1]");
372 $dialog->destroy;
373 },
374 );
375
376 $entry->focus_in;
377 }
378
379 $dialog->show_centered;
380} 353}
381 354
382sub drawinfo { 355sub drawinfo {
383 my ($self, $color, $text) = @_; 356 my ($self, $color, $text) = @_;
384 357
… …
398 [0.74, 0.65, 0.41], 371 [0.74, 0.65, 0.41],
399 ); 372 );
400 373
401 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 374 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
402 375
376 # try to create single paragraphs of multiple lines sent by the server
377 $text =~ s/(?<=\S)\n(?=\w)/ /g;
378
403 $text = CFClient::UI::Label::escape $text; 379 $text = CFClient::UI::Label::escape $text;
404 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 380 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
405 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 381 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
406 382
407 $self->{logview}->add_paragraph ($color[$color], 383 $self->{logview}->add_paragraph ($color[$color],
408 join "\n", map "$time $_", split /\n/, $text); 384 join "\n", map "$time $_", split /\n/, $text);
409 385
410 $self->{statusbox}->add ($text, 386 $self->{statusbox}->add ($text,
411 group => $text, 387 group => $text,
412 fg => $color[$color], 388 fg => $color[$color],
413 timeout => 10, 389 timeout => $color >= 2 ? 60 : 10,
414 tooltip_font => $::FONT_FIXED, 390 tooltip_font => $::FONT_FIXED,
415 ); 391 );
416} 392}
417 393
418sub drawextinfo { 394sub drawextinfo {
… …
422} 398}
423 399
424sub spell_add { 400sub spell_add {
425 my ($self, $spell) = @_; 401 my ($self, $spell) = @_;
426 402
427 # TODO 403 # try to create single paragraphs of multiple lines sent by the server
428 # 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
429 $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});
430 $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});
431} 412}
432 413
433sub spell_delete { 414sub spell_delete {
434 my ($self, $spell) = @_; 415 my ($self, $spell) = @_;
416 $::SETUP_SPELLS->remove_spell ($spell);
435} 417}
436 418
437sub addme_success { 419sub addme_success {
438 my ($self) = @_; 420 my ($self) = @_;
439 421
440 $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 {
441 $self->send ("command output-count $::CFG->{output_count}"); 423 my ($pom) = @_;
442 424
443 my $parser = new Pod::POM;
444 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
445
446 my %skill_tooltip; 425 my %skill_help;
447 426
448 for my $head2 ($pod->head1->[-2]->head2) { 427 for my $head2 ($pom->head1->[3]->head2) {
449 $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
450 } 432 };
451 433
452 for my $skill (values %{$self->{skill_info}}) { 434 for my $skill (values %{$self->{skill_info}}) {
453 $self->{map_widget}->add_command ("ready_skill $skill", 435 $self->{map_widget}->add_command ("ready_skill $skill",
454 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 436 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
455 . $skill_tooltip{$skill}); 437 . $skill_help->{$skill});
456 $self->{map_widget}->add_command ("use_skill $skill", 438 $self->{map_widget}->add_command ("use_skill $skill",
457 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 439 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
458 . $skill_tooltip{$skill}); 440 . $skill_help->{$skill});
459 } 441 }
460} 442}
461 443
462sub eof { 444sub eof {
463 my ($self) = @_; 445 my ($self) = @_;
… …
488 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 470 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
489 471
490 $self->send ("requestinfo image_sums $face $face"); 472 $self->send ("requestinfo image_sums $face $face");
491 473
492 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 474 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
493 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 475 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
494 } elsif (!exists $self->{num_faces}) { 476 } elsif (!exists $self->{num_faces}) {
495 $self->send ("requestinfo image_info"); 477 $self->send ("requestinfo image_info");
496 478
497 $self->{num_faces} = 0; 479 $self->{num_faces} = 0;
498 480
499 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 481 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
500 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); 482 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
501 } 483 }
502} 484}
503 485
504sub update_floorbox { 486sub update_floorbox {
505 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 487 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
… …
507 489
508 $::FLOORBOX->clear; 490 $::FLOORBOX->clear;
509 491
510 my $row; 492 my $row;
511 for (@{ $::CONN->{container}{0} }) { 493 for (@{ $::CONN->{container}{0} }) {
512 if ($row < 7) { 494 if ($row < 6) {
513 local $_->{face_widget}; # hack to force recreation of widget 495 local $_->{face_widget}; # hack to force recreation of widget
514 local $_->{desc_widget}; # hack to force recreation of widget 496 local $_->{desc_widget}; # hack to force recreation of widget
515 CFClient::Item::update_widgets $_; 497 CFClient::Item::update_widgets $_;
516 498
517 $::FLOORBOX->add (0, $row, $_->{face_widget}); 499 $::FLOORBOX->add (0, $row, $_->{face_widget});
518 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 500 $::FLOORBOX->add (1, $row, $_->{desc_widget});
519 501
520 $row++; 502 $row++;
521 } else { 503 } else {
522 $::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 );
523 last; 508 last;
524 } 509 }
525 } 510 }
526 }); 511 });
527 512
… …
529} 514}
530 515
531sub set_opencont { 516sub set_opencont {
532 my ($conn, $tag, $name) = @_; 517 my ($conn, $tag, $name) = @_;
533 $conn->{open_container} = $tag; 518 $conn->{open_container} = $tag;
534 $::INVR_LBL->set_text ($name); 519
520 $::INV_RIGHT_HB->clear ();
521 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);
522
523 if ($tag != 0) { # Floor isn't closable, is it?
524 $::INV_RIGHT_HB->add (new CFClient::UI::Button
525 text => "Close container",
526 tooltip => "Close the currently open container (if one is open)",
527 on_activate => sub {
528 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
529 if $tag != 0;
530 #if $CONN->{open_container} != 0;
531 },
532 );
533 }
534
535 $::INVR->set_items ($conn->{container}{$tag}); 535 $::INVR->set_items ($conn->{container}{$tag});
536} 536}
537 537
538sub update_container { 538sub update_container {
539 my ($tag) = @_; 539 my ($tag) = @_;
… …
568 if ($tag == 0) { 568 if ($tag == 0) {
569 update_floorbox; 569 update_floorbox;
570 update_container (0); 570 update_container (0);
571 } elsif ($tag == $self->{player}{tag}) { 571 } elsif ($tag == $self->{player}{tag}) {
572 $::INV->set_items ($self->{container}{$tag}) 572 $::INV->set_items ($self->{container}{$tag})
573 } else {
574 update_container ($tag);
573 } 575 }
574 576
575# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 577# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
576} 578}
577 579
… …
585 update_floorbox; 587 update_floorbox;
586 update_container ($_->{tag}); 588 update_container ($_->{tag});
587 } elsif ($_->{container} == $self->{player}{tag}) { 589 } elsif ($_->{container} == $self->{player}{tag}) {
588 $::INV->set_items ($self->{container}{$self->{player}{tag}}) 590 $::INV->set_items ($self->{container}{$self->{player}{tag}})
589 } else { 591 } else {
590 update_container ($_->{tag}); 592 update_container ($_->{container});
591 } 593 }
592 } 594 }
593} 595}
594 596
595sub item_update { 597sub item_update {
… …
602 return; 604 return;
603 } 605 }
604 606
605 CFClient::Item::update_widgets $item; 607 CFClient::Item::update_widgets $item;
606 608
607 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & Crossfire::Protocol::Base::F_OPEN)) { 609 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
608 set_opencont ($::CONN, 0, "Floor"); 610 set_opencont ($::CONN, 0, "Floor");
609 611
610 } elsif ($item->{flags} & Crossfire::Protocol::Base::F_OPEN) { 612 } elsif ($item->{flags} & F_OPEN) {
611 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 613 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
612 } else { 614 } else {
613 if ($item->{container} == 0) { 615 if ($item->{container} == 0) {
614 update_floorbox; 616 update_floorbox;
615 update_container (0); 617 update_container (0);
… …
617 $::INV->set_items ($self->{container}{$item->{container}}) 619 $::INV->set_items ($self->{container}{$item->{container}})
618 } 620 }
619 } 621 }
620} 622}
621 623
624sub player_update {
625 my ($self, $player) = @_;
626
627 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
628}
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
6221; 6531;

Diff Legend

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