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

Comparing CV/bin/cv (file contents):
Revision 1.47 by root, Wed Jul 20 09:06:37 2005 UTC vs.
Revision 1.71 by root, Thu Oct 4 10:30:12 2007 UTC

…		…
4	use Encode ();	4	use Encode ();
5		5
6	use Gtk2 -init;	6	use Gtk2 -init;
7	use Gtk2::Gdk::Keysyms;	7	use Gtk2::Gdk::Keysyms;
8		8
		9	use Gtk2::CV;
		10
9	use Gtk2::CV::ImageWindow;	11	use Gtk2::CV::ImageWindow;
10	use Gtk2::CV::Schnauzer;	12	use Gtk2::CV::Schnauzer;
11		13
12	use Gtk2::CV;	14	BEGIN {
		15	require Gtk2::CV::Plugin;
		16	require "$ENV{HOME}/.cvrc" if -r "$ENV{HOME}/.cvrc";
		17	}
		18
		19	use Gtk2::CV::Plugin::NameCluster;
		20	use Gtk2::CV::Plugin::RCluster;
13		21
14	Gtk2::Rc->parse (Gtk2::CV::find_rcfile "gtkrc");	22	Gtk2::Rc->parse (Gtk2::CV::find_rcfile "gtkrc");
15		23
16	use File::Spec;	24	use File::Spec;
17
18	require Gtk2::CV::Plugin;
19	require "$ENV{HOME}/.cvrc" if -r "$ENV{HOME}/.cvrc";
20		25
21	my $mainwin;	26	my $mainwin;
22	my $viewer;	27	my $viewer;
		28	my $viewer_count;
23	my $schnauzer;	29	my $schnauzer;
24	my $info;	30	my $info;
25	my $help;	31	my $help;
26		32
27	my $schnauzer_idx = 0;	33	my $schnauzer_idx = 0;
…		…
33	$s->signal_connect (activate => sub {	39	$s->signal_connect (activate => sub {
34	my $label = sprintf "%s (%d)",	40	my $label = sprintf "%s (%d)",
35	(File::Spec->splitpath ($_[1]))[2],	41	(File::Spec->splitpath ($_[1]))[2],
36	-s $_[1];	42	-s $_[1];
37	$info->set_label ($label);	43	$info->set_label ($label);
38	$viewer->load_image ($_[1]);	44	$viewer->load_image ($_[1]) if $viewer; # TODO: error, or chose ANY viewer
39	});	45	});
40		46
41	Gtk2::CV::Plugin->call (new_schnauzer => $s);	47	Gtk2::CV::Plugin->call (new_schnauzer => $s);
42		48
43	$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
44	}	95	}
45		96
46	sub std_keys {	97	sub std_keys {
47	my $key = $_[1]->keyval;	98	my $key = $_[1]->keyval;
48	my $state = $_[1]->state;	99	my $state = $_[1]->state;
49		100
50	my $ctrl = $state * "control-mask";	101	my $ctrl = $state * "control-mask";
51		102
52	if ($key == $Gtk2::Gdk::Keysyms{q}) {	103	if ($key == $Gtk2::Gdk::Keysyms{q}) {
53	main_quit Gtk2;	104	$viewer->destroy;
54	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {	105	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {
55	my $w = new Gtk2::Window;	106	my $w = new Gtk2::Window;
56		107
		108	$w->set_role ("schnauzer");
57	$w->set_title ("CV: Schnauzer");	109	$w->set_title ("CV: Schnauzer");
58	$w->add (my $s = new_schnauzer);	110	$w->add (my $s = new_schnauzer);
59	$s->set_dir (File::Spec->curdir);	111	$s->set_dir (File::Spec->curdir);
60	$s->set_geometry_hints;	112	$s->set_geometry_hints;
61	$w->show_all;	113	$w->show_all;
…		…
63	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{h}) {	115	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{h}) {
64	unless ($help) {	116	unless ($help) {
65	require Gtk2::PodViewer;	117	require Gtk2::PodViewer;
66		118
67	$help = new Gtk2::Window;	119	$help = new Gtk2::Window;
		120	$help->set_role ("help");
68	$help->set_title ("CV: Help");	121	$help->set_title ("CV: Help");
69	$help->set_default_size (500, 300);	122	$help->set_default_size (500, 300);
70	$help->signal_connect (delete_event => sub { $help->hide; 1 });	123	$help->signal_connect (delete_event => sub { $help->hide; 1 });
71		124
72	$help->add (my $sw = new Gtk2::ScrolledWindow);	125	$help->add (my $sw = new Gtk2::ScrolledWindow);
…		…
83		136
84	1	137	1
85	}	138	}
86		139
87	{	140	{
88	$viewer = new Gtk2::CV::ImageWindow;	141	$viewer = new_viewer;
89		142	$::cur_viewer = $viewer;
90	$viewer->set_title ("CV: Image");
91
92	$viewer->signal_connect (key_press_event => sub {
93	&std_keys
94	or $schnauzer->signal_emit (key_press_event => $_[1])
95	});
96	$viewer->signal_connect (delete_event => sub { main_quit Gtk2 });
97
98	$viewer->signal_connect (button3_press_event => sub {
99	$mainwin->visible
100	? $mainwin->hide
101	: $mainwin->show_all;
102	1;
103	});
104
105	Gtk2::CV::Plugin->call (new_imagewindow => $viewer);
106		143
107	$schnauzer = new_schnauzer;	144	$schnauzer = new_schnauzer;
108		145
109	$mainwin = new Gtk2::Window;	146	$mainwin = new Gtk2::Window;
		147	$mainwin->set_role ("main");
110	$mainwin->set_title ("CV");	148	$mainwin->set_title ("CV");
111	$mainwin->add (my $vbox = new Gtk2::VBox);	149	$mainwin->add (my $vbox = new Gtk2::VBox);
112	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1; });	150	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1 });
113		151
114	$vbox->add ($schnauzer);	152	$vbox->add ($schnauzer);
115	$vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);	153	$vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);
116	$frame->add (my $hbox = new Gtk2::HBox 0, 0);	154	$frame->add (my $hbox = new Gtk2::HBox 0, 0);
117	$hbox->pack_start ((new Gtk2::Label "Info: "), 0, 0, 0);	155	$hbox->pack_start ((new Gtk2::Label "Info: "), 0, 0, 0);
…		…
122		160
123	$schnauzer->set_geometry_hints;	161	$schnauzer->set_geometry_hints;
124	}	162	}
125		163
126	if (@ARGV) {	164	if (@ARGV) {
127	$schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]);	165	my $show_first = sub {
128	$schnauzer->show_all;	166	$schnauzer->show_all;
129	$viewer->show_all;
130	$schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);	167	$schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);
		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	}
131	} else {	179	} else {
132	$schnauzer->set_dir (File::Spec->curdir);	180	$schnauzer->set_dir (File::Spec->curdir, sub {
133	$mainwin->show_all;	181	$mainwin->show_all;
134	$viewer->show_all;	182	$viewer->show_all;
		183	});
135	}	184	}
136
137	$viewer->show_all;
138		185
139	main Gtk2;	186	main Gtk2;
140		187
		188	Gtk2::CV::flush_aio;
		189
141	__DATA__	190	__DATA__
		191
		192	=encoding utf-8
142		193
143	=head1 NAME	194	=head1 NAME
144		195
145	cv - a fast gtk+ image viewer loosely modeled after XV	196	cv - a fast gtk+ image viewer loosely modeled after XV
146		197
…		…
155		206
156	=over 4	207	=over 4
157		208
158	=item * optimized directory scanning algorithm	209	=item * optimized directory scanning algorithm
159		210
160	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
161	filesystems - makes it possible to detect filetypes faster than stat()'ing	212	filesystems - makes it possible to detect filetypes faster than stat()'ing
162	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
163	(10000+).	214	(10000+).
164		215
165	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
166	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
167	using the file extension only.	218	using the file extension only.
168		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
169	=item * use of asynchronous I/O	230	=item * use of asynchronous I/O
170		231
171	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
172	while scanning directories, waiting for stat data or unlinking files. This	233	while scanning directories, waiting for stat data, unlinking files or
173	usually decreases scanning times for large directories a bit (especially	234	generating thumbnails. This usually decreases scanning times for large
174	on RAID devices and over NFS).	235	directories a bit (especially on RAID devices and over NFS) and makes CV
		236	much more interactive.
175		237
176	=item * fast image loading	238	=item * fast image loading
177		239
178	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
179	image should be as small as possible. CV uses optimized (especially	241	image should be as small as possible. CV uses optimized (especially
180	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
181	correction) to achieve this speed.	243	correction, although this might change) to achieve this speed.
182		244
183	=item * fast thumbnail creation	245	=item * fast thumbnail creation
184		246
185	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
186	creation for JPEGs has been specially optimized.	249	creation for JPEGs has been specially optimized and can even take
		250	advantage of multiple CPUs.
187		251
188	=item * minimum optical clutter	252	=item * minimum optical clutter
189		253
190	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
191	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.
192		257
193	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
194	similar to XV's behaviour.	259	similar to XV's behaviour.
195		260
196	=item * efficient (and hard to learn) user interface	261	=item * efficient (and hard to learn) user interface
197		262
198	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
199	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
200	first, but will be an efficient tool later.	265	first, but will be an efficient tool later.
201		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
202	=item * i18n'ed filename handling throughout	273	=item * i18n'ed filename handling throughout
203		274
204	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
205	locale-specific, depending on your settings) and you have the relevant	276	locale-specific, depending on the setting of G_BROKEN_FILENAMES) and you
206	fonts, CV will display your filenames correctly.	277	have the relevant fonts, CV will display your filenames correctly.
207		278
208	=item * extensible through plug-ins	279	=item * extensible through plug-ins
209		280
210	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
211	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,
…		…
223		294
224	=head2 THE IMAGE WINDOW	295	=head2 THE IMAGE WINDOW
225		296
226	You can use the following keys in the image window:	297	You can use the following keys in the image window:
227		298
228	q quit the program	299	q quit the program
229	< half the image size	300	< half the image size
230	> double the image size	301	> double the image size
231	, shrink the image by 10%	302	, shrink the image by 10%
232	. enlarge the image by 10%	303	. enlarge the image by 10%
233	n reset to normal size	304	n reset to normal size
234	m maximize to screensize	305	m maximize to screensize
235	M maximize to screensize, respecting image aspect	306	M maximize to screensize, respecting image aspect
236	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
237	u uncrop	309	u uncrop
238	r set scaling mode to 'nearest' (fastest)	310	r set scaling mode to 'nearest' (fastest)
239	s set scaling mode to 'bilinear' (default)	311	s set scaling mode to 'bilinear' (default)
240	shift-s set scaling mode to 'hyper' (slowest)	312	shift-s set scaling mode to 'hyper' (slowest)
241	t rotate clockwise 90°	313	t rotate clockwise 90°
242	T rotate counterclockwise°	314	T rotate counterclockwise°
		315	a apply all rotations loslessly to a jpeg file (using exiftran)
243	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
244	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
245	ctrl-p fire up the print fialog	319	ctrl-p fire up the print dialog
246	escape cancel a crop action	320	escape cancel a crop action
247		321
248	And when playing movies, these additional keys are active:	322	And when playing movies, these additional keys are active:
249		323
250	left rewind by 10 seconds	324	left rewind by 10 seconds
251	right forward by 10 seconds	325	right forward by 10 seconds
252	down rewind by 60 seconds	326	down rewind by 60 seconds
253	up forward by 60 seconds	327	up forward by 60 seconds
254	pg_up rewind by 600 seconds	328	pg_up rewind by 600 seconds
255	pg_down forward by 600 seconds	329	pg_down forward by 600 seconds
256	o toggle on-screen display	330	o toggle on-screen display
257	p pause/unpause	331	p pause/unpause
258	escape stop playing	332	escape stop playing
259	9 turn volume down	333	9 turn volume down
260	0 turn volume up	334	0 turn volume up
261		335
262	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
263	toggled on and off by right-clicking into the image window.	337	toggled on and off by right-clicking into the image window.
264		338
265	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
266	to zoom into large images that CV scales down).	340	to zoom into large images that CV scales down).
267		341
268	=head2 THE VISUAL SCHNAUZER	342	=head2 THE VISUAL SCHNAUZER
269		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
270	You can use the following keys in the schnauzer window:	348	You can use the following keys in the schnauzer window:
271		349
272	ctrl-space,	350	ctrl-space,
273	space move to and display next image	351	space move to and display next image
274	ctrl-backspace,	352	ctrl-backspace,
275	backspace move to and display previous image	353	backspace move to and display previous image
276	ctrl-return,	354	ctrl-return,
277	return display selected picture, or enter directory	355	return display selected picture, or enter directory
278		356
279	cursor keys move selection	357	cursor keys move selection
280	page-up move one page up	358	page-up move one page up
281	page-down move one page down	359	page-down move one page down
282	home move to first file	360	home move to first file
283	end move to last file	361	end move to last file
284		362
285	ctrl-a select all files	363	ctrl-a select all files
		364	ctrl-shift-a select all files currently displayed in the schnauzer window
286	ctrl-d delete selected files WITHOUT ASKING AGAIN	365	ctrl-d delete selected files WITHOUT ASKING AGAIN
287	ctrl-g force generation of thumbnais for the selected files	366	ctrl-g force generation of thumbnais for the selected files
288	ctrl-s rescan current direcory or files updates/deletes etc.	367	ctrl-s rescan current direcory or files updates/deletes etc.
289	ctrl-u update selected (or all) icons if neccessary	368	ctrl-u update selected (or all) icons if neccessary
290	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).
291		372
292	0-9,	373	0-9,
293	a-z find the first filename beginning with this letter	374	a-z find the first filename beginning with this letter
294		375
295	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
296	additional actions.	377	additional actions.
297		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
298	=head1 FILES	416	=head1 FILES
299		417
300	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
301	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.
302		420
…		…
315	=item CV_EDITOR	433	=item CV_EDITOR
316		434
317	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
318	Schnauzer or image window. The default is C<gimp>.	436	Schnauzer or image window. The default is C<gimp>.
319		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
320	=item CV_PRINT_DESTINATION	443	=item CV_PRINT_DESTINATION
321		444
322	The default (perl-style) destination to use in the print dialog.	445	The default (perl-style) destination to use in the print dialog.
323		446
324	=item CV_TRASHCAN	447	=item CV_TRASHCAN
…		…
328		451
329	=back	452	=back
330		453
331	=head1 SECURITY CONSIDERATIONS	454	=head1 SECURITY CONSIDERATIONS
332		455
333	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
334	purpose, though (from the gtk-2.2 release notes):	457	this purpose, though (from the gtk-2.2 release notes):
335		458
336	"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
337	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
338	the likelyhood that there are additional problems where an invalid image	461	the likelyhood that there are additional problems where an invalid image
339	could cause gdk-pixbuf to crash or worse."	462	could cause gdk-pixbuf to crash or worse."
…		…
341	=head1 BUGS/TODO	464	=head1 BUGS/TODO
342		465
343	Lots of functionality is missing.	466	Lots of functionality is missing.
344		467
345	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
346	names incompatible might utf-8 fail.	469	names incompatible with utf-8 might fail.
347		470
348	rotate on disk	471	rotate on disk
349	lots of ui issues	472	lots of ui issues
350	save(?)	473	save(?)
351	preferences	474	preferences
352	shift-cursor in schnauzer
353		475
354	=head1 AUTHOR	476	=head1 AUTHOR
355		477
356	Marc Lehmann <cv@plan9.de>.	478	Marc Lehmann <cv@plan9.de>.
357		479

Diff Legend

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

Comparing CV/bin/cv (file contents): Revision 1.47 by root, Wed Jul 20 09:06:37 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.47 by root, Wed Jul 20 09:06:37 2005 UTC vs.
Revision 1.71 by root, Thu Oct 4 10:30:12 2007 UTC