--- deliantra/Deliantra-Client/DC.pm 2006/05/21 00:02:00 1.57 +++ deliantra/Deliantra-Client/DC.pm 2006/05/31 07:13:50 1.82 @@ -21,42 +21,12 @@ XSLoader::load "CFClient", $VERSION; } +use utf8; + use Carp (); use AnyEvent (); use BerkeleyDB; -use CFClient::OpenGL; - -our %GL_EXT; -our $GL_VERSION; - -our $GL_NPOT; -our $GL_DEBUG = 1; - -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; - - glDisable GL_COLOR_MATERIAL; - glShadeModel GL_FLAT; - glDisable GL_DITHER; - glDisable GL_DEPTH_TEST; - glDepthMask 0; - glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; - - CFClient::Texture::restore_state (); -} - -sub gl_check { - return unless $GL_DEBUG; - - if (my $error = glGetError) { - Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_); - } -} - sub find_rcfile($) { my $path; @@ -100,22 +70,34 @@ close CFG; } -mkdir "$Crossfire::VARDIR/pclient", 0777; +mkdir "$Crossfire::VARDIR/cfplus", 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; + + my $recover = $BerkeleyDB::db_version >= 4.4 + ? eval "DB_REGISTER | DB_RECOVER" + : 0; + warn $recover; + + $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_FATAL | 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, @@ -123,7 +105,7 @@ # -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($) { @@ -132,6 +114,15 @@ $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::PodToPango; use base Pod::POM::View::Text; @@ -160,7 +151,7 @@ sub view_verbatim { (join "", - map +("\t" x ($indent / 2)) . "$_\n", + map +("\t" x ($indent / 2)) . "$_\n", split /\n/, CFClient::UI::Label::escape ($_[1])) . "\n" } @@ -169,8 +160,18 @@ ("\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 { - "" . $_[1]->title->present ($_[0]) . "\n\n" + "\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]) }; @@ -201,195 +202,244 @@ $db->db_put ($key => $data) } -package CFClient::Texture; +package CFClient::Item; use strict; +use Crossfire::Protocol::Constants; -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) = @_; +sub desc_string { + my ($self) = @_; - my ($w, $h, $data, $format, $internalformat) = $layout->render; + 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 .= " *"; - $class->new ( - w => $w, - h => $h, - data => $data, - format => $format, - internalformat => $format, - type => GL_UNSIGNED_BYTE, - %arg, - ) + $desc } -sub new_from_opengl { - my ($class, $w, $h, $cb) = @_; +sub weight_string { + my ($self) = @_; - $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) -} + my $weight = ($self->{nrof} || 1) * $self->{weight}; -sub topot { - (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] + $weight < 0 ? "?" : $weight * 0.001 } -sub upload { +sub update_widgets { my ($self) = @_; - return unless $GL_VERSION; - - my $data; - - if (exists $self->{data}) { - $data = $self->{data}; + my $button_cb = sub { + my (undef, $ev, $x, $y) = @_; - } 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)}; + if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { + my $targ = $::CONN->{player}{tag}; - unless ($tw > 0 && $th > 0) { - $tw = $th = 1; - $data = "\x00" x 64; - } + if ($self->{container} == $::CONN->{player}{tag}) { + $targ = $::CONN->{open_container}; + } + + $::CONN->send ("move $targ $self->{tag} 0") + if $targ || !($self->{flags} & F_LOCKED); + } elsif ($ev->{button} == 1) { + $::CONN->send ("examine $self->{tag}"); + } elsif ($ev->{button} == 2) { + $::CONN->send ("apply $self->{tag}"); + } elsif ($ev->{button} == 3) { + my @menu_items = ( + ["examine", sub { $::CONN->send ("examine $self->{tag}") }], + ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], + ["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}) }], + ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], + ) + ), + ); - $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}); + CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); } - } - $self->{s} = $self->{w} / $tw; - $self->{t} = $self->{h} / $th; + 1 + }; - $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; - } + my $tooltip_std = "" + . "Left click - examine item\n" + . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" + . "Middle click - apply\n" + . "Right click - further options" + . "\n"; + + $self->{face_widget} ||= new CFClient::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}{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" + ); - 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}; -} + $self->{desc_widget} ||= new CFClient::UI::Label + can_events => 1, + can_hover => 1, + ellipsise => 2, + align => -1, + on_button_down => $button_cb, + ; + my $desc = CFClient::Item::desc_string $self; + $self->{desc_widget}->set_text ($desc); + $self->{desc_widget}->set_tooltip ("$desc.\n$tooltip_std"); + + $self->{weight_widget} ||= new CFClient::UI::Label + can_events => 1, + can_hover => 1, + ellipsise => 0, + align => 0, + on_button_down => $button_cb, + ; + $self->{weight_widget}->set_text (CFClient::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" + ); +} + +package CFClient::Binder; + +my @ALLOWED_MODIFIER_KEYS = ( + (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", +); + +my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/; +my @DIRECT_BIND_KEYS = ( + CFClient::SDLK_F1, + CFClient::SDLK_F2, + CFClient::SDLK_F3, + CFClient::SDLK_F4, + CFClient::SDLK_F5, + CFClient::SDLK_F6, + CFClient::SDLK_F7, + CFClient::SDLK_F8, + CFClient::SDLK_F9, + CFClient::SDLK_F10, + CFClient::SDLK_F11, + CFClient::SDLK_F12, + CFClient::SDLK_F13, + CFClient::SDLK_F14, + CFClient::SDLK_F15, +); + +# this binding dialog asks for a key-combo to be pressed +# and if successful it calls the $cb with $mod and $sym as args. +sub open_binding_dialog { + my ($cb) = @_; + + my $w = new CFClient::UI::FancyFrame + title => "Bind Action", + x => "center", + y => "center"; + + $w->add (my $vb = new CFClient::UI::VBox); + $vb->add (new CFClient::UI::Label + text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key." + ."You can only bind 0-9 and F1-F15 without modifiers." + ); + $vb->add (my $entry = new CFClient::UI::Entry + text => "", + on_key_down => sub { + my ($entry, $ev) = @_; + + my $mod = $ev->{mod}; + my $sym = $ev->{sym}; + + # XXX: This seems a little bit hackisch to me, but i have to ignore them + if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) { + return; + } + + if ($mod == CFClient::KMOD_NONE + and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})} + and not grep { $sym == $_ } @DIRECT_BIND_KEYS) + { + $::STATUSBOX->add ( + "Can't bind key ".CFClient::SDL_GetKeyName ($sym) + ." directly without modifier! It would damage the completer handling." + ); + return; + } + + $entry->focus_out; + + $cb->($mod, $sym); + + $w->destroy + }); + + $entry->focus_in; + $w->show; +} + +sub keycombo_to_name { + my ($mod, $sym) = @_; + + my $mods = join '+', + map { $ALLOWED_MODIFIERS{$_} } + grep { ($_ + 0) & ($mod + 0) } + keys %ALLOWED_MODIFIERS; + $mods .= "+" if $mods ne ''; -sub restore_state { - $_->upload - for values %TEXTURES; + return $mods . CFClient::SDL_GetKeyName ($sym); } 1;