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

Comparing CV/bin/cv (file contents):
Revision 1.43 by root, Tue Jun 28 21:26:04 2005 UTC vs.
Revision 1.64 by root, Fri Dec 9 18:31:54 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);
…		…
96		134
97	1	135	1
98	}	136	}
99		137
100	{	138	{
101	$viewer = new Gtk2::CV::ImageWindow;	139	$viewer = new_viewer;
102		140	$::cur_viewer = $viewer;
103	$viewer->set_title ("CV: Image");
104
105	$viewer->signal_connect (key_press_event => sub {
106	&std_keys
107	or $schnauzer->signal_emit (key_press_event => $_[1])
108	});
109	$viewer->signal_connect (delete_event => sub { main_quit Gtk2 });
110
111	$viewer->signal_connect (button3_press_event => sub {
112	$mainwin->visible
113	? $mainwin->hide
114	: $mainwin->show_all;
115	1;
116	});
117
118	Gtk2::CV::Plugin->call (new_imagewindow => $viewer);
119		141
120	$schnauzer = new_schnauzer;	142	$schnauzer = new_schnauzer;
121		143
122	$mainwin = new Gtk2::Window;	144	$mainwin = new Gtk2::Window;
123	$mainwin->set_title ("CV");	145	$mainwin->set_title ("CV");
124	$mainwin->add (my $vbox = new Gtk2::VBox);	146	$mainwin->add (my $vbox = new Gtk2::VBox);
125	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1; });	147	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1 });
126		148
127	$vbox->add ($schnauzer);	149	$vbox->add ($schnauzer);
128	$vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);	150	$vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);
129	$frame->add (my $hbox = new Gtk2::HBox 0, 0);	151	$frame->add (my $hbox = new Gtk2::HBox 0, 0);
130	$hbox->pack_start ((new Gtk2::Label "Info"), 0, 0, 0);	152	$hbox->pack_start ((new Gtk2::Label "Info: "), 0, 0, 0);
131	$hbox->pack_start (($info = new Gtk2::Label), 1, 1, 0);	153	$hbox->pack_end (my $labelwindow = new Gtk2::EventBox, 1, 1, 0);
132	$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");
133		157
134	$schnauzer->set_geometry_hints;	158	$schnauzer->set_geometry_hints;
135	}	159	}
136		160
137	if (@ARGV) {	161	if (@ARGV) {
		162	@ARGV == 1 && -d $ARGV[0]
		163	? $schnauzer->set_dir (Glib::filename_to_unicode shift)
138	$schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]);	164	: $schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]);
139	$schnauzer->show_all;	165	$schnauzer->show_all;
140	$schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);	166	$schnauzer->handle_key ($Gtk2::Gdk::Keysyms{space}, []);
141	} else {	167	} else {
142	$schnauzer->set_dir (File::Spec->curdir);	168	$schnauzer->set_dir (File::Spec->curdir);
143	$mainwin->show_all;	169	$mainwin->show_all;
144	$viewer->show_all;
145	}	170	}
146		171
147	$viewer->show_all;	172	$viewer->show_all;
148		173
149	main Gtk2;	174	main Gtk2;
150		175
151	__DATA__	176	__DATA__
152		177
		178	=encoding utf-8
		179
153	=head1 NAME	180	=head1 NAME
154		181
155	cv - a fast gtk+ image viewer modeled after xv	182	cv - a fast gtk+ image viewer loosely modeled after XV
156		183
157	=head1 SYNOPSIS	184	=head1 SYNOPSIS
158		185
159	cv [file...]	186	cv [file...]
160		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
161	=head1 DESCRIPTION	279	=head1 DESCRIPTION
162		280
163	None yet.
164
165	=head2 THE IMAGE WINDOW	281	=head2 THE IMAGE WINDOW
166		282
167	You can use the following keys in the image window:	283	You can use the following keys in the image window:
168		284
169	q quit the program	285	q quit the program
170	< half the image size	286	< half the image size
171	> double the image size	287	> double the image size
172	, shrink the image by 10%	288	, shrink the image by 10%
173	. enlarge the image by 10%	289	. enlarge the image by 10%
174	n reset to normal size	290	n reset to normal size
175	m maximize to screensize	291	m maximize to screensize
176	M maxime to screensize, respecting image aspect	292	M maximize to screensize, respecting image aspect
177	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
178	u uncrop	295	u uncrop
179	r set scaling mode to 'nearest' (fastest)	296	r set scaling mode to 'nearest' (fastest)
180	s set scaling mode to 'bilinear' (default)	297	s set scaling mode to 'bilinear' (default)
181	S set scaling mode to 'hyper' (slowest)	298	shift-s set scaling mode to 'hyper' (slowest)
182	t rotate clockwise 90°	299	t rotate clockwise 90°
183	T rotate counterclockwise°	300	T rotate counterclockwise°
		301	a apply all rotations loslessly to a jpeg file (using exiftran)
184	ctrl-v open a new visual schnauzer window for the current dir	302	ctrl-v open a new visual schnauzer window for the current dir
185	ctrl-s rescan visual schnauzer files for updates/deletes etc.	303	ctrl-c clone the current image window
186	ctrl-e run an editor ($CV_EDITOR or "gimp") on the current image.	304	ctrl-e run an editor ($CV_EDITOR or "gimp") on the current image
		305	ctrl-p fire up the print dialog
		306	escape cancel a crop action
187		307
188	And when playing movies, these additional keys are active:	308	And when playing movies, these additional keys are active:
189		309
190	left rewind by 10 seconds	310	left rewind by 10 seconds
191	right forward by 10 seconds	311	right forward by 10 seconds
192	down rewind by 60 seconds	312	down rewind by 60 seconds
193	up forward by 60 seconds	313	up forward by 60 seconds
194	pg_up rewind by 600 seconds	314	pg_up rewind by 600 seconds
195	pg_down forward by 600 seconds	315	pg_down forward by 600 seconds
196	o toggle on-screen display	316	o toggle on-screen display
197	p pause/unpause	317	p pause/unpause
198	escape stop playing	318	escape stop playing
199	9 turn volume down	319	9 turn volume down
200	0 turn volume up	320	0 turn volume up
201		321
202	The following keys are redirected to the default visual schnauzer window:	322	Any other keys will be sent to the default schnauzer window, which can be
		323	toggled on and off by right-clicking into the image window.
203		324
204	space next image	325	Left-clicking into the image window will let you crop the image (usually
205	backspace last image	326	to zoom into large images that CV scales down).
206		327
207	=head2 THE VISUAL SCHNAUZER	328	=head2 THE VISUAL SCHNAUZER
208		329
		330	Any image-loading action in a schnauzer window acts on the
		331	"last-recently-activated" imagewindow, which currently is simply the last
		332	image window that received a keypress.
		333
209	You can use the following keys in the schnauzer window:	334	You can use the following keys in the schnauzer window:
210		335
		336	ctrl-space,
211	space move to and display next image	337	space move to and display next image
		338	ctrl-backspace,
212	backspace move to and display previous image	339	backspace move to and display previous image
		340	ctrl-return,
213	return display selected picture	341	return display selected picture, or enter directory
214		342
215	cursor keys move selection	343	cursor keys move selection
216	page-up move one page up	344	page-up move one page up
217	page-down move one page down	345	page-down move one page down
218	home move to first file	346	home move to first file
219	end move to last file	347	end move to last file
220		348
		349	ctrl-a select all files
		350	ctrl-shift-a select all files currently displayed in the schnauzer window
221	ctrl-d delete selected files WITHOUT ASKING AGAIN	351	ctrl-d delete selected files WITHOUT ASKING AGAIN
222	ctrl-g generate icons for the selected files	352	ctrl-g force generation of thumbnais for the selected files
		353	ctrl-s rescan current direcory or files updates/deletes etc.
223	ctrl-u update selected (or all) icons if neccessary	354	ctrl-u update selected (or all) icons if neccessary
224	ctrl-a select all files	355	ctrl-l don't use, will become a plug-in eventually
		356
		357	^ go to parent directory (caret).
		358
		359	0-9,
		360	a-z find the first filename beginning with this letter
		361
		362	Right-clicking into the schnauzer window displays a pop-up menu with
		363	additional actions.
		364
		365	=head3 SELECTION
		366
		367	You can select entries in the Schnauzer in a variety of ways:
		368
		369	=over 4
		370
		371	=item Keyboard
		372
		373	Moving the cursor with the keyboard will first deselect all files and then
		374	select the file you moved to.
		375
		376	=item Clicking
		377
		378	Clicking on an entry will select the one you clicked and deselect all
		379	others.
		380
		381	=item Shift-Clicking
		382
		383	Shift-clicking will toggle the selection on the entry under the mouse.
		384
		385	=item Dragging
		386
		387	Dragging will select all entries between the one selected when pushing the
		388	button and the one selected when releasing the button. If you move above
		389	or below the schnauzer area while drag-selecting, the schnauzer will move
		390	up/down one row twice per second. In addition, horizontal mouse movement
		391	acts as a kind of invisible horizontal scrollbar.
		392
		393	=item Hint: double-click works while click-selecting
		394
		395	You can double-click any image while click-selecting to display it
		396	without stopping the selection process. This will act as if you normally
		397	double-clicked the image to display it, and will toggle the selection
		398	twice, resulting in no change.
		399
		400	=back
		401
		402	=head1 FILES
		403
		404	When starting, CV runs the F<.cvrc> file in your F<$HOME> directory as if
		405	it were a perl script. in that, you will mostly load plug-ins.
		406
		407	Example:
		408
		409	system "fping -q -t 10 ether"
		410	or require "/fs/cv/cvplugin.pl";
		411
		412	This will load a plug-in, but only if the machine I<ether> is reachable
		413	(supposedly the plug-in is networked in some way :).
225		414
226	=head1 ENVIRONMENT	415	=head1 ENVIRONMENT
227		416
228	=over 4	417	=over 4
229		418
…		…
243		432
244	=back	433	=back
245		434
246	=head1 SECURITY CONSIDERATIONS	435	=head1 SECURITY CONSIDERATIONS
247		436
248	CV uses Pixbuf to load images. Pixbuf is not considered safe for this	437	CV uses Pixbuf to load non-JPEG images. Pixbuf is not considered safe for
249	purpose, though (from the gtk-2.2 release notes):	438	this purpose, though (from the gtk-2.2 release notes):
250		439
251	"While efforts have been made to make gdk-pixbuf robust against invalid	440	"While efforts have been made to make gdk-pixbuf robust against invalid
252	images, using gdk-pixbuf to load untrusted data is not recommended, due to	441	images, using gdk-pixbuf to load untrusted data is not recommended, due to
253	the likelyhood that there are additional problems where an invalid image	442	the likelyhood that there are additional problems where an invalid image
254	could cause gdk-pixbuf to crash or worse."	443	could cause gdk-pixbuf to crash or worse."
255		444
256	=head1 BUGS/TODO	445	=head1 BUGS/TODO
257		446
		447	Lots of functionality is missing.
		448
258	Pixbuf doesn't honor G_BROKEN_FILENAMES, so accessing files with names	449	Pixbuf doesn't always honor G_BROKEN_FILENAMES, so accessing files with
259	incompatible with utf-8 fails.	450	names incompatible with utf-8 might fail.
260		451
261	rotate on disk	452	rotate on disk
262	print
263	lots of ui issues	453	lots of ui issues
264	save(?)	454	save(?)
265	preferences	455	preferences
266	ctrl-u in schnauzer
267	shift-cursor in schnauzer
268		456
269	=head1 AUTHOR	457	=head1 AUTHOR
270		458
271	Marc Lehmann <cv@plan9.de>.	459	Marc Lehmann <cv@plan9.de>.
272		460

Diff Legend

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

Comparing CV/bin/cv (file contents): Revision 1.43 by root, Tue Jun 28 21:26:04 2005 UTC vs. Revision 1.64 by root, Fri Dec 9 18:31:54 2005 UTC

Diff Legend

Comparing CV/bin/cv (file contents):
Revision 1.43 by root, Tue Jun 28 21:26:04 2005 UTC vs.
Revision 1.64 by root, Fri Dec 9 18:31:54 2005 UTC