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

Comparing CV/bin/cv (file contents):
Revision 1.52 by root, Sun Aug 14 19:07:15 2005 UTC vs.
Revision 1.68 by root, Mon Oct 23 17:52:37 2006 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) {
165 my $show_first = sub {
166 $schnauzer->show_all;
167 $schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);
168 $viewer->show_all;
169 };
170
132 @ARGV == 1 && -d $ARGV[0] 171 @ARGV == 1 && -d $ARGV[0]
133 ? $schnauzer->set_dir (Glib::filename_to_unicode shift) 172 ? $schnauzer->set_dir (Glib::filename_to_unicode shift, $show_first)
134 : $schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]); 173 : $schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV], 1, $show_first);
135 $schnauzer->show_all;
136 $schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);
137} else { 174} else {
138 $schnauzer->set_dir (File::Spec->curdir); 175 $schnauzer->set_dir (File::Spec->curdir, sub {
139 $mainwin->show_all; 176 $mainwin->show_all;
140}
141
142$viewer->show_all; 177 $viewer->show_all;
178 });
179}
143 180
144main Gtk2; 181main Gtk2;
145 182
146__DATA__ 183__DATA__
184
185=encoding utf-8
147 186
148=head1 NAME 187=head1 NAME
149 188
150cv - a fast gtk+ image viewer loosely modeled after XV 189cv - a fast gtk+ image viewer loosely modeled after XV
151 190
160 199
161=over 4 200=over 4
162 201
163=item * optimized directory scanning algorithm 202=item * optimized directory scanning algorithm
164 203
165The directory scanning in CV plays some tricks that - on most modern 204The directory scanning in CV uses some tricks that - on most modern
166filesystems - makes it possible to detect filetypes faster than stat()'ing 205filesystems - makes it possible to detect filetypes faster than stat()'ing
167every file. This makes CV suitable for directories with lots of files 206every file. This makes CV suitable for directories with lots of files
168(10000+). 207(10000+).
169 208
170This algorithm is quite unprecise - it doesn't make a difference between 209This algorithm is quite unprecise - it doesn't make a difference between
171files, device nodes, symlinks and the like, and filetype detection is done 210files, device nodes, symlinks and the like, and filetype detection is done
172using the file extension only. 211using the file extension only.
173 212
213On the positive side, it is usually many orders of magnitude faster than
214traditional scanning techniques (good for directories with 10000 or
215100000+ files).
216
217=item * queuing for all time-consuming background tasks
218
219All tasks, such as unlinking files or generating thumbnails, that can be
220done in the background will be done so - no waiting required, even when
221changing directories.
222
174=item * use of asynchronous I/O 223=item * use of asynchronous I/O
175 224
176CV tries to use asynchronous I/O whereever it makes sense, for example 225CV tries to use asynchronous I/O whereever it makes sense, for example
177while scanning directories, waiting for stat data or unlinking files. This 226while scanning directories, waiting for stat data, unlinking files or
178usually decreases scanning times for large directories a bit (especially 227generating thumbnails. This usually decreases scanning times for large
179on RAID devices and over NFS). 228directories a bit (especially on RAID devices and over NFS) and makes CV
229much more interactive.
180 230
181=item * fast image loading 231=item * fast image loading
182 232
183The time span between the user issuing a command and displaying the new 233The time span between the user issuing a command and displaying the new
184image should be as small as possible. CV uses optimized (especially 234image should be as small as possible. CV uses optimized (especially
185for JPEG) loading functions and sacrifices some quality (e.g no gamma 235for JPEG) loading functions and sacrifices some quality (e.g no gamma
186correction) to achieve this speed. 236correction, although this might change) to achieve this speed.
187 237
188=item * fast thumbnail creation 238=item * fast thumbnail creation
189 239
190Thumbnail creation is crucial for me, so it's better be fast. Thumbnail 240Thumbnail creation uses both CPU and Disk-I/O. CV interleaves both, so
241on modern CPUs, thumbnailing is usually limited by I/O speed. Thumbnail
191creation for JPEGs has been specially optimized. 242creation for JPEGs has been specially optimized and can even take
243advantage of multiple CPUs.
192 244
193=item * minimum optical clutter 245=item * minimum optical clutter
194 246
195CV has no menus or other user interface elements that take up a lot of 247CV has no menus or other user interface elements that take up a lot of
196screen space. The schnauzer windows can also be somewhat crowded. 248screen space (or are useful for beginning users). The schnauzer windows
249can also be somewhat crowded.
197 250
198The point of an image viewer is viewing images, not a nice GUI. This is 251The point of an image viewer is viewing images, not a nice GUI. This is
199similar to XV's behaviour. 252similar to XV's behaviour.
200 253
201=item * efficient (and hard to learn) user interface 254=item * efficient (and hard to learn) user interface
202 255
203CV uses key combinations. A lot. If you are an experienced XV user, you 256CV uses key combinations. A lot. If you are an experienced XV user, you
204will find most of these keys familiar. If not, CV might be hard to use at 257will find most of these keys familiar. If not, CV might be hard to use at
205first, but will be an efficient tool later. 258first, but will be an efficient tool later.
206 259
260=item * multi-window GUI
261
262CV doesn't force you to use a specific layout, instead it relies on your
263window manager, thus enabling you to chose whatever layout that suits you
264most.
265
207=item * i18n'ed filename handling throughout 266=item * i18n'ed filename handling throughout
208 267
209As long as glib can recognize your filename encoding (either UTF-8 or 268As long as glib can recognize your filename encoding (either UTF-8 or
210locale-specific, depending on your settings) and you have the relevant 269locale-specific, depending on the setting of G_BROKEN_FILENAMES) and you
211fonts, CV will display your filenames correctly. 270have the relevant fonts, CV will display your filenames correctly.
212 271
213=item * extensible through plug-ins 272=item * extensible through plug-ins
214 273
215I have weird plug-ins that access remote databases to find a 274I have weird plug-ins that access remote databases to find a
216directory. This is not likely to be of any use to other people. Likewise, 275directory. This is not likely to be of any use to other people. Likewise,
237 . enlarge the image by 10% 296 . enlarge the image by 10%
238 n reset to normal size 297 n reset to normal size
239 m maximize to screensize 298 m maximize to screensize
240 M maximize to screensize, respecting image aspect 299 M maximize to screensize, respecting image aspect
241 ctrl-m toggle maxpect-always mode 300 ctrl-m toggle maxpect-always mode
301 ctrl-sift-m toggle using current image size as max image size
242 u uncrop 302 u uncrop
243 r set scaling mode to 'nearest' (fastest) 303 r set scaling mode to 'nearest' (fastest)
244 s set scaling mode to 'bilinear' (default) 304 s set scaling mode to 'bilinear' (default)
245 shift-s set scaling mode to 'hyper' (slowest) 305 shift-s set scaling mode to 'hyper' (slowest)
246 t rotate clockwise 90° 306 t rotate clockwise 90°
247 T rotate counterclockwise° 307 T rotate counterclockwise°
308 a apply all rotations loslessly to a jpeg file (using exiftran)
248 ctrl-v open a new visual schnauzer window for the current dir 309 ctrl-v open a new visual schnauzer window for the current dir
310 ctrl-c clone the current image window
249 ctrl-e run an editor ($CV_EDITOR or "gimp") on the current image 311 ctrl-e run an editor ($CV_EDITOR or "gimp") on the current image
250 ctrl-p fire up the print fialog 312 ctrl-p fire up the print dialog
251 escape cancel a crop action 313 escape cancel a crop action
252 314
253And when playing movies, these additional keys are active: 315And when playing movies, these additional keys are active:
254 316
255 left rewind by 10 seconds 317 left rewind by 10 seconds
270Left-clicking into the image window will let you crop the image (usually 332Left-clicking into the image window will let you crop the image (usually
271to zoom into large images that CV scales down). 333to zoom into large images that CV scales down).
272 334
273=head2 THE VISUAL SCHNAUZER 335=head2 THE VISUAL SCHNAUZER
274 336
337Any image-loading action in a schnauzer window acts on the
338"last-recently-activated" imagewindow, which currently is simply the last
339image window that received a keypress.
340
275You can use the following keys in the schnauzer window: 341You can use the following keys in the schnauzer window:
276 342
277 ctrl-space, 343 ctrl-space,
278 space move to and display next image 344 space move to and display next image
279 ctrl-backspace, 345 ctrl-backspace,
293 ctrl-g force generation of thumbnais for the selected files 359 ctrl-g force generation of thumbnais for the selected files
294 ctrl-s rescan current direcory or files updates/deletes etc. 360 ctrl-s rescan current direcory or files updates/deletes etc.
295 ctrl-u update selected (or all) icons if neccessary 361 ctrl-u update selected (or all) icons if neccessary
296 ctrl-l don't use, will become a plug-in eventually 362 ctrl-l don't use, will become a plug-in eventually
297 363
364 ^ go to parent directory (caret).
365
298 0-9, 366 0-9,
299 a-z find the first filename beginning with this letter 367 a-z find the first filename beginning with this letter
300 368
301Right-clicking into the schnauzer window displays a pop-up menu with 369Right-clicking into the schnauzer window displays a pop-up menu with
302additional actions. 370additional actions.
303 371
372=head3 SELECTION
373
374You can select entries in the Schnauzer in a variety of ways:
375
376=over 4
377
378=item Keyboard
379
380Moving the cursor with the keyboard will first deselect all files and then
381select the file you moved to.
382
383=item Clicking
384
385Clicking on an entry will select the one you clicked and deselect all
386others.
387
388=item Shift-Clicking
389
390Shift-clicking will toggle the selection on the entry under the mouse.
391
392=item Dragging
393
394Dragging will select all entries between the one selected when pushing the
395button and the one selected when releasing the button. If you move above
396or below the schnauzer area while drag-selecting, the schnauzer will move
397up/down one row twice per second. In addition, horizontal mouse movement
398acts as a kind of invisible horizontal scrollbar.
399
400=item Hint: double-click works while click-selecting
401
402You can double-click any image while click-selecting to display it
403without stopping the selection process. This will act as if you normally
404double-clicked the image to display it, and will toggle the selection
405twice, resulting in no change.
406
407=back
408
304=head1 FILES 409=head1 FILES
305 410
306When starting, CV runs the F<.cvrc> file in your F<$HOME> directory as if 411When starting, CV runs the F<.cvrc> file in your F<$HOME> directory as if
307it were a perl script. in that, you will mostly load plug-ins. 412it were a perl script. in that, you will mostly load plug-ins.
308 413
334 439
335=back 440=back
336 441
337=head1 SECURITY CONSIDERATIONS 442=head1 SECURITY CONSIDERATIONS
338 443
339CV uses Pixbuf to load images. Pixbuf is not considered safe for this 444CV uses Pixbuf to load non-JPEG images. Pixbuf is not considered safe for
340purpose, though (from the gtk-2.2 release notes): 445this purpose, though (from the gtk-2.2 release notes):
341 446
342"While efforts have been made to make gdk-pixbuf robust against invalid 447"While efforts have been made to make gdk-pixbuf robust against invalid
343images, using gdk-pixbuf to load untrusted data is not recommended, due to 448images, using gdk-pixbuf to load untrusted data is not recommended, due to
344the likelyhood that there are additional problems where an invalid image 449the likelyhood that there are additional problems where an invalid image
345could cause gdk-pixbuf to crash or worse." 450could cause gdk-pixbuf to crash or worse."
347=head1 BUGS/TODO 452=head1 BUGS/TODO
348 453
349 Lots of functionality is missing. 454 Lots of functionality is missing.
350 455
351 Pixbuf doesn't always honor G_BROKEN_FILENAMES, so accessing files with 456 Pixbuf doesn't always honor G_BROKEN_FILENAMES, so accessing files with
352 names incompatible might utf-8 fail. 457 names incompatible with utf-8 might fail.
353 458
354 rotate on disk 459 rotate on disk
355 lots of ui issues 460 lots of ui issues
356 save(?) 461 save(?)
357 preferences 462 preferences
358 shift-cursor in schnauzer
359 463
360=head1 AUTHOR 464=head1 AUTHOR
361 465
362Marc Lehmann <cv@plan9.de>. 466Marc Lehmann <cv@plan9.de>.
363 467

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines