--- deliantra/Deliantra-Client/DC.pm 2006/05/25 16:24:43 1.62
+++ deliantra/Deliantra-Client/DC.pm 2006/07/12 17:20:04 1.98
@@ -26,41 +26,93 @@
use Carp ();
use AnyEvent ();
use BerkeleyDB;
+use Pod::POM ();
+use Scalar::Util ();
+use Storable (); # finally
-use CFClient::OpenGL;
+package CFClient::PodToPango;
-our %GL_EXT;
-our $GL_VERSION;
+use base Pod::POM::View::Text;
-our $GL_NPOT;
-our $GL_DEBUG = 1;
+our $VERSION = 1; # bump if resultant formatting changes
-sub gl_init {
- $GL_VERSION = gl_version * 1;
- %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
+our $indent = 0;
- $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...
+*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]) };
- glDisable GL_COLOR_MATERIAL;
- glShadeModel GL_FLAT;
- glDisable GL_DITHER;
- glDisable GL_DEPTH_TEST;
- glDepthMask 0;
- glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
+sub view_seq_text {
+ my $text = $_[1];
+ $text =~ s/\s+/ /g;
+ CFClient::UI::Label::escape ($text)
+}
- CFClient::Texture::restore_state ();
+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 +156,32 @@
close CFG;
}
-mkdir "$Crossfire::VARDIR/pclient", 0777;
+our $DB_ENV;
+
+{
+ use strict;
-our $DB_ENV = new BerkeleyDB::Env
- -Home => "$Crossfire::VARDIR/pclient",
- -Cachesize => 1_000_000,
- -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
+ 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 +189,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) = @_;
-
- $pom->present ("CFClient::PodToPango")
-}
+my $pod_cache = db_table "pod_cache";
-sub pod_to_pango_list($) {
- my ($pom) = @_;
+sub load_pod($$$$) {
+ my ($path, $filtertype, $filterversion, $filtercb) = @_;
- [
- map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
- split /\n/, $pom->present ("CFClient::PodToPango")
- ]
-}
+ stat $path
+ or die "$path: $!";
-package CFClient::PodToPango;
+ my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
-use base Pod::POM::View::Text;
+ my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
-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 +258,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,20 +284,99 @@
$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->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) = @_;
+
+ my $targ = $::CONN->{player}{tag};
+
+ if ($self->{container} == $::CONN->{player}{tag}) {
+ $targ = $::CONN->{open_container};
+ }
+
+ 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 @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") }],
+ ["move n",
+ sub {
+ do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
+ }
+ ]
+ )
+ ),
+ );
+
+ CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
+ }
+
+ 1
+ };
+
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";
- $self->{face_widget} ||= new CFClient::UI::Face can_events => 1, can_hover => 1;
+ $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->{animespeed};
+ $self->{face_widget}{animspeed} = $self->{animspeed};
$self->{face_widget}->set_tooltip (
"Face/Animation.\n"
. "Item uses face #$self->{face}. "
@@ -276,10 +384,24 @@
. "\n\n$tooltip_std"
);
- $self->{desc_widget} ||= new CFClient::UI::Label ellipsise => 2, can_events => 1, can_hover => 1;
- $self->{desc_widget}->set_text (CFClient::Item::desc_string $self);
-
- $self->{weight_widget} ||= new CFClient::UI::Label ellipsise => 0, can_events => 1, can_hover => 1, align => 0.5;
+ $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 (
@@ -290,197 +412,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