ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CV/bin/cv
(Generate patch)

Comparing CV/bin/cv (file contents):
Revision 1.51 by root, Sun Aug 14 02:25:44 2005 UTC vs.
Revision 1.70 by root, Sat Sep 8 08:20:02 2007 UTC

23 23
24use File::Spec; 24use File::Spec;
25 25
26my $mainwin; 26my $mainwin;
27my $viewer; 27my $viewer;
28my $viewer_count;
28my $schnauzer; 29my $schnauzer;
29my $info; 30my $info;
30my $help; 31my $help;
31 32
32my $schnauzer_idx = 0; 33my $schnauzer_idx = 0;
38 $s->signal_connect (activate => sub { 39 $s->signal_connect (activate => sub {
39 my $label = sprintf "%s (%d)", 40 my $label = sprintf "%s (%d)",
40 (File::Spec->splitpath ($_[1]))[2], 41 (File::Spec->splitpath ($_[1]))[2],
41 -s $_[1]; 42 -s $_[1];
42 $info->set_label ($label); 43 $info->set_label ($label);
43 $viewer->load_image ($_[1]); 44 $viewer->load_image ($_[1]) if $viewer; # TODO: error, or chose ANY viewer
44 }); 45 });
45 46
46 Gtk2::CV::Plugin->call (new_schnauzer => $s); 47 Gtk2::CV::Plugin->call (new_schnauzer => $s);
47 48
48 $s; 49 $s
50}
51
52sub new_viewer {
53 my $self = new Gtk2::CV::ImageWindow;
54
55 $viewer_count++;
56
57 $self->set_title ("CV: Image");
58
59 $self->signal_connect (key_press_event => sub {
60 $viewer = $_[0];
61
62 my $key = $_[1]->keyval;
63 my $state = $_[1]->state;
64
65 if ($state * "control-mask" && $key == $Gtk2::Gdk::Keysyms{c}) {
66 my $viewer = new_viewer ();
67 $viewer->set_image ($_[0]->{image});
68 $viewer->show_all;
69 1
70 } else {
71 &std_keys
72 or $schnauzer->signal_emit (key_press_event => $_[1])
73 }
74 });
75 $self->signal_connect (delete_event => sub { $_[0]->destroy; 0 });
76 $self->signal_connect (destroy => sub {
77 $viewer = undef if $viewer == $_[0];
78
79 main_quit Gtk2 unless --$viewer_count;
80
81 0
82 });
83
84 $self->signal_connect (button3_press_event => sub {
85 $mainwin->visible
86 ? $mainwin->hide
87 : $mainwin->show_all;
88
89 1
90 });
91
92 Gtk2::CV::Plugin->call (new_imagewindow => $self);
93
94 $self
49} 95}
50 96
51sub std_keys { 97sub std_keys {
52 my $key = $_[1]->keyval; 98 my $key = $_[1]->keyval;
53 my $state = $_[1]->state; 99 my $state = $_[1]->state;
54 100
55 my $ctrl = $state * "control-mask"; 101 my $ctrl = $state * "control-mask";
56 102
57 if ($key == $Gtk2::Gdk::Keysyms{q}) { 103 if ($key == $Gtk2::Gdk::Keysyms{q}) {
58 main_quit Gtk2; 104 $viewer->destroy;
59 } elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) { 105 } elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {
60 my $w = new Gtk2::Window; 106 my $w = new Gtk2::Window;
61 107
108 $w->set_role ("schnauzer");
62 $w->set_title ("CV: Schnauzer"); 109 $w->set_title ("CV: Schnauzer");
63 $w->add (my $s = new_schnauzer); 110 $w->add (my $s = new_schnauzer);
64 $s->set_dir (File::Spec->curdir); 111 $s->set_dir (File::Spec->curdir);
65 $s->set_geometry_hints; 112 $s->set_geometry_hints;
66 $w->show_all; 113 $w->show_all;
68 } elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{h}) { 115 } elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{h}) {
69 unless ($help) { 116 unless ($help) {
70 require Gtk2::PodViewer; 117 require Gtk2::PodViewer;
71 118
72 $help = new Gtk2::Window; 119 $help = new Gtk2::Window;
120 $help->set_role ("help");
73 $help->set_title ("CV: Help"); 121 $help->set_title ("CV: Help");
74 $help->set_default_size (500, 300); 122 $help->set_default_size (500, 300);
75 $help->signal_connect (delete_event => sub { $help->hide; 1 }); 123 $help->signal_connect (delete_event => sub { $help->hide; 1 });
76 124
77 $help->add (my $sw = new Gtk2::ScrolledWindow); 125 $help->add (my $sw = new Gtk2::ScrolledWindow);
88 136
89 1 137 1
90} 138}
91 139
92{ 140{
93 $viewer = new Gtk2::CV::ImageWindow; 141 $viewer = new_viewer;
94 142 $::cur_viewer = $viewer;
95 $viewer->set_title ("CV: Image");
96
97 $viewer->signal_connect (key_press_event => sub {
98 &std_keys
99 or $schnauzer->signal_emit (key_press_event => $_[1])
100 });
101 $viewer->signal_connect (delete_event => sub { main_quit Gtk2 });
102
103 $viewer->signal_connect (button3_press_event => sub {
104 $mainwin->visible
105 ? $mainwin->hide
106 : $mainwin->show_all;
107 1;
108 });
109
110 Gtk2::CV::Plugin->call (new_imagewindow => $viewer);
111 143
112 $schnauzer = new_schnauzer; 144 $schnauzer = new_schnauzer;
113 145
114 $mainwin = new Gtk2::Window; 146 $mainwin = new Gtk2::Window;
147 $mainwin->set_role ("main");
115 $mainwin->set_title ("CV"); 148 $mainwin->set_title ("CV");
116 $mainwin->add (my $vbox = new Gtk2::VBox); 149 $mainwin->add (my $vbox = new Gtk2::VBox);
117 $mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1; }); 150 $mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1 });
118 151
119 $vbox->add ($schnauzer); 152 $vbox->add ($schnauzer);
120 $vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0); 153 $vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);
121 $frame->add (my $hbox = new Gtk2::HBox 0, 0); 154 $frame->add (my $hbox = new Gtk2::HBox 0, 0);
122 $hbox->pack_start ((new Gtk2::Label "Info: "), 0, 0, 0); 155 $hbox->pack_start ((new Gtk2::Label "Info: "), 0, 0, 0);
127 160
128 $schnauzer->set_geometry_hints; 161 $schnauzer->set_geometry_hints;
129} 162}
130 163
131if (@ARGV) { 164if (@ARGV) {
132 $schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]); 165 my $show_first = sub {
133 $schnauzer->show_all; 166 $schnauzer->show_all;
134 $schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []); 167 $schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);
168 $viewer->show_all;
169 };
170
171 @ARGV == 1 && -d $ARGV[0]
172 ? $schnauzer->set_dir (Glib::filename_to_unicode shift, $show_first)
173 : $schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV], 1, $show_first);
135} else { 174} else {
136 $schnauzer->set_dir (File::Spec->curdir); 175 $schnauzer->set_dir (File::Spec->curdir, sub {
137 $mainwin->show_all; 176 $mainwin->show_all;
138}
139
140$viewer->show_all; 177 $viewer->show_all;
178 });
179}
141 180
142main Gtk2; 181main Gtk2;
143 182
183Gtk2::CV::flush_aio;
184
144__DATA__ 185__DATA__
186
187=encoding utf-8
145 188
146=head1 NAME 189=head1 NAME
147 190
148cv - a fast gtk+ image viewer loosely modeled after XV 191cv - a fast gtk+ image viewer loosely modeled after XV
149 192
158 201
159=over 4 202=over 4
160 203
161=item * optimized directory scanning algorithm 204=item * optimized directory scanning algorithm
162 205
163The directory scanning in CV plays some tricks that - on most modern 206The directory scanning in CV uses some tricks that - on most modern
164filesystems - makes it possible to detect filetypes faster than stat()'ing 207filesystems - makes it possible to detect filetypes faster than stat()'ing
165every file. This makes CV suitable for directories with lots of files 208every file. This makes CV suitable for directories with lots of files
166(10000+). 209(10000+).
167 210
168This algorithm is quite unprecise - it doesn't make a difference between 211This algorithm is quite unprecise - it doesn't make a difference between
169files, device nodes, symlinks and the like, and filetype detection is done 212files, device nodes, symlinks and the like, and filetype detection is done
170using the file extension only. 213using the file extension only.
171 214
215On the positive side, it is usually many orders of magnitude faster than
216traditional scanning techniques (good for directories with 10000 or
217100000+ files).
218
219=item * queuing for all time-consuming background tasks
220
221All tasks, such as unlinking files or generating thumbnails, that can be
222done in the background will be done so - no waiting required, even when
223changing directories.
224
172=item * use of asynchronous I/O 225=item * use of asynchronous I/O
173 226
174CV tries to use asynchronous I/O whereever it makes sense, for example 227CV tries to use asynchronous I/O whereever it makes sense, for example
175while scanning directories, waiting for stat data or unlinking files. This 228while scanning directories, waiting for stat data, unlinking files or
176usually decreases scanning times for large directories a bit (especially 229generating thumbnails. This usually decreases scanning times for large
177on RAID devices and over NFS). 230directories a bit (especially on RAID devices and over NFS) and makes CV
231much more interactive.
178 232
179=item * fast image loading 233=item * fast image loading
180 234
181The time span between the user issuing a command and displaying the new 235The time span between the user issuing a command and displaying the new
182image should be as small as possible. CV uses optimized (especially 236image should be as small as possible. CV uses optimized (especially
183for JPEG) loading functions and sacrifices some quality (e.g no gamma 237for JPEG) loading functions and sacrifices some quality (e.g no gamma
184correction) to achieve this speed. 238correction, although this might change) to achieve this speed.
185 239
186=item * fast thumbnail creation 240=item * fast thumbnail creation
187 241
188Thumbnail creation is crucial for me, so it's better be fast. Thumbnail 242Thumbnail creation uses both CPU and Disk-I/O. CV interleaves both, so
243on modern CPUs, thumbnailing is usually limited by I/O speed. Thumbnail
189creation for JPEGs has been specially optimized. 244creation for JPEGs has been specially optimized and can even take
245advantage of multiple CPUs.
190 246
191=item * minimum optical clutter 247=item * minimum optical clutter
192 248
193CV has no menus or other user interface elements that take up a lot of 249CV has no menus or other user interface elements that take up a lot of
194screen space. The schnauzer windows can also be somewhat crowded. 250screen space (or are useful for beginning users). The schnauzer windows
251can also be somewhat crowded.
195 252
196The point of an image viewer is viewing images, not a nice GUI. This is 253The point of an image viewer is viewing images, not a nice GUI. This is
197similar to XV's behaviour. 254similar to XV's behaviour.
198 255
199=item * efficient (and hard to learn) user interface 256=item * efficient (and hard to learn) user interface
200 257
201CV uses key combinations. A lot. If you are an experienced XV user, you 258CV uses key combinations. A lot. If you are an experienced XV user, you
202will find most of these keys familiar. If not, CV might be hard to use at 259will find most of these keys familiar. If not, CV might be hard to use at
203first, but will be an efficient tool later. 260first, but will be an efficient tool later.
204 261
262=item * multi-window GUI
263
264CV doesn't force you to use a specific layout, instead it relies on your
265window manager, thus enabling you to chose whatever layout that suits you
266most.
267
205=item * i18n'ed filename handling throughout 268=item * i18n'ed filename handling throughout
206 269
207As long as glib can recognize your filename encoding (either UTF-8 or 270As long as glib can recognize your filename encoding (either UTF-8 or
208locale-specific, depending on your settings) and you have the relevant 271locale-specific, depending on the setting of G_BROKEN_FILENAMES) and you
209fonts, CV will display your filenames correctly. 272have the relevant fonts, CV will display your filenames correctly.
210 273
211=item * extensible through plug-ins 274=item * extensible through plug-ins
212 275
213I have weird plug-ins that access remote databases to find a 276I have weird plug-ins that access remote databases to find a
214directory. This is not likely to be of any use to other people. Likewise, 277directory. This is not likely to be of any use to other people. Likewise,
235 . enlarge the image by 10% 298 . enlarge the image by 10%
236 n reset to normal size 299 n reset to normal size
237 m maximize to screensize 300 m maximize to screensize
238 M maximize to screensize, respecting image aspect 301 M maximize to screensize, respecting image aspect
239 ctrl-m toggle maxpect-always mode 302 ctrl-m toggle maxpect-always mode
303 ctrl-sift-m toggle using current image size as max image size
240 u uncrop 304 u uncrop
241 r set scaling mode to 'nearest' (fastest) 305 r set scaling mode to 'nearest' (fastest)
242 s set scaling mode to 'bilinear' (default) 306 s set scaling mode to 'bilinear' (default)
243 shift-s set scaling mode to 'hyper' (slowest) 307 shift-s set scaling mode to 'hyper' (slowest)
244 t rotate clockwise 90° 308 t rotate clockwise 90°
245 T rotate counterclockwise° 309 T rotate counterclockwise°
310 a apply all rotations loslessly to a jpeg file (using exiftran)
246 ctrl-v open a new visual schnauzer window for the current dir 311 ctrl-v open a new visual schnauzer window for the current dir
312 ctrl-c clone the current image window
247 ctrl-e run an editor ($CV_EDITOR or "gimp") on the current image 313 ctrl-e run an editor ($CV_EDITOR or "gimp") on the current image
248 ctrl-p fire up the print fialog 314 ctrl-p fire up the print dialog
249 escape cancel a crop action 315 escape cancel a crop action
250 316
251And when playing movies, these additional keys are active: 317And when playing movies, these additional keys are active:
252 318
253 left rewind by 10 seconds 319 left rewind by 10 seconds
268Left-clicking into the image window will let you crop the image (usually 334Left-clicking into the image window will let you crop the image (usually
269to zoom into large images that CV scales down). 335to zoom into large images that CV scales down).
270 336
271=head2 THE VISUAL SCHNAUZER 337=head2 THE VISUAL SCHNAUZER
272 338
339Any image-loading action in a schnauzer window acts on the
340"last-recently-activated" imagewindow, which currently is simply the last
341image window that received a keypress.
342
273You can use the following keys in the schnauzer window: 343You can use the following keys in the schnauzer window:
274 344
275 ctrl-space, 345 ctrl-space,
276 space move to and display next image 346 space move to and display next image
277 ctrl-backspace, 347 ctrl-backspace,
291 ctrl-g force generation of thumbnais for the selected files 361 ctrl-g force generation of thumbnais for the selected files
292 ctrl-s rescan current direcory or files updates/deletes etc. 362 ctrl-s rescan current direcory or files updates/deletes etc.
293 ctrl-u update selected (or all) icons if neccessary 363 ctrl-u update selected (or all) icons if neccessary
294 ctrl-l don't use, will become a plug-in eventually 364 ctrl-l don't use, will become a plug-in eventually
295 365
366 ^ go to parent directory (caret).
367
296 0-9, 368 0-9,
297 a-z find the first filename beginning with this letter 369 a-z find the first filename beginning with this letter
298 370
299Right-clicking into the schnauzer window displays a pop-up menu with 371Right-clicking into the schnauzer window displays a pop-up menu with
300additional actions. 372additional actions.
301 373
374=head3 SELECTION
375
376You can select entries in the Schnauzer in a variety of ways:
377
378=over 4
379
380=item Keyboard
381
382Moving the cursor with the keyboard will first deselect all files and then
383select the file you moved to.
384
385=item Clicking
386
387Clicking on an entry will select the one you clicked and deselect all
388others.
389
390=item Shift-Clicking
391
392Shift-clicking will toggle the selection on the entry under the mouse.
393
394=item Dragging
395
396Dragging will select all entries between the one selected when pushing the
397button and the one selected when releasing the button. If you move above
398or below the schnauzer area while drag-selecting, the schnauzer will move
399up/down one row twice per second. In addition, horizontal mouse movement
400acts as a kind of invisible horizontal scrollbar.
401
402=item Hint: double-click works while click-selecting
403
404You can double-click any image while click-selecting to display it
405without stopping the selection process. This will act as if you normally
406double-clicked the image to display it, and will toggle the selection
407twice, resulting in no change.
408
409=back
410
302=head1 FILES 411=head1 FILES
303 412
304When starting, CV runs the F<.cvrc> file in your F<$HOME> directory as if 413When starting, CV runs the F<.cvrc> file in your F<$HOME> directory as if
305it were a perl script. in that, you will mostly load plug-ins. 414it were a perl script. in that, you will mostly load plug-ins.
306 415
319=item CV_EDITOR 428=item CV_EDITOR
320 429
321The program that gets executed when the user presses C<CTRL-e> in the 430The program that gets executed when the user presses C<CTRL-e> in the
322Schnauzer or image window. The default is C<gimp>. 431Schnauzer or image window. The default is C<gimp>.
323 432
433=item CV_AUDIO_PLAYER
434
435Program used to play all sorts of audio (wav, aif, mp3, ogg...), default "play".
436Will be called like C<< $CV_AUDIO_PLAYER -- <path> >>.
437
324=item CV_PRINT_DESTINATION 438=item CV_PRINT_DESTINATION
325 439
326The default (perl-style) destination to use in the print dialog. 440The default (perl-style) destination to use in the print dialog.
327 441
328=item CV_TRASHCAN 442=item CV_TRASHCAN
332 446
333=back 447=back
334 448
335=head1 SECURITY CONSIDERATIONS 449=head1 SECURITY CONSIDERATIONS
336 450
337CV uses Pixbuf to load images. Pixbuf is not considered safe for this 451CV uses Pixbuf to load non-JPEG images. Pixbuf is not considered safe for
338purpose, though (from the gtk-2.2 release notes): 452this purpose, though (from the gtk-2.2 release notes):
339 453
340"While efforts have been made to make gdk-pixbuf robust against invalid 454"While efforts have been made to make gdk-pixbuf robust against invalid
341images, using gdk-pixbuf to load untrusted data is not recommended, due to 455images, using gdk-pixbuf to load untrusted data is not recommended, due to
342the likelyhood that there are additional problems where an invalid image 456the likelyhood that there are additional problems where an invalid image
343could cause gdk-pixbuf to crash or worse." 457could cause gdk-pixbuf to crash or worse."
345=head1 BUGS/TODO 459=head1 BUGS/TODO
346 460
347 Lots of functionality is missing. 461 Lots of functionality is missing.
348 462
349 Pixbuf doesn't always honor G_BROKEN_FILENAMES, so accessing files with 463 Pixbuf doesn't always honor G_BROKEN_FILENAMES, so accessing files with
350 names incompatible might utf-8 fail. 464 names incompatible with utf-8 might fail.
351 465
352 rotate on disk 466 rotate on disk
353 lots of ui issues 467 lots of ui issues
354 save(?) 468 save(?)
355 preferences 469 preferences
356 shift-cursor in schnauzer
357 470
358=head1 AUTHOR 471=head1 AUTHOR
359 472
360Marc Lehmann <cv@plan9.de>. 473Marc Lehmann <cv@plan9.de>.
361 474

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines