--- CV/bin/cv	2003/11/05 01:29:47	1.11
+++ CV/bin/cv	2003/11/08 01:00:08	1.21
@@ -1,5 +1,117 @@
 #!/opt/bin/perl
 
+use Gtk2 -init;
+use Gtk2::Gdk::Keysyms;
+
+use Gtk2::CV::ImageWindow;
+use Gtk2::CV::Schnauzer;
+
+use Gtk2::CV;
+
+Gtk2::Rc->parse (Gtk2::CV::find_rcfile "gtkrc");
+
+use File::Spec;
+
+my $mainwin;
+my $viewer;
+my $schnauzer;
+my $info;
+my $help;
+
+sub new_schnauzer {
+   my $s = new Gtk2::CV::Schnauzer;
+
+   $s->signal_connect_after (key_press_event => \&std_keys);
+   $s->signal_connect (activate => sub {
+      my $label = sprintf "%s (%d)",
+                  (File::Spec->splitpath ($_[1]))[2],
+                  -s $_[1];
+      $info->set_label ($label);
+      $viewer->load_image ($_[1]);
+   });
+
+   $s;
+}
+
+sub std_keys {
+   my $key = $_[1]->keyval;
+   my $state = $_[1]->state;
+
+   my $ctrl = $state * "control-mask";
+
+   if ($key == $Gtk2::Gdk::Keysyms{q}) {
+      main_quit Gtk2;
+   } elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {
+      my $w = new Gtk2::Window;
+      $w->add (my $s = new_schnauzer);
+      $s->set_dir (File::Spec->curdir);
+      $w->show_all;
+   } elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{h}) {
+      unless ($help) {
+         require Gtk2::PodViewer;
+
+         $help = new Gtk2::Window;
+         $help->set_title ("CV Help");
+         $help->set_default_size (500, 300);
+         $help->signal_connect (delete_event => sub { $help->hide; 1 });
+
+         $help->add (my $sw = new Gtk2::ScrolledWindow);
+         $sw->add (my $h = new Gtk2::PodViewer);
+
+         #binmode DATA, ":utf8";
+         $h->load_string (do { local $/; <DATA> });
+      }
+
+      $help->show_all;
+   } else {
+      #$mainwin->show_all;
+      $schnauzer->handle_key ($key, $state);
+   }
+
+   1;
+}
+
+{
+   $viewer = new Gtk2::CV::ImageWindow;
+
+   $viewer->set_title ("CV: Image");
+
+   $viewer->signal_connect (key_press_event => \&std_keys);
+   $viewer->signal_connect (delete_event => sub { main_quit Gtk2 });
+
+   $viewer->signal_connect (button3_press_event => sub {
+      $mainwin->visible
+         ? $mainwin->hide
+         : $mainwin->show_all;
+   });
+
+   $schnauzer = new_schnauzer;
+
+   $mainwin = new Gtk2::Window;
+   $mainwin->set_title ("CV");
+   $mainwin->add (my $vbox = new Gtk2::VBox);
+
+   $vbox->add ($schnauzer);
+   $vbox->add (my $frame = new Gtk2::Frame);
+   $frame->add (my $hbox = new Gtk2::HBox 0, 0);
+   $hbox->pack_start ((new Gtk2::Label "Info"), 0, 0, 0);
+   $hbox->pack_start (($info = new Gtk2::Label), 1, 1, 0);
+}
+
+if (@ARGV) {
+   $schnauzer->set_paths (\@ARGV);
+   $schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);
+} else {
+   $schnauzer->set_dir (File::Spec->curdir);
+   $mainwin->show_all;
+}
+
+$viewer->show_all;
+
+main Gtk2;
+
+__DATA__
+
 =head1 NAME
 
 cv - a fast gtk+ image viewer modeled after xv
@@ -61,6 +173,8 @@
  lots of ui issues
  save(?)
  preferences
+ ctrl-u in schnauzer
+ shift-cursor in schnauzer
 
 =head1 AUTHOR
 
@@ -68,61 +182,3 @@
 
 =cut
 
-use Gtk2 -init;
-use Gtk2::Gdk::Keysyms;
-
-use Gtk2::CV::ImageWindow;
-use Gtk2::CV::Schnauzer;
-
-my $viewer;
-my $schnauzer;
-
-sub new_schnauzer {
-   my $w = new Gtk2::Window;
-   $w->add (my $s = new Gtk2::CV::Schnauzer);
-
-   $s->signal_connect (activate => sub { $viewer->load_image ($_[1]) });
-   $s->signal_connect_after (key_press_event => \&std_keys);
-
-   $s->set_dir (".");
-   $w->show_all;
-
-   $s;
-}
-
-sub std_keys {
-   my $key = $_[1]->keyval;
-   my $state = $_[1]->state;
-
-   my $ctrl = grep $_ eq "control-mask", @$state;
-
-   if ($key == $Gtk2::Gdk::Keysyms{q}) {
-      main_quit Gtk2;
-   } elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {
-      new_schnauzer;
-   } else {
-      $schnauzer->handle_key ($key, $state);
-   }
-
-   1;
-}
-
-$viewer = new Gtk2::CV::ImageWindow;
-$viewer->signal_connect (key_press_event => \&std_keys);
-$viewer->signal_connect (delete_event => sub { main_quit Gtk2 });
-
-$schnauzer = new_schnauzer;
-
-if (@ARGV) {
-   $viewer->load_image ($ARGV[0]);
-
-   if (@ARGV > 1) {
-      $schnauzer->set_paths (\@ARGV);
-   }
-}
-
-$viewer->show_all;
-
-main Gtk2;
-
-