[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.191 by root, Sun Jul 29 21:31:48 2007 UTC vs.
Revision 1.229 by root, Mon Oct 8 17:01:03 2007 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
		3	# do splash-screen thingy on win32
3	my $startup_done = sub { };	4	my $startup_done = sub { };
4	our $PANGO = "1.5.0";
5
6	# do splash-screen thingy on win32
7	BEGIN {	5	BEGIN {
8	if (%PAR::LibCache && $^O eq "MSWin32") {	6	if (%PAR::LibCache && $^O eq "MSWin32") {
9	while (my ($filename, $zip) = each %PAR::LibCache) {	7	while (my ($filename, $zip) = each %PAR::LibCache) {
10	$zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");	8	$zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11	}	9	}
30	# do things only needed for single-binary version (par)	28	# do things only needed for single-binary version (par)
31	BEGIN {	29	BEGIN {
32	if (%PAR::LibCache) {	30	if (%PAR::LibCache) {
33	@INC = grep ref, @INC; # weed out all paths except pars loader refs	31	@INC = grep ref, @INC; # weed out all paths except pars loader refs
34		32
35	my $tmp = $ENV{PAR_TEMP};	33	my $root = $ENV{PAR_TEMP};
36		34
37	while (my ($filename, $zip) = each %PAR::LibCache) {	35	while (my ($filename, $zip) = each %PAR::LibCache) {
38	for ($zip->memberNames) {	36	for ($zip->memberNames) {
39	next unless /^root\/(.*)/;	37	next unless /^root\/(.*)/;
40	$zip->extractMember ($_, "$tmp/$1")	38	$zip->extractMember ($_, "$root/$1")
41	unless -e "$tmp/$1";	39	unless -e "$root/$1";
42	}	40	}
43	}	41	}
44		42
45	if ($^O eq "MSWin32") {	43	if ($^O eq "MSWin32") {
46	# relocatable	44	# pango is relocatable on win32
47	} else {	45	} else {
		46	open my $fh, "<:perlio", "$root/pangoversion"
		47	or die "pangoversion: $!";
		48	my $PANGO = <$fh>;
48	# unix, need to patch pango rc file	49	# unix, need to patch pango rc file
49	open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"	50	open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50	or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";	51	or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51	local $/;	52	local $/;
52	my $rc = <$fh>;	53	my $rc = <$fh>;
53	$rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones	54	$rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
54		55
55	mkdir "$tmp/pango-modules";	56	mkdir "$root/pango-modules";
56	open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"	57	open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
57	or die "$tmp/pango-modules/pango.modules: $!";	58	or die "$root/pango-modules/pango.modules: $!";
58	print $fh $rc;	59	print $fh $rc;
59		60
60	$ENV{PANGO_RC_FILE} = "$tmp/pango.rc";	61	$ENV{PANGO_RC_FILE} = "$root/pango.rc";
61	open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}	62	open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62	or die "$ENV{PANGO_RC_FILE}: $!";	63	or die "$ENV{PANGO_RC_FILE}: $!";
63	print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";	64	print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
64	}	65	}
65		66
66	unshift @INC, $tmp;	67	unshift @INC, $root;
67	}	68	}
68	}	69	}
69		70
70	# need to do it again because that pile of garbage called PAR nukes it before main	71	# need to do it again because that pile of garbage called PAR nukes it before main
71	unshift @INC, $ENV{PAR_TEMP}	72	unshift @INC, $ENV{PAR_TEMP}
…		…
86	use CFPlus::DB;	87	use CFPlus::DB;
87	use CFPlus::UI;	88	use CFPlus::UI;
88	use CFPlus::UI::Canvas;	89	use CFPlus::UI::Canvas;
89	use CFPlus::UI::Inventory;	90	use CFPlus::UI::Inventory;
90	use CFPlus::UI::SpellList;	91	use CFPlus::UI::SpellList;
		92	use CFPlus::UI::Dockable;
91	use CFPlus::UI::MessageWindow;	93	use CFPlus::UI::MessageWindow;
		94	use CFPlus::UI::ChatView;
92	use CFPlus::Pod;	95	use CFPlus::Pod;
93	use CFPlus::MapWidget;	96	use CFPlus::MapWidget;
94	use CFPlus::Macro;	97	use CFPlus::Macro;
95		98
96	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	99	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
…		…
113	our $CONN;	116	our $CONN;
114	our $PROFILE; # current profile	117	our $PROFILE; # current profile
115	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	118	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
116		119
117	our $WANT_REFRESH;	120	our $WANT_REFRESH;
118	our $CAN_REFRESH;
119		121
120	our @SDL_MODES;	122	our @SDL_MODES;
121	our $WIDTH;	123	our $WIDTH;
122	our $HEIGHT;	124	our $HEIGHT;
123	our $FULLSCREEN;	125	our $FULLSCREEN;
…		…
127	our $FONT_FIXED;	129	our $FONT_FIXED;
128		130
129	our $MAP;	131	our $MAP;
130	our $MAPMAP;	132	our $MAPMAP;
131	our $MAPWIDGET;	133	our $MAPWIDGET;
		134	our $COMPLETER;
132	our $BUTTONBAR;	135	our $BUTTONBAR;
133	our $METASERVER;	136	our $METASERVER;
134	our $LOGIN_BUTTON;	137	our $LOGIN_BUTTON;
135	our $QUIT_DIALOG;	138	our $QUIT_DIALOG;
136	our $HOST_ENTRY;	139	our $HOST_ENTRY;
…		…
144	our $SETUP_KEYBOARD;	147	our $SETUP_KEYBOARD;
145		148
146	our $PL_NOTEBOOK;	149	our $PL_NOTEBOOK;
147	our $PL_WINDOW;	150	our $PL_WINDOW;
148		151
		152	our $MUSIC_PLAYING_WIDGET;
		153	our $LICENSE_WIDGET;
		154
		155	our $PICKUP_PAGE;
149	our $INVENTORY_PAGE;	156	our $INVENTORY_PAGE;
150	our $STATS_PAGE;	157	our $STATS_PAGE;
151	our $SKILL_PAGE;	158	our $SKILL_PAGE;
152	our $SPELL_PAGE;	159	our $SPELL_PAGE;
153	our $SPELL_LIST;	160	our $SPELL_LIST;
…		…
159	our $STATWIDS;	166	our $STATWIDS;
160		167
161	our $SDL_ACTIVE;	168	our $SDL_ACTIVE;
162	our %SDL_CB;	169	our %SDL_CB;
163		170
		171	our $ALT_ENTER_MESSAGE;
		172	our $STATUSBOX;
		173	our $DEBUG_STATUS;
		174
		175	our $INV;
		176	our $INVR;
		177	our $INVR_HB;
		178
		179	#############################################################################
		180
		181	sub status {
		182	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
		183	}
		184
		185	sub debug {
		186	$DEBUG_STATUS->set_text ($_[0]);
		187	}
		188
		189	sub message {
		190	$MESSAGE_WINDOW->message (@_);
		191	}
		192
		193	#############################################################################
		194	#TODO: maybe move into own audio module...
		195
164	our $SDL_MIXER;	196	our $SDL_MIXER;
		197
165	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";	198	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166	our @MUSIC_WANT;	199	our $MUSIC_WANT; # arryref of ambient music we want to play
		200	our @MUSIC_HAVE; # ambient music we have on disk
167	our $MUSIC_START;	201	our $MUSIC_START;
		202	our @MUSIC_JINGLE; # which jingles to play next
168	our $MUSIC_PLAYING_DATA;	203	our $MUSIC_PLAYING_DATA;
169	our $MUSIC_PLAYING_META;	204	our $MUSIC_PLAYING_META;
170	our $MUSIC_PLAYER;	205	our $MUSIC_PLAYER;
171	our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before	206	our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
172	our @SOUNDS; # event => file mapping	207
173	our %AUDIO_CHUNKS; # audio files	208	our %AUDIO_CHUNK; # audio "files"
		209	our %AUDIO_PLAY; # which audio faces should be played
174		210
175	our $ALT_ENTER_MESSAGE;	211	sub audio_channel_finished {
176	our $STATUSBOX;	212	my ($channel) = @_;
177	our $DEBUG_STATUS;
178		213
179	our $INV;	214	# warn "channel $channel finished\n";#d#
180	our $INVR;
181	our $INV_RIGHT_HB;
182
183	our $PICKUP_CFG;
184
185	sub status {
186	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
187	}	215	}
188		216
189	sub debug {	217	sub audio_sound_push($) {
190	$DEBUG_STATUS->set_text ($_[0]);
191	}
192
193	sub message {
194	my ($para) = @_;	218	my ($face) = @_;
195	$MESSAGE_WINDOW->message ($para);	219
		220	$CFG->{effects_enable}
		221	or return;
		222
		223	$AUDIO_PLAY{$face}
		224	or return;
		225
		226	if (my $chunk = $AUDIO_CHUNK{$face}) {
		227	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) \|\| []}) {
		228	my (undef, $dx, $dy, $vol) = @$_;
		229
		230	my $channel = CFPlus::Channel::find;
		231	$channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
		232	$channel->set_position_r ($dx, $dy, 20);
		233	$chunk->play ($channel);
		234	}
		235	} else {
		236	# sound_meta not set means data is in flight either way
		237	my $meta = $CONN->{face}[$face]
		238	or return;
		239
		240	$meta->{data}
		241	or return;
		242
		243	# if its a jingle, play it as ambient music
		244	if ($meta->{data}{jingle}) {
		245	if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
		246	push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
		247	&audio_music_push ($face);
		248	}
		249	} else {
		250	# fetch from database
		251	CFPlus::DB::get res_data => $meta->{name}, sub {
		252	my $rwops = new CFPlus::RW $_[0];
		253	my $chunk = new CFPlus::MixChunk $rwops
		254	or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
		255	$chunk->volume (($meta->{data}{volume} \|\| 1) * 128);
		256	$AUDIO_CHUNK{$face} = $chunk;
		257
		258	audio_sound_push ($face);
		259	};
		260	}
		261	}
196	}	262	}
		263
		264	sub audio_sound_play {
		265	my ($face, $dx, $dy, $vol) = @_;
		266
		267	$SDL_MIXER
		268	or return;
		269	$CFG->{effects_enable}
		270	or return;
		271
		272	my $queue = $AUDIO_PLAY{$face} \|\|= [];
		273	push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
		274	audio_sound_push $face
		275	unless @$queue > 1;
		276	}
		277
		278	sub audio_music_set_meta {
		279	my ($meta) = @_;
		280
		281	$MUSIC_PLAYING_META = $meta;
		282	$MUSIC_PLAYING_WIDGET->set_markup (
		283	"<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
		284	. "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
		285	. "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
		286	. "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
		287	);
		288	}
		289
		290	sub audio_music_update_volume {
		291	return unless $MUSIC_PLAYING_META;
		292	my $volume = $MUSIC_PLAYING_META->{data}{volume} \|\| 1;
		293	my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
		294	CFPlus::MixMusic::volume $base * $volume * 128;
		295	}
		296
		297	sub audio_music_start {
		298	my $meta = $MUSIC_PLAYING_META;
		299
		300	CFPlus::DB::get res_data => $meta->{name}, sub {
		301	return unless $SDL_MIXER;
		302
		303	# music might have changed...
		304	$meta eq $MUSIC_PLAYING_META
		305	or return &audio_music_start ();
		306
		307	audio_music_update_volume;
		308
		309	$MUSIC_PLAYING_DATA = \$_[0];
		310
		311	my $rwops = $meta->{path}
		312	? new_from_file CFPlus::RW $meta->{path}
		313	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
		314
		315	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
		316	or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
		317
		318	my $NOW = time;
		319
		320	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
		321	my $pos = $MUSIC_PLAYING_META->{stop_pos};
		322	$MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
		323	$MUSIC_START = time - $pos;
		324	} else {
		325	$MUSIC_PLAYER->play (0);
		326	$MUSIC_START = time;
		327	}
		328
		329	delete $meta->{stop_time};
		330	delete $meta->{stop_pos};
		331	}
		332	}
		333
		334	sub audio_music_push {
		335	return unless $SDL_MIXER;
		336
		337	my $fade_out;
		338
		339	if (@MUSIC_JINGLE) {
		340	@MUSIC_HAVE = $MUSIC_JINGLE[0];
		341	$fade_out = 333;
		342	} else {
		343	return unless $CFG->{bgm_enable};
		344
		345	my @have =
		346	grep $_ && $_->{data},
		347	map $CONN->{face}[$_],
		348	@$MUSIC_WANT;
		349
		350	# randomize music a bit so that the order is not always the same
		351	$_->{stop_time} \|\|= rand for @have;
		352
		353	@MUSIC_HAVE = @have
		354	if @have;
		355
		356	# default MUSIC_HAVE == MUSIC_DEFAULT
		357	@MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
		358	$fade_out = 700;
		359	}
		360
		361	# if the currently playing song is acceptable, let it continue
		362	return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
		363
		364	my $NOW = time;
		365
		366	if ($MUSIC_PLAYING_META) {
		367	$MUSIC_PLAYING_META->{stop_time} = $NOW;
		368	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
		369	CFPlus::MixMusic::fade_out $fade_out;
		370	} else {
		371	# sort by stop time, oldest first
		372	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
		373
		374	# if the most recently-played piece played very recently,
		375	# resume it, else choose the oldest piece for rotation.
		376	audio_music_set_meta
		377	$MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
		378	? $MUSIC_HAVE[-1]
		379	: $MUSIC_HAVE[0];
		380
		381	audio_music_start;
		382	}
		383	}
		384
		385	sub audio_music_set_ambient {
		386	my ($songs) = @_;
		387
		388	$MUSIC_WANT = $songs;
		389	audio_music_push;
		390	}
		391
		392	sub audio_music_finished {
		393	if ($MUSIC_PLAYING_META) {
		394	$MUSIC_PLAYING_META->{stop_time} = time;
		395	}
		396
		397	# we compress multiple jingles of the same type
		398	shift @MUSIC_JINGLE
		399	while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
		400
		401	$MUSIC_PLAYING_WIDGET->clear;
		402
		403	undef $MUSIC_PLAYER;
		404	undef $MUSIC_PLAYING_META;
		405	undef $MUSIC_PLAYING_DATA;
		406
		407	audio_music_push;
		408	}
		409
		410	sub audio_init {
		411	if ($CFG->{audio_enable}) {
		412	$ENV{MIX_EFFECTSMAXSPEED} = 1;
		413	$SDL_MIXER = !CFPlus::Mix_OpenAudio
		414	$CFG->{audio_hw_frequency},
		415	CFPlus::MIX_DEFAULT_FORMAT,
		416	$CFG->{audio_hw_channels},
		417	$CFG->{audio_hw_chunksize};
		418
		419	if ($SDL_MIXER) {
		420	CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};
		421
		422	audio_music_finished;
		423	} else {
		424	status "Unable to open sound device: there will be no sound";
		425	}
		426	} else {
		427	undef $SDL_MIXER;
		428	}
		429
		430	sub audio_tab_update;
		431	audio_tab_update;
		432	}
		433
		434	sub audio_shutdown {
		435	undef $MUSIC_PLAYER;
		436	undef $MUSIC_PLAYING_META;
		437	undef $MUSIC_PLAYING_DATA;
		438
		439	$MUSIC_WANT = [];
		440	@MUSIC_JINGLE = ();
		441	%AUDIO_PLAY = ();
		442	%AUDIO_CHUNK = ();
		443
		444	CFPlus::Mix_CloseAudio if $SDL_MIXER;
		445	undef $SDL_MIXER;
		446	}
		447
		448	#############################################################################
197		449
198	sub destroy_query_dialog {	450	sub destroy_query_dialog {
199	(delete $_[0]{query_dialog})->destroy	451	(delete $_[0]{query_dialog})->destroy
200	if $_[0]{query_dialog};	452	if $_[0]{query_dialog};
201	}	453	}
…		…
481	$SETUP_DIALOG->show;	733	$SETUP_DIALOG->show;
482	$PL_WINDOW->hide;	734	$PL_WINDOW->hide;
483	$SPELL_LIST->clear_spells;	735	$SPELL_LIST->clear_spells;
484	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);	736	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
485		737
486	&audio_music_set ([]);	738	&audio_music_set_ambient ([]);
487		739
488	return unless $CONN;	740	return unless $CONN;
489		741
490	status "connection closed";	742	status "connection closed";
491		743
…		…
533	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");	785	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
534	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox	786	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
535	state => $CFG->{fullscreen},	787	state => $CFG->{fullscreen},
536	tooltip => "Bring the client into fullscreen mode.",	788	tooltip => "Bring the client into fullscreen mode.",
537	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	789	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
		790	);
		791
		792	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
		793	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		794	state => $CFG->{force_opengl11},
		795	tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
		796	. "higher memory usage and slower performance. It will, however, help tremendously on "
		797	. "cards that claim to support a feature but fall back to software rendering. "
		798	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
		799	. "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
		800	. "experience extremely low framerates and your card should do better, try this option.</b>",
		801	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
		802	);
		803
		804	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
		805	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		806	state => $CFG->{texture_compression},
		807	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
		808	. "will save a lot of memory and increase performance. The compression algorithm "
		809	. "can differ form card to card, so your mileage may vary. This setting is ignored in "
		810	. "forced OpenGL 1.1 mode.",
		811	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
538	);	812	);
539		813
540	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	814	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
541	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	815	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
542	state => $CFG->{fast},	816	state => $CFG->{fast},
…		…
570		844
571	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");	845	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
572	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	846	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
573	state => $CFG->{map_smoothing},	847	state => $CFG->{map_smoothing},
574	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "	848	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
575	. "This increases load on the graphics subsystem and works only with 2.x servers. "	849	. "This increases load on the graphics subsystem and works only with TRT servers. "
576	. "Changes take effect at next connection only.",	850	. "Changes take effect at next login only.",
577	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }	851	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
578	);	852	);
579		853
580	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");	854	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
581	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	855	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
…		…
592	);	866	);
593		867
594	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");	868	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
595	$table->add_at (1, $row++, new CFPlus::UI::Slider	869	$table->add_at (1, $row++, new CFPlus::UI::Slider
596	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	870	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
597	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	871	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
		872	. "but you still need to press apply to correctly re-layout the widget.",
598	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	873	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
599	);	874	);
600		875
601	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	876	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
602	$table->add_at (1, $row++, new CFPlus::UI::Slider	877	$table->add_at (1, $row++, new CFPlus::UI::Slider
…		…
621	);	896	);
622		897
623	$vbox	898	$vbox
624	}	899	}
625		900
		901	our $AUDIO_HW_CHUNKSIZE;
		902	our $AUDIO_INFO;
		903
		904	sub audio_tab_update {
		905	my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;
		906
		907	$AUDIO_HW_CHUNKSIZE->set_options ([
		908	[0, "default", "system default"],
		909	map {
		910	my $ms = sprintf "%dms", 1000 * $_ / $CFG->{audio_hw_frequency};
		911	[$_, $ms, "$ms ($_ samples)"],
		912	} 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
		913	]);
		914
		915	my $text = !$freq
		916	? "audio is off"
		917	: "Frequency (Hz): $freq\n"
		918	. "Channels: $chans";
		919
		920	$AUDIO_INFO->set_text ($text);
		921	}
		922
626	sub audio_setup {	923	sub audio_setup {
627	my $vbox = new CFPlus::UI::VBox;	924	my $vbox = new CFPlus::UI::VBox;
628		925
629	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	926	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
630		927
631	my $row = 0;	928	my $row = 0;
632		929
633	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");	930	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
634	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	931	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
635	state => $CFG->{audio_enable},	932	state => $CFG->{audio_enable},
636	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",	933	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
637	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	934	on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
638	);	935	);
		936
639	# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");	937	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
640	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	938	$table->add_at (1, $row, new CFPlus::UI::CheckBox
		939	expand => 1, state => $CFG->{effects_enable},
		940	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
		941	on_changed => sub {
641	# $CFG->{effects_volume} = $_[1];	942	$CFG->{effects_enable} = $_[1];
642	# });	943	$CONN->update_fx_want if $CONN;
		944	1
		945	}
		946	);
		947	$table->add_at (2, $row++, new CFPlus::UI::Slider
		948	expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
		949	tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
		950	. "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
		951	on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
		952	);
		953
643	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");	954	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
644	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);	955	$table->add_at (1, $row, new CFPlus::UI::CheckBox
645	$hbox->add (new CFPlus::UI::CheckBox
646	expand => 1, state => $CFG->{bgm_enable},	956	expand => 1, state => $CFG->{bgm_enable},
647	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	957	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
648	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	958	on_changed => sub {
		959	$CFG->{bgm_enable} = $_[1];
		960	$CONN->update_fx_want if $CONN;
		961	audio_music_push;
		962	1
		963	}
649	);	964	);
650	$hbox->add (new CFPlus::UI::Slider	965	$table->add_at (2, $row++, new CFPlus::UI::Slider
651	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	966	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
652	tooltip => "The volume of the background music. Changes are instant.",	967	tooltip => "The volume of the background music. Changes are instant.",
653	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }	968	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
		969	);
		970
		971	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
		972	$table->add_at (1, $row++, new CFPlus::UI::Selector
		973	c_colspan => 2, expand => 1,
		974	value => $CFG->{audio_hw_frequency},
		975	options => [
		976	[11025, "11 kHz" , "11kHz (low quality)"],
		977	[22050, "22 kHz" , "22kHz (reduced quality)"],
		978	[44100, "44.1 kHz", "44.1kHz (cd quality)"],
		979	[48000, "48 kHz" , "48kHz (studio quality)"],
		980	],
		981	tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
		982	on_changed => sub {
		983	$CFG->{audio_hw_frequency} = $_[1];
		984	audio_tab_update;
		985	1
		986	}
		987	);
		988
		989	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
		990	$table->add_at (1, $row++, new CFPlus::UI::Selector
		991	c_colspan => 2, expand => 1,
		992	value => $CFG->{audio_hw_channels},
		993	options => [
		994	[1, "Mono" , "Mono (single channel, low quality)"],
		995	[2, "Stereo" , "Stereo (dual channe, standard quality)"],
		996	[4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],
		997	[6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
		998	],
		999	tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
		1000	on_changed => sub {
		1001	$CFG->{audio_hw_channels} = $_[1];
		1002	audio_tab_update;
		1003	1
		1004	}
		1005	);
		1006
		1007	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
		1008	$table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
		1009	c_colspan => 2, expand => 1,
		1010	value => $CFG->{audio_hw_chunksize},
		1011	tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
		1012	. "is stuttering, increase this value. Values of 50-100ms are optimal.",
		1013	on_changed => sub {
		1014	$CFG->{audio_hw_chunksize} = $_[1]
		1015	if $_[1];
		1016	audio_tab_update;
		1017	1
		1018	}
		1019	);
		1020
		1021	# should really be a slider
		1022	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
		1023	$table->add_at (1, $row++, new CFPlus::UI::ValSlider
		1024	c_colspan => 2, expand => 1,
		1025	tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
		1026	range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
		1027	template => ">= 99",
		1028	on_changed => sub {
		1029	my ($slider, $value) = @_;
		1030
		1031	$CFG->{audio_mix_channels} = $value
		1032	if $value;
		1033	1;
		1034	}
654	);	1035	);
655		1036
656	$table->add_at (1, $row++, new CFPlus::UI::Button	1037	$table->add_at (1, $row++, new CFPlus::UI::Button
657	expand => 1, align => 0, text => "Apply",	1038	c_colspan => 2, expand => 1, align => 0, text => "Apply",
658	tooltip => "Apply the audio settings",	1039	tooltip => "Apply the audio settings",
659	on_activate => sub {	1040	on_activate => sub {
660	audio_shutdown ();	1041	audio_shutdown ();
661	audio_init ();	1042	audio_init ();
662	0	1043	0
663	}	1044	}
664	);	1045	);
		1046
		1047	$vbox->add (new CFPlus::UI::FancyFrame
		1048	expand => 1,
		1049	label => "Audio Info",
		1050	child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
		1051	);
		1052
		1053	audio_tab_update;
665		1054
666	$vbox	1055	$vbox
667	}	1056	}
668		1057
669	sub set_gauge_window_fontsize {	1058	sub set_gauge_window_fontsize {
…		…
704	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");	1093	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
705	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");	1094	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
706	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");	1095	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
707	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");	1096	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
708		1097
709	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");	1098	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
		1099	$vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
		1100	$vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
710	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");	1101	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
711		1102
712	$GAUGES = {	1103	$GAUGES = {
		1104	exp => $exp, prg => $prg, sklprg => $sklprg,
713	exp => $exp, win => $win, range => $rng,	1105	win => $win, range => $rng,
714	food => $fg, mana => $mg, hp => $hg, grace => $gg	1106	hp => $hg, mana => $mg, grace => $gg, food => $fg,
715	};	1107	};
716		1108
717	&set_gauge_window_fontsize;	1109	&set_gauge_window_fontsize;
718		1110
719	$win	1111	$win
…		…
733	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );	1125	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
734		1126
735	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#	1127	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
736		1128
737	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);	1129	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
738	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);	1130	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
739	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);	1131	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
740	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);	1132	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
741	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);	1133	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
742	$t->add_at (1,1, new CFPlus::UI::Label text => "e");	1134	$t->add_at (1,1, new CFPlus::UI::Label text => "e");
743		1135
744	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);	1136	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
745		1137
746	$c->add_items ({	1138	$c->add_items ({
…		…
920	$r	1312	$r
921	}	1313	}
922		1314
923	sub skill_window {	1315	sub skill_window {
924	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);	1316	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
		1317
925	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);	1318	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
		1319
926	$sw	1320	$sw
927	}	1321	}
928		1322
929	sub formsep($) {	1323	sub formsep($) {
930	scalar reverse join ",", unpack "(A3)", reverse $_[0] 1	1324	scalar reverse join ",", unpack "(A3)", reverse $_[0] 1
…		…
1071	text => $CFG->{profile}{default}{host},	1465	text => $CFG->{profile}{default}{host},
1072	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	1466	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1073	on_changed => sub {	1467	on_changed => sub {
1074	my ($self, $value) = @_;	1468	my ($self, $value) = @_;
1075	$CFG->{profile}{default}{host} = $value;	1469	$CFG->{profile}{default}{host} = $value;
1076	0	1470	1
1077	}	1471	}
1078	);	1472	);
1079		1473
1080	$vbox->add (new CFPlus::UI::Button	1474	$vbox->add (new CFPlus::UI::Button
1081	expand => 1,	1475	expand => 1,
1082	text => "Server List",	1476	text => "Server List",
1083	other => $METASERVER,	1477	other => $METASERVER,
1084	tooltip => "Show a list of available crossfire servers",	1478	tooltip => "Show a list of available crossfire servers",
1085	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1479	on_activate => sub { $METASERVER->toggle_visibility; 0 },
1086	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1480	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1087	);	1481	);
1088	}	1482	}
1089		1483
1090	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");	1484	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1091	$table->add_at (1, 4, new CFPlus::UI::Entry	1485	$table->add_at (1, 4, new CFPlus::UI::Entry
1092	text => $CFG->{profile}{default}{user},	1486	text => $CFG->{profile}{default}{user},
1093	tooltip => "The name of your character on the server",	1487	tooltip => "The name of your character on the server",
1094	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1488	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1095	);	1489	);
1096		1490
1097	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");	1491	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1098	$table->add_at (1, 5, new CFPlus::UI::Entry	1492	$table->add_at (1, 5, new CFPlus::UI::Entry
1099	text => $CFG->{profile}{default}{password},	1493	text => $CFG->{profile}{default}{password},
1100	hidden => 1,	1494	hidden => 1,
1101	tooltip => "The password for your character",	1495	tooltip => "The password for your character",
1102	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1496	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1103	);	1497	);
1104		1498
1105	$table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");	1499	$table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1106	$table->add_at (1, 7, new CFPlus::UI::Slider	1500	$table->add_at (1, 7, new CFPlus::UI::Slider
1107	force_w => 100,	1501	force_w => 100,
1108	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1502	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1109	tooltip => "This is the size of the portion of the map update the server sends you. "	1503	tooltip => "This is the size of the portion of the map update the server sends you. "
1110	. "If you set this to a high value you will be able to see further, "	1504	. "If you set this to a high value you will be able to see further, "
1111	. "but you also increase bandwidth requirements and latency. "	1505	. "but you also increase bandwidth requirements and latency. "
1112	. "This option is only used once at log-in.",	1506	. "This option is only used once at log-in.",
1113	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1507	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1114	);	1508	);
1115		1509
1116	$table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");	1510	$table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1117	$table->add_at (1, 8, new CFPlus::UI::Entry	1511	$table->add_at (1, 8, new CFPlus::UI::Entry
1118	text => $CFG->{output_rate},	1512	text => $CFG->{output_rate},
1119	tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "	1513	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1120	. "when sending images, to ensure interactiveness. When 0 or unset, the server "	1514	. "when sending data. When 0 or unset, the server "
1121	. "default will be used, which is usually around 100kb/s.",	1515	. "default will be used, which is usually around 100kb/s. Most servers will "
		1516	. "dynamically find an optimal rate, so adjust this only when necessary.",
1122	on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },	1517	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1123	);	1518	);
1124		1519
1125	$table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");	1520	$table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1126	$table->add_at (1, 9, new CFPlus::UI::Entry	1521	$table->add_at (1, 9, new CFPlus::UI::Entry
1127	text => $CFG->{output_count},	1522	text => $CFG->{output_count},
1128	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1523	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1129	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1524	on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1130	);	1525	);
1131		1526
1132	$table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");	1527	$table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1133	$table->add_at (1, 10, new CFPlus::UI::Entry	1528	$table->add_at (1, 10, new CFPlus::UI::Entry
1134	text => $CFG->{output_sync},	1529	text => $CFG->{output_sync},
1135	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1530	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1136	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1531	on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1137	);	1532	);
1138		1533
1139	$table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button	1534	$table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1140	expand => 1,	1535	expand => 1,
1141	align => 0,	1536	align => 0,
1142	text => "Login",	1537	text => "Login",
1143	on_activate => sub {	1538	on_activate => sub {
1144	$CONN ? stop_game	1539	$CONN ? stop_game
1145	: start_game;	1540	: start_game;
1146	0	1541	1
1147	},	1542	},
1148	);	1543	);
1149		1544
1150	$vbox->add (new CFPlus::UI::FancyFrame	1545	$vbox->add (new CFPlus::UI::FancyFrame
1151	label => "Server Info",	1546	label => "Server Info",
…		…
1341	$sw1->add ($INV = new CFPlus::UI::Inventory);	1736	$sw1->add ($INV = new CFPlus::UI::Inventory);
1342	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});	1737	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1343		1738
1344	$hb->add (my $vb2 = new CFPlus::UI::VBox);	1739	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1345		1740
1346	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);	1741	$vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1347		1742
1348	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	1743	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1349	$sw2->add ($INVR = new CFPlus::UI::Inventory);	1744	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1350		1745
1351	# XXX: Call after $INVR = ... because set_opencont sets the items	1746	# XXX: Call after $INVR = ... because set_opencont sets the items
1352	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");	1747	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1353		1748
1354	$hb	1749	$hb
		1750	}
		1751
		1752	sub media_window {
		1753	my $vb = new CFPlus::UI::VBox;
		1754
		1755	$vb->add (new CFPlus::UI::FancyFrame
		1756	label => "Currently playing music",
		1757	child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
		1758	child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
		1759	);
		1760
		1761	$vb->add (new CFPlus::UI::FancyFrame
		1762	label => "Other media used in this session",
		1763	expand => 1,
		1764	child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
		1765	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
		1766	);
		1767
		1768	$vb
		1769	}
		1770
		1771	sub add_license {
		1772	my ($meta) = @_;
		1773
		1774	$meta = $meta->{data}
		1775	or return;
		1776
		1777	$meta->{license} \|\| $meta->{author} \|\| $meta->{source}
		1778	or return;
		1779
		1780	$LICENSE_WIDGET->add_paragraph ({
		1781	fg => [1, 1, 1, 1],
		1782	markup => "<small>"
		1783	. "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
		1784	. "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
		1785	. "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
		1786	. "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
		1787	. "</small>",
		1788	});
		1789	$LICENSE_WIDGET->scroll_to_bottom;
1355	}	1790	}
1356		1791
1357	sub toggle_player_page {	1792	sub toggle_player_page {
1358	my ($widget) = @_;	1793	my ($widget) = @_;
1359		1794
…		…
1398	$ntb->add_tab (	1833	$ntb->add_tab (
1399	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1834	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1400	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1835	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1401	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1836	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1402	);	1837	);
1403	$ntb->add_tab (Pickup => autopickup_setup,	1838	$ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1404	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1839	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
		1840
		1841	$ntb->add_tab (Media => media_window,
		1842	"License, Author and Source info for media sent by the server.");
1405		1843
1406	$ntb->set_current_page ($INVENTORY_PAGE);	1844	$ntb->set_current_page ($INVENTORY_PAGE);
1407		1845
1408	$plwin->add ($ntb);	1846	$plwin->add ($ntb);
1409	$plwin	1847	$plwin
…		…
1563	on_activate => sub { $QUIT_DIALOG->hide; 0 },	2001	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1564	);	2002	);
1565	$hb->add (new CFPlus::UI::Button	2003	$hb->add (new CFPlus::UI::Button
1566	text => "Quit anyway",	2004	text => "Quit anyway",
1567	expand => 1,	2005	expand => 1,
1568	on_activate => sub { exit },	2006	on_activate => sub { Event::unloop_all },
1569	);	2007	);
1570	}	2008	}
1571		2009
1572	$QUIT_DIALOG->show;	2010	$QUIT_DIALOG->show;
1573	$QUIT_DIALOG->grab_focus;	2011	$QUIT_DIALOG->grab_focus;
…		…
1646		2084
1647	$SDL_ACTIVE = 1;	2085	$SDL_ACTIVE = 1;
1648	$LAST_REFRESH = time - 0.01;	2086	$LAST_REFRESH = time - 0.01;
1649		2087
1650	CFPlus::OpenGL::init;	2088	CFPlus::OpenGL::init;
		2089	CFPlus::Macro::init;
1651		2090
1652	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	2091	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1653		2092
1654	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	2093	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1655		2094
1656	#############################################################################	2095	#############################################################################
1657		2096
1658	if ($DEBUG_STATUS) {	2097	if ($DEBUG_STATUS) {
1659	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	2098	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1660	} else {	2099	} else {
1661	# create the widgets	2100	# create/configure the widgets
		2101
		2102	$CFPlus::UI::ROOT->connect (key_down => sub {
		2103	my (undef, $ev) = @_;
		2104
		2105	if (my @macros = CFPlus::Macro::find $ev) {
		2106	CFPlus::Macro::execute $_ for @macros;
		2107
		2108	return 1;
		2109	}
		2110
		2111	0
		2112	});
1662		2113
1663	$DEBUG_STATUS = new CFPlus::UI::Label	2114	$DEBUG_STATUS = new CFPlus::UI::Label
1664	padding => 0,	2115	padding => 0,
1665	z => 100,	2116	z => 100,
1666	force_x => "max",	2117	force_x => "max",
…		…
1696	$MESSAGE_WINDOW->activate_console ($preset)	2147	$MESSAGE_WINDOW->activate_console ($preset)
1697	if $MESSAGE_WINDOW;	2148	if $MESSAGE_WINDOW;
1698	});	2149	});
1699	$MAPWIDGET->show;	2150	$MAPWIDGET->show;
1700	$MAPWIDGET->grab_focus;	2151	$MAPWIDGET->grab_focus;
		2152
		2153	$COMPLETER = new CFPlus::MapWidget::Command::
		2154	command => { },
		2155	tooltip => "#completer_help",
		2156	;
1701		2157
1702	$SETUP_DIALOG = new CFPlus::UI::Toplevel	2158	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1703	title => "Setup",	2159	title => "Setup",
1704	name => "setup_dialog",	2160	name => "setup_dialog",
1705	x => 'center',	2161	x => 'center',
…		…
1767	tooltip => "Terminates the program",	2223	tooltip => "Terminates the program",
1768	on_activate => sub {	2224	on_activate => sub {
1769	if ($CONN) {	2225	if ($CONN) {
1770	open_quit_dialog;	2226	open_quit_dialog;
1771	} else {	2227	} else {
1772	exit;	2228	Event::unloop_all;
1773	}	2229	}
1774	0	2230	0
1775	},	2231	},
1776	);	2232	);
1777		2233
1778	$BUTTONBAR->show;	2234	$BUTTONBAR->show;
1779	$SETUP_DIALOG->show;	2235	$SETUP_DIALOG->show;
		2236	$MESSAGE_WINDOW->show;
1780	}	2237	}
1781		2238
1782	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	2239	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1783	}	2240	}
1784		2241
…		…
1786	CFPlus::OpenGL::shutdown;	2243	CFPlus::OpenGL::shutdown;
1787		2244
1788	undef $SDL_ACTIVE;	2245	undef $SDL_ACTIVE;
1789	}	2246	}
1790		2247
1791	sub audio_channel_finished {
1792	my ($channel) = @_;
1793
1794	# warn "channel $channel finished\n";#d#
1795	}
1796
1797	our %AUDIO_PLAY;
1798	our %AUDIO_CHUNK;
1799
1800	sub audio_sound_push($) {
1801	my ($face) = @_;
1802
1803	if (my $chunk = $AUDIO_CHUNK{$face}) {
1804	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) \|\| []}) {
1805	my (undef, $dx, $dy, $vol) = @$_;
1806
1807	my $channel = $chunk->play
1808	or return;
1809
1810	$channel->volume (128 + $vol);
1811	$dx = $dx / 10 * 255;
1812	$channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1813	# my $angle = $dx ? : $dx < 0 ?
1814	# my $distance = -$vol;
1815	# $channel->set_position ($angle, $distance);
1816	}
1817	} else {
1818	# sound_meta not set means data is in flight either way
1819	my $meta = $CONN->{sound_meta}{$face}
1820	or return;
1821
1822	# fetch from database
1823	CFPlus::DB::get res_data => $meta->{name}, sub {
1824	my $vol = $meta->{meta}{volume} \|\| 100;
1825	my $rwops = new CFPlus::RW $_[0];
1826	my $chunk = new CFPlus::MixChunk $rwops;
1827	$chunk->volume ($vol * 128 / 100);
1828	$AUDIO_CHUNK{$face} = $chunk;
1829
1830	audio_sound_push ($face);
1831	};
1832	}
1833	}
1834
1835	sub audio_sound_play {
1836	my ($face, $dx, $dy, $vol) = @_;
1837
1838	$SDL_MIXER
1839	or return;
1840
1841	my $queue = $AUDIO_PLAY{$face} \|\|= [];
1842	push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1843	audio_sound_push $face
1844	unless @$queue > 1;
1845	}
1846
1847	sub audio_music_set {
1848	my ($songs) = @_;
1849
1850	my @want =
1851	grep $_,
1852	map $CONN->{music_meta}{$_},
1853	@$songs;
1854
1855	if (@want) {
1856	@MUSIC_WANT = @want;
1857	&audio_music_changed ();
1858	}
1859	}
1860
1861	sub audio_music_start {
1862	my $meta = $MUSIC_PLAYING_META;
1863
1864	CFPlus::DB::get res_data => $meta->{name}, sub {
1865	return unless $SDL_MIXER;
1866
1867	# music might have changed...
1868	$meta eq $MUSIC_PLAYING_META
1869	or return &audio_music_start ();
1870
1871	$MUSIC_PLAYING_DATA = \$_[0];
1872
1873	my $rwops = $meta->{path}
1874	? new_from_file CFPlus::RW $meta->{path}
1875	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
1876
1877	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1878	or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1879
1880	my $NOW = time;
1881
1882	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1883	my $pos = $MUSIC_PLAYING_META->{stop_pos};
1884	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1885	$MUSIC_START = time - $pos;
1886	} else {
1887	$MUSIC_PLAYER->play (0);
1888	$MUSIC_START = time;
1889	}
1890
1891	delete $MUSIC_PLAYING_META->{stop_time};
1892	delete $MUSIC_PLAYING_META->{stop_pos};
1893	}
1894	}
1895
1896	sub audio_music_changed {
1897	return unless $CFG->{bgm_enable};
1898	return unless $SDL_MIXER;
1899
1900	# default MUSIC_WANT == MUSIC_DEFAULT
1901	@MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1902
1903	# if the currently playing song is acceptable, let it continue
1904	return if $MUSIC_PLAYING_META
1905	&& grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
1906
1907	my $NOW = time;
1908
1909	if ($MUSIC_PLAYING_META) {
1910	$MUSIC_PLAYING_META->{stop_time} = $NOW;
1911	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
1912	CFPlus::MixMusic::fade_out 1000;
1913	} else {
1914	# sort by stop time, oldest first
1915	@MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1916
1917	# if the most recently-played piece played very recently,
1918	# resume it, else choose the oldest piece for rotation.
1919	$MUSIC_PLAYING_META =
1920	$MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1921	? $MUSIC_WANT[-1]
1922	: $MUSIC_WANT[0];
1923
1924	audio_music_start;
1925	}
1926	}
1927
1928	sub audio_music_finished {
1929	undef $MUSIC_PLAYER;
1930	undef $MUSIC_PLAYING_META;
1931	undef $MUSIC_PLAYING_DATA;
1932
1933	audio_music_changed;
1934	}
1935
1936	sub audio_init {
1937	if ($CFG->{audio_enable}) {
1938	$ENV{MIX_EFFECTSMAXSPEED} = 1;
1939	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1940
1941	unless ($SDL_MIXER) {
1942	status "Unable to open sound device: there will be no sound";
1943	return;
1944	}
1945
1946	CFPlus::Mix_AllocateChannels 16;
1947	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1948
1949	audio_music_finished;
1950	} else {
1951	undef $SDL_MIXER;
1952	}
1953	}
1954
1955	sub audio_shutdown {
1956	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1957	undef $SDL_MIXER;
1958	@SOUNDS = ();
1959	%AUDIO_CHUNKS = ();
1960	}
1961
1962	my %animate_object;	2248	my %animate_object;
1963	my $animate_timer;	2249	my $animate_timer;
1964		2250
1965	my $fps = 9;	2251	my $fps = 9;
1966		2252
1967	my %demo;#d#
1968
1969	sub force_refresh {	2253	sub force_refresh {
		2254	if ($ENV{CFPLUS_DEBUG} & 4) {
1970	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	2255	$fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.02;
1971	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2256	debug sprintf "%3.2f", $fps;
		2257	}
1972		2258
1973	$CFPlus::UI::ROOT->draw;	2259	$CFPlus::UI::ROOT->draw;
1974		2260	CFPlus::SDL_GL_SwapBuffers;
1975	$WANT_REFRESH = 0;
1976	$CAN_REFRESH = 0;
1977	$LAST_REFRESH = $NOW;	2261	$LAST_REFRESH = $NOW;
1978		2262	$WANT_REFRESH->stop;
1979	CFPlus::SDL_GL_SwapBuffers;
1980	}	2263	}
1981		2264
		2265	$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
		2266
1982	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2267	my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1983	$NOW = time;	2268	$NOW = time;
1984		2269
1985	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)	2270	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
1986	for CFPlus::poll_events;	2271	for CFPlus::poll_events;
1987		2272
1988	if (%animate_object) {	2273	if (%animate_object) {
1989	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2274	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1990	++$WANT_REFRESH;	2275	$WANT_REFRESH->start;
1991	}
1992
1993	if ($WANT_REFRESH) {
1994	force_refresh;
1995	} else {
1996	$CAN_REFRESH = 1;
1997	}	2276	}
1998	});	2277	});
1999		2278
2000	sub animation_start {	2279	sub animation_start {
2001	my ($widget) = @_;	2280	my ($widget) = @_;
…		…
2007	delete $animate_object{$widget};	2286	delete $animate_object{$widget};
2008	}	2287	}
2009		2288
2010	%SDL_CB = (	2289	%SDL_CB = (
2011	CFPlus::SDL_QUIT => sub {	2290	CFPlus::SDL_QUIT => sub {
2012	exit;	2291	Event::unloop_all;
2013	},	2292	},
2014	CFPlus::SDL_VIDEORESIZE => sub {	2293	CFPlus::SDL_VIDEORESIZE => sub {
2015	},	2294	},
2016	CFPlus::SDL_VIDEOEXPOSE => sub {	2295	CFPlus::SDL_VIDEOEXPOSE => sub {
2017	CFPlus::UI::full_refresh;	2296	CFPlus::UI::full_refresh;
…		…
2056	CFPlus::DB::Server::run;	2335	CFPlus::DB::Server::run;
2057		2336
2058	CFPlus::UI::set_layout ($::CFG->{layout});	2337	CFPlus::UI::set_layout ($::CFG->{layout});
2059		2338
2060	my %DEF_CFG = (	2339	my %DEF_CFG = (
2061	sdl_mode => 0,	2340	sdl_mode => 0,
2062	width => 640,
2063	height => 480,
2064	fullscreen => 0,	2341	fullscreen => 0,
2065	fast => 0,	2342	fast => 0,
		2343	force_opengl11 => undef,
		2344	texture_compression => 1,
2066	map_scale => 1,	2345	map_scale => 1,
2067	fow_enable => 1,	2346	fow_enable => 1,
2068	fow_intensity => 0,	2347	fow_intensity => 0,
2069	map_smoothing => 1,	2348	map_smoothing => 1,
2070	gui_fontsize => 1,	2349	gui_fontsize => 1,
2071	log_fontsize => 0.7,	2350	log_fontsize => 0.7,
2072	gauge_fontsize => 1,	2351	gauge_fontsize => 1,
2073	gauge_size => 0.35,	2352	gauge_size => 0.35,
2074	stat_fontsize => 0.7,	2353	stat_fontsize => 0.7,
2075	mapsize => 100,	2354	mapsize => 100,
2076	audio_enable => 1,	2355	audio_enable => 1,
		2356	audio_hw_channels => 2,
		2357	audio_hw_frequency => 22050,
		2358	audio_hw_chunksize => 0,
		2359	audio_mix_channels => 8,
		2360	effects_enable => 1,
		2361	effects_volume => 1,
2077	bgm_enable => 1,	2362	bgm_enable => 1,
2078	bgm_volume => 0.25,	2363	bgm_volume => 0.5,
2079	output_sync => 1,	2364	output_sync => 1,
2080	output_count => 1,	2365	output_count => 1,
2081	output_rate => "",	2366	output_rate => "",
2082	pickup => 0,	2367	pickup => 0,
2083	inv_sort => "mtime",	2368	inv_sort => "mtime",
2084	default => "profile", # default profile	2369	default => "profile", # default profile
2085	show_tips => 1,	2370	show_tips => 1,
2086	logview_max_par => 1000,	2371	logview_max_par => 1000,
2087	);	2372	);
2088		2373
2089	while (my ($k, $v) = each %DEF_CFG) {	2374	while (my ($k, $v) = each %DEF_CFG) {
2090	$CFG->{$k} = $v unless exists $CFG->{$k};	2375	$CFG->{$k} = $v unless exists $CFG->{$k};
2091	}	2376	}
…		…
2148	# }	2433	# }
2149	# my $t2 = Time::HiRes::time;	2434	# my $t2 = Time::HiRes::time;
2150	# warn $t2-$t1;	2435	# warn $t2-$t1;
2151	# }	2436	# }
2152		2437
2153	$startup_done->();
2154
2155	video_init;	2438	video_init;
2156	audio_init;	2439	audio_init;
2157	}	2440	}
2158		2441
2159	show_tip_of_the_day if $CFG->{show_tips};	2442	show_tip_of_the_day if $CFG->{show_tips};
2160		2443
		2444	Event->idle (cb => sub {
		2445	$_[0]->w->cancel;
		2446	$startup_done->();
		2447	});
		2448
2161	Event::loop;	2449	Event::loop;
		2450
		2451	#video_shutdown;
		2452	#audio_shutdown;
2162	#CFPlus::SDL_Quit;	2453	CFPlus::SDL_Quit;
2163	#CFPlus::_exit 0;
2164
2165	END {
2166	CFPlus::SDL_Quit;
2167	CFPlus::DB::Server::stop;	2454	CFPlus::DB::Server::stop;
2168	}
2169		2455
2170	=head1 NAME	2456	=head1 NAME
2171		2457
2172	cfplus - A Crossfire+ and Crossfire game client	2458	cfplus - A Crossfire TRT and Crossfire game client
2173		2459
2174	=head1 SYNOPSIS	2460	=head1 SYNOPSIS
2175		2461
2176	Just run it - no commandline arguments are supported.	2462	Just run it - no commandline arguments are supported.
2177		2463
2178	=head1 USAGE	2464	=head1 USAGE
2179		2465
2180	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used	2466	cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2181	fullscreen and interactively.	2467	be used in fullscreen mode and interactively.
2182		2468
2183	=head1 DEBUGGING	2469	=head1 DEBUGGING
2184		2470
2185		2471
2186	CFPLUS_DEBUG - environment variable	2472	CFPLUS_DEBUG - environment variable

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.191 by root, Sun Jul 29 21:31:48 2007 UTC vs. Revision 1.229 by root, Mon Oct 8 17:01:03 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.191 by root, Sun Jul 29 21:31:48 2007 UTC vs.
Revision 1.229 by root, Mon Oct 8 17:01:03 2007 UTC