[ViewVC] Diff of: cvs/CV/bin/cv

Comparing CV/bin/cv (file contents):
Revision 1.40 by root, Mon Jun 27 18:25:50 2005 UTC vs.
Revision 1.48 by root, Fri Jul 22 05:43:53 2005 UTC

 use Encode ();
 use Gtk2 -init;
 use Gtk2::Gdk::Keysyms;
+use Gtk2::CV;
 use Gtk2::CV::ImageWindow;
 use Gtk2::CV::Schnauzer;
-use Gtk2::CV;
+BEGIN {
+   require Gtk2::CV::Plugin;
+   require "$ENV{HOME}/.cvrc" if -r "$ENV{HOME}/.cvrc";
+}
+use Gtk2::CV::Plugin::NameCluster;
+use Gtk2::CV::Plugin::RCluster;
 Gtk2::Rc->parse (Gtk2::CV::find_rcfile "gtkrc");
 use File::Spec;
-require Gtk2::CV::Plugin;
-require "$ENV{HOME}/.cvrc" if -r "$ENV{HOME}/.cvrc";
 my $mainwin;
 my $viewer;
 my $schnauzer;
 my $info;
                   (File::Spec->splitpath ($_[1]))[2],
                   -s $_[1];
       $info->set_label ($label);
       $viewer->load_image ($_[1]);
    });
-   $s->signal_connect (chdir => sub {
-      my ($self, $dir) = @_;
-      my $path = Cwd::abs_path $dir;
-      $self->realize;
-      $self->window->property_change (
-         Gtk2::Gdk::Atom->intern ("_X_CWD", 0),
-         Gtk2::Gdk::Atom->intern ("UTF8_STRING", 0),
-         Gtk2::Gdk::CHARS, 'replace',
-         Encode::encode_utf8 $path,
-      );
-   });
    Gtk2::CV::Plugin->call (new_schnauzer => $s);
    $s;
 }
          $h->load_string (do { local $/; <DATA> });
       }
       $help->show_all;
    } else {
-      #$mainwin->show_all;
+      return 0;
-      $schnauzer->handle_key ($key, $state);
    }
-   1;
+   1
 }
 {
    $viewer = new Gtk2::CV::ImageWindow;
    $viewer->set_title ("CV: Image");
-   $viewer->signal_connect (key_press_event => \&std_keys);
+   $viewer->signal_connect (key_press_event => sub {
+      &std_keys
+         or $schnauzer->signal_emit (key_press_event => $_[1])
+   });
    $viewer->signal_connect (delete_event => sub { main_quit Gtk2 });
    $viewer->signal_connect (button3_press_event => sub {
       $mainwin->visible
          ? $mainwin->hide
    $mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1; });
    $vbox->add ($schnauzer);
    $vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);
    $frame->add (my $hbox = new Gtk2::HBox 0, 0);
-   $hbox->pack_start ((new Gtk2::Label "Info"), 0, 0, 0);
+   $hbox->pack_start ((new Gtk2::Label "Info: "), 0, 0, 0);
-   $hbox->pack_start (($info = new Gtk2::Label), 1, 1, 0);
+   $hbox->pack_end   (my $labelwindow = new Gtk2::EventBox, 1, 1, 0);
-   $info->set (wrap => 1);
+   $labelwindow->add ($info = new Gtk2::Label);
+   $labelwindow->signal_connect_after (size_request => sub { $_[1]->width (0); 0 });
+   $info->set (selectable => 1, xalign => 0, justify => "left");
    $schnauzer->set_geometry_hints;
 }
 if (@ARGV) {
    $schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]);
    $schnauzer->show_all;
+$viewer->show_all;
    $schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);
 } else {
    $schnauzer->set_dir (File::Spec->curdir);
    $mainwin->show_all;
    $viewer->show_all;
 __DATA__
 =head1 NAME
-cv - a fast gtk+ image viewer modeled after xv
+cv - a fast gtk+ image viewer loosely modeled after XV
 =head1 SYNOPSIS
    cv [file...]
+=head1 FEATURES
+CV is supposed to work similar to the venerable XV image viewer, just
+faster. Why faster?
+=over 4
+=item * optimized directory scanning algorithm
+The directory scanning in CV plays some tricks that - on most modern
+filesystems - makes it possible to detect filetypes faster than stat()'ing
+every file. This makes CV suitable for directories with lots of files
+(10000+).
+This algorithm is quite unprecise - it doesn't make a difference between
+files, device nodes, symlinks and the like, and filetype detection is done
+using the file extension only.
+=item * use of asynchronous I/O
+CV tries to use asynchronous I/O whereever it makes sense, for example
+while scanning directories, waiting for stat data or unlinking files. This
+usually decreases scanning times for large directories a bit (especially
+on RAID devices and over NFS).
+=item * fast image loading
+The time span between the user issuing a command and displaying the new
+image should be as small as possible. CV uses optimized (especially
+for JPEG) loading functions and sacrifices some quality (e.g no gamma
+correction) to achieve this speed.
+=item * fast thumbnail creation
+Thumbnail creation is crucial for me, so it's better be fast. Thumbnail
+creation for JPEGs has been specially optimized.
+=item * minimum optical clutter
+CV has no menus or other user interface elements that take up a lot of
+screen space. The schnauzer windows can also be somewhat crowded.
+The point of an image viewer is viewing images, not a nice GUI. This is
+similar to XV's behaviour.
+=item * efficient (and hard to learn) user interface
+CV uses key combinations. A lot. If you are an experienced XV user, you
+will find most of these keys familiar. If not, CV might be hard to use at
+first, but will be an efficient tool later.
+=item * i18n'ed filename handling throughout
+As long as glib can recognize your filename encoding (either UTF-8 or
+locale-specific, depending on your settings) and you have the relevant
+fonts, CV will display your filenames correctly.
+=item * extensible through plug-ins
+I have weird plug-ins that access remote databases to find a
+directory. This is not likely to be of any use to other people. Likewise,
+others might have weird requirements I cannot dream of.
+=item * filename clustering
+Among the standard plug-ins is a filename clustering plug-in, that (in
+case of tens of thousands images in one directory) might be able to
+cluster similar names together.
+=back
 =head1 DESCRIPTION
-None yet.
 =head2 THE IMAGE WINDOW
 You can use the following keys in the image window:
  >       double the image size
  ,       shrink the image by 10%
  .       enlarge the image by 10%
  n       reset to normal size
  m       maximize to screensize
- M       maxime to screensize, respecting image aspect
+ M       maximize to screensize, respecting image aspect
  ctrl-m  toggle maxpect-always mode
  u       uncrop
  r       set scaling mode to 'nearest' (fastest)
  s       set scaling mode to 'bilinear' (default)
- S       set scaling mode to 'hyper' (slowest)
+ shift-s set scaling mode to 'hyper' (slowest)
  t       rotate clockwise 90°
  T       rotate counterclockwise°
  ctrl-v  open a new visual schnauzer window for the current dir
- ctrl-s  rescan visual schnauzer files for updates/deletes etc.
- ctrl-e  run an editor ($CV_EDITOR or "gimp") on the current image.
+ ctrl-e  run an editor ($CV_EDITOR or "gimp") on the current image
+ ctrl-p  fire up the print fialog
+ escape  cancel a crop action
 And when playing movies, these additional keys are active:
  left    rewind by 10 seconds
  right   forward by 10 seconds
  p       pause/unpause
  escape  stop playing
  9       turn volume down
  0       turn volume up
-The following keys are redirected to the default visual schnauzer window:
+Any other keys will be sent to the default schnauzer window, which can be
+toggled on and off by right-clicking into the image window.
- space     next image
+Left-clicking into the image window will let you crop the image (usually
- backspace last image
+to zoom into large images that CV scales down).
 =head2 THE VISUAL SCHNAUZER
 You can use the following keys in the schnauzer window:
+ ctrl-space,
  space       move to and display next image
+ ctrl-backspace,
  backspace   move to and display previous image
+ ctrl-return,
- return      display selected picture
+ return      display selected picture, or enter directory
  cursor keys move selection
  page-up     move one page up
  page-down   move one page down
  home        move to first file
  end         move to last file
+ ctrl-a      select all files
  ctrl-d      delete selected files WITHOUT ASKING AGAIN
- ctrl-g      generate icons for the selected files
+ ctrl-g      force generation of thumbnais for the selected files
+ ctrl-s      rescan current direcory or files updates/deletes etc.
  ctrl-u      update selected (or all) icons if neccessary
- ctrl-a      select all files
+ ctrl-l      don't use, will become a plug-in eventually
+ 0-9,
+ a-z         find the first filename beginning with this letter
+Right-clicking into the schnauzer window displays a pop-up menu with
+additional actions.
+=head1 FILES
+When starting, CV runs the F<.cvrc> file in your F<$HOME> directory as if
+it were a perl script. in that, you will mostly load plug-ins.
+Example:
+   system "fping -q -t 10 ether"
+     or require "/fs/cv/cvplugin.pl";
+This will load a plug-in, but only if the machine I<ether> is reachable
+(supposedly the plug-in is networked in some way :).
 =head1 ENVIRONMENT
 =over 4
 the likelyhood that there are additional problems where an invalid image
 could cause gdk-pixbuf to crash or worse."
 =head1 BUGS/TODO
+ Lots of functionality is missing.
- Pixbuf doesn't honor G_BROKEN_FILENAMES, so accessing files with names
+ Pixbuf doesn't always honor G_BROKEN_FILENAMES, so accessing files with
- incompatible with utf-8 fails.
+ names incompatible might utf-8 fail.
  rotate on disk
- print
  lots of ui issues
  save(?)
  preferences
- ctrl-u in schnauzer
  shift-cursor in schnauzer
 =head1 AUTHOR
 Marc Lehmann <cv@plan9.de>.

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing CV/bin/cv (file contents): Revision 1.40 by root, Mon Jun 27 18:25:50 2005 UTC vs. Revision 1.48 by root, Fri Jul 22 05:43:53 2005 UTC

Diff Legend

Comparing CV/bin/cv (file contents):
Revision 1.40 by root, Mon Jun 27 18:25:50 2005 UTC vs.
Revision 1.48 by root, Fri Jul 22 05:43:53 2005 UTC