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

Comparing CV/bin/cv (file contents):
Revision 1.38 by root, Fri Apr 29 19:52:38 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		25
18	my $mainwin;	26	my $mainwin;
19	my $viewer;	27	my $viewer;
		28	my $viewer_count;
20	my $schnauzer;	29	my $schnauzer;
21	my $info;	30	my $info;
22	my $help;	31	my $help;
23		32
24	my $schnauzer_idx = 0;	33	my $schnauzer_idx = 0;
…		…
30	$s->signal_connect (activate => sub {	39	$s->signal_connect (activate => sub {
31	my $label = sprintf "%s (%d)",	40	my $label = sprintf "%s (%d)",
32	(File::Spec->splitpath ($_[1]))[2],	41	(File::Spec->splitpath ($_[1]))[2],
33	-s $_[1];	42	-s $_[1];
34	$info->set_label ($label);	43	$info->set_label ($label);
35	$viewer->load_image ($_[1]);	44	$viewer->load_image ($_[1]) if $viewer; # TODO: error, or chose ANY viewer
36	});	45	});
		46
		47	Gtk2::CV::Plugin->call (new_schnauzer => $s);
		48
		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
37	$s->signal_connect (chdir => sub {	59	$self->signal_connect (key_press_event => sub {
38	my ($self, $dir) = @_;	60	$viewer = $_[0];
39		61
40	my $path = Cwd::abs_path $dir;	62	my $key = $_[1]->keyval;
		63	my $state = $_[1]->state;
41		64
42	$self->realize;	65	if ($state * "control-mask" && $key == $Gtk2::Gdk::Keysyms{c}) {
43	$self->window->property_change (	66	my $viewer = new_viewer ();
44	Gtk2::Gdk::Atom->intern ("_X_CWD", 0),	67	$viewer->set_image ($_[0]->{image});
45	Gtk2::Gdk::Atom->intern ("UTF8_STRING", 0),	68	$viewer->show_all;
46	Gtk2::Gdk::CHARS, 'replace',	69	1
47	Encode::encode_utf8 $path,	70	} else {
		71	&std_keys
		72	or $schnauzer->signal_emit (key_press_event => $_[1])
48	);	73	}
49	});	74	});
		75	$self->signal_connect (delete_event => sub { $_[0]->destroy; 0 });
		76	$self->signal_connect (destroy => sub {
		77	$viewer = undef if $viewer == $_[0];
50		78
51	$s;	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
52	}	95	}
53		96
54	sub std_keys {	97	sub std_keys {
55	my $key = $_[1]->keyval;	98	my $key = $_[1]->keyval;
56	my $state = $_[1]->state;	99	my $state = $_[1]->state;
57		100
58	my $ctrl = $state * "control-mask";	101	my $ctrl = $state * "control-mask";
59		102
60	if ($key == $Gtk2::Gdk::Keysyms{q}) {	103	if ($key == $Gtk2::Gdk::Keysyms{q}) {
61	main_quit Gtk2;	104	$viewer->destroy;
62	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {	105	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {
63	my $w = new Gtk2::Window;	106	my $w = new Gtk2::Window;
64		107
		108	$w->set_role ("schnauzer");
65	$w->set_title ("CV: Schnauzer");	109	$w->set_title ("CV: Schnauzer");
66	$w->add (my $s = new_schnauzer);	110	$w->add (my $s = new_schnauzer);
67	$s->set_dir (File::Spec->curdir);	111	$s->set_dir (File::Spec->curdir);
68	$s->set_geometry_hints;	112	$s->set_geometry_hints;
69	$w->show_all;	113	$w->show_all;
…		…
71	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{h}) {	115	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{h}) {
72	unless ($help) {	116	unless ($help) {
73	require Gtk2::PodViewer;	117	require Gtk2::PodViewer;
74		118
75	$help = new Gtk2::Window;	119	$help = new Gtk2::Window;
		120	$help->set_role ("help");
76	$help->set_title ("CV: Help");	121	$help->set_title ("CV: Help");
77	$help->set_default_size (500, 300);	122	$help->set_default_size (500, 300);
78	$help->signal_connect (delete_event => sub { $help->hide; 1 });	123	$help->signal_connect (delete_event => sub { $help->hide; 1 });
79		124
80	$help->add (my $sw = new Gtk2::ScrolledWindow);	125	$help->add (my $sw = new Gtk2::ScrolledWindow);
…		…
84	$h->load_string (do { local $/; <DATA> });	129	$h->load_string (do { local $/; <DATA> });
85	}	130	}
86		131
87	$help->show_all;	132	$help->show_all;
88	} else {	133	} else {
89	#$mainwin->show_all;	134	return 0;
90	$schnauzer->handle_key ($key, $state);
91	}	135	}
92		136
93	1;	137	1
94	}	138	}
95		139
96	{	140	{
97	$viewer = new Gtk2::CV::ImageWindow;	141	$viewer = new_viewer;
98		142	$::cur_viewer = $viewer;
99	$viewer->set_title ("CV: Image");
100
101	$viewer->signal_connect (key_press_event => \&std_keys);
102	$viewer->signal_connect (delete_event => sub { main_quit Gtk2 });
103
104	$viewer->signal_connect (button3_press_event => sub {
105	$mainwin->visible
106	? $mainwin->hide
107	: $mainwin->show_all;
108	1;
109	});
110		143
111	$schnauzer = new_schnauzer;	144	$schnauzer = new_schnauzer;
112		145
113	$mainwin = new Gtk2::Window;	146	$mainwin = new Gtk2::Window;
		147	$mainwin->set_role ("main");
114	$mainwin->set_title ("CV");	148	$mainwin->set_title ("CV");
115	$mainwin->add (my $vbox = new Gtk2::VBox);	149	$mainwin->add (my $vbox = new Gtk2::VBox);
116	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1; });	150	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1 });
117		151
118	$vbox->add ($schnauzer);	152	$vbox->add ($schnauzer);
119	$vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);	153	$vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);
120	$frame->add (my $hbox = new Gtk2::HBox 0, 0);	154	$frame->add (my $hbox = new Gtk2::HBox 0, 0);
121	$hbox->pack_start ((new Gtk2::Label "Info"), 0, 0, 0);	155	$hbox->pack_start ((new Gtk2::Label "Info: "), 0, 0, 0);
122	$hbox->pack_start (($info = new Gtk2::Label), 1, 1, 0);	156	$hbox->pack_end (my $labelwindow = new Gtk2::EventBox, 1, 1, 0);
		157	$labelwindow->add ($info = new Gtk2::Label);
		158	$labelwindow->signal_connect_after (size_request => sub { $_[1]->width (0); 0 });
		159	$info->set (selectable => 1, xalign => 0, justify => "left");
123		160
124	$schnauzer->set_geometry_hints;	161	$schnauzer->set_geometry_hints;
125	}	162	}
126		163
127	if (@ARGV) {	164	if (@ARGV) {
128	$schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]);	165	my $show_first = sub {
129	$schnauzer->show_all;	166	$schnauzer->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__
142		191
		192	=encoding utf-8
		193
143	=head1 NAME	194	=head1 NAME
144		195
145	cv - a fast gtk+ image viewer modeled after xv	196	cv - a fast gtk+ image viewer loosely modeled after XV
146		197
147	=head1 SYNOPSIS	198	=head1 SYNOPSIS
148		199
149	cv [file...]	200	cv [file...]
150		201
		202	=head1 FEATURES
		203
		204	CV is supposed to work similar to the venerable XV image viewer, just
		205	faster. Why faster?
		206
		207	=over 4
		208
		209	=item * optimized directory scanning algorithm
		210
		211	The directory scanning in CV uses some tricks that - on most modern
		212	filesystems - makes it possible to detect filetypes faster than stat()'ing
		213	every file. This makes CV suitable for directories with lots of files
		214	(10000+).
		215
		216	This algorithm is quite unprecise - it doesn't make a difference between
		217	files, device nodes, symlinks and the like, and filetype detection is done
		218	using the file extension only.
		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
		230	=item * use of asynchronous I/O
		231
		232	CV tries to use asynchronous I/O whereever it makes sense, for example
		233	while scanning directories, waiting for stat data, unlinking files or
		234	generating thumbnails. This usually decreases scanning times for large
		235	directories a bit (especially on RAID devices and over NFS) and makes CV
		236	much more interactive.
		237
		238	=item * fast image loading
		239
		240	The time span between the user issuing a command and displaying the new
		241	image should be as small as possible. CV uses optimized (especially
		242	for JPEG) loading functions and sacrifices some quality (e.g no gamma
		243	correction, although this might change) to achieve this speed.
		244
		245	=item * fast thumbnail creation
		246
		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
		249	creation for JPEGs has been specially optimized and can even take
		250	advantage of multiple CPUs.
		251
		252	=item * minimum optical clutter
		253
		254	CV has no menus or other user interface elements that take up a lot of
		255	screen space (or are useful for beginning users). The schnauzer windows
		256	can also be somewhat crowded.
		257
		258	The point of an image viewer is viewing images, not a nice GUI. This is
		259	similar to XV's behaviour.
		260
		261	=item * efficient (and hard to learn) user interface
		262
		263	CV uses key combinations. A lot. If you are an experienced XV user, you
		264	will find most of these keys familiar. If not, CV might be hard to use at
		265	first, but will be an efficient tool later.
		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
		273	=item * i18n'ed filename handling throughout
		274
		275	As long as glib can recognize your filename encoding (either UTF-8 or
		276	locale-specific, depending on the setting of G_BROKEN_FILENAMES) and you
		277	have the relevant fonts, CV will display your filenames correctly.
		278
		279	=item * extensible through plug-ins
		280
		281	I have weird plug-ins that access remote databases to find a
		282	directory. This is not likely to be of any use to other people. Likewise,
		283	others might have weird requirements I cannot dream of.
		284
		285	=item * filename clustering
		286
		287	Among the standard plug-ins is a filename clustering plug-in, that (in
		288	case of tens of thousands images in one directory) might be able to
		289	cluster similar names together.
		290
		291	=back
		292
151	=head1 DESCRIPTION	293	=head1 DESCRIPTION
152		294
153	None yet.
154
155	=head2 THE IMAGE WINDOW	295	=head2 THE IMAGE WINDOW
156		296
157	You can use the following keys in the image window:	297	You can use the following keys in the image window:
158		298
159	q quit the program	299	q quit the program
160	< half the image size	300	< half the image size
161	> double the image size	301	> double the image size
162	, shrink the image by 10%	302	, shrink the image by 10%
163	. enlarge the image by 10%	303	. enlarge the image by 10%
164	n reset to normal size	304	n reset to normal size
165	m maximize to screensize	305	m maximize to screensize
166	M maxime to screensize, respecting image aspect	306	M maximize to screensize, respecting image aspect
167	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
168	u uncrop	309	u uncrop
169	r set scaling mode to 'nearest' (fastest)	310	r set scaling mode to 'nearest' (fastest)
170	s set scaling mode to 'bilinear' (default)	311	s set scaling mode to 'bilinear' (default)
171	S set scaling mode to 'hyper' (slowest)	312	shift-s set scaling mode to 'hyper' (slowest)
172	t rotate clockwise 90°	313	t rotate clockwise 90°
173	T rotate counterclockwise°	314	T rotate counterclockwise°
		315	a apply all rotations loslessly to a jpeg file (using exiftran)
174	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
175	ctrl-s rescan visual schnauzer files for updates/deletes etc.	317	ctrl-c clone the current image window
176	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
		319	ctrl-p fire up the print dialog
		320	escape cancel a crop action
177		321
178	And when playing movies, these additional keys are active:	322	And when playing movies, these additional keys are active:
179		323
180	left rewind by 10 seconds	324	left rewind by 10 seconds
181	right forward by 10 seconds	325	right forward by 10 seconds
182	down rewind by 60 seconds	326	down rewind by 60 seconds
183	up forward by 60 seconds	327	up forward by 60 seconds
184	pg_up rewind by 600 seconds	328	pg_up rewind by 600 seconds
185	pg_down forward by 600 seconds	329	pg_down forward by 600 seconds
186	o toggle on-screen display	330	o toggle on-screen display
187	p pause/unpause	331	p pause/unpause
188	escape stop playing	332	escape stop playing
189	9 turn volume down	333	9 turn volume down
190	0 turn volume up	334	0 turn volume up
191		335
192	The following keys are redirected to the default visual schnauzer window:	336	Any other keys will be sent to the default schnauzer window, which can be
		337	toggled on and off by right-clicking into the image window.
193		338
194	space next image	339	Left-clicking into the image window will let you crop the image (usually
195	backspace last image	340	to zoom into large images that CV scales down).
196		341
197	=head2 THE VISUAL SCHNAUZER	342	=head2 THE VISUAL SCHNAUZER
198		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
199	You can use the following keys in the schnauzer window:	348	You can use the following keys in the schnauzer window:
200		349
		350	ctrl-space,
201	space move to and display next image	351	space move to and display next image
		352	ctrl-backspace,
202	backspace move to and display previous image	353	backspace move to and display previous image
		354	ctrl-return,
203	return display selected picture	355	return display selected picture, or enter directory
204		356
205	cursor keys move selection	357	cursor keys move selection
206	page-up move one page up	358	page-up move one page up
207	page-down move one page down	359	page-down move one page down
208	home move to first file	360	home move to first file
209	end move to last file	361	end move to last file
210		362
		363	ctrl-a select all files
		364	ctrl-shift-a select all files currently displayed in the schnauzer window
211	ctrl-d delete selected files WITHOUT ASKING AGAIN	365	ctrl-d delete selected files WITHOUT ASKING AGAIN
212	ctrl-g generate icons for the selected files	366	ctrl-g force generation of thumbnais for the selected files
		367	ctrl-s rescan current direcory or files updates/deletes etc.
213	ctrl-u update selected (or all) icons if neccessary	368	ctrl-u update selected (or all) icons if neccessary
214	ctrl-a select all files	369	ctrl-l don't use, will become a plug-in eventually
		370
		371	^ go to parent directory (caret).
		372
		373	0-9,
		374	a-z find the first filename beginning with this letter
		375
		376	Right-clicking into the schnauzer window displays a pop-up menu with
		377	additional actions.
		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
		416	=head1 FILES
		417
		418	When starting, CV runs the F<.cvrc> file in your F<$HOME> directory as if
		419	it were a perl script. in that, you will mostly load plug-ins.
		420
		421	Example:
		422
		423	system "fping -q -t 10 ether"
		424	or require "/fs/cv/cvplugin.pl";
		425
		426	This will load a plug-in, but only if the machine I<ether> is reachable
		427	(supposedly the plug-in is networked in some way :).
215		428
216	=head1 ENVIRONMENT	429	=head1 ENVIRONMENT
217		430
218	=over 4	431	=over 4
219		432
220	=item CV_EDITOR	433	=item CV_EDITOR
221		434
222	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
223	Schnauzer or image window. The default is C<gimp>.	436	Schnauzer or image window. The default is C<gimp>.
224		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
225	=item CV_PRINT_DESTINATION	443	=item CV_PRINT_DESTINATION
226		444
227	The default (perl-style) destination to use in the print dialog.	445	The default (perl-style) destination to use in the print dialog.
228		446
229	=item CV_TRASHCAN	447	=item CV_TRASHCAN
…		…
233		451
234	=back	452	=back
235		453
236	=head1 SECURITY CONSIDERATIONS	454	=head1 SECURITY CONSIDERATIONS
237		455
238	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
239	purpose, though (from the gtk-2.2 release notes):	457	this purpose, though (from the gtk-2.2 release notes):
240		458
241	"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
242	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
243	the likelyhood that there are additional problems where an invalid image	461	the likelyhood that there are additional problems where an invalid image
244	could cause gdk-pixbuf to crash or worse."	462	could cause gdk-pixbuf to crash or worse."
245		463
246	=head1 BUGS/TODO	464	=head1 BUGS/TODO
247		465
		466	Lots of functionality is missing.
		467
248	Pixbuf doesn't honor G_BROKEN_FILENAMES, so accessing files with names	468	Pixbuf doesn't always honor G_BROKEN_FILENAMES, so accessing files with
249	incompatible with utf-8 fails.	469	names incompatible with utf-8 might fail.
250		470
251	rotate on disk	471	rotate on disk
252	print
253	lots of ui issues	472	lots of ui issues
254	save(?)	473	save(?)
255	preferences	474	preferences
256	ctrl-u in schnauzer
257	shift-cursor in schnauzer
258		475
259	=head1 AUTHOR	476	=head1 AUTHOR
260		477
261	Marc Lehmann <cv@plan9.de>.	478	Marc Lehmann <cv@plan9.de>.
262		479

Diff Legend

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

Comparing CV/bin/cv (file contents): Revision 1.38 by root, Fri Apr 29 19:52:38 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.38 by root, Fri Apr 29 19:52:38 2005 UTC vs.
Revision 1.71 by root, Thu Oct 4 10:30:12 2007 UTC