… | |
… | |
268 | unless ($id) { |
268 | unless ($id) { |
269 | # create new id for face |
269 | # create new id for face |
270 | # I love transactions |
270 | # I love transactions |
271 | for (1..100) { |
271 | for (1..100) { |
272 | my $txn = $CFClient::DB_ENV->txn_begin; |
272 | my $txn = $CFClient::DB_ENV->txn_begin; |
273 | my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW); |
273 | my $status = $self->{facemap}->db_get (id => $id); |
274 | if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { |
274 | if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { |
275 | $id = ($id || 16) + 1; |
275 | $id = ($id || 16) + 1; |
276 | if ($self->{facemap}->put (id => $id) == 0 |
276 | if ($self->{facemap}->put (id => $id) == 0 |
277 | && $self->{facemap}->put ($hash => $id) == 0) { |
277 | && $self->{facemap}->put ($hash => $id) == 0) { |
278 | $txn->txn_commit; |
278 | $txn->txn_commit; |
279 | |
279 | |
280 | goto gotid; |
280 | goto gotid; |
281 | } |
281 | } |
282 | } |
282 | } |
283 | $txn->abort; |
283 | $txn->txn_abort; |
284 | } |
284 | } |
285 | |
285 | |
286 | CFClient::fatal "maximum number of transaction retries reached - database problems?"; |
286 | CFClient::fatal "maximum number of transaction retries reached - database problems?"; |
287 | } |
287 | } |
288 | |
288 | |
… | |
… | |
429 | join "\n", map "$time $_", split /\n/, $text); |
429 | join "\n", map "$time $_", split /\n/, $text); |
430 | |
430 | |
431 | $self->{statusbox}->add ($text, |
431 | $self->{statusbox}->add ($text, |
432 | group => $text, |
432 | group => $text, |
433 | fg => $color[$color], |
433 | fg => $color[$color], |
434 | timeout => 10, |
434 | timeout => $color >= 2 ? 60 : 10, |
435 | tooltip_font => $::FONT_FIXED, |
435 | tooltip_font => $::FONT_FIXED, |
436 | ); |
436 | ); |
437 | } |
437 | } |
438 | |
438 | |
439 | sub drawextinfo { |
439 | sub drawextinfo { |
… | |
… | |
445 | sub spell_add { |
445 | sub spell_add { |
446 | my ($self, $spell) = @_; |
446 | my ($self, $spell) = @_; |
447 | |
447 | |
448 | # TODO |
448 | # TODO |
449 | # create a widget dynamically, using spell face (CF::Protocol downloads them) |
449 | # create a widget dynamically, using spell face (CF::Protocol downloads them) |
450 | $::SPELL_LIST->add_spell ($spell); |
450 | $::SETUP_SPELLS->add_spell ($spell); |
451 | |
451 | |
452 | $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}); |
453 | $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}); |
454 | } |
454 | } |
455 | |
455 | |
456 | sub spell_delete { |
456 | sub spell_delete { |
457 | my ($self, $spell) = @_; |
457 | my ($self, $spell) = @_; |
458 | $::SPELL_LIST->remove_spell ($spell); |
458 | $::SETUP_SPELLS->remove_spell ($spell); |
459 | } |
459 | } |
460 | |
460 | |
461 | sub addme_success { |
461 | sub addme_success { |
462 | my ($self) = @_; |
462 | my ($self) = @_; |
463 | |
463 | |
… | |
… | |
509 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
509 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
510 | |
510 | |
511 | $self->send ("requestinfo image_sums $face $face"); |
511 | $self->send ("requestinfo image_sums $face $face"); |
512 | |
512 | |
513 | $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", |
513 | $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", |
514 | group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); |
514 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
515 | } elsif (!exists $self->{num_faces}) { |
515 | } elsif (!exists $self->{num_faces}) { |
516 | $self->send ("requestinfo image_info"); |
516 | $self->send ("requestinfo image_info"); |
517 | |
517 | |
518 | $self->{num_faces} = 0; |
518 | $self->{num_faces} = 0; |
519 | |
519 | |
520 | $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", |
520 | $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", |
521 | group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); |
521 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
522 | } |
522 | } |
523 | } |
523 | } |
524 | |
524 | |
525 | sub update_floorbox { |
525 | sub update_floorbox { |
526 | $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
526 | $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { |