--- deliantra/Deliantra-Client/DC.pm	2006/04/07 18:20:13	1.3
+++ deliantra/Deliantra-Client/DC.pm	2006/04/08 17:21:01	1.10
@@ -21,6 +21,49 @@
    XSLoader::load "Crossfire::Client", $VERSION;
 }
 
+sub find_rcfile($) {
+   my $path;
+
+   for (@INC) {
+      $path = "$_/Crossfire/resources/$_[0]";
+      return $path if -r $path;
+   }
+
+   die "FATAL: can't find required file $_[0]\n";
+}
+
+sub read_cfg {
+   my ($file) = @_;
+
+   open CFG, $file
+      or return;
+
+   my $CFG;
+
+   local $/;
+   $CFG = eval <CFG>;
+
+   $::CFG = $CFG;
+
+   close CFG;
+}
+
+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;
+}
+
 package Crossfire::Client::Texture;
 
 use Scalar::Util;
@@ -29,6 +72,25 @@
 
 my @textures;
 
+sub _new {
+   my ($class, %data) = @_;
+
+   my $self = bless \%data, $class;
+
+   push @textures, $self;
+   Scalar::Util::weaken $textures[-1];
+
+   $self->upload;
+
+   $self
+}
+
+sub new_from_image {
+   my ($class, $image) = @_;
+
+   $class->_new (image => $image)
+}
+
 sub new_from_file {
    my ($class, $path) = @_;
 
@@ -36,22 +98,36 @@
       or die "$path: $!";
 
    local $/;
-   $class->new_from_data (<$fh>)
+   $class->new_from_image (<$fh>)
 }
 
-sub new_from_image {
-   my ($class, $image) = @_;
+sub new_from_surface {
+   my ($class, $surface) = @_;
 
-   my $self = bless {
-      image => $data,
-   };
+   $surface->rgba;
 
-   push @textures, $self;
-   Scalar::Util::weaken $textures[-1];
+   $class->_new (
+      data   => $surface->pixels,
+      width  => $surface->width,
+      height => $surface->height,
+   )
+}
 
-   $self->upload;
+sub new_from_ttf {
+   my ($class, $ttf, $text) = @_;
 
-   $self
+   utf8::encode $text;
+
+   my $surface = SDL::TTFRenderUTF8Blended $ttf, $text,
+      (new SDL::Color -r => 255, -g => 255, -b => 255);
+
+   $class->new_from_surface (bless \$surface, SDL::Surface::)
+}
+
+sub new_from_opengl {
+   my ($class, $w, $h, $cb) = @_;
+
+   $class->_new (width => $w, height => $h, rendercb => $cb)
 }
 
 sub upload {
@@ -59,19 +135,27 @@
 
    return unless $SDL::App::USING_OPENGL;
 
-   my ($data, $width, $height);
+   my $data;
 
    if (exists $self->{data}) {
-      ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height});
+      $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->{data});
+      $pb->write ($self->{image});
       $pb->close;
 
       $pb = $pb->get_pixbuf;
       $pb = $pb->add_alpha (0, 0, 0, 0);
 
-      ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height);
+      $self->{width}  = $pb->get_width;
+      $self->{height} = $pb->get_height;
+
+      $data = $pb->get_pixels;
    }
 
    ($self->{name}) = @{glGenTextures 1};
@@ -83,13 +167,21 @@
    glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
    glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
    
-   glTexImage2D GL_TEXTURE_2D, 0,
-                GL_RGBA8,
-                $width, $height,
-                0,
-                GL_RGBA,
-                GL_UNSIGNED_BYTE,
-                $data;
+   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;
+   }
 }
 
 sub DESTROY {