[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/MapWidget.pm

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.85 by root, Sun Oct 8 21:22:30 2006 UTC vs.
Revision 1.146 by root, Fri Dec 19 22:16:18 2008 UTC

…		…
1	package CFPlus::MapWidget;	1	package DC::MapWidget;
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use List::Util qw(min max);	6	use List::Util qw(min max);
7		7
8	use CFPlus;	8	use DC;
9	use CFPlus::OpenGL;	9	use DC::OpenGL;
10	use CFPlus::UI;	10	use DC::UI;
		11	use DC::Macro;
11		12
12	our @ISA = CFPlus::UI::Base::;	13	our @ISA = DC::UI::Base::;
13		14
14	my $magicmap_tex =	15	my $magicmap_tex =
15	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",	16	new_from_resource DC::Texture "magicmap.png",
16	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17		18
18	sub new {	19	sub new {
19	my $class = shift;	20	my $class = shift;
20		21
21	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
22	z => -1,	23	z => -1,
23	can_focus => 1,	24	can_focus => 1,
24	list => glGenList,	25	tilesize => 32,
25
26	smooth_matrix => [
27	0.05, 0.13, 0.05,
28	0.13, 0.30, 0.13,
29	0.05, 0.13, 0.05,
30	],
31
32	@_	26	@_
33	);	27	);
34
35	$self->{completer} = new CFPlus::MapWidget::Command::
36	command => $self->{command},
37	tooltip => "#completer_help",
38	;
39		28
40	$self	29	$self
41	}	30	}
42		31
43	sub add_command {	32	sub add_command {
47		36
48	$tooltip =~ s/^\s+//;	37	$tooltip =~ s/^\s+//;
49	$tooltip = "<big>$data</big>\n\n$tooltip";	38	$tooltip = "<big>$data</big>\n\n$tooltip";
50	$tooltip =~ s/\s+$//;	39	$tooltip =~ s/\s+$//;
51		40
52	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	41	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53	}	42	}
54		43
55	sub clr_commands {	44	sub clr_commands {
56	my ($self) = @_;	45	my ($self) = @_;
57		46
58	%{$self->{completer}{command}} = ();	47	%{$::COMPLETER->{command}} = ();
59		48
60	$self->{completer}->hide	49	$::COMPLETER->hide
61	if $self->{completer};	50	if $::COMPLETER;
62	}	51	}
63		52
64	sub server_login {	53	sub server_login {
65	my ($server) = @_;	54	my ($server) = @_;
66		55
67	::stop_game ();	56	::stop_game ();
68	local $::PROFILE->{host} = $server;	57	local $::PROFILE->{host} = $server;
69	::start_game ();	58	::start_game ();
70	}	59	}
71		60
72	sub check_lwp($) {
73	my ($res) = @_;
74
75	$res->is_error
76	and die $res->status_line;
77
78	$res
79	}
80
81	sub editor_invoke {	61	sub editor_invoke {
82	my $editsup = $::CONN && $::CONN->{editor_support}	62	my $editsup = $::CONN && $::CONN->{editor_support}
83	or return;	63	or return;
84		64
85	# putting the password into the env is somewhat tasteless	65	DC::background {
86	# local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};
87	# local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
88	# local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
89
90	my ($pid, $fh);
91	unless ($pid = open $fh, "-\|:utf8", "-") {
92	$SIG{__DIE__} = sub {
93	warn "@_\n";
94	CFPlus::_exit 99;
95	};
96
97	open STDERR, ">&STDOUT";
98	binmode STDOUT, ":utf8";
99	binmode STDERR, ":utf8";
100	close $fh;
101
102	$\| = 1;
103	print "preparing editor startup...\n";	66	print "preparing editor startup...\n";
104	CFPlus::set_proxy;
105		67
106	my $server = $editsup->{gameserver} \|\| "default";	68	my $server = $editsup->{gameserver} \|\| "default";
107	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	69	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108		70
109	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;	71	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
110	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;	72	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
111		73
112	print "map directory is $mapdir\n";	74	print "map directory is $mapdir\n";
113	print "lib directory is $libdir\n";	75	print "lib directory is $libdir\n";
114		76
115	require LWP::UserAgent;	77	my $ua = DC::lwp_useragent;
116
117	my $ua = LWP::UserAgent->new (
118	agent => "cfplus $CFPlus::VERSION",
119	keep_alive => 1,
120	env_proxy => 1,
121	timeout => 30,
122	);
123		78
124	for my $file (qw(archetypes crossfire.0)) {	79	for my $file (qw(archetypes crossfire.0)) {
125	my $url = "$editsup->{lib_root}$file";	80	my $url = "$editsup->{lib_root}$file";
126	print "mirroring $url...\n";	81	print "mirroring $url...\n";
127	check_lwp $ua->mirror ($url, "$libdir/$file");	82	DC::lwp_check $ua->mirror ($url, "$libdir/$file");
128	printf "%s size %d octets\n", $file, -s "$libdir/$file";	83	printf "%s size %d octets\n", $file, -s "$libdir/$file";
129	}	84	}
130		85
131	if (1) { # upload a map	86	if (1) { # upload a map
132	my $mapname = $::CONN->{map_info}[0];	87	my $mapname = $::CONN->{map_info}[0];
133		88
		89	my $mappath = "$mapdir/$mapname";
		90
		91	-e $mappath and die "$mappath already exists\n";
		92
134	print "getting map revision for $mapname...\n";	93	print "getting map revision for $mapname...\n";
135		94
136	# try to get the most recent head revision, what a hack,	95	# try to get the most recent head revision, what a hack,
137	# this should have been returned while downloading sigh	96	# this should have been returned while downloading sigh
138	my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;	97	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
139		98
140	if ($log =~ /\?rev=(\d+\.\d+)"/) {	99	if ($log =~ /\?rev=(\d+\.\d+)"/) {
141	my $rev = $1;	100	my $rev = $1;
142		101
143	print "downloading revision $rev...\n";	102	print "downloading revision $rev...\n";
144		103
145	my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;	104	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		105
		106	my $meta = {
		107	%$editsup,
		108	path => $mapname,
		109	revision => $rev,
		110	cf_login => $::PROFILE->{user},
		111	};
		112
		113	require File::Basename;
		114	require File::Path;
		115
		116	File::Path::mkpath (File::Basename::dirname ($mappath));
		117	open my $fh, ">:raw:perlio", "$mappath.meta"
		118	or die "$mappath.meta: $!\n";
		119	print $fh DC::encode_json $meta;
		120	close $fh;
		121	open my $fh, ">:raw:perlio:utf8", $mappath
		122	or die "$mappath: $!\n";
		123	print $fh $map;
		124	close $fh;
		125
		126	print "saved as $mappath\n";
		127
		128	print "invoking editor...\n";
		129	exec "/root/s2/gce $mappath";#d#
146		130
147	# now upload it	131	# now upload it
148	# require HTTP::Request::Common;	132	# require HTTP::Request::Common;
149	#	133	#
150	# my $res = $ua->post (	134	# my $res = $ua->post (
…		…
171	# }	155	# }
172	} else {	156	} else {
173	die "viewvc parse error, unable to detect revision\n";	157	die "viewvc parse error, unable to detect revision\n";
174	}	158	}
175	}	159	}
176
177	print "invoking editor...\n";
178	exec "/root/s2/gce";#d#
179
180	CFPlus::_exit;
181	}
182
183	my $buffer;
184
185	Event->io (fd => $fh, poll => 'r', cb => sub {
186	unless (sysread $fh, $buffer, 4096, length $buffer) {
187	$_[0]->w->cancel;
188	$buffer .= "done\n";
189	}
190
191	while ($buffer =~ s/^(.*)\n//) {
192	::message ({
193	markup => "editor($pid): " . CFPlus::asxml $1,
194	});
195	}
196	});	160	}
197	}	161	}
198		162
199	sub invoke_button_down {	163	sub invoke_button_down {
200	my ($self, $ev, $x, $y) = @_;	164	my ($self, $ev, $x, $y) = @_;
201		165
202	if ($ev->{button} == 1) {	166	if ($ev->{button} == 1) {
203	$self->grab_focus;	167	$self->grab_focus;
204	return unless $::CONN;	168	return unless $::CONN;
205		169
206	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	170	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
207	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	171	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
208		172
209	$x -= int 0.5 * $self->{sw};	173	$x -= DC::floor $::MAP->w * 0.5;
210	$y -= int 0.5 * $self->{sh};	174	$y -= DC::floor $::MAP->h * 0.5;
211		175
		176	if ($::CONN) {
212	$::CONN->lookat ($x, $y)	177	$::CONN->lookat ($x, $y)
213	if $::CONN;	178	}
214		179
215	} elsif ($ev->{button} == 2) {	180	} elsif ($ev->{button} == 2) {
216	$self->grab_focus;	181	$self->grab_focus;
217	return unless $::CONN;	182	return unless $::CONN;
218		183
…		…
235	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	200	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
236	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	201	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
237	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	202	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
238	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	203	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
239	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],	204	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
240	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],	205	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
241	[	206	[
242	$::PICKUP_ENABLE->{state}	207	$::PICKUP_ENABLE->{state}
243	? "Disable automatic pickup"	208	? "Disable automatic pickup"
244	: "Enable automatic pickup",	209	: "Enable automatic pickup",
245	sub { $::PICKUP_ENABLE->toggle }	210	sub { $::PICKUP_ENABLE->toggle }
246	],	211	],
247	);	212	);
248		213
249	if ($::CONN && $::CONN->{editor_support}) {	214	if ($::CONN && $::CONN->{editor_support}) {
250	push @items, [	215	# push @items, [
251	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",	216	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
252	\&editor_invoke,	217	# \&editor_invoke,
253	];	218	# ];
254		219
255	for my $type (qw(test name)) {	220	for my $type (qw(test name)) {
256	$::CONN->{editor_support}{type} ne $type	221	$::CONN->{editor_support}{type} ne $type
257	or next;	222	or next;
258	my $server = $::CONN->{editor_support}{"${type}server"}	223	my $server = $::CONN->{editor_support}{"${type}server"}
259	or next;	224	or next;
260		225
261	push @items, [	226	push @items, [
262	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",	227	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
263	sub { server_login $server },	228	sub { server_login $server },
264	];	229	];
265	}	230	}
266	}	231	}
267		232
…		…
275	}	240	}
276	}	241	}
277	],	242	],
278	;	243	;
279		244
280	(new CFPlus::UI::Menu	245	(new DC::UI::Menu
281	items => \@items,	246	items => \@items,
282	)->popup ($ev);	247	)->popup ($ev);
283	}	248	}
284		249
285	1	250	1
…		…
304		269
305	1	270	1
306	}	271	}
307		272
308	sub size_request {	273	sub size_request {
		274	my ($self) = @_;
		275
309	(	276	(
310	32 * CFPlus::ceil $::WIDTH / 32,	277	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
311	32 * CFPlus::ceil $::HEIGHT / 32,	278	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
312	)	279	)
313	}	280	}
314		281
315	sub update {	282	sub update {
316	my ($self) = @_;	283	my ($self) = @_;
…		…
318	$self->{need_update} = 1;	285	$self->{need_update} = 1;
319	$self->SUPER::update;	286	$self->SUPER::update;
320	}	287	}
321		288
322	my %DIR = (	289	my %DIR = (
323	CFPlus::SDLK_KP8, [1, "north"],	290	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
		291	( "," . DC::SDLK_KP8 ), [1, "north"],
324	CFPlus::SDLK_KP9, [2, "northeast"],	292	( "," . DC::SDLK_KP9 ), [2, "northeast"],
325	CFPlus::SDLK_KP6, [3, "east"],	293	( "," . DC::SDLK_KP6 ), [3, "east"],
326	CFPlus::SDLK_KP3, [4, "southeast"],	294	( "," . DC::SDLK_KP3 ), [4, "southeast"],
327	CFPlus::SDLK_KP2, [5, "south"],	295	( "," . DC::SDLK_KP2 ), [5, "south"],
328	CFPlus::SDLK_KP1, [6, "southwest"],	296	( "," . DC::SDLK_KP1 ), [6, "southwest"],
329	CFPlus::SDLK_KP4, [7, "west"],	297	( "," . DC::SDLK_KP4 ), [7, "west"],
330	CFPlus::SDLK_KP7, [8, "northwest"],	298	( "," . DC::SDLK_KP7 ), [8, "northwest"],
331		299
332	CFPlus::SDLK_UP, [1, "north"],	300	( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
		301	( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
		302	( "," . DC::SDLK_END ), [6, "southwest"],
		303	( "," . DC::SDLK_HOME ), [8, "northwest"],
		304
		305	( "," . DC::SDLK_UP ), [1, "north"],
		306	("1," . DC::SDLK_UP ), [2, "northeast"],
333	CFPlus::SDLK_RIGHT, [3, "east"],	307	( "," . DC::SDLK_RIGHT ), [3, "east"],
334	CFPlus::SDLK_DOWN, [5, "south"],	308	("1," . DC::SDLK_RIGHT ), [4, "southeast"],
335	CFPlus::SDLK_LEFT, [7, "west"],	309	( "," . DC::SDLK_DOWN ), [5, "south"],
		310	("1," . DC::SDLK_DOWN ), [6, "southwest"],
		311	( "," . DC::SDLK_LEFT ), [7, "west"],
		312	("1," . DC::SDLK_LEFT ), [8, "northwest"],
336	);	313	);
337		314
338	sub invoke_key_down {	315	sub invoke_key_down {
339	my ($self, $ev) = @_;	316	my ($self, $ev) = @_;
340		317
341	my $mod = $ev->{mod};	318	my $mod = $ev->{mod};
342	my $sym = $ev->{sym};	319	my $sym = $ev->{sym};
343	my $uni = $ev->{unicode};	320	my $uni = $ev->{unicode};
344		321
345	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	322	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
346		323
347	if ($uni == ord "\t") {	324	# ignore repeated keypresses
348	$::PL_WINDOW->toggle_visibility;	325	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
349	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	326	$self->{last_mod} = $mod;
350	$::HELP_WINDOW->toggle_visibility;	327	$self->{last_sym} = $sym;
351	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
352	::toggle_player_page ($::STATS_PAGE);
353	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
354	::toggle_player_page ($::SKILL_PAGE);
355	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
356	::toggle_player_page ($::SPELL_PAGE);
357	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
358	::toggle_player_page ($::INVENTORY_PAGE);
359	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
360	$::SETUP_DIALOG->toggle_visibility;
361	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
362	$::BIND_EDITOR->set_binding (undef, undef, [],
363	sub {
364	my ($mod, $sym, $cmds) = @_;
365	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
366	});
367	$::BIND_EDITOR->start;
368	$::BIND_EDITOR->show;
369	#TODO: elmex, what was this supposed to do? it currently crashes the client.
370	# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
371	# $::BIND_EDITOR->stop;
372	# $::BIND_EDITOR->ask_for_bind_and_commit;
373	# $::BIND_EDITOR->hide;
374	} elsif (!$::CONN) {
375	return 0; # bindings further down need a valid connection
376		328
377	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {	329	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
378	$::CONN->user_send ("stay fire");	330
379	} elsif ($uni == ord ",") {	331	if ($::CONN && $dir) {
380	$::CONN->user_send ("take");
381	} elsif ($uni == ord " ") {
382	$::CONN->user_send ("apply");
383	} elsif ($uni == 13) {
384	$::CONN->user_send ("examine");
385	} elsif ($uni == ord ".") {
386	$::CONN->user_send ($self->{completer}{last_command})
387	if exists $self->{completer}{last_command};
388	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
389	$::CONN->user_send ($_) for @$bind_cmd;
390	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
391	$::CONN->user_send ("rotateshoottype +");
392	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
393	$::CONN->user_send ("rotateshoottype -");
394	} elsif ($uni == ord '"') {
395	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
396	$self->{completer}->show;
397	} elsif ($uni == ord "'") {
398	$self->{completer}->set_prefix ("");
399	$self->{completer}->show;
400	} elsif (exists $DIR{$sym}) {
401	if ($mod & CFPlus::KMOD_SHIFT) {	332	if ($mod & DC::KMOD_SHIFT) {
402	$self->{shft}++;	333	$self->{shft}++;
403	if ($DIR{$sym}[0] != $self->{fire_dir}) {	334	if ($dir->[0] != $self->{fire_dir}) {
404	$::CONN->user_send ("fire $DIR{$sym}[0]");	335	$::CONN->user_send ("fire $dir->[0]");
405	}	336	}
406	$self->{fire_dir} = $DIR{$sym}[0];	337	$self->{fire_dir} = $dir->[0];
407	} elsif ($mod & CFPlus::KMOD_CTRL) {	338	} elsif ($mod & DC::KMOD_CTRL) {
408	$self->{ctrl}++;	339	$self->{ctrl}++;
409	$::CONN->user_send ("run $DIR{$sym}[0]");	340	$::CONN->user_send ("run $dir->[0]");
410	} else {	341	} else {
411	$::CONN->user_send ("$DIR{$sym}[1]");	342	$::CONN->user_send ("$dir->[1]");
412	}	343	}
413	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	344
414	$self->{completer}->inject_key_down ($ev);
415	$self->{completer}->show;
416	} else {
417	return 0;	345	return 1;
418	}
419
420	1	346	}
		347
		348	0
421	}	349	}
422		350
423	sub invoke_key_up {	351	sub invoke_key_up {
424	my ($self, $ev) = @_;	352	my ($self, $ev) = @_;
425		353
426	my $res = 0;	354	my $res = 0;
427	my $mod = $ev->{mod};	355	my $mod = $ev->{mod};
428	my $sym = $ev->{sym};	356	my $sym = $ev->{sym};
429		357
		358	delete $self->{last_mod};
		359	delete $self->{last_sym};
		360
430	if ($::CFG->{shift_fire_stop}) {	361	if ($::CFG->{shift_fire_stop}) {
431	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {	362	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
432	$::CONN->user_send ("fire_stop");	363	$::CONN->user_send ("fire_stop");
433	delete $self->{fire_dir};	364	delete $self->{fire_dir};
434	$res = 1;	365	$res = 1;
435	}	366	}
436	} else {	367	} else {
		368	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		369
437	if (exists $DIR{$sym} && delete $self->{shft}) {	370	if ($dir && delete $self->{shft}) {
438	$::CONN->user_send ("fire_stop");	371	$::CONN->user_send ("fire_stop");
439	delete $self->{fire_dir};	372	delete $self->{fire_dir};
440	$res = 1;	373	$res = 1;
441	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	374	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		375	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
442	$::CONN->user_send ("fire_stop");	376	$::CONN->user_send ("fire_stop");
443	delete $self->{fire_dir};	377	delete $self->{fire_dir};
444	$res = 1;	378	$res = 1;
445	}	379	}
446	}	380	}
447		381
448	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {	382	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
449	$::CONN->user_send ("run_stop");	383	$::CONN->user_send ("run_stop");
450	$res = 1;	384	$res = 1;
451	}	385	}
452		386
453	$res	387	$res
454	}	388	}
455		389
		390	sub invoke_visibility_change {
		391	my ($self) = @_;
		392
		393	$self->refresh_hook;
		394
		395	0
		396	}
		397
		398	sub set_tilesize {
		399	my ($self, $tilesize) = @_;
		400
		401	$self->{tilesize} = $tilesize;
		402	}
		403
		404	sub scroll {
		405	my ($self, $dx, $dy) = @_;
		406
		407	$::MAP->scroll ($dx, $dy);
		408
		409	$self->movement_update;
		410
		411	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		412	$self->{sdy} += $dy * $self->{tilesize};
		413	}
		414
456	sub set_magicmap {	415	sub set_magicmap {
457	my ($self, $w, $h, $x, $y, $data) = @_;	416	my ($self, $w, $h, $x, $y, $data) = @_;
458		417
459	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	418	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
460	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	419	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
461		420
462	$self->{magicmap} = [$x, $y, $w, $h, $data];	421	$self->{magicmap} = [$x, $y, $w, $h, $data];
463		422
464	$self->update;	423	$self->update;
465	}	424	}
466		425
		426	sub movement_update {
		427	my ($self) = @_;
		428
		429	if ($::CFG->{smooth_movement}) {
		430	if ($self->{sdx} \|\| $self->{sdy}) {
		431	my $diff = EV::time - ($self->{last_update} \|\| $::LAST_REFRESH);
		432	my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
		433
		434	# the minimum time for a single tile movement
		435	my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK \|\| 1);
		436
		437	$spd *= $self->{tilesize};
		438
		439	# jump if "impossibly high" speed
		440	if (
		441	(max abs $self->{sdx}, abs $self->{sdy})
		442	> $spd * $mintime * 2.1
		443	) {
		444	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
		445	$self->{sdx} = $self->{sdy} = 0;
		446	} else {
		447	$spd = $diff 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
		448
		449	my $dx = $self->{sdx} < 0 ? -$spd : $spd;
		450	my $dy = $self->{sdy} < 0 ? -$spd : $spd;
		451
		452	if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
		453	if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
		454	}
		455
		456	$self->update;
		457	}
		458	} else {
		459	$self->{sdx} = $self->{sdy} = 0;
		460	}
		461
		462	$self->{last_update} = EV::time;
		463	}
		464
		465	sub refresh_hook {
		466	my ($self) = @_;
		467
		468	if ($::MAP && $::CONN) {
		469	if (delete $self->{need_update}) {
		470	$self->movement_update;
		471
		472	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		473
		474	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
		475	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
		476
		477	# width/height of map, in tiles
		478	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
		479	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
		480
		481	# the map displacement, in tiles
		482	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
		483	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
		484
		485	# the upper left "visible" corner, in pixels
		486	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		487	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		488
		489	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		490	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		491
		492	if ($::CFG->{fow_enable}) {
		493	$sdx_t = $sdy_t = 0;#d#
		494	my ($w, $h, $data) = $::MAP->fow_texture (
		495	$dx + (min 0, $sdx_t),
		496	$dy + (min 0, $sdy_t),
		497	$sw + abs $sdx_t,
		498	$sh + abs $sdy_t
		499	);
		500
		501	$self->{fow_texture} = new DC::Texture
		502	w => $w,
		503	h => $h,
		504	data => $data,
		505	internalformat => GL_ALPHA,
		506	format => GL_ALPHA;
		507	} else {
		508	delete $self->{fow_texture};
		509	}
		510
		511	glNewList ($self->{list} \|\|= glGenList);
		512
		513	glPushMatrix;
		514	glTranslate $sx0, $sy0;
		515	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		516	glTranslate $self->{sdx}, $self->{sdy};
		517
		518	$::MAP->draw ($dx, $dy, $sw, $sh,
		519	$self->{tilesize},
		520	$::CONN->{player}{tag},
		521	-$self->{sdx}, -$self->{sdy});
		522
		523	#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
		524	glScale $self->{tilesize}, $self->{tilesize};
		525
		526	if (my $tex = $self->{fow_texture}) {
		527	glPushMatrix;
		528	glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
		529	glScale 1/3, 1/3;
		530	glEnable GL_TEXTURE_2D;
		531	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		532
		533	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		534	$self->{fow_texture}->draw_quad_alpha (0, 0);
		535
		536	glDisable GL_TEXTURE_2D;
		537	glPopMatrix;
		538	}
		539
		540	if ($self->{magicmap}) {
		541	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		542
		543	$x += $::MAP->ox + $self->{dx};
		544	$y += $::MAP->oy + $self->{dy};
		545
		546	glTranslate - $x - 1, - $y - 1;
		547	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		548	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		549	}
		550
		551	glPopMatrix;
		552	glEndList;
		553	}
		554	} else {
		555	glDeleteList delete $self->{list}
		556	if $self->{list};
		557	}
		558	}
		559
467	sub draw {	560	sub draw {
468	my ($self) = @_;	561	my ($self) = @_;
469		562
470	return unless $::MAP;	563	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
471		564
		565	return unless $self->{list};
		566
472	my $focused = $CFPlus::UI::FOCUS == $self	567	my $focused = $DC::UI::FOCUS == $self
473	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	568	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
474		569
475	return	570	return
476	unless $focused \|\| !$::FAST;	571	unless $focused \|\| !$::FAST;
477		572
478	if (delete $self->{need_update}) {
479	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
480
481	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
482	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
483
484	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
485	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
486
487	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
488	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
489
490	if ($::CFG->{fow_enable}) {
491	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
492
493	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
494	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
495	glConvolutionFilter2D (
496	GL_CONVOLUTION_2D,
497	GL_ALPHA,
498	3, 3,
499	GL_ALPHA, GL_FLOAT,
500	(pack "f*", @{ $self->{smooth_matrix} }),
501	);
502	glEnable GL_CONVOLUTION_2D;
503	}
504
505	$self->{fow_texture} = new CFPlus::Texture
506	w => $w,
507	h => $h,
508	data => $data,
509	internalformat => GL_ALPHA,
510	format => GL_ALPHA;
511
512	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
513	} else {
514	delete $self->{fow_texture};
515	}
516
517	glNewList $self->{list};
518
519	glPushMatrix;
520	glTranslate $sx0, $sy0;
521	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
522
523	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
524
525	glScale 32, 32;
526
527	if (my $tex = $self->{fow_texture}) {
528	glEnable GL_TEXTURE_2D;
529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
530
531	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
532	$self->{fow_texture}->draw_quad_alpha (0, 0);
533
534	glDisable GL_TEXTURE_2D;
535	}
536
537	if ($self->{magicmap}) {
538	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
539
540	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
541	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
542
543	glTranslate - $x - 1, - $y - 1;
544	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
545	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
546	}
547
548	glPopMatrix;
549	glEndList;
550	}
551
552	glCallList $self->{list};	573	glCallList $self->{list};
553		574
554	# TNT2 emulates logops in software (or worse :)	575	# TNT2 emulates logops in software (or worse :)
555	unless ($focused) {	576	unless ($focused) {
556	glColor 0.4, 0.2, 0.2, 0.6;	577	glColor_premultiply 0, 0, 1, 0.25;
557	glEnable GL_BLEND;	578	glEnable GL_BLEND;
558	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	579	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
559	glBegin GL_QUADS;	580	glBegin GL_QUADS;
560	glVertex 0, 0;	581	glVertex 0, 0;
561	glVertex 0, $::HEIGHT;	582	glVertex 0, $::HEIGHT;
562	glVertex $::WIDTH, $::HEIGHT;	583	glVertex $::WIDTH, $::HEIGHT;
563	glVertex $::WIDTH, 0;	584	glVertex $::WIDTH, 0;
…		…
572	glDeleteList $self->{list};	593	glDeleteList $self->{list};
573		594
574	$self->SUPER::DESTROY;	595	$self->SUPER::DESTROY;
575	}	596	}
576		597
577	package CFPlus::MapWidget::MapMap;	598	package DC::MapWidget::MapMap;
578		599
		600	use strict;
		601	use utf8;
		602
579	our @ISA = CFPlus::UI::Base::;	603	our @ISA = DC::UI::Base::;
580		604
581	use Time::HiRes qw(time);	605	use Time::HiRes qw(time);
582	use CFPlus::OpenGL;	606	use DC::OpenGL;
583		607
584	sub size_request {	608	sub size_request {
585	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	609	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		610	}
		611
		612	sub refresh_hook {
		613	my ($self) = @_;
		614
		615	if ($::MAP && $self->{texture_atime} < time) {
		616	my ($w, $h) = @$self{qw(w h)};
		617
		618	return unless $w && $h;
		619
		620	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		621	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		622
		623	my $ox = 0.5 * ($w - $sw);
		624	my $oy = 0.5 * ($h - $sh);
		625
		626	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		627	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		628
		629	#TODO: map scale is completely borked
		630
		631	my $x0 = int $ox - $sx + 0.5;
		632	my $y0 = int $oy - $sy + 0.5;
		633
		634	$self->{sw} = $sw;
		635	$self->{sh} = $sh;
		636
		637	$self->{x0} = $x0;
		638	$self->{y0} = $y0;
		639
		640	$self->{texture_atime} = time + 1/3;
		641
		642	$self->{texture} =
		643	new DC::Texture
		644	w => $w,
		645	h => $h,
		646	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		647	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		648	}
		649	}
		650
		651	sub invoke_visibility_change {
		652	my ($self) = @_;
		653
		654	$self->refresh_hook;
		655
		656	0
586	}	657	}
587		658
588	sub invoke_size_allocate {	659	sub invoke_size_allocate {
589	my ($self, $w, $h) = @_;	660	my ($self, $w, $h) = @_;
590		661
…		…
601	}	672	}
602		673
603	sub _draw {	674	sub _draw {
604	my ($self) = @_;	675	my ($self) = @_;
605		676
606	$::MAP or return;	677	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
607		678
608	my ($w, $h) = @$self{qw(w h)};	679	$self->{texture} or return;
609
610	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
611	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
612
613	my $sx = int $::CFG->{map_shift_x} / 32;
614	my $sy = int $::CFG->{map_shift_y} / 32;
615
616	my $ox = 0.5 * ($w - $sw);
617	my $oy = 0.5 * ($h - $sh);
618		680
619	glEnable GL_BLEND;	681	glEnable GL_BLEND;
620	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	682	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
621	glEnable GL_TEXTURE_2D;	683	glEnable GL_TEXTURE_2D;
622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	684	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
623		685
624	if ($self->{texture_atime} < time) {
625	$self->{texture_atime} = time + 1/3;
626
627	$self->{texture} =
628	new CFPlus::Texture
629	w => $w,
630	h => $h,
631	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
632	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
633	}
634
635	$self->{texture}->draw_quad (0, 0);	686	$self->{texture}->draw_quad (0, 0);
636		687
637	glDisable GL_TEXTURE_2D;	688	glDisable GL_TEXTURE_2D;
638		689
639	glTranslate 0.375, 0.375;	690	glTranslate 0.375, 0.375;
640
641	#TODO: map scale is completely borked
642
643	my $x0 = int $ox - $sx + 0.5;
644	my $y0 = int $oy - $sy + 0.5;
645		691
646	glColor 1, 1, 0, 1;	692	glColor 1, 1, 0, 1;
647	glBegin GL_LINE_LOOP;	693	glBegin GL_LINE_LOOP;
648	glVertex $x0 , $y0 ;	694	glVertex $self->{x0} , $self->{y0} ;
649	glVertex $x0 , $y0 + $sh;	695	glVertex $self->{x0} , $self->{y0} + $self->{sh};
650	glVertex $x0 + $sw, $y0 + $sh;	696	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
651	glVertex $x0 + $sw, $y0 ;	697	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
652	glEnd;	698	glEnd;
653		699
654	glDisable GL_BLEND;	700	glDisable GL_BLEND;
655	}	701	}
656		702
657	package CFPlus::MapWidget::Command;	703	package DC::MapWidget::Command;
658		704
659	use strict;	705	use strict;
660		706
661	use CFPlus::OpenGL;	707	use DC::OpenGL;
662		708
663	our @ISA = CFPlus::UI::Frame::;	709	our @ISA = DC::UI::Frame::;
664		710
665	sub new {	711	sub new {
666	my $class = shift;	712	my $class = shift;
667		713
668	my $self = $class->SUPER::new (	714	my $self = $class->SUPER::new (
669	bg => [0, 0, 0, 0.8],	715	bg => [0, 0, 0, 0.8],
670	@_,	716	@_,
671	);	717	);
672		718
673	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	719	$self->add ($self->{vbox} = new DC::UI::VBox);
674		720
675	$self->{label} = [	721	$self->{label} = [
676	map	722	map
677	CFPlus::UI::Label->new (	723	DC::UI::Label->new (
		724	align => 0,
678	can_hover => 1,	725	can_hover => 1,
679	can_events => 1,	726	can_events => 1,
680	tooltip_width => 0.33,	727	tooltip_width => 0.33,
681	fontsize => $_,	728	fontsize => $_,
682	), (0.8) x 16	729	), (0.8) x 16
683	];	730	];
684		731
685	$self->{entry} = new CFPlus::UI::Entry	732	$self->{entry} = new DC::UI::Entry
686	on_changed => sub {	733	on_changed => sub {
687	$self->update_labels;	734	$self->update_labels;
688	0	735	0
689	},	736	},
690	on_button_down => sub {	737	on_button_down => sub {
691	my ($entry, $ev, $x, $y) = @_;	738	my ($entry, $ev, $x, $y) = @_;
692		739
693	if ($ev->{button} == 3) {	740	if ($ev->{button} == 3) {
694	(new CFPlus::UI::Menu	741	(new DC::UI::Menu
695	items => [	742	items => [
696	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	743	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
697	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	744	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
698	],	745	],
699	)->popup ($ev);	746	)->popup ($ev);
700	return 1;	747	return 1;
701	}	748	}
702	0	749	0
…		…
717	$self->hide;	764	$self->hide;
718	}	765	}
719	} elsif ($ev->{sym} == 27) {	766	} elsif ($ev->{sym} == 27) {
720	$self->{hist_ptr} = 0;	767	$self->{hist_ptr} = 0;
721	$self->hide;	768	$self->hide;
722	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {	769	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
723	if ($self->{hist_ptr} > 1) {	770	if ($self->{hist_ptr} > 1) {
724	$self->{hist_ptr}--;	771	$self->{hist_ptr}--;
725	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	772	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
726	} elsif ($self->{hist_ptr} > 0) {	773	} elsif ($self->{hist_ptr} > 0) {
727	$self->{hist_ptr}--;	774	$self->{hist_ptr}--;
…		…
729	} else {	776	} else {
730	++$self->{select_offset}	777	++$self->{select_offset}
731	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	778	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
732	}	779	}
733	$self->update_labels;	780	$self->update_labels;
734	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {	781	} elsif ($ev->{sym} == DC::SDLK_UP) {
735	if ($self->{select_offset}) {	782	if ($self->{select_offset}) {
736	--$self->{select_offset}	783	--$self->{select_offset}
737	} else {	784	} else {
738	unless ($self->{hist_ptr}) {	785	unless ($self->{hist_ptr}) {
739	$self->{hist_saveback} = $self->{entry}->get_text;	786	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
897		944
898	sub _draw {	945	sub _draw {
899	my ($self) = @_;	946	my ($self) = @_;
900		947
901	# hack	948	# hack
902	local $CFPlus::UI::FOCUS = $self->{entry};	949	local $DC::UI::FOCUS = $self->{entry};
903		950
904	$self->SUPER::_draw;	951	$self->SUPER::_draw;
905	}	952	}
906		953
907	1	954	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.85 by root, Sun Oct 8 21:22:30 2006 UTC vs. Revision 1.146 by root, Fri Dec 19 22:16:18 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.85 by root, Sun Oct 8 21:22:30 2006 UTC vs.
Revision 1.146 by root, Fri Dec 19 22:16:18 2008 UTC