--- deliantra/Deliantra-Client/DC.pm 2006/05/25 18:48:45 1.64 +++ deliantra/Deliantra-Client/DC.pm 2006/07/23 08:58:43 1.103 @@ -26,41 +26,124 @@ use Carp (); use AnyEvent (); use BerkeleyDB; +use Pod::POM (); +use Scalar::Util (); +use Storable (); # finally + +our %STAT_TOOLTIP = ( + Str => "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack", + Dex => "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed", + Con => "Constitution, physical health and toughness. Determines how many healthpoints you can have", + Int => "Intelligence, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have", + Wis => "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have", + Pow => "Power, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up", + Cha => "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops.", + + Wc => "Weapon Class, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72.", + Ac => "Armour Class, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases.", + Dam => "Damage, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack.", + Arm => "Armour, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance.", + Spd => "Speed, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed.", + WSp => "Weapon Speed, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed.", +); + +=item guard { BLOCK } + +Returns an object that executes the given block as soon as it is destroyed. -use CFClient::OpenGL; +=cut -our %GL_EXT; -our $GL_VERSION; +sub guard(&) { + bless \(my $cb = $_[0]), "CFClient::Guard" +} + +sub CFClient::Guard::DESTROY { + ${$_[0]}->() +} -our $GL_NPOT; -our $GL_DEBUG = 1; +package CFClient::PodToPango; -sub gl_init { - $GL_VERSION = gl_version * 1; - %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; +use base Pod::POM::View::Text; - $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; - $GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right... +our $VERSION = 1; # bump if resultant formatting changes - glDisable GL_COLOR_MATERIAL; - glShadeModel GL_FLAT; - glDisable GL_DITHER; - glDisable GL_DEPTH_TEST; - glDepthMask 0; - glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; +our $indent = 0; - CFClient::Texture::restore_state (); +*view_seq_code = +*view_seq_bold = sub { "$_[1]" }; +*view_seq_italic = sub { "$_[1]" }; +*view_seq_space = +*view_seq_link = +*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) }; + +sub view_seq_text { + my $text = $_[1]; + $text =~ s/\s+/ /g; + CFClient::UI::Label::escape ($text) +} + +sub view_item { + ("\t" x ($indent / 4)) + . $_[1]->title->present ($_[0]) + . "\n\n" + . $_[1]->content->present ($_[0]) } -sub gl_check { - return unless $GL_DEBUG; +sub view_verbatim { + (join "", + map +("\t" x ($indent / 2)) . "$_\n", + split /\n/, CFClient::UI::Label::escape ($_[1])) + . "\n" +} - if (my $error = glGetError) { - my ($format, @args) = @_; - Carp::cluck sprintf "opengl error %x while $format", $error, @args; - } +sub view_textblock { + ("\t" x ($indent / 2)) . "$_[1]\n\n" } +sub view_head1 { + "\n\n" . $_[1]->title->present ($_[0]) . "\n\n" + . $_[1]->content->present ($_[0]) +}; + +sub view_head2 { + "\n" . $_[1]->title->present ($_[0]) . "\n\n" + . $_[1]->content->present ($_[0]) +}; + +sub view_head3 { + "\n" . $_[1]->title->present ($_[0]) . "\n\n" + . $_[1]->content->present ($_[0]) +}; + +sub view_over { + local $indent = $indent + $_[1]->indent; + $_[1]->content->present ($_[0]) +} + +package CFClient::Database; + +our @ISA = BerkeleyDB::Btree::; + +sub get($$) { + my $data; + + $_[0]->db_get ($_[1], $data) == 0 + ? $data + : () +} + +my %DB_SYNC; + +sub put($$$) { + my ($db, $key, $data) = @_; + + $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); + + $db->db_put ($key => $data) +} + +package CFClient; + sub find_rcfile($) { my $path; @@ -104,22 +187,32 @@ close CFG; } -mkdir "$Crossfire::VARDIR/pclient", 0777; +our $DB_ENV; -our $DB_ENV = new BerkeleyDB::Env - -Home => "$Crossfire::VARDIR/pclient", - -Cachesize => 1_000_000, - -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", +{ + 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, - or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; + -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, @@ -127,99 +220,66 @@ # -Subname => $table, -Property => DB_CHKSUM, -Flags => DB_CREATE | DB_UPGRADE, - or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; + or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" } -sub pod_to_pango($) { - my ($pom) = @_; +my $pod_cache = db_table "pod_cache"; - $pom->present ("CFClient::PodToPango") -} +sub load_pod($$$$) { + my ($path, $filtertype, $filterversion, $filtercb) = @_; -sub pod_to_pango_list($) { - my ($pom) = @_; + stat $path + or die "$path: $!"; - [ - map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "], - split /\n/, $pom->present ("CFClient::PodToPango") - ] -} + my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9]; -package CFClient::PodToPango; + my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } }; -use base Pod::POM::View::Text; - -our $indent = 0; + return $pom if $chash eq $phash; -*view_seq_code = -*view_seq_bold = sub { "$_[1]" }; -*view_seq_italic = sub { "$_[1]" }; -*view_seq_space = -*view_seq_link = -*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) }; + my $pod = do { + local $/; + open my $pod, "<:utf8", $_[0] + or die "$_[0]: $!"; + <$pod> + }; -sub view_seq_text { - my $text = $_[1]; - $text =~ s/\s+/ /g; - CFClient::UI::Label::escape ($text) -} + #utf8::downgrade $pod; -sub view_item { - ("\t" x ($indent / 4)) - . $_[1]->title->present ($_[0]) - . "\n" - . $_[1]->content->present ($_[0]) -} + $pom = $filtercb-> (Pod::POM->new->parse_text ($pod)); -sub view_verbatim { - (join "", - map +("\t" x ($indent / 2)) . "$_\n", - split /\n/, CFClient::UI::Label::escape ($_[1])) - . "\n" -} + $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]); -sub view_textblock { - ("\t" x ($indent / 2)) . "$_[1]\n\n" + $pom } -sub view_head1 { - "" . $_[1]->title->present ($_[0]) . "\n\n" - . $_[1]->content->present ($_[0]) -}; - -sub view_head2 { - "" . $_[1]->title->present ($_[0]) . "\n\n" - . $_[1]->content->present ($_[0]) -}; +sub pod_to_pango($) { + my ($pom) = @_; -sub view_over { - local $indent = $indent + $_[1]->indent; - $_[1]->content->present ($_[0]) + $pom->present ("CFClient::PodToPango") } -package CFClient::Database; - -our @ISA = BerkeleyDB::Btree::; - -sub get($$) { - my $data; +sub pod_to_pango_list($) { + my ($pom) = @_; - $_[0]->db_get ($_[1], $data) == 0 - ? $data - : () + [ + map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "], + split /\n/, $pom->present ("CFClient::PodToPango") + ] } -my %DB_SYNC; +package CFClient::Layout; -sub put($$$) { - my ($db, $key, $data) = @_; +$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { + reset_glyph_cache; +}; - $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); +package CFClient::Item; - $db->db_put ($key => $data) -} +use strict; +use Crossfire::Protocol::Constants; -package CFClient::Item; +my $last_enter_count = 1; sub desc_string { my ($self) = @_; @@ -229,19 +289,19 @@ ? $self->{name} : "$self->{nrof} × $self->{name_pl}"; - $self->{flags} & Crossfire::Protocol::F_OPEN + $self->{flags} & F_OPEN and $desc .= " (open)"; - $self->{flags} & Crossfire::Protocol::F_APPLIED + $self->{flags} & F_APPLIED and $desc .= " (applied)"; - $self->{flags} & Crossfire::Protocol::F_UNPAID + $self->{flags} & F_UNPAID and $desc .= " (unpaid)"; - $self->{flags} & Crossfire::Protocol::F_MAGIC + $self->{flags} & F_MAGIC and $desc .= " (magic)"; - $self->{flags} & Crossfire::Protocol::F_CURSED + $self->{flags} & F_CURSED and $desc .= " (cursed)"; - $self->{flags} & Crossfire::Protocol::F_DAMNED + $self->{flags} & F_DAMNED and $desc .= " (damned)"; - $self->{flags} & Crossfire::Protocol::F_LOCKED + $self->{flags} & F_LOCKED and $desc .= " *"; $desc @@ -255,37 +315,88 @@ $weight < 0 ? "?" : $weight * 0.001 } +sub do_n_dialog { + my ($cb) = @_; + + my $w = new CFClient::UI::FancyFrame + on_delete => sub { $_[0]->destroy; 1 }, + has_close_button => 1, + ; + + $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->destroy; + + 0 + }, + on_escape => sub { $w->destroy; 1 }, + ); + $entry->grab_focus; + $w->show; +} + sub update_widgets { my ($self) = @_; + # necessary to avoid cyclic references + Scalar::Util::weaken $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) { $::CONN->send ("apply $self->{tag}"); } elsif ($ev->{button} == 3) { + my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop'; + if ($self->{container} == $::CONN->{open_container}) { + $move_prefix = "take"; + } + my @menu_items = ( ["examine", sub { $::CONN->send ("examine $self->{tag}") }], ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], + ["ignite/thaw", # first try of an easier use of flint&steel + sub { + $::CONN->send ("mark ". pack "N", $self->{tag}); + $::CONN->send ("command apply flint and steel"); + } + ], ["apply", sub { $::CONN->send ("apply $self->{tag}") }], ( - $self->{flags} & Crossfire::Protocol::F_LOCKED + $self->{flags} & F_LOCKED ? ( ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], ) : ( ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], - ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], + ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }], + ["$move_prefix ", + sub { + do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) + } + ] ) ), ); @@ -300,17 +411,20 @@ . "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"; $self->{face_widget} ||= new CFClient::UI::Face can_events => 1, can_hover => 1, - connect_button_down => $button_cb, + anim => $self->{anim}, + animspeed => $self->{animspeed}, # TODO# must be set at creation time + on_button_down => $button_cb, ; $self->{face_widget}{face} = $self->{face}; $self->{face_widget}{anim} = $self->{anim}; - $self->{face_widget}{animspeed} = $self->{animespeed}; + $self->{face_widget}{animspeed} = $self->{animspeed}; $self->{face_widget}->set_tooltip ( "Face/Animation.\n" . "Item uses face #$self->{face}. " @@ -322,8 +436,8 @@ can_events => 1, can_hover => 1, ellipsise => 2, - xalign => 0, - connect_button_down => $button_cb, + align => -1, + on_button_down => $button_cb, ; my $desc = CFClient::Item::desc_string $self; $self->{desc_widget}->set_text ($desc); @@ -333,8 +447,8 @@ can_events => 1, can_hover => 1, ellipsise => 0, - xalign => 0.5, - connect_button_down => $button_cb, + align => 0, + on_button_down => $button_cb, ; $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); @@ -346,197 +460,6 @@ ); } -package CFClient::Texture; - -use strict; - -use Scalar::Util; - -use CFClient::OpenGL; - -my %TEXTURES; - -sub new { - my ($class, %data) = @_; - - my $self = bless { - internalformat => GL_RGBA, - format => GL_RGBA, - type => GL_UNSIGNED_BYTE, - %data, - }, $class; - - Scalar::Util::weaken ($TEXTURES{$self+0} = $self); - - $self->upload; - - $self -} - -sub new_from_image { - my ($class, $image, %arg) = @_; - - $class->new (image => $image, %arg) -} - -sub new_from_file { - my ($class, $path, %arg) = @_; - - open my $fh, "<:raw", $path - or die "$path: $!"; - - local $/; - $class->new_from_image (<$fh>, %arg) -} - -#sub new_from_surface { -# my ($class, $surface) = @_; -# -# $surface->rgba; -# -# $class->new ( -# data => $surface->pixels, -# w => $surface->width, -# h => $surface->height, -# ) -#} - -sub new_from_layout { - my ($class, $layout, %arg) = @_; - - my ($w, $h, $data, $format, $internalformat) = $layout->render; - - $class->new ( - w => $w, - h => $h, - data => $data, - format => $format, - internalformat => $format, - type => GL_UNSIGNED_BYTE, - %arg, - ) -} - -sub new_from_opengl { - my ($class, $w, $h, $cb) = @_; - - $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) -} - -sub topot { - (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] -} - -sub upload { - my ($self) = @_; - - return unless $GL_VERSION; - - my $data; - - if (exists $self->{data}) { - $data = $self->{data}; - - } elsif (exists $self->{render_cb}) { - glViewport 0, 0, $self->{w}, $self->{h}; - glMatrixMode GL_PROJECTION; - glLoadIdentity; - glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000; - glMatrixMode GL_MODELVIEW; - glLoadIdentity; - $self->{render_cb}->($self, $self->{w}, $self->{h}); - - } else { - ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) - = CFClient::load_image_inline $self->{image}; - } - - my ($tw, $th) = @$self{qw(w h)}; - - unless ($tw > 0 && $th > 0) { - $tw = $th = 1; - $data = "\x00" x 64; - } - - $self->{minified} = [CFClient::average $tw, $th, $data] - if $self->{minify}; - - unless ($GL_NPOT) { - # TODO: does not work for zero-sized textures - $tw = topot $tw; - $th = topot $th; - - if (($tw != $self->{w} || $th != $self->{h}) && defined $data) { - my $bpp = (length $data) / ($self->{w} * $self->{h}); - $data = pack "(a" . ($tw * $bpp) . ")*", - unpack "(a" . ($self->{w} * $bpp) . ")*", $data; - $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); - } - } - - $self->{s} = $self->{w} / $tw; - $self->{t} = $self->{h} / $th; - - $self->{name} ||= glGenTexture; - - glBindTexture GL_TEXTURE_2D, $self->{name}; - - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; - - if ($::FAST) { - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST; - } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) { - # alternatively check for 0x8191 - glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR; - } else { - glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap}; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR; - } - - glGetError; - - if (defined $data) { - glTexImage2D GL_TEXTURE_2D, 0, - $self->{internalformat}, - $tw, $th, - 0, - $self->{format}, - $self->{type}, - $data; - CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x", - $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; - } else { - glCopyTexImage2D GL_TEXTURE_2D, 0, - $self->{internalformat}, - 0, 0, - $tw, $th, - 0; - CFClient::gl_check "copying to texture %dx%d if=%x", - $tw, $th, $self->{internalformat}; - } - - glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side -} - -sub DESTROY { - my ($self) = @_; - - delete $TEXTURES{$self+0}; - - glDeleteTexture delete $self->{name} - if $self->{name}; -} - -sub restore_state { - $_->upload - for values %TEXTURES; -} - 1; =back