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

Diff Legend

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