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

Comparing CV/bin/cv (file contents):
Revision 1.41 by root, Mon Jun 27 19:42:53 2005 UTC vs.
Revision 1.62 by root, Tue Oct 4 04:55:47 2005 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	});
		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
40	$s->signal_connect (chdir => sub {	59	$self->signal_connect (key_press_event => sub {
41	my ($self, $dir) = @_;	60	$viewer = $_[0];
42		61
43	my $path = Cwd::abs_path $dir;	62	my $key = $_[1]->keyval;
		63	my $state = $_[1]->state;
44		64
45	$self->realize;	65	if ($state * "control-mask" && $key == $Gtk2::Gdk::Keysyms{c}) {
46	$self->window->property_change (	66	my $viewer = new_viewer ();
47	Gtk2::Gdk::Atom->intern ("_X_CWD", 0),	67	$viewer->set_image ($_[0]->{image});
48	Gtk2::Gdk::Atom->intern ("UTF8_STRING", 0),	68	$viewer->show_all;
49	Gtk2::Gdk::CHARS, 'replace',	69	1
50	Encode::encode_utf8 $path,	70	} else {
		71	&std_keys
		72	or $schnauzer->signal_emit (key_press_event => $_[1])
51	);	73	}
52	});	74	});
		75	$self->signal_connect (destroy => sub {
		76	$viewer = undef if $viewer == $_[0];
53		77
		78	main_quit Gtk2 unless --$viewer_count;
		79	});
		80
		81	$self->signal_connect (button3_press_event => sub {
		82	$mainwin->visible
		83	? $mainwin->hide
		84	: $mainwin->show_all;
		85	1
		86	});
		87
54	Gtk2::CV::Plugin->call (new_schnauzer => $s);	88	Gtk2::CV::Plugin->call (new_imagewindow => $self);
55		89
56	$s;	90	$self
57	}	91	}
58		92
59	sub std_keys {	93	sub std_keys {
60	my $key = $_[1]->keyval;	94	my $key = $_[1]->keyval;
61	my $state = $_[1]->state;	95	my $state = $_[1]->state;
62		96
63	my $ctrl = $state * "control-mask";	97	my $ctrl = $state * "control-mask";
64		98
65	if ($key == $Gtk2::Gdk::Keysyms{q}) {	99	if ($key == $Gtk2::Gdk::Keysyms{q}) {
66	main_quit Gtk2;	100	$viewer->destroy;
67	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {	101	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{v}) {
68	my $w = new Gtk2::Window;	102	my $w = new Gtk2::Window;
69		103
70	$w->set_title ("CV: Schnauzer");	104	$w->set_title ("CV: Schnauzer");
71	$w->add (my $s = new_schnauzer);	105	$w->add (my $s = new_schnauzer);
…		…
89	$h->load_string (do { local $/; <DATA> });	123	$h->load_string (do { local $/; <DATA> });
90	}	124	}
91		125
92	$help->show_all;	126	$help->show_all;
93	} else {	127	} else {
94	#$mainwin->show_all;	128	return 0;
95	return $self->{schnauzer}->signal_emit (key_press_event => $_[1]);
96	}	129	}
97		130
98	1;	131	1
99	}	132	}
100		133
101	{	134	{
102	$viewer = new Gtk2::CV::ImageWindow;	135	$viewer = new_viewer;
103		136	$::cur_viewer = $viewer;
104	$viewer->set_title ("CV: Image");
105
106	$viewer->signal_connect (key_press_event => \&std_keys);
107	$viewer->signal_connect (delete_event => sub { main_quit Gtk2 });
108
109	$viewer->signal_connect (button3_press_event => sub {
110	$mainwin->visible
111	? $mainwin->hide
112	: $mainwin->show_all;
113	1;
114	});
115
116	Gtk2::CV::Plugin->call (new_imagewindow => $viewer);
117		137
118	$schnauzer = new_schnauzer;	138	$schnauzer = new_schnauzer;
119		139
120	$mainwin = new Gtk2::Window;	140	$mainwin = new Gtk2::Window;
121	$mainwin->set_title ("CV");	141	$mainwin->set_title ("CV");
122	$mainwin->add (my $vbox = new Gtk2::VBox);	142	$mainwin->add (my $vbox = new Gtk2::VBox);
123	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1; });	143	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1 });
124		144
125	$vbox->add ($schnauzer);	145	$vbox->add ($schnauzer);
126	$vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);	146	$vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);
127	$frame->add (my $hbox = new Gtk2::HBox 0, 0);	147	$frame->add (my $hbox = new Gtk2::HBox 0, 0);
128	$hbox->pack_start ((new Gtk2::Label "Info"), 0, 0, 0);	148	$hbox->pack_start ((new Gtk2::Label "Info: "), 0, 0, 0);
129	$hbox->pack_start (($info = new Gtk2::Label), 1, 1, 0);	149	$hbox->pack_end (my $labelwindow = new Gtk2::EventBox, 1, 1, 0);
130	$info->set (wrap => 1);	150	$labelwindow->add ($info = new Gtk2::Label);
		151	$labelwindow->signal_connect_after (size_request => sub { $_[1]->width (0); 0 });
		152	$info->set (selectable => 1, xalign => 0, justify => "left");
131		153
132	$schnauzer->set_geometry_hints;	154	$schnauzer->set_geometry_hints;
133	}	155	}
134		156
135	if (@ARGV) {	157	if (@ARGV) {
		158	@ARGV == 1 && -d $ARGV[0]
		159	? $schnauzer->set_dir (Glib::filename_to_unicode shift)
136	$schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]);	160	: $schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]);
137	$schnauzer->show_all;	161	$schnauzer->show_all;
138	$schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);	162	$schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);
139	} else {	163	} else {
140	$schnauzer->set_dir (File::Spec->curdir);	164	$schnauzer->set_dir (File::Spec->curdir);
141	$mainwin->show_all;	165	$mainwin->show_all;
142	$viewer->show_all;
143	}	166	}
144		167
145	$viewer->show_all;	168	$viewer->show_all;
146		169
147	main Gtk2;	170	main Gtk2;
148		171
149	__DATA__	172	__DATA__
150		173
		174	=encoding utf-8
		175
151	=head1 NAME	176	=head1 NAME
152		177
153	cv - a fast gtk+ image viewer modeled after xv	178	cv - a fast gtk+ image viewer loosely modeled after XV
154		179
155	=head1 SYNOPSIS	180	=head1 SYNOPSIS
156		181
157	cv [file...]	182	cv [file...]
158		183
		184	=head1 FEATURES
		185
		186	CV is supposed to work similar to the venerable XV image viewer, just
		187	faster. Why faster?
		188
		189	=over 4
		190
		191	=item * optimized directory scanning algorithm
		192
		193	The directory scanning in CV uses some tricks that - on most modern
		194	filesystems - makes it possible to detect filetypes faster than stat()'ing
		195	every file. This makes CV suitable for directories with lots of files
		196	(10000+).
		197
		198	This algorithm is quite unprecise - it doesn't make a difference between
		199	files, device nodes, symlinks and the like, and filetype detection is done
		200	using the file extension only.
		201
		202	On the positive side, it is usually many orders of magnitude faster than
		203	traditional scanning techniques (good for directories with 10000 or
		204	100000+ files).
		205
		206	=item * queuing for all time-consuming background tasks
		207
		208	All tasks, such as unlinking files or generating thumbnails, that can be
		209	done in the background will be done so - no waiting required, even when
		210	changing directories.
		211
		212	=item * use of asynchronous I/O
		213
		214	CV tries to use asynchronous I/O whereever it makes sense, for example
		215	while scanning directories, waiting for stat data, unlinking files or
		216	generating thumbnails. This usually decreases scanning times for large
		217	directories a bit (especially on RAID devices and over NFS) and makes CV
		218	much more interactive.
		219
		220	=item * fast image loading
		221
		222	The time span between the user issuing a command and displaying the new
		223	image should be as small as possible. CV uses optimized (especially
		224	for JPEG) loading functions and sacrifices some quality (e.g no gamma
		225	correction, although this might change) to achieve this speed.
		226
		227	=item * fast thumbnail creation
		228
		229	Thumbnail creation uses both CPU and Disk-I/O. CV interleaves both, so
		230	on modern CPUs, thumbnailing is usually limited by I/O speed. Thumbnail
		231	creation for JPEGs has been specially optimized and can even take
		232	advantage of multiple CPUs.
		233
		234	=item * minimum optical clutter
		235
		236	CV has no menus or other user interface elements that take up a lot of
		237	screen space (or are useful for beginning users). The schnauzer windows
		238	can also be somewhat crowded.
		239
		240	The point of an image viewer is viewing images, not a nice GUI. This is
		241	similar to XV's behaviour.
		242
		243	=item * efficient (and hard to learn) user interface
		244
		245	CV uses key combinations. A lot. If you are an experienced XV user, you
		246	will find most of these keys familiar. If not, CV might be hard to use at
		247	first, but will be an efficient tool later.
		248
		249	=item * multi-window GUI
		250
		251	CV doesn't force you to use a specific layout, instead it relies on your
		252	window manager, thus enabling you to chose whatever layout that suits you
		253	most.
		254
		255	=item * i18n'ed filename handling throughout
		256
		257	As long as glib can recognize your filename encoding (either UTF-8 or
		258	locale-specific, depending on the setting of G_BROKEN_FILENAMES) and you
		259	have the relevant fonts, CV will display your filenames correctly.
		260
		261	=item * extensible through plug-ins
		262
		263	I have weird plug-ins that access remote databases to find a
		264	directory. This is not likely to be of any use to other people. Likewise,
		265	others might have weird requirements I cannot dream of.
		266
		267	=item * filename clustering
		268
		269	Among the standard plug-ins is a filename clustering plug-in, that (in
		270	case of tens of thousands images in one directory) might be able to
		271	cluster similar names together.
		272
		273	=back
		274
159	=head1 DESCRIPTION	275	=head1 DESCRIPTION
160		276
161	None yet.
162
163	=head2 THE IMAGE WINDOW	277	=head2 THE IMAGE WINDOW
164		278
165	You can use the following keys in the image window:	279	You can use the following keys in the image window:
166		280
167	q quit the program	281	q quit the program
168	< half the image size	282	< half the image size
169	> double the image size	283	> double the image size
170	, shrink the image by 10%	284	, shrink the image by 10%
171	. enlarge the image by 10%	285	. enlarge the image by 10%
172	n reset to normal size	286	n reset to normal size
173	m maximize to screensize	287	m maximize to screensize
174	M maxime to screensize, respecting image aspect	288	M maximize to screensize, respecting image aspect
175	ctrl-m toggle maxpect-always mode	289	ctrl-m toggle maxpect-always mode
		290	ctrl-sift-m toggle using current image size as max image size
176	u uncrop	291	u uncrop
177	r set scaling mode to 'nearest' (fastest)	292	r set scaling mode to 'nearest' (fastest)
178	s set scaling mode to 'bilinear' (default)	293	s set scaling mode to 'bilinear' (default)
179	S set scaling mode to 'hyper' (slowest)	294	shift-s set scaling mode to 'hyper' (slowest)
180	t rotate clockwise 90°	295	t rotate clockwise 90°
181	T rotate counterclockwise°	296	T rotate counterclockwise°
182	ctrl-v open a new visual schnauzer window for the current dir	297	ctrl-v open a new visual schnauzer window for the current dir
183	ctrl-s rescan visual schnauzer files for updates/deletes etc.
184	ctrl-e run an editor ($CV_EDITOR or "gimp") on the current image.	298	ctrl-e run an editor ($CV_EDITOR or "gimp") on the current image
		299	ctrl-p fire up the print dialog
		300	escape cancel a crop action
185		301
186	And when playing movies, these additional keys are active:	302	And when playing movies, these additional keys are active:
187		303
188	left rewind by 10 seconds	304	left rewind by 10 seconds
189	right forward by 10 seconds	305	right forward by 10 seconds
190	down rewind by 60 seconds	306	down rewind by 60 seconds
191	up forward by 60 seconds	307	up forward by 60 seconds
192	pg_up rewind by 600 seconds	308	pg_up rewind by 600 seconds
193	pg_down forward by 600 seconds	309	pg_down forward by 600 seconds
194	o toggle on-screen display	310	o toggle on-screen display
195	p pause/unpause	311	p pause/unpause
196	escape stop playing	312	escape stop playing
197	9 turn volume down	313	9 turn volume down
198	0 turn volume up	314	0 turn volume up
199		315
200	The following keys are redirected to the default visual schnauzer window:	316	Any other keys will be sent to the default schnauzer window, which can be
		317	toggled on and off by right-clicking into the image window.
201		318
202	space next image	319	Left-clicking into the image window will let you crop the image (usually
203	backspace last image	320	to zoom into large images that CV scales down).
204		321
205	=head2 THE VISUAL SCHNAUZER	322	=head2 THE VISUAL SCHNAUZER
206		323
207	You can use the following keys in the schnauzer window:	324	You can use the following keys in the schnauzer window:
208		325
		326	ctrl-space,
209	space move to and display next image	327	space move to and display next image
		328	ctrl-backspace,
210	backspace move to and display previous image	329	backspace move to and display previous image
		330	ctrl-return,
211	return display selected picture	331	return display selected picture, or enter directory
212		332
213	cursor keys move selection	333	cursor keys move selection
214	page-up move one page up	334	page-up move one page up
215	page-down move one page down	335	page-down move one page down
216	home move to first file	336	home move to first file
217	end move to last file	337	end move to last file
218		338
		339	ctrl-a select all files
		340	ctrl-shift-a select all files currently displayed in the schnauzer window
219	ctrl-d delete selected files WITHOUT ASKING AGAIN	341	ctrl-d delete selected files WITHOUT ASKING AGAIN
220	ctrl-g generate icons for the selected files	342	ctrl-g force generation of thumbnais for the selected files
		343	ctrl-s rescan current direcory or files updates/deletes etc.
221	ctrl-u update selected (or all) icons if neccessary	344	ctrl-u update selected (or all) icons if neccessary
222	ctrl-a select all files	345	ctrl-l don't use, will become a plug-in eventually
		346
		347	^ go to parent directory (caret).
		348
		349	0-9,
		350	a-z find the first filename beginning with this letter
		351
		352	Right-clicking into the schnauzer window displays a pop-up menu with
		353	additional actions.
		354
		355	=head3 SELECTION
		356
		357	You can select entries in the Schnauzer in a variety of ways:
		358
		359	=over 4
		360
		361	=item Keyboard
		362
		363	Moving the cursor with the keyboard will first deselect all files and then
		364	select the file you moved to.
		365
		366	=item Clicking
		367
		368	Clicking on an entry will select the one you clicked and deselect all
		369	others.
		370
		371	=item Shift-Clicking
		372
		373	Shift-clicking will toggle the selection on the entry under the mouse.
		374
		375	=item Dragging
		376
		377	Dragging will select all entries between the one selected when pushing the
		378	button and the one selected when releasing the button. If you move above
		379	or below the schnauzer area while drag-selecting, the schnauzer will move
		380	up/down one row twice per second. In addition, horizontal mouse movement
		381	acts as a kind of invisible horizontal scrollbar.
		382
		383	=item Hint: double-click works while click-selecting
		384
		385	You can double-click any image while click-selecting to display it
		386	without stopping the selection process. This will act as if you normally
		387	double-clicked the image to display it, and will toggle the selection
		388	twice, resulting in no change.
		389
		390	=back
		391
		392	=head1 FILES
		393
		394	When starting, CV runs the F<.cvrc> file in your F<$HOME> directory as if
		395	it were a perl script. in that, you will mostly load plug-ins.
		396
		397	Example:
		398
		399	system "fping -q -t 10 ether"
		400	or require "/fs/cv/cvplugin.pl";
		401
		402	This will load a plug-in, but only if the machine I<ether> is reachable
		403	(supposedly the plug-in is networked in some way :).
223		404
224	=head1 ENVIRONMENT	405	=head1 ENVIRONMENT
225		406
226	=over 4	407	=over 4
227		408
…		…
241		422
242	=back	423	=back
243		424
244	=head1 SECURITY CONSIDERATIONS	425	=head1 SECURITY CONSIDERATIONS
245		426
246	CV uses Pixbuf to load images. Pixbuf is not considered safe for this	427	CV uses Pixbuf to load non-JPEG images. Pixbuf is not considered safe for
247	purpose, though (from the gtk-2.2 release notes):	428	this purpose, though (from the gtk-2.2 release notes):
248		429
249	"While efforts have been made to make gdk-pixbuf robust against invalid	430	"While efforts have been made to make gdk-pixbuf robust against invalid
250	images, using gdk-pixbuf to load untrusted data is not recommended, due to	431	images, using gdk-pixbuf to load untrusted data is not recommended, due to
251	the likelyhood that there are additional problems where an invalid image	432	the likelyhood that there are additional problems where an invalid image
252	could cause gdk-pixbuf to crash or worse."	433	could cause gdk-pixbuf to crash or worse."
253		434
254	=head1 BUGS/TODO	435	=head1 BUGS/TODO
255		436
		437	Lots of functionality is missing.
		438
256	Pixbuf doesn't honor G_BROKEN_FILENAMES, so accessing files with names	439	Pixbuf doesn't always honor G_BROKEN_FILENAMES, so accessing files with
257	incompatible with utf-8 fails.	440	names incompatible with utf-8 might fail.
258		441
259	rotate on disk	442	rotate on disk
260	print
261	lots of ui issues	443	lots of ui issues
262	save(?)	444	save(?)
263	preferences	445	preferences
264	ctrl-u in schnauzer
265	shift-cursor in schnauzer
266		446
267	=head1 AUTHOR	447	=head1 AUTHOR
268		448
269	Marc Lehmann <cv@plan9.de>.	449	Marc Lehmann <cv@plan9.de>.
270		450

Diff Legend

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

Comparing CV/bin/cv (file contents): Revision 1.41 by root, Mon Jun 27 19:42:53 2005 UTC vs. Revision 1.62 by root, Tue Oct 4 04:55:47 2005 UTC

Diff Legend

Comparing CV/bin/cv (file contents):
Revision 1.41 by root, Mon Jun 27 19:42:53 2005 UTC vs.
Revision 1.62 by root, Tue Oct 4 04:55:47 2005 UTC