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

Comparing CV/bin/cv (file contents):
Revision 1.49 by root, Sun Jul 31 07:01:31 2005 UTC vs.
Revision 1.71 by root, Thu Oct 4 10:30:12 2007 UTC

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

Diff Legend

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

Comparing CV/bin/cv (file contents): Revision 1.49 by root, Sun Jul 31 07:01:31 2005 UTC vs. Revision 1.71 by root, Thu Oct 4 10:30:12 2007 UTC

Diff Legend

Comparing CV/bin/cv (file contents):
Revision 1.49 by root, Sun Jul 31 07:01:31 2005 UTC vs.
Revision 1.71 by root, Thu Oct 4 10:30:12 2007 UTC