--- deliantra/Deliantra-Client/DC.pm 2006/04/21 07:19:56 1.43 +++ deliantra/Deliantra-Client/DC.pm 2006/07/30 13:40:17 1.109 @@ -1,10 +1,10 @@ =head1 NAME -CFClient - undocumented utility garbage for our crossfire client +CFPlus - undocumented utility garbage for our crossfire client =head1 SYNOPSIS - use CFClient; + use CFPlus; =head1 DESCRIPTION @@ -12,111 +12,67 @@ =cut -package CFClient; +package CFPlus; BEGIN { $VERSION = '0.1'; use XSLoader; - XSLoader::load "CFClient", $VERSION; + XSLoader::load "CFPlus", $VERSION; } +use utf8; + use Carp (); -use AnyEvent; +use AnyEvent (); use BerkeleyDB; -use CFClient::OpenGL; - -our %GL_EXT; -our $GL_VERSION; - -our $GL_NPOT; - -sub gl_init { - $GL_VERSION = gl_version * 1; - %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; - - $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; - - glEnable GL_TEXTURE_2D; - glEnable GL_COLOR_MATERIAL; - glShadeModel GL_FLAT; - glDisable GL_DEPTH_TEST; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - - glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; - - CFClient::Texture::restore_state (); -} - -sub find_rcfile($) { - my $path; - - for (@INC) { - $path = "$_/CFClient/resources/$_[0]"; - return $path if -r $path; - } +use Pod::POM (); +use Scalar::Util (); +use JSON::Syck (); +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.", +); - die "FATAL: can't find required file $_[0]\n"; -} +=item guard { BLOCK } -sub read_cfg { - my ($file) = @_; +Returns an object that executes the given block as soon as it is destroyed. - open CFG, $file - or return; - - my $CFG; - - local $/; - $CFG = eval ; - - $::CFG = $CFG; +=cut - close CFG; +sub guard(&) { + bless \(my $cb = $_[0]), "CFPlus::Guard" } -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; +sub CFPlus::Guard::DESTROY { + ${$_[0]}->() } -mkdir "$Crossfire::VARDIR/pclient", 0777; +sub asxml($) { + local $_ = $_[0]; -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_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, - or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; + s/&/&/g; + s/>/>/g; + s/ $DB_ENV, - -Filename => $table, -# -Filename => "database", -# -Subname => $table, - -Flags => DB_CREATE | DB_UPGRADE, - or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; + $_ } -package CFClient::Database; +package CFPlus::Database; our @ISA = BerkeleyDB::Btree::; @@ -138,193 +94,301 @@ $db->db_put ($key => $data) } -package CFClient::Texture; +package CFPlus; -use strict; - -use Scalar::Util; +sub find_rcfile($) { + my $path; -use CFClient::OpenGL; + for (grep !ref, @INC) { + $path = "$_/CFPlus/resources/$_[0]"; + return $path if -r $path; + } -my %TEXTURES; + die "FATAL: can't find required file $_[0]\n"; +} -sub new { - my ($class, %data) = @_; +$JSON::Syck::ImplicitUnicode = 1; - my $self = bless { - internalformat => GL_RGBA, - format => GL_RGBA, - type => GL_UNSIGNED_BYTE, - %data, - }, $class; +sub from_json { + JSON::Syck::Load $_[0] +} - Scalar::Util::weaken ($TEXTURES{$self+0} = $self); +sub to_json { + JSON::Syck::Dump $_[0] +} - $self->upload; +sub read_cfg { + my ($file) = @_; - $self -} + open my $fh, $file + or return; -sub new_from_image { - my ($class, $image, %arg) = @_; + local $/; + my $CFG = <$fh>; - $class->new (image => $image, %arg) + if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove + require YAML; + utf8::decode $CFG; + $::CFG = YAML::Load ($CFG); + } elsif ($CFG =~ /^\{/) { + $::CFG = from_json $CFG; + } else { + $::CFG = eval $CFG; ## todo comaptibility cruft + } } -sub new_from_file { - my ($class, $path, %arg) = @_; +sub write_cfg { + my ($file) = @_; - open my $fh, "<:raw", $path - or die "$path: $!"; + $::CFG->{VERSION} = $::VERSION; - local $/; - $class->new_from_image (<$fh>, %arg) + open my $fh, ">:utf8", $file + or return; + print $fh to_json $::CFG; } -#sub new_from_surface { -# my ($class, $surface) = @_; -# -# $surface->rgba; -# -# $class->new ( -# data => $surface->pixels, -# w => $surface->width, -# h => $surface->height, -# ) -#} +our $DB_ENV; -sub new_from_layout { - my ($class, $layout, %arg) = @_; +{ + use strict; - my ($w, $h, $data) = $layout->render; + mkdir "$Crossfire::VARDIR/cfplus", 0777; + my $recover = $BerkeleyDB::db_version >= 4.4 + ? eval "DB_REGISTER | DB_RECOVER" + : 0; - $class->new ( - w => $w, - h => $h, - data => $data, - internalformat => GL_ALPHA4, - format => GL_ALPHA, - type => GL_UNSIGNED_BYTE, - %arg, - ) + $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 new_from_opengl { - my ($class, $w, $h, $cb) = @_; +sub db_table($) { + my ($table) = @_; - $class->new (w => $w, h => $h, render_cb => $cb) -} + $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; -sub topot { - (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] + new CFPlus::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 upload { - my ($self) = @_; +package CFPlus::Layout; - return unless $GL_VERSION; +$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { + reset_glyph_cache; +}; - my $data; +package CFPlus::Item; + +use strict; +use Crossfire::Protocol::Constants; - if (exists $self->{data}) { - $data = $self->{data}; +my $last_enter_count = 1; - } 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}); +sub desc_string { + my ($self) = @_; - } else { - ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) - = CFClient::load_image_inline $self->{image}; - } + my $desc = + $self->{nrof} < 2 + ? $self->{name} + : "$self->{nrof} × $self->{name_pl}"; + + $self->{flags} & F_OPEN + and $desc .= " (open)"; + $self->{flags} & F_APPLIED + and $desc .= " (applied)"; + $self->{flags} & F_UNPAID + and $desc .= " (unpaid)"; + $self->{flags} & F_MAGIC + and $desc .= " (magic)"; + $self->{flags} & F_CURSED + and $desc .= " (cursed)"; + $self->{flags} & F_DAMNED + and $desc .= " (damned)"; + $self->{flags} & F_LOCKED + and $desc .= " *"; - my ($tw, $th) = @$self{qw(w h)}; + $desc +} - unless ($tw && $th) { - $tw = $th = 1; - $data = "\x00" x 64; - } +sub weight_string { + my ($self) = @_; - $self->{minified} = [CFClient::average $tw, $th, $data] - if $self->{minify}; + my $weight = ($self->{nrof} || 1) * $self->{weight}; - 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}); - } - } + $weight < 0 ? "?" : $weight * 0.001 +} - $self->{s} = $self->{w} / $tw; - $self->{t} = $self->{h} / $th; +sub do_n_dialog { + my ($cb) = @_; - glGetError; + my $w = new CFPlus::UI::FancyFrame + on_delete => sub { $_[0]->destroy; 1 }, + has_close_button => 1, + ; + + $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center"); + $vb->add (new CFPlus::UI::Label text => "Enter item count:"); + $vb->add (my $entry = new CFPlus::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; +} - $self->{name} ||= glGenTexture; +sub update_widgets { + my ($self) = @_; - glBindTexture GL_TEXTURE_2D, $self->{name}; + # necessary to avoid cyclic references + Scalar::Util::weaken $self; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; + my $button_cb = sub { + my (undef, $ev, $x, $y) = @_; - if ($::FAST) { - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST; - } 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, $self->{mipmap} ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR; - } - - if (defined $data) { - glTexImage2D GL_TEXTURE_2D, 0, - $self->{internalformat}, - $tw, $th, # need to pad texture first - 0, - $self->{format}, - $self->{type}, - $data; - if (my $error = glGetError) { - Carp::cluck sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x", - $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; - } - } else { - glCopyTexImage2D GL_TEXTURE_2D, 0, - $self->{internalformat}, - 0, 0, - $tw, $th, - 0; - if (my $error = glGetError) { - Carp::cluck sprintf "texture upload error: %x %dx%d i=%x", - $error, $tw, $th, $self->{internalformat}; + my $targ = $::CONN->{player}{tag}; + + if ($self->{container} == $::CONN->{player}{tag}) { + $targ = $::CONN->{open_container}; } - } -} -sub DESTROY { - my ($self) = @_; + if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) { + $::CONN->send ("move $targ $self->{tag} 0") + if $targ || !($self->{flags} & F_LOCKED); + } elsif (($ev->{mod} & CFPlus::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"); + } + ], + ["inscribe", # first try of an easier use of flint&steel + sub { + &::open_string_query ("Text to inscribe", sub { + my ($entry, $txt) = @_; + $::CONN->send ("mark ". pack "N", $self->{tag}); + $::CONN->send ("command use_skill inscription $txt"); + }); + } + ], + ["apply", sub { $::CONN->send ("apply $self->{tag}") }], + ( + $self->{flags} & F_LOCKED + ? ( + ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], + ) + : ( + ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], + ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }], + ["$move_prefix <n>", + sub { + do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) + } + ] + ) + ), + ); - delete $TEXTURES{$self+0}; + CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); + } - glDeleteTexture delete $self->{name} - if $self->{name}; -} + 1 + }; -sub restore_state{ - $_->upload - for values %TEXTURES; -}; + my $tooltip_std = "" + . "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"; + + my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5] + : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5] + : undef; + + $self->{face_widget} ||= new CFPlus::UI::Face + can_events => 1, + can_hover => 1, + anim => $self->{anim}, + animspeed => $self->{animspeed}, # TODO# must be set at creation time + on_button_down => $button_cb, + ; + $self->{face_widget}{bg} = $bg; + $self->{face_widget}{face} = $self->{face}; + $self->{face_widget}{anim} = $self->{anim}; + $self->{face_widget}{animspeed} = $self->{animspeed}; + $self->{face_widget}->set_tooltip ( + "Face/Animation.\n" + . "Item uses face #$self->{face}. " + . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") + . "\n\n$tooltip_std" + ); + + $self->{desc_widget} ||= new CFPlus::UI::Label + can_events => 1, + can_hover => 1, + ellipsise => 2, + align => -1, + on_button_down => $button_cb, + ; + my $desc = CFPlus::Item::desc_string $self; + $self->{desc_widget}{bg} = $bg; + $self->{desc_widget}->set_text ($desc); + $self->{desc_widget}->set_tooltip ("$desc.\n$tooltip_std"); + + $self->{weight_widget} ||= new CFPlus::UI::Label + can_events => 1, + can_hover => 1, + ellipsise => 0, + align => 0, + on_button_down => $button_cb, + ; + $self->{weight_widget}{bg} = $bg; + $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self); + $self->{weight_widget}->set_tooltip ( + "Weight.\n" + . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") + . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") + . "\n\n$tooltip_std" + ); +} 1;