--- deliantra/Deliantra-Client/DC.pm 2006/04/08 13:36:25 1.8
+++ deliantra/Deliantra-Client/DC.pm 2006/05/29 21:54:15 1.77
@@ -1,10 +1,10 @@
=head1 NAME
-Crossfire::Client - undocumented utility garbage for our crossfire client
+CFClient - undocumented utility garbage for our crossfire client
=head1 SYNOPSIS
- use Crossfire::Client;
+ use CFClient;
=head1 DESCRIPTION
@@ -12,20 +12,26 @@
=cut
-package Crossfire::Client;
+package CFClient;
BEGIN {
$VERSION = '0.1';
use XSLoader;
- XSLoader::load "Crossfire::Client", $VERSION;
+ XSLoader::load "CFClient", $VERSION;
}
+use utf8;
+
+use Carp ();
+use AnyEvent ();
+use BerkeleyDB;
+
sub find_rcfile($) {
my $path;
- for (@INC) {
- $path = "$_/Crossfire/resources/$_[0]";
+ for (grep !ref, @INC) {
+ $path = "$_/CFClient/resources/$_[0]";
return $path if -r $path;
}
@@ -55,6 +61,7 @@
or return;
{
+ require Data::Dumper;
local $Data::Dumper::Purity = 1;
$::CFG->{VERSION} = $::VERSION;
print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
@@ -63,138 +70,479 @@
close CFG;
}
-package Crossfire::Client::Texture;
+mkdir "$Crossfire::VARDIR/cfplus", 0777;
+
+our $DB_ENV;
-use Scalar::Util;
+{
+ use strict;
-use SDL::OpenGL;
+ my $recover = $BerkeleyDB::db_version >= 4.4
+ ? eval "DB_REGISTER | DB_RECOVER"
+ : 0;
-my @textures;
+ $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 | DB_TXN_WRITE_NOSYNC,
+ or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
+}
-sub _new {
- my ($class, %data) = @_;
+sub db_table($) {
+ my ($table) = @_;
- my $self = bless \%data, $class;
+ $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
- push @textures, $self;
- Scalar::Util::weaken $textures[-1];
+ 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"
+}
- $self->upload;
+sub pod_to_pango($) {
+ my ($pom) = @_;
- $self
+ $pom->present ("CFClient::PodToPango")
}
-sub new_from_image {
- my ($class, $image) = @_;
+sub pod_to_pango_list($) {
+ my ($pom) = @_;
- $class->_new (image => $image)
+ [
+ map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
+ split /\n/, $pom->present ("CFClient::PodToPango")
+ ]
}
-sub new_from_file {
- my ($class, $path) = @_;
+package CFClient::PodToPango;
- open my $fh, "<:raw", $path
- or die "$path: $!";
+use base Pod::POM::View::Text;
- local $/;
- $class->new_from_image (<$fh>)
+our $indent = 0;
+
+*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 new_from_surface {
- my ($class, $surface) = @_;
+sub view_item {
+ ("\t" x ($indent / 4))
+ . $_[1]->title->present ($_[0])
+ . "\n"
+ . $_[1]->content->present ($_[0])
+}
- $surface->rgba;
+sub view_verbatim {
+ (join "",
+ map +("\t" x ($indent / 2)) . "$_\n",
+ split /\n/, CFClient::UI::Label::escape ($_[1]))
+ . "\n"
+}
- $class->_new (
- data => $surface->pixels,
- width => $surface->width,
- height => $surface->height,
- )
+sub view_textblock {
+ ("\t" x ($indent / 2)) . "$_[1]\n\n"
}
-sub new_from_ttf {
- my ($class, $ttf, $text) = @_;
+sub view_head1 {
+ "\n\n" . $_[1]->title->present ($_[0]) . "\n\n"
+ . $_[1]->content->present ($_[0])
+};
- utf8::encode $text;
+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])
+}
- my $surface = SDL::TTFRenderUTF8Blended $ttf, $text,
- (new SDL::Color -r => 255, -g => 255, -b => 255);
+package CFClient::Database;
- $class->new_from_surface (bless \$surface, SDL::Surface::)
+our @ISA = BerkeleyDB::Btree::;
+
+sub get($$) {
+ my $data;
+
+ $_[0]->db_get ($_[1], $data) == 0
+ ? $data
+ : ()
}
-sub new_from_opengl {
- my ($class, $w, $h, $cb) = @_;
+my %DB_SYNC;
+
+sub put($$$) {
+ my ($db, $key, $data) = @_;
+
+ $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
- $class->_new (width => $w, height => $h, render => $cb)
+ $db->db_put ($key => $data)
}
-sub upload {
+package CFClient::Item;
+
+use strict;
+use Crossfire::Protocol::Constants;
+
+sub desc_string {
my ($self) = @_;
- return unless $SDL::App::USING_OPENGL;
+ 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 $data;
+ $desc
+}
- if (exists $self->{data}) {
- $data = $self->{data};
- } elsif (exists $self->{rendercb}) {
- glViewport 0, 0, $self->{width}, $self->{height};
- 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;
+sub weight_string {
+ my ($self) = @_;
- $pb = $pb->get_pixbuf;
- $pb = $pb->add_alpha (0, 0, 0, 0);
+ my $weight = ($self->{nrof} || 1) * $self->{weight};
- $self->{width} = $pb->get_width;
- $self->{height} = $pb->get_height;
+ $weight < 0 ? "?" : $weight * 0.001
+}
- $data = $pb->get_pixels;
- }
+sub update_widgets {
+ my ($self) = @_;
- ($self->{name}) = @{glGenTextures 1};
+ my $button_cb = sub {
+ my (undef, $ev, $x, $y) = @_;
- glBindTexture GL_TEXTURE_2D, $self->{name};
+ if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
+ my $targ = $::CONN->{player}{tag};
- 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;
+ 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
+ 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"
+ );
- if (defined $data) {
- glTexImage2D GL_TEXTURE_2D, 0,
- GL_RGBA8,
- $self->{width}, $self->{height},
- 0,
- GL_RGBA,
- GL_UNSIGNED_BYTE,
- $data;
- } else {
- glCopyTexImage2D GL_TEXTURE_2D, 0,
- GL_RGBA8,
- 0, 0,
- $self->{width}, $self->{height},
- 0;
+ $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::Recorder;
+
+our $RECORD_WINDOW;
+
+my $CMDBOX;
+my $CURRENT_CMDS;
+my $REC_BTN;
+
+my @ALLOWED_MODIFIER_KEYS = (
+ (CFClient::SDLK_LSHIFT) => "LSHIFT",
+ (CFClient::SDLK_LCTRL ) => "LCTRL",
+ (CFClient::SDLK_LALT ) => "LALT",
+ (CFClient::SDLK_LMETA ) => "LMETA",
+
+ (CFClient::SDLK_RSHIFT) => "RSHIFT",
+ (CFClient::SDLK_RCTRL ) => "RCTRL",
+ (CFClient::SDLK_RALT ) => "RALT",
+ (CFClient::SDLK_RMETA ) => "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 binds the modifier+symbol to the
+# supplied actions in $cmd.
+# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
+sub open_binding_dialog {
+ my ($cmd) = @_;
+
+ my $w = new CFClient::UI::FancyFrame
+ title => "Bind Action";
+
+ $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;
+
+ $::CFG->{bindings}->{$mod}->{$sym} = $cmd;
+ $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
+
+ $w->destroy
+ });
+
+ $entry->focus_in;
+ $w->center;
+ $w->show;
+}
+
+sub keycombo_to_name {
+ my ($mod, $sym) = @_;
+
+ my $mods = join '+',
+ map { $ALLOWED_MODIFIERS{$_} }
+ grep { $_ & $mod }
+ keys %ALLOWED_MODIFIERS;
+ $mods .= "+" if $mods ne '';
+
+ return $mods . CFClient::SDL_GetKeyName ($sym);
+}
+
+sub clear_command_list {
+ $CMDBOX->clear () if $CMDBOX;
+}
+
+sub set_command_list {
+ my ($list) = @_;
+
+ return unless $CMDBOX;
+
+ $CMDBOX->clear ();
+ $CURRENT_CMDS = $list;
+
+ my $idx = 0;
+
+ for (@$list) {
+ $CMDBOX->add (my $hb = new CFClient::UI::HBox);
+
+ my $i = $idx;
+ $hb->add (new CFClient::UI::Button
+ text => "delete",
+ tooltip => "Deletes the action from the record",
+ on_activate => sub {
+ $CMDBOX->remove ($hb);
+ $list->[$i] = undef;
+ });
+
+ $hb->add (new CFClient::UI::Label text => $_);
+
+ $idx++
}
}
-sub DESTROY {
- my ($self) = @_;
+# if $show is 1 the recorder will be shown
+sub start {
+ my ($show) = @_;
- return unless exists $self->{name};
+ $RECORD_WINDOW->show if $show;
- glDeleteTextures delete $self->{name};
+ $REC_BTN->set_text ("stop recording");
+ $REC_BTN->{recording} = 1;
+ clear_command_list;
+ $::CONN->start_record;
}
-push @::GLINIT, sub {
- $_->upload
- for grep $_, @textures;
-};
+# if $autobind is 1 the recorder will be automatically
+# jump into the binding query and hide the recorder window
+sub stop {
+ my ($autobind) = @_;
+
+ $REC_BTN->set_text ("start recording");
+ $REC_BTN->{recording} = 0;
+
+ my $rec = $::CONN->stop_record;
+ return unless ref $rec eq 'ARRAY';
+ set_command_list ($rec);
+
+ if ($autobind) {
+ open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
+ $RECORD_WINDOW->hide;
+ }
+}
+
+sub make_window {
+ $RECORD_WINDOW = new CFClient::UI::FancyFrame
+ req_y => 1,
+ req_x => -1,
+ title => "Action Recorder";
+
+ $RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
+ $vb->add ($REC_BTN = new CFClient::UI::Button
+ text => "start recording",
+ tooltip => "Start/Stops recording of actions."
+ ."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
+ ."All subsequent actions after the recording started will be captured."
+ ."The actions are displayed after the record was stopped."
+ ."To bind the action you have to click on the 'Bind' button",
+ on_activate => sub {
+ my ($btn) = @_;
+
+ unless ($btn->{recording}) {
+ start;
+ } else {
+ stop;
+ }
+ });
+ $vb->add ($CMDBOX = new CFClient::UI::VBox);
+ $vb->add (new CFClient::UI::Button
+ text => "bind",
+ tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
+ on_activate => sub {
+ open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
+ });
+
+ $RECORD_WINDOW
+}
1;