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

Comparing CV/bin/cv (file contents):
Revision 1.48 by root, Fri Jul 22 05:43:53 2005 UTC vs.
Revision 1.63 by root, Tue Oct 4 05:06:39 2005 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
62	$w->set_title ("CV: Schnauzer");	108	$w->set_title ("CV: Schnauzer");
63	$w->add (my $s = new_schnauzer);	109	$w->add (my $s = new_schnauzer);
…		…
88		134
89	1	135	1
90	}	136	}
91		137
92	{	138	{
93	$viewer = new Gtk2::CV::ImageWindow;	139	$viewer = new_viewer;
94		140	$::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		141
112	$schnauzer = new_schnauzer;	142	$schnauzer = new_schnauzer;
113		143
114	$mainwin = new Gtk2::Window;	144	$mainwin = new Gtk2::Window;
115	$mainwin->set_title ("CV");	145	$mainwin->set_title ("CV");
116	$mainwin->add (my $vbox = new Gtk2::VBox);	146	$mainwin->add (my $vbox = new Gtk2::VBox);
117	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1; });	147	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1 });
118		148
119	$vbox->add ($schnauzer);	149	$vbox->add ($schnauzer);
120	$vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);	150	$vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);
121	$frame->add (my $hbox = new Gtk2::HBox 0, 0);	151	$frame->add (my $hbox = new Gtk2::HBox 0, 0);
122	$hbox->pack_start ((new Gtk2::Label "Info: "), 0, 0, 0);	152	$hbox->pack_start ((new Gtk2::Label "Info: "), 0, 0, 0);
…		…
127		157
128	$schnauzer->set_geometry_hints;	158	$schnauzer->set_geometry_hints;
129	}	159	}
130		160
131	if (@ARGV) {	161	if (@ARGV) {
		162	@ARGV == 1 && -d $ARGV[0]
		163	? $schnauzer->set_dir (Glib::filename_to_unicode shift)
132	$schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]);	164	: $schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]);
133	$schnauzer->show_all;	165	$schnauzer->show_all;
134	$viewer->show_all;
135	$schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);	166	$schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);
136	} else {	167	} else {
137	$schnauzer->set_dir (File::Spec->curdir);	168	$schnauzer->set_dir (File::Spec->curdir);
138	$mainwin->show_all;	169	$mainwin->show_all;
139	$viewer->show_all;
140	}	170	}
141		171
142	$viewer->show_all;	172	$viewer->show_all;
143		173
144	main Gtk2;	174	main Gtk2;
145		175
146	__DATA__	176	__DATA__
		177
		178	=encoding utf-8
147		179
148	=head1 NAME	180	=head1 NAME
149		181
150	cv - a fast gtk+ image viewer loosely modeled after XV	182	cv - a fast gtk+ image viewer loosely modeled after XV
151		183
…		…
160		192
161	=over 4	193	=over 4
162		194
163	=item * optimized directory scanning algorithm	195	=item * optimized directory scanning algorithm
164		196
165	The directory scanning in CV plays some tricks that - on most modern	197	The directory scanning in CV uses some tricks that - on most modern
166	filesystems - makes it possible to detect filetypes faster than stat()'ing	198	filesystems - makes it possible to detect filetypes faster than stat()'ing
167	every file. This makes CV suitable for directories with lots of files	199	every file. This makes CV suitable for directories with lots of files
168	(10000+).	200	(10000+).
169		201
170	This algorithm is quite unprecise - it doesn't make a difference between	202	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	203	files, device nodes, symlinks and the like, and filetype detection is done
172	using the file extension only.	204	using the file extension only.
173		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
174	=item * use of asynchronous I/O	216	=item * use of asynchronous I/O
175		217
176	CV tries to use asynchronous I/O whereever it makes sense, for example	218	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	219	while scanning directories, waiting for stat data, unlinking files or
178	usually decreases scanning times for large directories a bit (especially	220	generating thumbnails. This usually decreases scanning times for large
179	on RAID devices and over NFS).	221	directories a bit (especially on RAID devices and over NFS) and makes CV
		222	much more interactive.
180		223
181	=item * fast image loading	224	=item * fast image loading
182		225
183	The time span between the user issuing a command and displaying the new	226	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	227	image should be as small as possible. CV uses optimized (especially
185	for JPEG) loading functions and sacrifices some quality (e.g no gamma	228	for JPEG) loading functions and sacrifices some quality (e.g no gamma
186	correction) to achieve this speed.	229	correction, although this might change) to achieve this speed.
187		230
188	=item * fast thumbnail creation	231	=item * fast thumbnail creation
189		232
190	Thumbnail creation is crucial for me, so it's better be fast. Thumbnail	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
191	creation for JPEGs has been specially optimized.	235	creation for JPEGs has been specially optimized and can even take
		236	advantage of multiple CPUs.
192		237
193	=item * minimum optical clutter	238	=item * minimum optical clutter
194		239
195	CV has no menus or other user interface elements that take up a lot of	240	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.	241	screen space (or are useful for beginning users). The schnauzer windows
		242	can also be somewhat crowded.
197		243
198	The point of an image viewer is viewing images, not a nice GUI. This is	244	The point of an image viewer is viewing images, not a nice GUI. This is
199	similar to XV's behaviour.	245	similar to XV's behaviour.
200		246
201	=item * efficient (and hard to learn) user interface	247	=item * efficient (and hard to learn) user interface
202		248
203	CV uses key combinations. A lot. If you are an experienced XV user, you	249	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	250	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.	251	first, but will be an efficient tool later.
206		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
207	=item * i18n'ed filename handling throughout	259	=item * i18n'ed filename handling throughout
208		260
209	As long as glib can recognize your filename encoding (either UTF-8 or	261	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	262	locale-specific, depending on the setting of G_BROKEN_FILENAMES) and you
211	fonts, CV will display your filenames correctly.	263	have the relevant fonts, CV will display your filenames correctly.
212		264
213	=item * extensible through plug-ins	265	=item * extensible through plug-ins
214		266
215	I have weird plug-ins that access remote databases to find a	267	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,	268	directory. This is not likely to be of any use to other people. Likewise,
…		…
228		280
229	=head2 THE IMAGE WINDOW	281	=head2 THE IMAGE WINDOW
230		282
231	You can use the following keys in the image window:	283	You can use the following keys in the image window:
232		284
233	q quit the program	285	q quit the program
234	< half the image size	286	< half the image size
235	> double the image size	287	> double the image size
236	, shrink the image by 10%	288	, shrink the image by 10%
237	. enlarge the image by 10%	289	. enlarge the image by 10%
238	n reset to normal size	290	n reset to normal size
239	m maximize to screensize	291	m maximize to screensize
240	M maximize to screensize, respecting image aspect	292	M maximize to screensize, respecting image aspect
241	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
242	u uncrop	295	u uncrop
243	r set scaling mode to 'nearest' (fastest)	296	r set scaling mode to 'nearest' (fastest)
244	s set scaling mode to 'bilinear' (default)	297	s set scaling mode to 'bilinear' (default)
245	shift-s set scaling mode to 'hyper' (slowest)	298	shift-s set scaling mode to 'hyper' (slowest)
246	t rotate clockwise 90°	299	t rotate clockwise 90°
247	T rotate counterclockwise°	300	T rotate counterclockwise°
248	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
		302	ctrl-c clone the current image window
249	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
250	ctrl-p fire up the print fialog	304	ctrl-p fire up the print dialog
251	escape cancel a crop action	305	escape cancel a crop action
252		306
253	And when playing movies, these additional keys are active:	307	And when playing movies, these additional keys are active:
254		308
255	left rewind by 10 seconds	309	left rewind by 10 seconds
256	right forward by 10 seconds	310	right forward by 10 seconds
257	down rewind by 60 seconds	311	down rewind by 60 seconds
258	up forward by 60 seconds	312	up forward by 60 seconds
259	pg_up rewind by 600 seconds	313	pg_up rewind by 600 seconds
260	pg_down forward by 600 seconds	314	pg_down forward by 600 seconds
261	o toggle on-screen display	315	o toggle on-screen display
262	p pause/unpause	316	p pause/unpause
263	escape stop playing	317	escape stop playing
264	9 turn volume down	318	9 turn volume down
265	0 turn volume up	319	0 turn volume up
266		320
267	Any other keys will be sent to the default schnauzer window, which can be	321	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.	322	toggled on and off by right-clicking into the image window.
269		323
270	Left-clicking into the image window will let you crop the image (usually	324	Left-clicking into the image window will let you crop the image (usually
271	to zoom into large images that CV scales down).	325	to zoom into large images that CV scales down).
272		326
273	=head2 THE VISUAL SCHNAUZER	327	=head2 THE VISUAL SCHNAUZER
274		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
275	You can use the following keys in the schnauzer window:	333	You can use the following keys in the schnauzer window:
276		334
277	ctrl-space,	335	ctrl-space,
278	space move to and display next image	336	space move to and display next image
279	ctrl-backspace,	337	ctrl-backspace,
280	backspace move to and display previous image	338	backspace move to and display previous image
281	ctrl-return,	339	ctrl-return,
282	return display selected picture, or enter directory	340	return display selected picture, or enter directory
283		341
284	cursor keys move selection	342	cursor keys move selection
285	page-up move one page up	343	page-up move one page up
286	page-down move one page down	344	page-down move one page down
287	home move to first file	345	home move to first file
288	end move to last file	346	end move to last file
289		347
290	ctrl-a select all files	348	ctrl-a select all files
		349	ctrl-shift-a select all files currently displayed in the schnauzer window
291	ctrl-d delete selected files WITHOUT ASKING AGAIN	350	ctrl-d delete selected files WITHOUT ASKING AGAIN
292	ctrl-g force generation of thumbnais for the selected files	351	ctrl-g force generation of thumbnais for the selected files
293	ctrl-s rescan current direcory or files updates/deletes etc.	352	ctrl-s rescan current direcory or files updates/deletes etc.
294	ctrl-u update selected (or all) icons if neccessary	353	ctrl-u update selected (or all) icons if neccessary
295	ctrl-l don't use, will become a plug-in eventually	354	ctrl-l don't use, will become a plug-in eventually
		355
		356	^ go to parent directory (caret).
296		357
297	0-9,	358	0-9,
298	a-z find the first filename beginning with this letter	359	a-z find the first filename beginning with this letter
299		360
300	Right-clicking into the schnauzer window displays a pop-up menu with	361	Right-clicking into the schnauzer window displays a pop-up menu with
301	additional actions.	362	additional actions.
302		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
303	=head1 FILES	401	=head1 FILES
304		402
305	When starting, CV runs the F<.cvrc> file in your F<$HOME> directory as if	403	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.	404	it were a perl script. in that, you will mostly load plug-ins.
307		405
…		…
333		431
334	=back	432	=back
335		433
336	=head1 SECURITY CONSIDERATIONS	434	=head1 SECURITY CONSIDERATIONS
337		435
338	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
339	purpose, though (from the gtk-2.2 release notes):	437	this purpose, though (from the gtk-2.2 release notes):
340		438
341	"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
342	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
343	the likelyhood that there are additional problems where an invalid image	441	the likelyhood that there are additional problems where an invalid image
344	could cause gdk-pixbuf to crash or worse."	442	could cause gdk-pixbuf to crash or worse."
…		…
346	=head1 BUGS/TODO	444	=head1 BUGS/TODO
347		445
348	Lots of functionality is missing.	446	Lots of functionality is missing.
349		447
350	Pixbuf doesn't always honor G_BROKEN_FILENAMES, so accessing files with	448	Pixbuf doesn't always honor G_BROKEN_FILENAMES, so accessing files with
351	names incompatible might utf-8 fail.	449	names incompatible with utf-8 might fail.
352		450
353	rotate on disk	451	rotate on disk
354	lots of ui issues	452	lots of ui issues
355	save(?)	453	save(?)
356	preferences	454	preferences
357	shift-cursor in schnauzer
358		455
359	=head1 AUTHOR	456	=head1 AUTHOR
360		457
361	Marc Lehmann <cv@plan9.de>.	458	Marc Lehmann <cv@plan9.de>.
362		459

Diff Legend

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

Comparing CV/bin/cv (file contents): Revision 1.48 by root, Fri Jul 22 05:43: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.48 by root, Fri Jul 22 05:43:53 2005 UTC vs.
Revision 1.63 by root, Tue Oct 4 05:06:39 2005 UTC