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

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.62 by root, Tue Oct 4 04:55:47 2005 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.62 by root, Tue Oct 4 04:55:47 2005 UTC