--- CV/bin/cv	2003/11/03 01:30:58	1.3
+++ CV/bin/cv	2003/11/03 04:57:43	1.4
@@ -95,19 +95,6 @@
 
 package main;
 
-sub std_keys {
-   my $key = $_[1]->keyval;
-      warn $key;
-
-   if ($key == $Gtk2::Gdk::Keysyms{q}) {
-      main_quit Gtk2;
-   } else {
-      return 0;
-   }
-
-   1;
-}
-
 sub new_schnauzer {
    my $w = new Gtk2::Window;
    $w->add (my $s = new Gtk2::CV::Schnauzer);
@@ -115,24 +102,41 @@
    $s->signal_connect (activate => sub {
       $viewer->load_image ($_[1]);
    });
+   $s->signal_connect (key_press_event => \&std_keys);
+   $w->signal_connect (delete_event => sub { $_[0]->destroy });
+   $s->signal_connect (destroy => sub { %{$_[0]} = () });
+
    $s->set_dir ("/root/pix");
    $w->show_all;
 
    $w;
 }
 
-$viewer = new Gtk2::CV::ImageWindow;
+sub std_keys {
+   my $key = $_[1]->keyval;
 
-$viewer->signal_connect (key_press_event => \&std_keys);
+   my $ctrl = grep $_ eq "control-mask", @{$_[1]->state};
+
+   if ($key == $Gtk2::Gdk::Keysyms{q}) {
+      main_quit Gtk2;
+   } elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {
+      new_schnauzer;
+   } else {
+      return 0;
+   }
+
+   1;
+}
 
+$viewer = new Gtk2::CV::ImageWindow;
+$viewer->signal_connect (key_press_event => \&std_keys);
+$viewer->signal_connect (delete_event => sub { main_quit Gtk2 });
 $viewer->show_all;
 
 my $cluster = new cluster;
 
-new_schnauzer;
-
-#$cluster->analyse ("/fs/samsung/store-anime-done");
-#$cluster->show_all;
+$cluster->analyse ("/fs/samsung/store-anime-done");
+$cluster->show_all;
 
 #$viewer->set (path => "/fs/samsung/store-anime-done/yuumi_kazuaki_-_love_to_hajieki_to_sayonara_to_-_150.jpg");
 #$viewer->set (path => "/root/pix/kvvz.jpg");