--- deliantra/Deliantra-Client/DC.pm 2006/05/29 19:30:27 1.73 +++ deliantra/Deliantra-Client/DC.pm 2006/06/07 06:28:28 1.91 @@ -26,95 +26,15 @@ use Carp (); use AnyEvent (); use BerkeleyDB; - -sub find_rcfile($) { - my $path; - - for (grep !ref, @INC) { - $path = "$_/CFClient/resources/$_[0]"; - return $path if -r $path; - } - - die "FATAL: can't find required file $_[0]\n"; -} - -sub read_cfg { - my ($file) = @_; - - open CFG, $file - or return; - - my $CFG; - - local $/; - $CFG = eval ; - - $::CFG = $CFG; - - close CFG; -} - -sub write_cfg { - my ($file) = @_; - - open CFG, ">$file" - or return; - - { - require Data::Dumper; - local $Data::Dumper::Purity = 1; - $::CFG->{VERSION} = $::VERSION; - print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); - } - - close CFG; -} - -mkdir "$Crossfire::VARDIR/pclient", 0777; - -our $DB_ENV = new BerkeleyDB::Env - -Home => "$Crossfire::VARDIR/pclient", - -Cachesize => 1_000_000, - -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", -# -ErrPrefix => "DATABASE", - -Verbose => 1, - -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, - or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; - -sub db_table($) { - my ($table) = @_; - - $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; - - new CFClient::Database - -Env => $DB_ENV, - -Filename => $table, -# -Filename => "database", -# -Subname => $table, - -Property => DB_CHKSUM, - -Flags => DB_CREATE | DB_UPGRADE, - or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; -} - -sub pod_to_pango($) { - my ($pom) = @_; - - $pom->present ("CFClient::PodToPango") -} - -sub pod_to_pango_list($) { - my ($pom) = @_; - - [ - map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "], - split /\n/, $pom->present ("CFClient::PodToPango") - ] -} +use Pod::POM (); +use Storable (); # finally package CFClient::PodToPango; use base Pod::POM::View::Text; +our $VERSION = 1; # bump if resultant formatting changes + our $indent = 0; *view_seq_code = @@ -133,7 +53,7 @@ sub view_item { ("\t" x ($indent / 4)) . $_[1]->title->present ($_[0]) - . "\n" + . "\n\n" . $_[1]->content->present ($_[0]) } @@ -190,11 +110,139 @@ $db->db_put ($key => $data) } +package CFClient; + +sub find_rcfile($) { + my $path; + + for (grep !ref, @INC) { + $path = "$_/CFClient/resources/$_[0]"; + return $path if -r $path; + } + + die "FATAL: can't find required file $_[0]\n"; +} + +sub read_cfg { + my ($file) = @_; + + open CFG, $file + or return; + + my $CFG; + + local $/; + $CFG = eval ; + + $::CFG = $CFG; + + close CFG; +} + +sub write_cfg { + my ($file) = @_; + + open CFG, ">$file" + or return; + + { + require Data::Dumper; + local $Data::Dumper::Purity = 1; + $::CFG->{VERSION} = $::VERSION; + print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); + } + + close CFG; +} + +our $DB_ENV; + +{ + use strict; + + mkdir "$Crossfire::VARDIR/cfplus", 0777; + my $recover = $BerkeleyDB::db_version >= 4.4 + ? eval "DB_REGISTER | DB_RECOVER" + : 0; + + $DB_ENV = new BerkeleyDB::Env + -Home => "$Crossfire::VARDIR/cfplus", + -Cachesize => 1_000_000, + -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt", +# -ErrPrefix => "DATABASE", + -Verbose => 1, + -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, + -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, + or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; +} + +sub db_table($) { + my ($table) = @_; + + $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; + + new CFClient::Database + -Env => $DB_ENV, + -Filename => $table, +# -Filename => "database", +# -Subname => $table, + -Property => DB_CHKSUM, + -Flags => DB_CREATE | DB_UPGRADE, + or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" +} + +my $pod_cache = db_table "pod_cache"; + +sub load_pod($$$$) { + my ($path, $filtertype, $filterversion, $filtercb) = @_; + + stat $path + or die "$path: $!"; + + my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9]; + + my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } }; + + return $pom if $chash eq $phash; + + my $pod = do { + local $/; + open my $pod, "<:utf8", $_[0] + or die "$_[0]: $!"; + <$pod> + }; + + #utf8::downgrade $pod; + + $pom = $filtercb-> (Pod::POM->new->parse_text ($pod)); + + $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]); + + $pom +} + +sub pod_to_pango($) { + my ($pom) = @_; + + $pom->present ("CFClient::PodToPango") +} + +sub pod_to_pango_list($) { + my ($pom) = @_; + + [ + map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "], + split /\n/, $pom->present ("CFClient::PodToPango") + ] +} + package CFClient::Item; use strict; use Crossfire::Protocol::Constants; +my $last_enter_count = 1; + sub desc_string { my ($self) = @_; @@ -229,20 +277,46 @@ $weight < 0 ? "?" : $weight * 0.001 } +sub do_n_dialog { + my ($cb) = @_; + + my $w = new CFClient::UI::FancyFrame; + $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center"); + $vb->add (new CFClient::UI::Label text => "Enter item count:"); + $vb->add (my $entry = new CFClient::UI::Entry + text => $last_enter_count, + on_activate => sub { + my ($entry) = @_; + $last_enter_count = $entry->get_text; + $cb->($last_enter_count); + $w->hide; + $w = undef; + } + ); + $entry->focus_in; + $w->show; + +} + sub update_widgets { my ($self) = @_; my $button_cb = sub { my (undef, $ev, $x, $y) = @_; - if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { - my $targ = $::CONN->{player}{tag}; + my $targ = $::CONN->{player}{tag}; - if ($self->{container} == $::CONN->{player}{tag}) { - $targ = $::CONN->{open_container}; - } + if ($self->{container} == $::CONN->{player}{tag}) { + $targ = $::CONN->{open_container}; + } - $::CONN->send ("move $targ $self->{tag} 0"); + if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { + $::CONN->send ("move $targ $self->{tag} 0") + if $targ || !($self->{flags} & F_LOCKED); + } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { + $self->{flags} & F_LOCKED + ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) + : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) } elsif ($ev->{button} == 1) { $::CONN->send ("examine $self->{tag}"); } elsif ($ev->{button} == 2) { @@ -260,6 +334,11 @@ : ( ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], + ["move n", + sub { + do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) + } + ] ) ), ); @@ -274,6 +353,7 @@ . "Left click - examine item\n" . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" . "Middle click - apply\n" + . "Shift-Middle click - lock/unlock\n" . "Right click - further options" . "\n"; @@ -322,36 +402,30 @@ ); } -package CFClient::Recorder; - -our $RECORD_WINDOW; - -my $CMDBOX; -my $CURRENT_CMDS; -my $REC_BTN; +package CFClient::Binder; my @ALLOWED_MODIFIER_KEYS = ( - (CFClient::SDLK_LSHIFT) => "LSHIFT", - (CFClient::SDLK_LCTRL ) => "LCTRL", - (CFClient::SDLK_LALT ) => "LALT", - (CFClient::SDLK_LMETA ) => "LMETA", - - (CFClient::SDLK_RSHIFT) => "RSHIFT", - (CFClient::SDLK_RCTRL ) => "RCTRL", - (CFClient::SDLK_RALT ) => "RALT", - (CFClient::SDLK_RMETA ) => "RMETA", + CFClient::SDLK_LSHIFT, + CFClient::SDLK_LCTRL , + CFClient::SDLK_LALT , + CFClient::SDLK_LMETA , + + CFClient::SDLK_RSHIFT, + CFClient::SDLK_RCTRL , + CFClient::SDLK_RALT , + CFClient::SDLK_RMETA , ); my %ALLOWED_MODIFIERS = ( - (CFClient::KMOD_LSHIFT) => "LSHIFT", - (CFClient::KMOD_LCTRL ) => "LCTRL", - (CFClient::KMOD_LALT ) => "LALT", - (CFClient::KMOD_LMETA ) => "LMETA", - - (CFClient::KMOD_RSHIFT) => "RSHIFT", - (CFClient::KMOD_RCTRL ) => "RCTRL", - (CFClient::KMOD_RALT ) => "RALT", - (CFClient::KMOD_RMETA ) => "RMETA", + CFClient::KMOD_LSHIFT => "LSHIFT", + CFClient::KMOD_LCTRL => "LCTRL", + CFClient::KMOD_LALT => "LALT", + CFClient::KMOD_LMETA => "LMETA", + + CFClient::KMOD_RSHIFT => "RSHIFT", + CFClient::KMOD_RCTRL => "RCTRL", + CFClient::KMOD_RALT => "RALT", + CFClient::KMOD_RMETA => "RMETA", ); my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/; @@ -374,14 +448,14 @@ ); # this binding dialog asks for a key-combo to be pressed -# and if successful it binds the modifier+symbol to the -# supplied actions in $cmd. -# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym}) +# and if successful it calls the $cb with $mod and $sym as args. sub open_binding_dialog { - my ($cmd) = @_; + my ($cb) = @_; my $w = new CFClient::UI::FancyFrame - title => "Bind Action"; + title => "Bind Action", + x => "center", + y => "center"; $w->add (my $vb = new CFClient::UI::VBox); $vb->add (new CFClient::UI::Label @@ -414,14 +488,12 @@ $entry->focus_out; - $::CFG->{bindings}->{$mod}->{$sym} = $cmd; - $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget Save Layout!"); + $cb->($mod, $sym); $w->destroy }); $entry->focus_in; - $w->center; $w->show; } @@ -430,109 +502,13 @@ my $mods = join '+', map { $ALLOWED_MODIFIERS{$_} } - grep { $_ & $mod } + grep { ($_ + 0) & ($mod + 0) } keys %ALLOWED_MODIFIERS; $mods .= "+" if $mods ne ''; return $mods . CFClient::SDL_GetKeyName ($sym); } -sub clear_command_list { - $CMDBOX->clear () if $CMDBOX; -} - -sub set_command_list { - my ($list) = @_; - - return unless $CMDBOX; - - $CMDBOX->clear (); - $CURRENT_CMDS = $list; - - my $idx = 0; - - for (@$list) { - $CMDBOX->add (my $hb = new CFClient::UI::HBox); - - my $i = $idx; - $hb->add (new CFClient::UI::Button - text => "del", - tooltip => "Deletes the action from the record", - on_activate => sub { - $CMDBOX->remove ($hb); - $list->[$i] = undef; - }); - - $hb->add (new CFClient::UI::Label text => $_); - - $idx++ - } -} - -# if $show is 1 the recorder will be shown -sub start { - my ($show) = @_; - - $RECORD_WINDOW->show if $show; - - $REC_BTN->set_text ("stop recording"); - $REC_BTN->{recording} = 1; - clear_command_list; - $::CONN->start_record; -} - -# if $autobind is 1 the recorder will be automatically -# jump into the binding query and hide the recorder window -sub stop { - my ($autobind) = @_; - - $REC_BTN->set_text ("start recording"); - $REC_BTN->{recording} = 0; - - my $rec = $::CONN->stop_record; - return unless ref $rec eq 'ARRAY'; - set_command_list ($rec); - - if ($autobind) { - open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]); - $RECORD_WINDOW->hide; - } -} - -sub make_window { - $RECORD_WINDOW = new CFClient::UI::FancyFrame - req_y => 1, - req_x => -1, - title => "Action Recorder"; - - $RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox); - $vb->add ($REC_BTN = new CFClient::UI::Button - text => "start recording", - tooltip => "Start/Stops recording of actions." - ."(CTRL+INS Starts the recorder, INS Stops recorder and binds automatically)" - ."All subsequent actions after the recording started will be captured." - ."The actions are displayed after the record was stopped." - ."To bind the action you have to click on the 'Bind' button", - on_activate => sub { - my ($btn) = @_; - - unless ($btn->{recording}) { - start; - } else { - stop; - } - }); - $vb->add ($CMDBOX = new CFClient::UI::VBox); - $vb->add (new CFClient::UI::Button - text => "bind", - tooltip => "This opens a query where you have to press the key combination to bind the recorded actions", - on_activate => sub { - open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]); - }); - - $RECORD_WINDOW -} - 1; =back