… | |
… | |
15 | package CFPlus; |
15 | package CFPlus; |
16 | |
16 | |
17 | use Carp (); |
17 | use Carp (); |
18 | |
18 | |
19 | BEGIN { |
19 | BEGIN { |
20 | $VERSION = '0.95'; |
20 | $VERSION = '0.97'; |
21 | |
21 | |
22 | use XSLoader; |
22 | use XSLoader; |
23 | XSLoader::load "CFPlus", $VERSION; |
23 | XSLoader::load "CFPlus", $VERSION; |
24 | } |
|
|
25 | |
|
|
26 | BEGIN { |
|
|
27 | $SIG{__DIE__} = sub { |
|
|
28 | return if CFPlus::in_destruct; |
|
|
29 | #CFPlus::fatal $_[0];#d# |
|
|
30 | CFPlus::error Carp::longmess $_[0];#d# |
|
|
31 | die;#d# |
|
|
32 | }; |
|
|
33 | } |
24 | } |
34 | |
25 | |
35 | use utf8; |
26 | use utf8; |
36 | |
27 | |
37 | use AnyEvent (); |
28 | use AnyEvent (); |
… | |
… | |
56 | bless \(my $cb = $_[0]), "CFPlus::Guard" |
47 | bless \(my $cb = $_[0]), "CFPlus::Guard" |
57 | } |
48 | } |
58 | |
49 | |
59 | sub CFPlus::Guard::DESTROY { |
50 | sub CFPlus::Guard::DESTROY { |
60 | ${$_[0]}->() |
51 | ${$_[0]}->() |
|
|
52 | } |
|
|
53 | |
|
|
54 | =item shorten $string[, $maxlength] |
|
|
55 | |
|
|
56 | =cut |
|
|
57 | |
|
|
58 | sub shorten($;$) { |
|
|
59 | my ($str, $len) = @_; |
|
|
60 | substr $str, $len, (length $str), "..." if $len + 3 <= length $str; |
|
|
61 | $str |
61 | } |
62 | } |
62 | |
63 | |
63 | sub asxml($) { |
64 | sub asxml($) { |
64 | local $_ = $_[0]; |
65 | local $_ = $_[0]; |
65 | |
66 | |
… | |
… | |
274 | } |
275 | } |
275 | |
276 | |
276 | { |
277 | { |
277 | use strict; |
278 | use strict; |
278 | |
279 | |
279 | mkdir "$Crossfire::VARDIR/cfplus", 0777; |
280 | my $HOME = "$Crossfire::VARDIR/cfplus-$BerkeleyDB::db_version"; |
|
|
281 | |
|
|
282 | mkdir $HOME, 0777; |
280 | my $recover = $BerkeleyDB::db_version >= 4.4 |
283 | my $recover = $BerkeleyDB::db_version >= 4.4 |
281 | ? eval "DB_REGISTER | DB_RECOVER" |
284 | ? eval "DB_REGISTER | DB_RECOVER" |
282 | : 0; |
285 | : 0; |
283 | |
286 | |
284 | $DB_ENV = new BerkeleyDB::Env |
287 | $DB_ENV = new BerkeleyDB::Env |
285 | -Home => "$Crossfire::VARDIR/cfplus", |
288 | -Home => $HOME, |
286 | -Cachesize => 1_000_000, |
289 | -Cachesize => 1_000_000, |
287 | -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt", |
290 | -ErrFile => "$HOME/errorlog.txt", |
288 | # -ErrPrefix => "DATABASE", |
291 | # -ErrPrefix => "DATABASE", |
289 | -Verbose => 1, |
292 | -Verbose => 1, |
290 | -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, |
293 | -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, |
291 | -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, |
294 | -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, |
292 | or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; |
295 | or die "unable to create/open database home $HOME: $BerkeleyDB::Error"; |
293 | |
296 | |
294 | $DB_STATE = db_table "state"; |
297 | $DB_STATE = db_table "state"; |
295 | } |
298 | } |
296 | |
299 | |
297 | package CFPlus::Layout; |
300 | package CFPlus::Layout; |
… | |
… | |
397 | } elsif ($ev->{button} == 3) { |
400 | } elsif ($ev->{button} == 3) { |
398 | my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop'; |
401 | my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop'; |
399 | if ($self->{container} == $::CONN->{open_container}) { |
402 | if ($self->{container} == $::CONN->{open_container}) { |
400 | $move_prefix = "take"; |
403 | $move_prefix = "take"; |
401 | } |
404 | } |
|
|
405 | |
|
|
406 | my $shortname = CFPlus::shorten $self->{name}, 14; |
402 | |
407 | |
403 | my @menu_items = ( |
408 | my @menu_items = ( |
404 | ["examine", sub { $::CONN->send ("examine $self->{tag}") }], |
409 | ["examine", sub { $::CONN->send ("examine $self->{tag}") }], |
405 | ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], |
410 | ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], |
406 | ["ignite/thaw", # first try of an easier use of flint&steel |
411 | ["ignite/thaw", # first try of an easier use of flint&steel |
… | |
… | |
442 | do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) |
447 | do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) |
443 | } |
448 | } |
444 | ] |
449 | ] |
445 | ) |
450 | ) |
446 | ), |
451 | ), |
|
|
452 | ["bind <i>apply $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["apply $self->{name}"]) }], |
447 | ); |
453 | ); |
448 | |
454 | |
449 | CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); |
455 | CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); |
450 | } |
456 | } |
451 | |
457 | |