--- deliantra/Deliantra-Client/DC.pm 2006/04/11 13:14:36 1.22
+++ deliantra/Deliantra-Client/DC.pm 2006/05/26 20:36:32 1.71
@@ -21,24 +21,16 @@
XSLoader::load "CFClient", $VERSION;
}
-our %GL_EXT;
-our $GL_VERSION;
+use utf8;
-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;
-
- CFClient::Texture::restore_state ();
-}
+use Carp ();
+use AnyEvent ();
+use BerkeleyDB;
sub find_rcfile($) {
my $path;
- for (@INC) {
+ for (grep !ref, @INC) {
$path = "$_/CFClient/resources/$_[0]";
return $path if -r $path;
}
@@ -78,175 +70,257 @@
close CFG;
}
-package CFClient::Texture;
-
-use Scalar::Util;
+mkdir "$Crossfire::VARDIR/pclient", 0777;
-use SDL::OpenGL;
+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";
-my @textures;
+sub db_table($) {
+ my ($table) = @_;
-sub new {
- my ($class, %data) = @_;
+ $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 $self = bless {
- internalformat => GL_RGBA,
- format => GL_RGBA,
- %data,
- }, $class;
+sub pod_to_pango($) {
+ my ($pom) = @_;
- push @textures, $self;
- Scalar::Util::weaken $textures[-1];
+ $pom->present ("CFClient::PodToPango")
+}
- $self->upload;
+sub pod_to_pango_list($) {
+ my ($pom) = @_;
- $self
+ [
+ map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
+ split /\n/, $pom->present ("CFClient::PodToPango")
+ ]
}
-sub new_from_image {
- my ($class, $image) = @_;
+package CFClient::PodToPango;
- $class->new (image => $image)
-}
+use base Pod::POM::View::Text;
-sub new_from_file {
- my ($class, $path) = @_;
+our $indent = 0;
- open my $fh, "<:raw", $path
- or die "$path: $!";
+*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]) };
- local $/;
- $class->new_from_image (<$fh>)
+sub view_seq_text {
+ my $text = $_[1];
+ $text =~ s/\s+/ /g;
+ CFClient::UI::Label::escape ($text)
}
-#sub new_from_surface {
-# my ($class, $surface) = @_;
-#
-# $surface->rgba;
-#
-# $class->new (
-# data => $surface->pixels,
-# width => $surface->width,
-# height => $surface->height,
-# )
-#}
-
-sub new_from_layout {
- my ($class, $layout) = @_;
+sub view_item {
+ ("\t" x ($indent / 4))
+ . $_[1]->title->present ($_[0])
+ . "\n"
+ . $_[1]->content->present ($_[0])
+}
- my ($w, $h, $data) = $layout->render;
+sub view_verbatim {
+ (join "",
+ map +("\t" x ($indent / 2)) . "$_\n",
+ split /\n/, CFClient::UI::Label::escape ($_[1]))
+ . "\n"
+}
- $class->new (
- width => $w,
- height => $h,
- data => $data,
- internalformat => GL_ALPHA4,
- format => GL_ALPHA,
- )
+sub view_textblock {
+ ("\t" x ($indent / 2)) . "$_[1]\n\n"
}
-sub new_from_opengl {
- my ($class, $w, $h, $cb) = @_;
+sub view_head1 {
+ "\n\n" . $_[1]->title->present ($_[0]) . "\n\n"
+ . $_[1]->content->present ($_[0])
+};
- $class->new (width => $w, height => $h, rendercb => $cb)
-}
+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 topot {
- (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
+sub view_over {
+ local $indent = $indent + $_[1]->indent;
+ $_[1]->content->present ($_[0])
}
-sub upload {
- my ($self) = @_;
+package CFClient::Database;
- return unless $SDL::App::USING_OPENGL;
+our @ISA = BerkeleyDB::Btree::;
+sub get($$) {
my $data;
- if (exists $self->{data}) {
- $data = $self->{data};
- } elsif (exists $self->{rendercb}) {
- glViewport 0, 0, $self->{width}, $self->{height};
- glMatrixMode GL_PROJECTION;
- glLoadIdentity;
- glOrtho 0, $self->{width}, 0, $self->{height}, -10000, 10000;
- glMatrixMode GL_MODELVIEW;
- glPushmatrix;
- glLoadIdentity;
- glClear GL_COLOR_BUFFER_BIT;
-
- $self->{rendercb}->($self, $self->{width}, $self->{height});
- } else {
- my $pb = new Gtk2::Gdk::PixbufLoader;
- $pb->write ($self->{image});
- $pb->close;
+ $_[0]->db_get ($_[1], $data) == 0
+ ? $data
+ : ()
+}
- $pb = $pb->get_pixbuf;
- $pb = $pb->add_alpha (0, 0, 0, 0);
+my %DB_SYNC;
- $self->{width} = $pb->get_width;
- $self->{height} = $pb->get_height;
+sub put($$$) {
+ my ($db, $key, $data) = @_;
- $data = $pb->get_pixels;
- }
+ $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
- my ($tw, $th) = @$self{qw(width height)};
+ $db->db_put ($key => $data)
+}
- unless ($GL_NPOT) {
- $tw = topot $tw;
- $th = topot $th;
-
- if (defined $data) {
- my $bpp = (length $data) / ($self->{width} * $self->{height});
- $data = pack "(a" . ($tw * $bpp) . ")*",
- unpack "(a" . ($self->{width} * $bpp) . ")*", $data;
- $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{height});
- }
- }
+package CFClient::Item;
- $self->{s} = $self->{width} / $tw;
- $self->{t} = $self->{height} / $th;
+use strict;
+use Crossfire::Protocol::Constants;
- $self->{name} ||= (glGenTextures 1)->[0];
+sub desc_string {
+ my ($self) = @_;
- glBindTexture GL_TEXTURE_2D, $self->{name};
+ 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 .= " *";
- glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
- glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
- glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
- glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
-
- glGetError;
- if (defined $data) {
- glTexImage2D GL_TEXTURE_2D, 0,
- $self->{internalformat},
- $tw, $th, # need to pad texture first
- 0,
- $self->{format},
- GL_UNSIGNED_BYTE,
- $data;
- glGetError and die;
- } else {
- glCopyTexImage2D GL_TEXTURE_2D, 0,
- $self->{internalformat},
- 0, 0,
- $tw, $th,
- 0;
- glPopmatrix;
- }
+ $desc
}
-sub DESTROY {
+sub weight_string {
my ($self) = @_;
- return unless exists $self->{name};
+ my $weight = ($self->{nrof} || 1) * $self->{weight};
- glDeleteTextures delete $self->{name};
+ $weight < 0 ? "?" : $weight * 0.001
}
-sub restore_state{
- $_->upload
- for grep $_, @textures;
-};
+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};
+
+ if ($self->{container} == $::CONN->{player}{tag}) {
+ $targ = $::CONN->{open_container};
+ }
+
+ $::CONN->send ("move $targ $self->{tag} 0");
+ } 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") }],
+ )
+ ),
+ );
+
+ 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"
+ . "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
+ connect_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"
+ );
+
+ $self->{desc_widget} ||= new CFClient::UI::Label
+ can_events => 1,
+ can_hover => 1,
+ ellipsise => 2,
+ align => -1,
+ connect_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,
+ connect_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"
+ );
+}
1;