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

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.63 by root, Tue Oct 4 05:06:39 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.63 by root, Tue Oct 4 05:06:39 2005 UTC