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.6 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.16 by root, Sat Jun 3 01:47:14 2006 UTC

… …
66} 66}
67 67
68sub user_send { 68sub user_send {
69 my ($self, $command) = @_; 69 my ($self, $command) = @_;
70 70
71 if ($self->{record}) {
72 push @{$self->{record}}, $command;
73 }
74
71 $self->send_command ($command); 75 $self->send_command ($command);
72 ::status $command; 76 ::status $command;
77}
78
79sub start_record {
80 my ($self) = @_;
81
82 $self->{record} = [];
83}
84
85sub stop_record {
86 my ($self) = @_;
87 return delete $self->{record};
73} 88}
74 89
75sub map_scroll { 90sub map_scroll {
76 my ($self, $dx, $dy) = @_; 91 my ($self, $dx, $dy) = @_;
77 92
… …
253 unless ($id) { 268 unless ($id) {
254 # create new id for face 269 # create new id for face
255 # I love transactions 270 # I love transactions
256 for (1..100) { 271 for (1..100) {
257 my $txn = $CFClient::DB_ENV->txn_begin; 272 my $txn = $CFClient::DB_ENV->txn_begin;
258 my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW); 273 my $status = $self->{facemap}->db_get (id => $id);
259 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 274 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
260 $id = ($id || 16) + 1; 275 $id = ($id || 16) + 1;
261 if ($self->{facemap}->put (id => $id) == 0 276 if ($self->{facemap}->put (id => $id) == 0
262 && $self->{facemap}->put ($hash => $id) == 0) { 277 && $self->{facemap}->put ($hash => $id) == 0) {
263 $txn->txn_commit; 278 $txn->txn_commit;
264 279
265 goto gotid; 280 goto gotid;
266 } 281 }
267 } 282 }
268 $txn->abort; 283 $txn->txn_abort;
269 } 284 }
270 285
271 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 286 CFClient::fatal "maximum number of transaction retries reached - database problems?";
272 } 287 }
273 288
… …
324 339
325 $prompt = $LAST_QUERY unless length $prompt; 340 $prompt = $LAST_QUERY unless length $prompt;
326 $LAST_QUERY = $prompt; 341 $LAST_QUERY = $prompt;
327 342
328 my $dialog = new CFClient::UI::FancyFrame 343 my $dialog = new CFClient::UI::FancyFrame
344 x => "center",
345 y => "center",
329 title => "Query", 346 title => "Query",
330 child => my $vbox = new CFClient::UI::VBox; 347 child => my $vbox = new CFClient::UI::VBox,
348 ;
331 349
332 $vbox->add (new CFClient::UI::Label 350 $vbox->add (new CFClient::UI::Label
333 max_w => $::WIDTH * 0.4, 351 max_w => $::WIDTH * 0.4,
334 ellipsise => 0, 352 ellipsise => 0,
335 text => $prompt); 353 text => $prompt);
336 354
337 if ($flags & CS_QUERY_YESNO) { 355 if ($flags & CS_QUERY_YESNO) {
338 $vbox->add (my $hbox = new CFClient::UI::HBox); 356 $vbox->add (my $hbox = new CFClient::UI::HBox);
339 $hbox->add (new CFClient::UI::Button 357 $hbox->add (new CFClient::UI::Button
340 text => "No", 358 text => "No",
341 connect_activate => sub { 359 on_activate => sub {
342 $self->send ("reply n"); 360 $self->send ("reply n");
343 $dialog->destroy; 361 $dialog->destroy;
344 $self->{map_widget}->focus_in; 362 $self->{map_widget}->focus_in;
345 } 363 }
346 ); 364 );
347 $hbox->add (new CFClient::UI::Button 365 $hbox->add (new CFClient::UI::Button
348 text => "Yes", 366 text => "Yes",
349 connect_activate => sub { 367 on_activate => sub {
350 $self->send ("reply y"); 368 $self->send ("reply y");
351 $dialog->destroy; 369 $dialog->destroy;
352 }, 370 },
353 ); 371 );
354 372
355 $dialog->focus_in; 373 $dialog->focus_in;
356 374
357 } elsif ($flags & CS_QUERY_SINGLECHAR) { 375 } elsif ($flags & CS_QUERY_SINGLECHAR) {
358 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 376 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
359 $vbox->add (my $entry = new CFClient::UI::Entry 377 $vbox->add (my $entry = new CFClient::UI::Entry
360 connect_changed => sub { 378 on_changed => sub {
361 $self->send ("reply $_[1]"); 379 $self->send ("reply $_[1]");
362 $dialog->destroy; 380 $dialog->destroy;
363 }, 381 },
364 ); 382 );
365 383
… …
368 } else { 386 } else {
369 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 387 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
370 388
371 $vbox->add (my $entry = new CFClient::UI::Entry 389 $vbox->add (my $entry = new CFClient::UI::Entry
372 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (), 390 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
373 connect_activate => sub { 391 on_activate => sub {
374 $self->send ("reply $_[1]"); 392 $self->send ("reply $_[1]");
375 $dialog->destroy; 393 $dialog->destroy;
376 }, 394 },
377 ); 395 );
378 396
379 $entry->focus_in; 397 $entry->focus_in;
380 } 398 }
381 399
382 $dialog->show_centered; 400 $dialog->show;
383} 401}
384 402
385sub drawinfo { 403sub drawinfo {
386 my ($self, $color, $text) = @_; 404 my ($self, $color, $text) = @_;
387 405
… …
427sub spell_add { 445sub spell_add {
428 my ($self, $spell) = @_; 446 my ($self, $spell) = @_;
429 447
430 # TODO 448 # TODO
431 # create a widget dynamically, using spell face (CF::Protocol downloads them) 449 # create a widget dynamically, using spell face (CF::Protocol downloads them)
450 $::SETUP_SPELLS->add_spell ($spell);
451
432 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 452 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
433 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 453 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
434} 454}
435 455
436sub spell_delete { 456sub spell_delete {
437 my ($self, $spell) = @_; 457 my ($self, $spell) = @_;
458 $::SPELL_LIST->remove_spell ($spell);
438} 459}
439 460
440sub addme_success { 461sub addme_success {
441 my ($self) = @_; 462 my ($self) = @_;
442
443 $self->send ("command output-sync $::CFG->{output_sync}");
444 $self->send ("command output-count $::CFG->{output_count}");
445 463
446 my $parser = new Pod::POM; 464 my $parser = new Pod::POM;
447 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod"); 465 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
448 466
449 my %skill_tooltip; 467 my %skill_tooltip;
… …
532} 550}
533 551
534sub set_opencont { 552sub set_opencont {
535 my ($conn, $tag, $name) = @_; 553 my ($conn, $tag, $name) = @_;
536 $conn->{open_container} = $tag; 554 $conn->{open_container} = $tag;
537 $::INVR_LBL->set_text ($name); 555
556 $::INV_RIGHT_HB->clear ();
557 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);
558
559 if ($tag != 0) { # Floor isn't closable, is it?
560 $::INV_RIGHT_HB->add (new CFClient::UI::Button
561 text => "Close container",
562 tooltip => "Close the currently open container (if one is open)",
563 on_activate => sub {
564 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
565 if $tag != 0;
566 #if $CONN->{open_container} != 0;
567 },
568 );
569 }
570
538 $::INVR->set_items ($conn->{container}{$tag}); 571 $::INVR->set_items ($conn->{container}{$tag});
539} 572}
540 573
541sub update_container { 574sub update_container {
542 my ($tag) = @_; 575 my ($tag) = @_;
… …
571 if ($tag == 0) { 604 if ($tag == 0) {
572 update_floorbox; 605 update_floorbox;
573 update_container (0); 606 update_container (0);
574 } elsif ($tag == $self->{player}{tag}) { 607 } elsif ($tag == $self->{player}{tag}) {
575 $::INV->set_items ($self->{container}{$tag}) 608 $::INV->set_items ($self->{container}{$tag})
609 } else {
610 update_container ($tag);
576 } 611 }
577 612
578# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 613# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
579} 614}
580 615
… …
588 update_floorbox; 623 update_floorbox;
589 update_container ($_->{tag}); 624 update_container ($_->{tag});
590 } elsif ($_->{container} == $self->{player}{tag}) { 625 } elsif ($_->{container} == $self->{player}{tag}) {
591 $::INV->set_items ($self->{container}{$self->{player}{tag}}) 626 $::INV->set_items ($self->{container}{$self->{player}{tag}})
592 } else { 627 } else {
593 update_container ($_->{tag}); 628 update_container ($_->{container});
594 } 629 }
595 } 630 }
596} 631}
597 632
598sub item_update { 633sub item_update {
… …
623} 658}
624 659
625sub player_update { 660sub player_update {
626 my ($self, $player) = @_; 661 my ($self, $player) = @_;
627 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 662 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
663
664 # do it here because it is ignored earlier, and there is no "login" event
665 $self->send_command ("output-sync $::CFG->{output_sync}");
666 $self->send_command ("output-count $::CFG->{output_count}");
628} 667}
629 668
6301; 6691;

Diff Legend

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