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

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.68 by root, Mon Oct 23 17:52:37 2006 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.68 by root, Mon Oct 23 17:52:37 2006 UTC