[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.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	});
		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
		108	$w->set_role ("schnauzer");
70	$w->set_title ("CV: Schnauzer");	109	$w->set_title ("CV: Schnauzer");
71	$w->add (my $s = new_schnauzer);	110	$w->add (my $s = new_schnauzer);
72	$s->set_dir (File::Spec->curdir);	111	$s->set_dir (File::Spec->curdir);
73	$s->set_geometry_hints;	112	$s->set_geometry_hints;
74	$w->show_all;	113	$w->show_all;
…		…
76	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{h}) {	115	} elsif ($ctrl && $key == $Gtk2::Gdk::Keysyms{h}) {
77	unless ($help) {	116	unless ($help) {
78	require Gtk2::PodViewer;	117	require Gtk2::PodViewer;
79		118
80	$help = new Gtk2::Window;	119	$help = new Gtk2::Window;
		120	$help->set_role ("help");
81	$help->set_title ("CV: Help");	121	$help->set_title ("CV: Help");
82	$help->set_default_size (500, 300);	122	$help->set_default_size (500, 300);
83	$help->signal_connect (delete_event => sub { $help->hide; 1 });	123	$help->signal_connect (delete_event => sub { $help->hide; 1 });
84		124
85	$help->add (my $sw = new Gtk2::ScrolledWindow);	125	$help->add (my $sw = new Gtk2::ScrolledWindow);
…		…
89	$h->load_string (do { local $/; <DATA> });	129	$h->load_string (do { local $/; <DATA> });
90	}	130	}
91		131
92	$help->show_all;	132	$help->show_all;
93	} else {	133	} else {
94	#$mainwin->show_all;	134	return 0;
95	return $self->{schnauzer}->signal_emit (key_press_event => $_[1]);
96	}	135	}
97		136
98	1;	137	1
99	}	138	}
100		139
101	{	140	{
102	$viewer = new Gtk2::CV::ImageWindow;	141	$viewer = new_viewer;
103		142	$::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		143
118	$schnauzer = new_schnauzer;	144	$schnauzer = new_schnauzer;
119		145
120	$mainwin = new Gtk2::Window;	146	$mainwin = new Gtk2::Window;
		147	$mainwin->set_role ("main");
121	$mainwin->set_title ("CV");	148	$mainwin->set_title ("CV");
122	$mainwin->add (my $vbox = new Gtk2::VBox);	149	$mainwin->add (my $vbox = new Gtk2::VBox);
123	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1; });	150	$mainwin->signal_connect (delete_event => sub { $mainwin->hide; 1 });
124		151
125	$vbox->add ($schnauzer);	152	$vbox->add ($schnauzer);
126	$vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);	153	$vbox->pack_end (my $frame = new Gtk2::Frame, 0, 0, 0);
127	$frame->add (my $hbox = new Gtk2::HBox 0, 0);	154	$frame->add (my $hbox = new Gtk2::HBox 0, 0);
128	$hbox->pack_start ((new Gtk2::Label "Info"), 0, 0, 0);	155	$hbox->pack_start ((new Gtk2::Label "Info: "), 0, 0, 0);
129	$hbox->pack_start (($info = new Gtk2::Label), 1, 1, 0);	156	$hbox->pack_end (my $labelwindow = new Gtk2::EventBox, 1, 1, 0);
130	$info->set (wrap => 1);	157	$labelwindow->add ($info = new Gtk2::Label);
		158	$labelwindow->signal_connect_after (size_request => sub { $_[1]->width (0); 0 });
		159	$info->set (selectable => 1, xalign => 0, justify => "left");
131		160
132	$schnauzer->set_geometry_hints;	161	$schnauzer->set_geometry_hints;
133	}	162	}
134		163
135	if (@ARGV) {	164	if (@ARGV) {
136	$schnauzer->set_paths ([map Glib::filename_to_unicode $_, @ARGV]);	165	my $show_first = sub {
137	$schnauzer->show_all;	166	$schnauzer->show_all;
138	$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);
139	} else {	174	} else {
140	$schnauzer->set_dir (File::Spec->curdir);	175	$schnauzer->set_dir (File::Spec->curdir, sub {
141	$mainwin->show_all;	176	$mainwin->show_all;
142	$viewer->show_all;	177	$viewer->show_all;
		178	});
143	}	179	}
144
145	$viewer->show_all;
146		180
147	main Gtk2;	181	main Gtk2;
148		182
149	__DATA__	183	__DATA__
150		184
		185	=encoding utf-8
		186
151	=head1 NAME	187	=head1 NAME
152		188
153	cv - a fast gtk+ image viewer modeled after xv	189	cv - a fast gtk+ image viewer loosely modeled after XV
154		190
155	=head1 SYNOPSIS	191	=head1 SYNOPSIS
156		192
157	cv [file...]	193	cv [file...]
158		194
		195	=head1 FEATURES
		196
		197	CV is supposed to work similar to the venerable XV image viewer, just
		198	faster. Why faster?
		199
		200	=over 4
		201
		202	=item * optimized directory scanning algorithm
		203
		204	The directory scanning in CV uses some tricks that - on most modern
		205	filesystems - makes it possible to detect filetypes faster than stat()'ing
		206	every file. This makes CV suitable for directories with lots of files
		207	(10000+).
		208
		209	This algorithm is quite unprecise - it doesn't make a difference between
		210	files, device nodes, symlinks and the like, and filetype detection is done
		211	using the file extension only.
		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
		223	=item * use of asynchronous I/O
		224
		225	CV tries to use asynchronous I/O whereever it makes sense, for example
		226	while scanning directories, waiting for stat data, unlinking files or
		227	generating thumbnails. This usually decreases scanning times for large
		228	directories a bit (especially on RAID devices and over NFS) and makes CV
		229	much more interactive.
		230
		231	=item * fast image loading
		232
		233	The time span between the user issuing a command and displaying the new
		234	image should be as small as possible. CV uses optimized (especially
		235	for JPEG) loading functions and sacrifices some quality (e.g no gamma
		236	correction, although this might change) to achieve this speed.
		237
		238	=item * fast thumbnail creation
		239
		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
		242	creation for JPEGs has been specially optimized and can even take
		243	advantage of multiple CPUs.
		244
		245	=item * minimum optical clutter
		246
		247	CV has no menus or other user interface elements that take up a lot of
		248	screen space (or are useful for beginning users). The schnauzer windows
		249	can also be somewhat crowded.
		250
		251	The point of an image viewer is viewing images, not a nice GUI. This is
		252	similar to XV's behaviour.
		253
		254	=item * efficient (and hard to learn) user interface
		255
		256	CV uses key combinations. A lot. If you are an experienced XV user, you
		257	will find most of these keys familiar. If not, CV might be hard to use at
		258	first, but will be an efficient tool later.
		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
		266	=item * i18n'ed filename handling throughout
		267
		268	As long as glib can recognize your filename encoding (either UTF-8 or
		269	locale-specific, depending on the setting of G_BROKEN_FILENAMES) and you
		270	have the relevant fonts, CV will display your filenames correctly.
		271
		272	=item * extensible through plug-ins
		273
		274	I have weird plug-ins that access remote databases to find a
		275	directory. This is not likely to be of any use to other people. Likewise,
		276	others might have weird requirements I cannot dream of.
		277
		278	=item * filename clustering
		279
		280	Among the standard plug-ins is a filename clustering plug-in, that (in
		281	case of tens of thousands images in one directory) might be able to
		282	cluster similar names together.
		283
		284	=back
		285
159	=head1 DESCRIPTION	286	=head1 DESCRIPTION
160		287
161	None yet.
162
163	=head2 THE IMAGE WINDOW	288	=head2 THE IMAGE WINDOW
164		289
165	You can use the following keys in the image window:	290	You can use the following keys in the image window:
166		291
167	q quit the program	292	q quit the program
168	< half the image size	293	< half the image size
169	> double the image size	294	> double the image size
170	, shrink the image by 10%	295	, shrink the image by 10%
171	. enlarge the image by 10%	296	. enlarge the image by 10%
172	n reset to normal size	297	n reset to normal size
173	m maximize to screensize	298	m maximize to screensize
174	M maxime to screensize, respecting image aspect	299	M maximize to screensize, respecting image aspect
175	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
176	u uncrop	302	u uncrop
177	r set scaling mode to 'nearest' (fastest)	303	r set scaling mode to 'nearest' (fastest)
178	s set scaling mode to 'bilinear' (default)	304	s set scaling mode to 'bilinear' (default)
179	S set scaling mode to 'hyper' (slowest)	305	shift-s set scaling mode to 'hyper' (slowest)
180	t rotate clockwise 90°	306	t rotate clockwise 90°
181	T rotate counterclockwise°	307	T rotate counterclockwise°
		308	a apply all rotations loslessly to a jpeg file (using exiftran)
182	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
183	ctrl-s rescan visual schnauzer files for updates/deletes etc.	310	ctrl-c clone the current image window
184	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
		312	ctrl-p fire up the print dialog
		313	escape cancel a crop action
185		314
186	And when playing movies, these additional keys are active:	315	And when playing movies, these additional keys are active:
187		316
188	left rewind by 10 seconds	317	left rewind by 10 seconds
189	right forward by 10 seconds	318	right forward by 10 seconds
190	down rewind by 60 seconds	319	down rewind by 60 seconds
191	up forward by 60 seconds	320	up forward by 60 seconds
192	pg_up rewind by 600 seconds	321	pg_up rewind by 600 seconds
193	pg_down forward by 600 seconds	322	pg_down forward by 600 seconds
194	o toggle on-screen display	323	o toggle on-screen display
195	p pause/unpause	324	p pause/unpause
196	escape stop playing	325	escape stop playing
197	9 turn volume down	326	9 turn volume down
198	0 turn volume up	327	0 turn volume up
199		328
200	The following keys are redirected to the default visual schnauzer window:	329	Any other keys will be sent to the default schnauzer window, which can be
		330	toggled on and off by right-clicking into the image window.
201		331
202	space next image	332	Left-clicking into the image window will let you crop the image (usually
203	backspace last image	333	to zoom into large images that CV scales down).
204		334
205	=head2 THE VISUAL SCHNAUZER	335	=head2 THE VISUAL SCHNAUZER
206		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
207	You can use the following keys in the schnauzer window:	341	You can use the following keys in the schnauzer window:
208		342
		343	ctrl-space,
209	space move to and display next image	344	space move to and display next image
		345	ctrl-backspace,
210	backspace move to and display previous image	346	backspace move to and display previous image
		347	ctrl-return,
211	return display selected picture	348	return display selected picture, or enter directory
212		349
213	cursor keys move selection	350	cursor keys move selection
214	page-up move one page up	351	page-up move one page up
215	page-down move one page down	352	page-down move one page down
216	home move to first file	353	home move to first file
217	end move to last file	354	end move to last file
218		355
		356	ctrl-a select all files
		357	ctrl-shift-a select all files currently displayed in the schnauzer window
219	ctrl-d delete selected files WITHOUT ASKING AGAIN	358	ctrl-d delete selected files WITHOUT ASKING AGAIN
220	ctrl-g generate icons for the selected files	359	ctrl-g force generation of thumbnais for the selected files
		360	ctrl-s rescan current direcory or files updates/deletes etc.
221	ctrl-u update selected (or all) icons if neccessary	361	ctrl-u update selected (or all) icons if neccessary
222	ctrl-a select all files	362	ctrl-l don't use, will become a plug-in eventually
		363
		364	^ go to parent directory (caret).
		365
		366	0-9,
		367	a-z find the first filename beginning with this letter
		368
		369	Right-clicking into the schnauzer window displays a pop-up menu with
		370	additional actions.
		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
		409	=head1 FILES
		410
		411	When starting, CV runs the F<.cvrc> file in your F<$HOME> directory as if
		412	it were a perl script. in that, you will mostly load plug-ins.
		413
		414	Example:
		415
		416	system "fping -q -t 10 ether"
		417	or require "/fs/cv/cvplugin.pl";
		418
		419	This will load a plug-in, but only if the machine I<ether> is reachable
		420	(supposedly the plug-in is networked in some way :).
223		421
224	=head1 ENVIRONMENT	422	=head1 ENVIRONMENT
225		423
226	=over 4	424	=over 4
227		425
…		…
241		439
242	=back	440	=back
243		441
244	=head1 SECURITY CONSIDERATIONS	442	=head1 SECURITY CONSIDERATIONS
245		443
246	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
247	purpose, though (from the gtk-2.2 release notes):	445	this purpose, though (from the gtk-2.2 release notes):
248		446
249	"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
250	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
251	the likelyhood that there are additional problems where an invalid image	449	the likelyhood that there are additional problems where an invalid image
252	could cause gdk-pixbuf to crash or worse."	450	could cause gdk-pixbuf to crash or worse."
253		451
254	=head1 BUGS/TODO	452	=head1 BUGS/TODO
255		453
		454	Lots of functionality is missing.
		455
256	Pixbuf doesn't honor G_BROKEN_FILENAMES, so accessing files with names	456	Pixbuf doesn't always honor G_BROKEN_FILENAMES, so accessing files with
257	incompatible with utf-8 fails.	457	names incompatible with utf-8 might fail.
258		458
259	rotate on disk	459	rotate on disk
260	print
261	lots of ui issues	460	lots of ui issues
262	save(?)	461	save(?)
263	preferences	462	preferences
264	ctrl-u in schnauzer
265	shift-cursor in schnauzer
266		463
267	=head1 AUTHOR	464	=head1 AUTHOR
268		465
269	Marc Lehmann <cv@plan9.de>.	466	Marc Lehmann <cv@plan9.de>.
270		467

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