The start of adding Clutter support.

diff --git a/lib/Display/Plugins/FSpot.pm b/lib/Display/Plugins/FSpot.pm
index 393e84c12e25f64a04c76713a12b58ab471f2eca..f20cf7d9938d832ba92eed3fc0f3db6d484544f5 100644 (file)
--- a/lib/Display/Plugins/FSpot.pm
+++ b/lib/Display/Plugins/FSpot.pm
@@ -1,13 +1,16 @@
 package Display::Plugins::FSpot;
 
 use DBI;
+use Clutter;
 
 my $f_spot_db = "/home/andrew/.gnome2/f-spot/photos.db";
 
 sub new {
-  my ($class,$instance) = @_;
+  my ($class,$stage) = @_;
 
-  my $self = {};
+  my $self = {
+    'stage' => $stage
+  };
 
   bless ($self, $class);
   $self->init();
@@ -27,6 +30,8 @@ sub display {
   $self->{'sth'}->finish()
     || die "Failed to finish statement: $DBI::errstr\n";;
 
+  $self->set_from_file($uri);
+
   return $uri;
 }
 
@@ -48,6 +53,10 @@ LIMIT 1
 
   $self->{'sth'} = $self->{'dbh'}->prepare($sql)
     || die "Failed to prepare statement: $DBI::errstr\n";
+
+  $self->{'picture'} = Clutter::Texture->new();
+  $self->display();
+  $self->{'stage'}->add($self->{'picture'};
 }
 
 1;

diff --git a/picture.pl b/picture.pl
index 82eae6c11623137f21b38ad5bf4233f9b7d80941..0656199e5f606f93b98f6e2711829d9bda8089b9 100755 (executable)
--- a/picture.pl
+++ b/picture.pl
@@ -3,11 +3,29 @@
 use strict;
 use FindBin;
 use Module::Pluggable search_path => ['Display::Plugins'];
+use Cluter qw( :init );
+use Getopt::Long;
 
 use lib "$FindBin::Bin/lib";
 
+my $full_screen = 1;
+
+GetOptions(
+  '!full|f' => \$full_screen,
+);
+
 my @modules = loadModules();
 
+my $stage = Clutter::Stage->get_default();
+$stage->set_color(Clutter::Color->parse('Black'));
+$stage->signal_connect('key-press-event' => sub { Clutter->main_quit() });
+
+if ($full_screen) {
+  $stage->fullscreen;
+} else {
+  $stage->set_size(800, 600);
+}
+
 for my $module (@modules) {
   print $module->display() . "\n";
 }
@@ -22,7 +40,7 @@ sub loadModules {
       die "Failed to load plugin: $module ($@)\n";
     }
 
-    push @modules, $module->new();
+    push @modules, $module->new($stage);
   }
 
   return @modules;