ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.142 by root, Mon Mar 12 22:23:09 2007 UTC vs.
Revision 1.223 by root, Tue Aug 28 01:23:47 2007 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	my $startup_done = sub { };	3	my $startup_done = sub { };
		4	our $PANGO = "1.5.0";
4		5
5	# do splash-screen thingy on win32	6	# do splash-screen thingy on win32
6	BEGIN {	7	BEGIN {
7	if (%PAR::LibCache && $^O eq "MSWin32") {	8	if (%PAR::LibCache && $^O eq "MSWin32") {
8	while (my ($filename, $zip) = each %PAR::LibCache) {	9	while (my ($filename, $zip) = each %PAR::LibCache) {
…		…
29	# do things only needed for single-binary version (par)	30	# do things only needed for single-binary version (par)
30	BEGIN {	31	BEGIN {
31	if (%PAR::LibCache) {	32	if (%PAR::LibCache) {
32	@INC = grep ref, @INC; # weed out all paths except pars loader refs	33	@INC = grep ref, @INC; # weed out all paths except pars loader refs
33		34
		35	my $tmp = $ENV{PAR_TEMP};
		36
34	while (my ($filename, $zip) = each %PAR::LibCache) {	37	while (my ($filename, $zip) = each %PAR::LibCache) {
35	for ($zip->memberNames) {	38	for ($zip->memberNames) {
36	next unless /^root\/(.*)/;	39	next unless /^root\/(.*)/;
37	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")	40	$zip->extractMember ($_, "$tmp/$1")
38	unless -e "$ENV{PAR_TEMP}/$1";	41	unless -e "$tmp/$1";
39	}	42	}
40	}	43	}
41		44
42	# TODO: pango-rc file, anybody?	45	if ($^O eq "MSWin32") {
		46	# relocatable
		47	} else {
		48	# 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	or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
		51	local $/;
		52	my $rc = <$fh>;
		53	$rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43		54
44	unshift @INC, $ENV{PAR_TEMP};	55	mkdir "$tmp/pango-modules";
		56	open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
		57	or die "$tmp/pango-modules/pango.modules: $!";
		58	print $fh $rc;
		59
		60	$ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
		61	open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
		62	or die "$ENV{PANGO_RC_FILE}: $!";
		63	print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
		64	}
		65
		66	unshift @INC, $tmp;
45	}	67	}
46	}	68	}
47		69
48	# need to do it again because that pile of garbage called PAR nukes it before main	70	# need to do it again because that pile of garbage called PAR nukes it before main
49	unshift @INC, $ENV{PAR_TEMP}	71	unshift @INC, $ENV{PAR_TEMP}
50	if %PAR::LibCache;	72	if %PAR::LibCache;
51		73
52	use Time::HiRes 'time';	74	use Time::HiRes 'time';
53	use Event;	75	use Event;
		76	use List::Util qw(max min);
54		77
55	use Crossfire;	78	use Crossfire;
56	use Crossfire::Protocol::Constants;	79	use Crossfire::Protocol::Constants;
57		80
58	use Compress::LZF;	81	use Compress::LZF;
59		82
60	use CFPlus;	83	use CFPlus;
61	use CFPlus::OpenGL ();	84	use CFPlus::OpenGL ();
62	use CFPlus::Protocol;	85	use CFPlus::Protocol;
		86	use CFPlus::DB;
63	use CFPlus::UI;	87	use CFPlus::UI;
		88	use CFPlus::UI::Canvas;
64	use CFPlus::UI::Inventory;	89	use CFPlus::UI::Inventory;
65	use CFPlus::UI::SpellList;	90	use CFPlus::UI::SpellList;
		91	use CFPlus::UI::MessageWindow;
66	use CFPlus::Pod;	92	use CFPlus::Pod;
67	use CFPlus::MapWidget;	93	use CFPlus::MapWidget;
68	use CFPlus::Macro;	94	use CFPlus::Macro;
69		95
70	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	96	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
…		…
87	our $CONN;	113	our $CONN;
88	our $PROFILE; # current profile	114	our $PROFILE; # current profile
89	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	115	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
90		116
91	our $WANT_REFRESH;	117	our $WANT_REFRESH;
92	our $CAN_REFRESH;
93		118
94	our @SDL_MODES;	119	our @SDL_MODES;
95	our $WIDTH;	120	our $WIDTH;
96	our $HEIGHT;	121	our $HEIGHT;
97	our $FULLSCREEN;	122	our $FULLSCREEN;
…		…
101	our $FONT_FIXED;	126	our $FONT_FIXED;
102		127
103	our $MAP;	128	our $MAP;
104	our $MAPMAP;	129	our $MAPMAP;
105	our $MAPWIDGET;	130	our $MAPWIDGET;
		131	our $COMPLETER;
106	our $BUTTONBAR;	132	our $BUTTONBAR;
107	our $LOGVIEW;
108	our $CONSOLE;
109	our $METASERVER;	133	our $METASERVER;
110	our $LOGIN_BUTTON;	134	our $LOGIN_BUTTON;
111	our $QUIT_DIALOG;	135	our $QUIT_DIALOG;
112	our $HOST_ENTRY;	136	our $HOST_ENTRY;
113	our $FULLSCREEN_ENABLE;	137	our $FULLSCREEN_ENABLE;
…		…
120	our $SETUP_KEYBOARD;	144	our $SETUP_KEYBOARD;
121		145
122	our $PL_NOTEBOOK;	146	our $PL_NOTEBOOK;
123	our $PL_WINDOW;	147	our $PL_WINDOW;
124		148
		149	our $MUSIC_PLAYING_WIDGET;
		150	our $LICENSE_WIDGET;
		151
		152	our $PICKUP_PAGE;
125	our $INVENTORY_PAGE;	153	our $INVENTORY_PAGE;
126	our $STATS_PAGE;	154	our $STATS_PAGE;
127	our $SKILL_PAGE;	155	our $SKILL_PAGE;
128	our $SPELL_PAGE;	156	our $SPELL_PAGE;
129	our $SPELL_LIST;	157	our $SPELL_LIST;
…		…
135	our $STATWIDS;	163	our $STATWIDS;
136		164
137	our $SDL_ACTIVE;	165	our $SDL_ACTIVE;
138	our %SDL_CB;	166	our %SDL_CB;
139		167
140	our $SDL_MIXER;
141	our @SOUNDS; # event => file mapping
142	our %AUDIO_CHUNKS; # audio files
143
144	our $ALT_ENTER_MESSAGE;	168	our $ALT_ENTER_MESSAGE;
145	our $STATUSBOX;	169	our $STATUSBOX;
146	our $DEBUG_STATUS;	170	our $DEBUG_STATUS;
147		171
148	our $INV;	172	our $INV;
149	our $INVR;	173	our $INVR;
150	our $INV_RIGHT_HB;	174	our $INVR_HB;
151		175
152	our $PICKUP_CFG;	176	#############################################################################
153
154	our $IN_BUILD_MODE;
155	our $BUILD_BUTTON;
156		177
157	sub status {	178	sub status {
158	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	179	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
159	}	180	}
160		181
…		…
162	$DEBUG_STATUS->set_text ($_[0]);	183	$DEBUG_STATUS->set_text ($_[0]);
163	}	184	}
164		185
165	sub message {	186	sub message {
166	my ($para) = @_;	187	my ($para) = @_;
167		188	$MESSAGE_WINDOW->message ($para);
168	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
169
170	$para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
171
172	$LOGVIEW->add_paragraph ($para);
173	$LOGVIEW->scroll_to_bottom;
174	}	189	}
		190
		191	#############################################################################
		192	#TODO: maybe move into own audio module...
		193
		194	our $SDL_MIXER;
		195
		196	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
		197	our $MUSIC_WANT; # arryref of ambient music we want to play
		198	our @MUSIC_HAVE; # ambient music we have on disk
		199	our $MUSIC_START;
		200	our @MUSIC_JINGLE; # which jingles to play next
		201	our $MUSIC_PLAYING_DATA;
		202	our $MUSIC_PLAYING_META;
		203	our $MUSIC_PLAYER;
		204	our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
		205
		206	our %AUDIO_CHUNK; # audio "files"
		207	our %AUDIO_PLAY; # which audio faces should be played
		208
		209	sub audio_channel_finished {
		210	my ($channel) = @_;
		211
		212	# warn "channel $channel finished\n";#d#
		213	}
		214
		215	sub audio_sound_push($) {
		216	my ($face) = @_;
		217
		218	$CFG->{effects_enable}
		219	or return;
		220
		221	$AUDIO_PLAY{$face}
		222	or return;
		223
		224	if (my $chunk = $AUDIO_CHUNK{$face}) {
		225	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
		226	my (undef, $dx, $dy, $vol) = @$_;
		227
		228	my $channel = CFPlus::Channel::find;
		229	$channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
		230	$channel->set_position_r ($dx, $dy, 20);
		231	$chunk->play ($channel);
		232	}
		233	} else {
		234	# sound_meta not set means data is in flight either way
		235	my $meta = $CONN->{face}[$face]
		236	or return;
		237
		238	$meta->{data}
		239	or return;
		240
		241	# if its a jingle, play it as ambient music
		242	if ($meta->{data}{jingle}) {
		243	if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
		244	push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
		245	&audio_music_push ($face);
		246	}
		247	} else {
		248	# fetch from database
		249	CFPlus::DB::get res_data => $meta->{name}, sub {
		250	my $rwops = new CFPlus::RW $_[0];
		251	my $chunk = new CFPlus::MixChunk $rwops
		252	or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
		253	$chunk->volume (($meta->{data}{volume} || 1) * 128);
		254	$AUDIO_CHUNK{$face} = $chunk;
		255
		256	audio_sound_push ($face);
		257	};
		258	}
		259	}
		260	}
		261
		262	sub audio_sound_play {
		263	my ($face, $dx, $dy, $vol) = @_;
		264
		265	$SDL_MIXER
		266	or return;
		267	$CFG->{effects_enable}
		268	or return;
		269
		270	my $queue = $AUDIO_PLAY{$face} ||= [];
		271	push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
		272	audio_sound_push $face
		273	unless @$queue > 1;
		274	}
		275
		276	sub audio_music_set_meta {
		277	my ($meta) = @_;
		278
		279	$MUSIC_PLAYING_META = $meta;
		280	$MUSIC_PLAYING_WIDGET->set_markup (
		281	"<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
		282	. "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
		283	. "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
		284	. "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
		285	);
		286	}
		287
		288	sub audio_music_update_volume {
		289	return unless $MUSIC_PLAYING_META;
		290	my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
		291	my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
		292	CFPlus::MixMusic::volume $base * $volume * 128;
		293	}
		294
		295	sub audio_music_start {
		296	my $meta = $MUSIC_PLAYING_META;
		297
		298	CFPlus::DB::get res_data => $meta->{name}, sub {
		299	return unless $SDL_MIXER;
		300
		301	# music might have changed...
		302	$meta eq $MUSIC_PLAYING_META
		303	or return &audio_music_start ();
		304
		305	audio_music_update_volume;
		306
		307	$MUSIC_PLAYING_DATA = \$_[0];
		308
		309	my $rwops = $meta->{path}
		310	? new_from_file CFPlus::RW $meta->{path}
		311	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
		312
		313	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
		314	or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
		315
		316	my $NOW = time;
		317
		318	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
		319	my $pos = $MUSIC_PLAYING_META->{stop_pos};
		320	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
		321	$MUSIC_START = time - $pos;
		322	} else {
		323	$MUSIC_PLAYER->play (0);
		324	$MUSIC_START = time;
		325	}
		326
		327	delete $meta->{stop_time};
		328	delete $meta->{stop_pos};
		329	}
		330	}
		331
		332	sub audio_music_push {
		333	return unless $SDL_MIXER;
		334
		335	my $fade_out;
		336
		337	if (@MUSIC_JINGLE) {
		338	@MUSIC_HAVE = $MUSIC_JINGLE[0];
		339	$fade_out = 333;
		340	} else {
		341	return unless $CFG->{bgm_enable};
		342
		343	my @have =
		344	grep $_ && $_->{data},
		345	map $CONN->{face}[$_],
		346	@$MUSIC_WANT;
		347
		348	@MUSIC_HAVE = @have
		349	if @have;
		350
		351	# default MUSIC_HAVE == MUSIC_DEFAULT
		352	@MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
		353	$fade_out = 1000;
		354	}
		355
		356	# if the currently playing song is acceptable, let it continue
		357	return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
		358
		359	my $NOW = time;
		360
		361	if ($MUSIC_PLAYING_META) {
		362	$MUSIC_PLAYING_META->{stop_time} = $NOW;
		363	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
		364	CFPlus::MixMusic::fade_out $fade_out;
		365	} else {
		366	# sort by stop time, oldest first
		367	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
		368
		369	# if the most recently-played piece played very recently,
		370	# resume it, else choose the oldest piece for rotation.
		371	audio_music_set_meta
		372	$MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
		373	? $MUSIC_HAVE[-1]
		374	: $MUSIC_HAVE[0];
		375
		376	audio_music_start;
		377	}
		378	}
		379
		380	sub audio_music_set_ambient {
		381	my ($songs) = @_;
		382
		383	$MUSIC_WANT = $songs;
		384	audio_music_push;
		385	}
		386
		387	sub audio_music_finished {
		388	# we compress multiple jingles of the same type
		389	shift @MUSIC_JINGLE
		390	while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
		391
		392	$MUSIC_PLAYING_WIDGET->clear;
		393
		394	undef $MUSIC_PLAYER;
		395	undef $MUSIC_PLAYING_META;
		396	undef $MUSIC_PLAYING_DATA;
		397
		398	audio_music_push;
		399	}
		400
		401	sub audio_init {
		402	if ($CFG->{audio_enable}) {
		403	$ENV{MIX_EFFECTSMAXSPEED} = 1;
		404	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
		405
		406	unless ($SDL_MIXER) {
		407	status "Unable to open sound device: there will be no sound";
		408	return;
		409	}
		410
		411	CFPlus::Mix_AllocateChannels 16;
		412
		413	audio_music_finished;
		414	} else {
		415	undef $SDL_MIXER;
		416	}
		417	}
		418
		419	sub audio_shutdown {
		420	undef $MUSIC_PLAYER;
		421	undef $MUSIC_PLAYING_META;
		422	undef $MUSIC_PLAYING_DATA;
		423
		424	$MUSIC_WANT = [];
		425	@MUSIC_JINGLE = ();
		426	%AUDIO_PLAY = ();
		427	%AUDIO_CHUNK = ();
		428
		429	CFPlus::Mix_CloseAudio if $SDL_MIXER;
		430	undef $SDL_MIXER;
		431	}
		432
		433	#############################################################################
175		434
176	sub destroy_query_dialog {	435	sub destroy_query_dialog {
177	(delete $_[0]{query_dialog})->destroy	436	(delete $_[0]{query_dialog})->destroy
178	if $_[0]{query_dialog};	437	if $_[0]{query_dialog};
179	}	438	}
…		…
206	title => "Server Query",	465	title => "Server Query",
207	child => my $vbox = new CFPlus::UI::VBox,	466	child => my $vbox = new CFPlus::UI::VBox,
208	;	467	;
209		468
210	my @dialog = my $label = new CFPlus::UI::Label	469	my @dialog = my $label = new CFPlus::UI::Label
211	max_w => $::WIDTH * 0.4,	470	max_w => $::WIDTH * 0.8,
212	ellipsise => 0,	471	ellipsise => 0,
213	text => $prompt;	472	text => $prompt;
214		473
215	if ($flags & CS_QUERY_YESNO) {	474	if ($flags & CS_QUERY_YESNO) {
216	push @dialog, my $hbox = new CFPlus::UI::HBox;	475	push @dialog, my $hbox = new CFPlus::UI::HBox;
…		…
233	);	492	);
234		493
235	$dialog->grab_focus;	494	$dialog->grab_focus;
236		495
237	} elsif ($flags & CS_QUERY_SINGLECHAR) {	496	} elsif ($flags & CS_QUERY_SINGLECHAR) {
238	$dialog->{tooltip} = "#charcreation_focus";
239
240	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	497	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
241	$MESSAGE_WINDOW->show;	498	$dialog->{tooltip} = "#charcreation_focus";
242		499
243	unshift @dialog, new CFPlus::UI::Label	500	unshift @dialog, new CFPlus::UI::Label
244	max_w => $::WIDTH * 0.4,	501	max_w => $::WIDTH * 0.8,
245	ellipsise => 0,	502	ellipsise => 0,
246	markup => "\nOr use your keyboard and the text entry below:\n";	503	markup => "\nOr use your keyboard and the text entry below:\n";
247		504
248	unshift @dialog, my $table = new CFPlus::UI::Table;	505	unshift @dialog, my $table = new CFPlus::UI::Table;
249		506
250	$table->add (0, 0, new CFPlus::UI::Button	507	$table->add_at (0, 0, new CFPlus::UI::Button
251	text => "Next Race",	508	text => "Next Race",
252	on_activate => sub {	509	on_activate => sub {
253	$conn->send ("reply n");	510	$conn->send ("reply n");
254	destroy_query_dialog $conn;	511	destroy_query_dialog $conn;
255	0	512	0
256	},	513	},
257	);	514	);
258	$table->add (2, 0, new CFPlus::UI::Button	515	$table->add_at (2, 0, new CFPlus::UI::Button
259	text => "Accept",	516	text => "Accept",
260	on_activate => sub {	517	on_activate => sub {
261	$conn->send ("reply d");	518	$conn->send ("reply d");
262	destroy_query_dialog $conn;	519	destroy_query_dialog $conn;
263	0	520	0
264	},	521	},
265	);	522	);
266		523
		524	if ($conn->{chargen_race_description}) {
		525	unshift @dialog, new CFPlus::UI::Label
		526	max_w => $::WIDTH * 0.8,
		527	ellipsise => 0,
		528	markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
		529	;
		530	}
		531
		532	unshift @dialog, new CFPlus::UI::Face
		533	face => $conn->{player}{face},
		534	bg => [.2, .2, .2, 1],
		535	min_w => 64,
		536	min_h => 64,
		537	;
		538
		539	if ($conn->{chargen_race_title}) {
		540	unshift @dialog, new CFPlus::UI::Label
		541	allign => 1,
		542	ellipsise => 0,
		543	markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
		544	;
		545	}
		546
267	unshift @dialog, new CFPlus::UI::Label	547	unshift @dialog, new CFPlus::UI::Label
268	max_w => $::WIDTH * 0.4,	548	max_w => $::WIDTH * 0.4,
269	ellipsise => 0,	549	ellipsise => 0,
270	markup => (CFPlus::Pod::section_label ui => "chargen_race"),	550	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
271	;	551	;
…		…
275	$conn->send ("reply $stat");	555	$conn->send ("reply $stat");
276	destroy_query_dialog $conn;	556	destroy_query_dialog $conn;
277	return;	557	return;
278	}	558	}
279		559
280	$STATS_PAGE->show;
281	$MESSAGE_WINDOW->hide;
282
283	unshift @dialog, new CFPlus::UI::Label	560	unshift @dialog, new CFPlus::UI::Label
284	max_w => $::WIDTH * 0.4,	561	max_w => $::WIDTH * 0.4,
285	ellipsise => 0,	562	ellipsise => 0,
286	markup => "\nOr use your keyboard and the text entry below:\n";	563	markup => "\nOr use your keyboard and the text entry below:\n";
287		564
288	unshift @dialog, my $table = new CFPlus::UI::Table;	565	unshift @dialog, my $table = new CFPlus::UI::Table;
289		566
290	# left: re-roll	567	# left: re-roll
291	$table->add (0, 0, new CFPlus::UI::Button	568	$table->add_at (0, 0, new CFPlus::UI::Button
292	text => "Roll Again",	569	text => "Roll Again",
293	on_activate => sub {	570	on_activate => sub {
294	$conn->send ("reply y");	571	$conn->send ("reply y");
295	destroy_query_dialog $conn;	572	destroy_query_dialog $conn;
296	0	573	0
…		…
310	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	587	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
311	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	588	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
312	],	589	],
313	), 1 .. 2;	590	), 1 .. 2;
314		591
315	$table->add (2, 0, new CFPlus::UI::Button	592	$table->add_at (2, 0, new CFPlus::UI::Button
316	text => "Swap Stats",	593	text => "Swap Stats",
317	on_activate => sub {	594	on_activate => sub {
318	$conn->{stat_change_with} = $sw2->{value};	595	$conn->{stat_change_with} = $sw2->{value};
319	$conn->send ("reply $sw1->{value}");	596	$conn->send ("reply $sw1->{value}");
320	destroy_query_dialog $conn;	597	destroy_query_dialog $conn;
321	0	598	0
322	},	599	},
323	);	600	);
324	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);	601	$table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
325		602
326	# right: accept	603	# right: accept
327	$table->add (4, 0, new CFPlus::UI::Button	604	$table->add_at (4, 0, new CFPlus::UI::Button
328	text => "Accept",	605	text => "Accept",
329	on_activate => sub {	606	on_activate => sub {
330	$conn->send ("reply n");	607	$conn->send ("reply n");
331	$STATS_PAGE->hide;	608	$STATS_PAGE->hide;
332	destroy_query_dialog $conn;	609	destroy_query_dialog $conn;
…		…
413	maph => $mapsize,	690	maph => $mapsize,
414		691
415	client => "cfplus $CFPlus::VERSION $] $^O",	692	client => "cfplus $CFPlus::VERSION $] $^O",
416		693
417	map_widget => $MAPWIDGET,	694	map_widget => $MAPWIDGET,
418	logview => $LOGVIEW,
419	statusbox => $STATUSBOX,	695	statusbox => $STATUSBOX,
420	map => $MAP,	696	map => $MAP,
421	mapmap => $MAPMAP,	697	mapmap => $MAPMAP,
422	query => \&server_query,	698	query => \&server_query,
423		699
424	sound_play => sub {	700	setup_req => {
425	my ($x, $y, $soundnum, $type) = @_;	701	smoothing => $CFG->{map_smoothing}*1,
426
427	$SDL_MIXER
428	or return;
429
430	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
431	or return;
432
433	$chunk->play;
434	},	702	},
435	};	703	};
436		704
437	if ($CONN) {	705	if ($CONN) {
438	CFPlus::lowdelay fileno $CONN->{fh};	706	CFPlus::lowdelay fileno $CONN->{fh};
…		…
448	$LOGIN_BUTTON->set_text ("Login");	716	$LOGIN_BUTTON->set_text ("Login");
449	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	717	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
450	$SETUP_DIALOG->show;	718	$SETUP_DIALOG->show;
451	$PL_WINDOW->hide;	719	$PL_WINDOW->hide;
452	$SPELL_LIST->clear_spells;	720	$SPELL_LIST->clear_spells;
		721	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
		722
		723	&audio_music_set_ambient ([]);
453		724
454	return unless $CONN;	725	return unless $CONN;
455		726
456	status "connection closed";	727	status "connection closed";
457		728
…		…
465	sub graphics_setup {	736	sub graphics_setup {
466	my $vbox = new CFPlus::UI::VBox;	737	my $vbox = new CFPlus::UI::VBox;
467		738
468	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	739	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
469		740
		741	my $row = 0;
		742
		743	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
		744	$table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
		745	can_events => 1,
		746	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
		747
		748	my $vidmode_tooltip =
		749	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
		750	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
		751
470	$table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");	752	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
471	$table->add (1, 0, my $hbox = new CFPlus::UI::HBox);	753	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
472		754
		755	$hbox->add (my $mode_slider = new CFPlus::UI::Slider
473	$hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	756	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
474	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	757	tooltip => $vidmode_tooltip);
		758	$hbox->add (my $mode_label = new CFPlus::UI::Label
		759	align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
		760	can_events => 1, tooltip => $vidmode_tooltip);
475		761
476	$mode_slider->connect (changed => sub {	762	$mode_slider->connect (changed => sub {
477	my ($self, $value) = @_;	763	my ($self, $value) = @_;
478		764
479	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	765	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
480	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	766	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
481	});	767	});
482	$mode_slider->emit (changed => $mode_slider->{range}[0]);	768	$mode_slider->emit (changed => $mode_slider->{range}[0]);
483		769
484	my $row = 1;
485
486	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");	770	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
487	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox	771	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
488	state => $CFG->{fullscreen},	772	state => $CFG->{fullscreen},
489	tooltip => "Bring the client into fullscreen mode.",	773	tooltip => "Bring the client into fullscreen mode.",
490	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	774	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
491	);	775	);
492		776
		777	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
		778	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		779	state => $CFG->{force_opengl11},
		780	tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
		781	. "higher memory usage and slower performance. It will, however, help tremendously on "
		782	. "cards that claim to support a feature but fall back to software rendering. "
		783	. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
		784	. "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
		785	. "experience extremely low framerates and your card should do better, try this option.</b>",
		786	on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
		787	);
		788
		789	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
		790	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		791	state => $CFG->{texture_compression},
		792	tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
		793	. "will save a lot of memory and increase performance. The compression algorithm "
		794	. "can differ form card to card, so your mileage may vary. This setting is ignored in "
		795	. "forced OpenGL 1.1 mode.",
		796	on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
		797	);
		798
493	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	799	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
494	$table->add (1, $row++, new CFPlus::UI::CheckBox	800	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
495	state => $CFG->{fast},	801	state => $CFG->{fast},
496	tooltip => "Lower the visual quality considerably to speed up rendering.",	802	tooltip => "Lower the visual quality considerably to speed up rendering.",
497	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	803	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
498	);	804	);
499		805
		806	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
		807	$table->add_at (1, $row++, new CFPlus::UI::Slider
		808	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
		809	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
		810	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
		811	);
		812
		813	$table->add_at (1, $row++, new CFPlus::UI::Button
		814	expand => 1, align => 0, text => "Apply",
		815	tooltip => "Apply the video settings above.",
		816	on_activate => sub {
		817	video_shutdown ();
		818	video_init ();
		819	0
		820	}
		821	);
		822
500	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");	823	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
501	$table->add (1, $row++, new CFPlus::UI::Slider	824	$table->add_at (1, $row++, new CFPlus::UI::Slider
502	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	825	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
503	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	826	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
504	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	827	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
505	);	828	);
506		829
		830	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
		831	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		832	state => $CFG->{map_smoothing},
		833	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
		834	. "This increases load on the graphics subsystem and works only with TRT servers. "
		835	. "Changes take effect at next login only.",
		836	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
		837	);
		838
507	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");	839	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
508	$table->add (1, $row++, new CFPlus::UI::CheckBox	840	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
509	state => $CFG->{fow_enable},	841	state => $CFG->{fow_enable},
510	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	842	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
511	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	843	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
512	);	844	);
513		845
514	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");	846	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
515	$table->add (1, $row++, new CFPlus::UI::Slider	847	$table->add_at (1, $row++, new CFPlus::UI::Slider
516	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	848	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
517	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	849	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
518	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	850	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
519	);	851	);
520		852
521	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
522	$table->add (1, $row++, new CFPlus::UI::CheckBox
523	state => $CFG->{fow_smooth},
524	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
525	on_changed => sub {
526	my ($self, $value) = @_;
527	$CFG->{fow_smooth} = $value;
528	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
529	0
530	}
531	);
532
533	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
534	$table->add (1, $row++, new CFPlus::UI::Slider
535	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
536	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
537	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
538	);
539
540	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");	853	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
541	$table->add (1, $row++, new CFPlus::UI::Slider	854	$table->add_at (1, $row++, new CFPlus::UI::Slider
542	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	855	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
543	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	856	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
		857	. "but you still need to press apply to correctly re-layout the widget.",
544	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	858	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
545	);	859	);
546		860
547	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	861	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
548	$table->add (1, $row++, new CFPlus::UI::Slider	862	$table->add_at (1, $row++, new CFPlus::UI::Slider
549	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	863	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
550	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	864	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
551	on_changed => sub {	865	on_changed => sub {
552	$CFG->{gauge_fontsize} = $_[1];	866	$CFG->{gauge_fontsize} = $_[1];
553	&set_gauge_window_fontsize;	867	&set_gauge_window_fontsize;
554	0	868	0
555	}	869	}
556	);	870	);
557		871
558	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");	872	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
559	$table->add (1, $row++, new CFPlus::UI::Slider	873	$table->add_at (1, $row++, new CFPlus::UI::Slider
560	range => [$CFG->{gauge_size}, 0.2, 0.8],	874	range => [$CFG->{gauge_size}, 0.2, 0.8],
561	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	875	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
562	on_changed => sub {	876	on_changed => sub {
563	$CFG->{gauge_size} = $_[1];	877	$CFG->{gauge_size} = $_[1];
564	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	878	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
565	0	879	0
566	}	880	}
567	);	881	);
568		882
569	$table->add (1, $row++, new CFPlus::UI::Button
570	expand => 1, align => 0, text => "Apply",
571	tooltip => "Apply the video settings",
572	on_activate => sub {
573	video_shutdown ();
574	video_init ();
575	0
576	}
577	);
578
579	$vbox	883	$vbox
580	}	884	}
581		885
582	sub audio_setup {	886	sub audio_setup {
583	my $vbox = new CFPlus::UI::VBox;	887	my $vbox = new CFPlus::UI::VBox;
584		888
585	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	889	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
586		890
587	my $row = 0;	891	my $row = 0;
588		892
589	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");	893	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
590	$table->add (1, $row++, new CFPlus::UI::CheckBox	894	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
591	state => $CFG->{audio_enable},	895	state => $CFG->{audio_enable},
592	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.",	896	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.",
593	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	897	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
594	);	898	);
595	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");	899	# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
596	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	900	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
597	# $CFG->{effects_volume} = $_[1];	901	# $CFG->{effects_volume} = $_[1];
598	# });	902	# });
		903
		904	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
		905	$table->add_at (1, $row, new CFPlus::UI::CheckBox
		906	expand => 1, state => $CFG->{effects_enable},
		907	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
		908	on_changed => sub {
		909	$CFG->{effects_enable} = $_[1];
		910	$CONN->update_fx_want if $CONN;
		911	0
		912	}
		913	);
		914	$table->add_at (2, $row++, new CFPlus::UI::Slider
		915	expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
		916	tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
		917	. "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
		918	on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
		919	);
		920
599	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");	921	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
600	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
601	$hbox->add (new CFPlus::UI::CheckBox	922	$table->add_at (1, $row, new CFPlus::UI::CheckBox
602	expand => 1, state => $CFG->{bgm_enable},	923	expand => 1, state => $CFG->{bgm_enable},
603	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	924	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
604	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	925	on_changed => sub {
		926	$CFG->{bgm_enable} = $_[1];
		927	$CONN->update_fx_want if $CONN;
		928	audio_music_push;
		929	0
		930	}
605	);	931	);
606	$hbox->add (new CFPlus::UI::Slider	932	$table->add_at (2, $row++, new CFPlus::UI::Slider
607	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	933	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
608	tooltip => "The volume of the background music. Changes are instant.",	934	tooltip => "The volume of the background music. Changes are instant.",
609	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }	935	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
610	);	936	);
611		937
612	$table->add (1, $row++, new CFPlus::UI::Button	938	$table->add_at (1, $row++, new CFPlus::UI::Button
613	expand => 1, align => 0, text => "Apply",	939	c_colspan => 2, expand => 1, align => 0, text => "Apply",
614	tooltip => "Apply the audio settings",	940	tooltip => "Apply the audio settings",
615	on_activate => sub {	941	on_activate => sub {
616	audio_shutdown ();	942	audio_shutdown ();
617	audio_init ();	943	audio_init ();
618	0	944	0
…		…
660	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");	986	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
661	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");	987	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
662	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");	988	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
663	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");	989	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
664		990
665	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");	991	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
		992	$vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
		993	$vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
666	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");	994	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
667		995
668	$GAUGES = {	996	$GAUGES = {
		997	exp => $exp, prg => $prg, sklprg => $sklprg,
669	exp => $exp, win => $win, range => $rng,	998	win => $win, range => $rng,
670	food => $fg, mana => $mg, hp => $hg, grace => $gg	999	hp => $hg, mana => $mg, grace => $gg, food => $fg,
671	};	1000	};
672		1001
673	&set_gauge_window_fontsize;	1002	&set_gauge_window_fontsize;
674		1003
675	$win	1004	$win
676	}	1005	}
677		1006
678	sub debug_setup {	1007	sub debug_setup {
679	my $table = new CFPlus::UI::Table;	1008	my $table = new CFPlus::UI::Table;
680		1009
681	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");	1010	$table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
682	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	1011	$table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
683	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");	1012	$table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
684	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	1013	$table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
685	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");	1014	$table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
686	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	1015	$table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
687	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");	1016	$table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
688	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	1017	$table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
689	$table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );	1018	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
690		1019
691	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
692
693	for my $x (0..2) {
694	for my $y (0 .. 2) {
695	$table->add ($x + 3, $y,
696	new CFPlus::UI::Entry
697	text => $default_smooth[$x * 3 + $y],
698	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
699	);
700	}
701	}
702
703	$table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#	1020	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
		1021
		1022	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
		1023	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
		1024	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
		1025	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
		1026	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
		1027	$t->add_at (1,1, new CFPlus::UI::Label text => "e");
		1028
		1029	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
		1030
		1031	$c->add_items ({
		1032	type => "line_loop",
		1033	color => [0, 1, 0],
		1034	width => 9,
		1035	coord_mode => "abs",
		1036	coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
		1037	});
		1038
		1039	$c->add_items ({
		1040	type => "lines",
		1041	color => [1, 1, 0],
		1042	width => 2,
		1043	coord_mode => "rel",
		1044	coord => [[0,0], [1,1], [1,0], [0,1]],
		1045	});
		1046
		1047	$c->add_items ({
		1048	type => "polygon",
		1049	color => [0, 0.43, 0],
		1050	width => 2,
		1051	coord_mode => "rel",
		1052	coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
		1053	});
704		1054
705	$table	1055	$table
706	}	1056	}
707		1057
708	sub stats_window {	1058	sub stats_window {
…		…
756	[2, 4, st_spd => "Spd", 10.54],	1106	[2, 4, st_spd => "Spd", 10.54],
757	[2, 5, st_wspd => "WSp", 10.54],	1107	[2, 5, st_wspd => "WSp", 10.54],
758	) {	1108	) {
759	my ($col, $row, $id, $label, $template) = @$_;	1109	my ($col, $row, $id, $label, $template) = @$_;
760		1110
761	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label	1111	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
762	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	1112	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
763	align => +1, template => $template, tooltip => "#stat_$label");	1113	align => +1, template => $template, tooltip => "#stat_$label");
764	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label	1114	$tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
765	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	1115	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
766	align => -1, text => $label, tooltip => "#stat_$label");	1116	align => -1, text => $label, tooltip => "#stat_$label");
767	}	1117	}
768		1118
769	$vb->add (new CFPlus::UI::FancyFrame	1119	$vb->add (new CFPlus::UI::FancyFrame
…		…
810	cold => ["Cold",	1160	cold => ["Cold",
811	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],	1161	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
812	ghit => ["Ghost hit",	1162	ghit => ["Ghost hit",
813	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],	1163	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
814	);	1164	);
		1165
815	for (qw/slow holyw conf fire depl magic	1166	for (qw/slow holyw conf fire depl magic
816	drain acid pois para deat phys	1167	drain acid pois para deat phys
817	blind fear tund elec cold ghit/)	1168	blind fear tund elec cold ghit/)
818	{	1169	{
819	$tbl2->add ($col, $row,	1170	$tbl2->add_at ($col, $row,
820	$STATWIDS->{"res_$_"} =	1171	$STATWIDS->{"res_$_"} =
821	new CFPlus::UI::Label	1172	new CFPlus::UI::Label
822	font => $FONT_FIXED,	1173	font => $FONT_FIXED,
823	template => "-100%",	1174	template => "-100%",
824	align => +1,	1175	align => +1,
825	valign => 0,	1176	valign => 0,
826	can_events => 1,	1177	can_events => 1,
827	can_hover => 1,	1178	can_hover => 1,
828	tooltip => $resist_names{$_}->[1],	1179	tooltip => $resist_names{$_}->[1],
829	);	1180	);
830	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image	1181	$tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
831	font => $FONT_FIXED,	1182	font => $FONT_FIXED,
832	can_hover => 1,	1183	can_hover => 1,
833	can_events => 1,	1184	can_events => 1,
834	path => "ui/resist/resist_$_.png",	1185	path => "ui/resist/resist_$_.png",
835	tooltip => $resist_names{$_}->[1],	1186	tooltip => $resist_names{$_}->[1],
836	);	1187	);
837	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label	1188	$tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
838	text => $resist_names{$_}->[0],	1189	text => $resist_names{$_}->[0],
839	font => $FONT_FIXED,	1190	font => $FONT_FIXED,
840	can_hover => 1,	1191	can_hover => 1,
841	can_events => 1,	1192	can_events => 1,
842	tooltip => $resist_names{$_}->[1],	1193	tooltip => $resist_names{$_}->[1],
…		…
854	$r	1205	$r
855	}	1206	}
856		1207
857	sub skill_window {	1208	sub skill_window {
858	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);	1209	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
		1210
859	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);	1211	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
		1212
860	$sw	1213	$sw
861	}	1214	}
862		1215
863	sub formsep($) {	1216	sub formsep($) {
864	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	1217	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
…		…
875	return if $METASERVER_ATIME > time;	1228	return if $METASERVER_ATIME > time;
876	$METASERVER_ATIME = time + 60;	1229	$METASERVER_ATIME = time + 60;
877		1230
878	my $table = $METASERVER->{table};	1231	my $table = $METASERVER->{table};
879	$table->clear;	1232	$table->clear;
880	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	1233	$table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
881		1234
882	my $ok = 0;	1235	my $ok = 0;
883		1236
884	CFPlus::background {	1237	CFPlus::background {
885	my $ua = CFPlus::lwp_useragent;	1238	my $ua = CFPlus::lwp_useragent;
…		…
896	"The time this server has been running without being restarted.",	1249	"The time this server has been running without being restarted.",
897	"The server software version - a '+' indicates a Crossfire+ server.",	1250	"The server software version - a '+' indicates a Crossfire+ server.",
898	"Short information about this server provided by its admins.",	1251	"Short information about this server provided by its admins.",
899	);	1252	);
900	my @col = qw(#Users Host Uptime Version Description);	1253	my @col = qw(#Users Host Uptime Version Description);
901	$table->add ($_, 0, new CFPlus::UI::Label	1254	$table->add_at ($_, 0, new CFPlus::UI::Label
902	can_hover => 1, can_events => 1,	1255	can_hover => 1, can_events => 1,
903	align => 0, fg => [1, 1, 0],	1256	align => 0, fg => [1, 1, 0],
904	text => $col[$_], tooltip => $tip[$_])	1257	text => $col[$_], tooltip => $tip[$_])
905	for 0 .. $#col;	1258	for 0 .. $#col;
906		1259
…		…
928		1281
929	$m = [$users, $host, $uptime, $version, $desc];	1282	$m = [$users, $host, $uptime, $version, $desc];
930		1283
931	$y++;	1284	$y++;
932		1285
933	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [	1286	$table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
934	(new CFPlus::UI::Button	1287	(new CFPlus::UI::Button
935	text => "Use",	1288	text => "Use",
936	tooltip => "Put this server into the <b>Host:Port</b> field",	1289	tooltip => "Put this server into the <b>Host:Port</b> field",
937	on_activate => sub {	1290	on_activate => sub {
938	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1291	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
…		…
941	},	1294	},
942	),	1295	),
943	(new CFPlus::UI::Empty expand => 1),	1296	(new CFPlus::UI::Empty expand => 1),
944	]);	1297	]);
945		1298
946	$table->add ($_, $y, new CFPlus::UI::Label	1299	$table->add_at ($_, $y, new CFPlus::UI::Label
947	max_w => $::WIDTH * 0.4,	1300	max_w => $::WIDTH * 0.4,
948	ellipsise => 0,	1301	ellipsise => 0,
949	align => $align[$_],	1302	align => $align[$_],
950	text => $m->[$_],	1303	text => $m->[$_],
951	tooltip => $tip[$_],	1304	tooltip => $tip[$_],
…		…
992		1345
993	$vbox->add (new CFPlus::UI::FancyFrame	1346	$vbox->add (new CFPlus::UI::FancyFrame
994	label => "Connection Settings",	1347	label => "Connection Settings",
995	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),	1348	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
996	);	1349	);
997	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");	1350	$table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
998		1351
999	{	1352	{
1000	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);	1353	$table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1001		1354
1002	$vbox->add (	1355	$vbox->add (
1003	$HOST_ENTRY = new CFPlus::UI::Entry	1356	$HOST_ENTRY = new CFPlus::UI::Entry
1004	expand => 1,	1357	expand => 1,
1005	text => $CFG->{profile}{default}{host},	1358	text => $CFG->{profile}{default}{host},
1006	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	1359	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1007	on_changed => sub {	1360	on_changed => sub {
1008	my ($self, $value) = @_;	1361	my ($self, $value) = @_;
1009	$CFG->{profile}{default}{host} = $value;	1362	$CFG->{profile}{default}{host} = $value;
1010	0	1363	1
1011	}	1364	}
1012	);	1365	);
1013		1366
1014	$vbox->add (new CFPlus::UI::Button	1367	$vbox->add (new CFPlus::UI::Button
1015	expand => 1,	1368	expand => 1,
1016	text => "Server List",	1369	text => "Server List",
1017	other => $METASERVER,	1370	other => $METASERVER,
1018	tooltip => "Show a list of available crossfire servers",	1371	tooltip => "Show a list of available crossfire servers",
1019	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1372	on_activate => sub { $METASERVER->toggle_visibility; 0 },
1020	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1373	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1021	);	1374	);
1022	}	1375	}
1023		1376
1024	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");	1377	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1025	$table->add (1, 4, new CFPlus::UI::Entry	1378	$table->add_at (1, 4, new CFPlus::UI::Entry
1026	text => $CFG->{profile}{default}{user},	1379	text => $CFG->{profile}{default}{user},
1027	tooltip => "The name of your character on the server",	1380	tooltip => "The name of your character on the server",
1028	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1381	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1029	);	1382	);
1030		1383
1031	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");	1384	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1032	$table->add (1, 5, new CFPlus::UI::Entry	1385	$table->add_at (1, 5, new CFPlus::UI::Entry
1033	text => $CFG->{profile}{default}{password},	1386	text => $CFG->{profile}{default}{password},
1034	hidden => 1,	1387	hidden => 1,
1035	tooltip => "The password for your character",	1388	tooltip => "The password for your character",
1036	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1389	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1037	);	1390	);
1038		1391
1039	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");	1392	$table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1040	$table->add (1, 7, new CFPlus::UI::Slider	1393	$table->add_at (1, 7, new CFPlus::UI::Slider
1041	force_w => 100,	1394	force_w => 100,
1042	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1395	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1043	tooltip => "This is the size of the portion of the map update the server sends you. "	1396	tooltip => "This is the size of the portion of the map update the server sends you. "
1044	. "If you set this to a high value you will be able to see further, "	1397	. "If you set this to a high value you will be able to see further, "
1045	. "but you also increase bandwidth requirements and latency. "	1398	. "but you also increase bandwidth requirements and latency. "
1046	. "This option is only used once at log-in.",	1399	. "This option is only used once at log-in.",
1047	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1400	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1048	);	1401	);
1049		1402
1050	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1403	$table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1051	$table->add (1, 8, new CFPlus::UI::CheckBox	1404	$table->add_at (1, 8, new CFPlus::UI::Entry
1052	state => $CFG->{face_prefetch},	1405	text => $CFG->{output_rate},
1053	tooltip => "<b>Background Image Prefetch</b>\n\n"	1406	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1054	. "If enabled, the client automatically pre-fetches images from the server. "	1407	. "when sending data. When 0 or unset, the server "
1055	. "This might increase or create lag, but increases the chances "	1408	. "default will be used, which is usually around 100kb/s. Most servers will "
1056	. "of faces being ready for display when you encounter them. "	1409	. "dynamically find an optimal rate, so adjust this only when necessary.",
1057	. "It also uses up server bandwidth on every connect, "
1058	. "so only set it if you really need to prefetch images. "
1059	. "This option can be set and unset any time.",
1060	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1410	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1061	);	1411	);
1062		1412
1063	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");	1413	$table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1064	$table->add (1, 9, new CFPlus::UI::Entry	1414	$table->add_at (1, 9, new CFPlus::UI::Entry
1065	text => $CFG->{output_count},	1415	text => $CFG->{output_count},
1066	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1416	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1067	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1417	on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1068	);	1418	);
1069		1419
1070	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");	1420	$table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1071	$table->add (1, 10, new CFPlus::UI::Entry	1421	$table->add_at (1, 10, new CFPlus::UI::Entry
1072	text => $CFG->{output_sync},	1422	text => $CFG->{output_sync},
1073	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1423	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1074	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1424	on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1075	);	1425	);
1076		1426
1077	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button	1427	$table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1078	expand => 1,	1428	expand => 1,
1079	align => 0,	1429	align => 0,
1080	text => "Login",	1430	text => "Login",
1081	on_activate => sub {	1431	on_activate => sub {
1082	$CONN ? stop_game	1432	$CONN ? stop_game
1083	: start_game;	1433	: start_game;
1084	0	1434	1
1085	},	1435	},
1086	);	1436	);
1087		1437
1088	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");	1438	$vbox->add (new CFPlus::UI::FancyFrame
1089	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry	1439	label => "Server Info",
1090	text => $CFG->{say_command},	1440	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1091	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1092	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1093	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1094	on_changed => sub {
1095	my ($self, $value) = @_;
1096	$CFG->{say_command} = $value;
1097	0
1098	}
1099	);	1441	);
1100		1442
		1443	$vbox
		1444	}
		1445
		1446	sub client_setup {
		1447	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
		1448
		1449	my $row = 0;
		1450
1101	$table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");	1451	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1102	$table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox	1452	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
1103	state => $CFG->{show_tips},	1453	state => $CFG->{show_tips},
1104	tooltip => "Show the <b>Tip of the day</b> window at startup?",	1454	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1105	on_changed => sub {	1455	on_changed => sub {
1106	my ($self, $value) = @_;	1456	my ($self, $value) = @_;
1107	$CFG->{show_tips} = $value;	1457	$CFG->{show_tips} = $value;
1108	0	1458	0
1109	}	1459	}
1110	);	1460	);
1111		1461
1112	$vbox->add (new CFPlus::UI::FancyFrame	1462	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1113	label => "Server Info",	1463	$table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1114	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),	1464	text => $CFG->{logview_max_par},
1115	);	1465	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1116		1466	. "sends more messages than this number, older messages get removed to save memory and "
1117	$vbox	1467	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1118	}
1119
1120	sub message_window {
1121	my $window = new CFPlus::UI::Toplevel
1122	name => "message_window",
1123	title => "Messages",
1124	border_bg => [1, 1, 1, 1],
1125	x => "max",
1126	y => 0,
1127	force_w => $::WIDTH * 0.4,
1128	force_h => $::HEIGHT * 0.5,
1129	child => (my $vbox = new CFPlus::UI::VBox),
1130	has_close_button => 1;
1131
1132	$vbox->add ($LOGVIEW);
1133
1134	$vbox->add (my $input = new CFPlus::UI::Entry
1135	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1136	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1137	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1138	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1139	on_focus_in => sub {	1468	on_changed => sub {
1140	my ($input, $prev_focus) = @_;	1469	my ($self, $value) = @_;
1141		1470	$MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1142	delete $input->{refocus_map};
1143
1144	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1145	$input->{refocus_map} = 1;
1146	}
1147	delete $input->{auto_activated};
1148
1149	0	1471	0
1150	},	1472	},
1151	on_activate => sub {
1152	my ($input, $text) = @_;
1153	$input->set_text ('');
1154
1155	if ($text =~ /^\/(.*)/) {
1156	$::CONN->user_send ($1);
1157	} else {
1158	my $say_cmd = $::CFG->{say_command} || 'say';
1159	$::CONN->user_send ("$say_cmd $text");
1160	}
1161	if ($input->{refocus_map}) {
1162	delete $input->{refocus_map};
1163	$MAPWIDGET->focus_in
1164	}
1165
1166	0
1167	},
1168	on_escape => sub {
1169	$MAPWIDGET->grab_focus;
1170
1171	0
1172	},
1173	);
1174
1175	$CONSOLE = {
1176	window => $window,
1177	input => $input,
1178	};	1473	);
1179		1474
1180	$window	1475	$table
1181	}	1476	}
1182		1477
1183	sub autopickup_setup {	1478	sub autopickup_setup {
		1479	my $r = new CFPlus::UI::ScrolledWindow (
		1480	expand => 1,
		1481	scroll_y => 1
		1482	);
1184	my $table = new CFPlus::UI::Table;	1483	$r->add (my $table = new CFPlus::UI::Table
		1484	row_expand => [0],
		1485	col_expand => [0, 1, 0, 1],
		1486	);
1185		1487
1186	for (	1488	for (
1187	["General", 0, 0,	1489	["General", 0, 0,
1188	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1490	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189	["Inhibit autopickup" => PICKUP_INHIBIT],	1491	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1224	],	1526	],
1225	["Weight/Value ratio", 2, 17]	1527	["Weight/Value ratio", 2, 17]
1226	)	1528	)
1227	{	1529	{
1228	my ($title, $x, $y, @bits) = @$_;	1530	my ($title, $x, $y, @bits) = @$_;
1229	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1531	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1230		1532
1231	for (@bits) {	1533	for (@bits) {
1232	++$y;	1534	++$y;
1233		1535
1234	my $mask = $_->[1];	1536	my $mask = $_->[1];
1235	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);	1537	$table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1236	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox	1538	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1237	state => $::CFG->{pickup} & $mask,	1539	state => $::CFG->{pickup} & $mask,
1238	on_changed => sub {	1540	on_changed => sub {
1239	my ($box, $value) = @_;	1541	my ($box, $value) = @_;
1240		1542
1241	if ($value) {	1543	if ($value) {
…		…
1252		1554
1253	${$_->[2]} = $checkbox if $_->[2];	1555	${$_->[2]} = $checkbox if $_->[2];
1254	}	1556	}
1255	}	1557	}
1256		1558
1257	$table->add (2, 18, new CFPlus::UI::ValSlider	1559	$table->add_at (2, 18, new CFPlus::UI::ValSlider
1258	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1560	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1259	template => ">= 99",	1561	template => ">= 99",
1260	to_value => sub { ">= " . 5 * $_[0] },	1562	to_value => sub { ">= " . 5 * $_[0] },
1261	on_changed => sub {	1563	on_changed => sub {
1262	my ($slider, $value) = @_;	1564	my ($slider, $value) = @_;
…		…
1265	$::CFG->{pickup} |= int $value	1567	$::CFG->{pickup} |= int $value
1266	if $value;	1568	if $value;
1267	1;	1569	1;
1268	});	1570	});
1269		1571
1270	$table->add (3, 18, new CFPlus::UI::Button	1572	$table->add_at (3, 18, new CFPlus::UI::Button
1271	text => "set",	1573	text => "set",
1272	on_activate => sub {	1574	on_activate => sub {
1273	$::CONN->send_command ("pickup $::CFG->{pickup}")	1575	$::CONN->send_command ("pickup $::CFG->{pickup}")
1274	if defined $::CONN;	1576	if defined $::CONN;
1275	0	1577	0
1276	});	1578	});
1277		1579
1278	$table	1580	$r
1279	}	1581	}
1280		1582
1281	my %SORT_ORDER = (	1583	my %SORT_ORDER = (
1282	type => undef,	1584	type => undef,
1283	mtime => sub {	1585	mtime => sub {
…		…
1327	$sw1->add ($INV = new CFPlus::UI::Inventory);	1629	$sw1->add ($INV = new CFPlus::UI::Inventory);
1328	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});	1630	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1329		1631
1330	$hb->add (my $vb2 = new CFPlus::UI::VBox);	1632	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1331		1633
1332	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);	1634	$vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1333		1635
1334	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	1636	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1335	$sw2->add ($INVR = new CFPlus::UI::Inventory);	1637	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1336		1638
1337	# XXX: Call after $INVR = ... because set_opencont sets the items	1639	# XXX: Call after $INVR = ... because set_opencont sets the items
1338	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");	1640	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1339		1641
1340	$hb	1642	$hb
		1643	}
		1644
		1645	sub media_window {
		1646	my $vb = new CFPlus::UI::VBox;
		1647
		1648	$vb->add (new CFPlus::UI::FancyFrame
		1649	label => "Currently playing music",
		1650	child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
		1651	child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
		1652	);
		1653
		1654	$vb->add (new CFPlus::UI::FancyFrame
		1655	label => "Other media used in this session",
		1656	expand => 1,
		1657	child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
		1658	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
		1659	);
		1660
		1661	$vb
		1662	}
		1663
		1664	sub add_license {
		1665	my ($meta) = @_;
		1666
		1667	$meta = $meta->{data}
		1668	or return;
		1669
		1670	$meta->{license} || $meta->{author} || $meta->{source}
		1671	or return;
		1672
		1673	$LICENSE_WIDGET->add_paragraph ({
		1674	fg => [1, 1, 1, 1],
		1675	markup => "<small>"
		1676	. "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
		1677	. "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
		1678	. "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
		1679	. "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
		1680	. "</small>",
		1681	});
		1682	$LICENSE_WIDGET->scroll_to_bottom;
1341	}	1683	}
1342		1684
1343	sub toggle_player_page {	1685	sub toggle_player_page {
1344	my ($widget) = @_;	1686	my ($widget) = @_;
1345		1687
…		…
1362	has_close_button => 1	1704	has_close_button => 1
1363	;	1705	;
1364		1706
1365	my $ntb =	1707	my $ntb =
1366	$PL_NOTEBOOK =	1708	$PL_NOTEBOOK =
1367	new CFPlus::UI::Notebook expand => 1, debug => 1;	1709	new CFPlus::UI::Notebook expand => 1;
1368		1710
1369	$ntb->add (	1711	$ntb->add_tab (
1370	"Statistics (F2)" => $STATS_PAGE = stats_window,	1712	"Statistics (F2)" => $STATS_PAGE = stats_window,
1371	"Shows statistics, where all your Stats and Resistances are shown."	1713	"Shows statistics, where all your Stats and Resistances are shown."
1372	);	1714	);
1373	$ntb->add (	1715	$ntb->add_tab (
1374	"Skills (F3)" => $SKILL_PAGE = skill_window,	1716	"Skills (F3)" => $SKILL_PAGE = skill_window,
1375	"Shows all your Skills."	1717	"Shows all your Skills."
1376	);	1718	);
1377		1719
1378	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1720	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1379	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);	1721	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1380	$ntb->add (	1722	$ntb->add_tab (
1381	"Spellbook (F4)" => $spellsw,	1723	"Spellbook (F4)" => $spellsw,
1382	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1724	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1383	);	1725	);
1384	$ntb->add (	1726	$ntb->add_tab (
1385	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1727	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1386	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1728	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1387	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1729	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1388	);	1730	);
		1731	$ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
		1732	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
		1733
		1734	$ntb->add_tab (Media => media_window,
		1735	"License, Author and Source info for media sent by the server.");
1389		1736
1390	$ntb->set_current_page ($INVENTORY_PAGE);	1737	$ntb->set_current_page ($INVENTORY_PAGE);
1391		1738
1392	$plwin->add ($ntb);	1739	$plwin->add ($ntb);
1393	$plwin	1740	$plwin
…		…
1547	on_activate => sub { $QUIT_DIALOG->hide; 0 },	1894	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1548	);	1895	);
1549	$hb->add (new CFPlus::UI::Button	1896	$hb->add (new CFPlus::UI::Button
1550	text => "Quit anyway",	1897	text => "Quit anyway",
1551	expand => 1,	1898	expand => 1,
1552	on_activate => sub { exit },	1899	on_activate => sub { Event::unloop_all },
1553	);	1900	);
1554	}	1901	}
1555		1902
1556	$QUIT_DIALOG->show;	1903	$QUIT_DIALOG->show;
1557	$QUIT_DIALOG->grab_focus;	1904	$QUIT_DIALOG->grab_focus;
…		…
1559		1906
1560	sub show_tip_of_the_day {	1907	sub show_tip_of_the_day {
1561	# find all tips	1908	# find all tips
1562	my @tod = CFPlus::Pod::find tip_of_the_day => "*";	1909	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1563		1910
1564	my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");	1911	CFPlus::DB::get state => "tip_of_the_day", sub {
		1912	my ($todindex) = @_;
1565	$todindex = 0 if $todindex >= @tod;	1913	$todindex = 0 if $todindex >= @tod;
1566	$CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);	1914	CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1567		1915
1568	# create dialog	1916	# create dialog
1569	my $dialog;	1917	my $dialog;
1570		1918
1571	my $close = sub {	1919	my $close = sub {
1572	$dialog->destroy;	1920	$dialog->destroy;
		1921	};
		1922
		1923	$dialog = new CFPlus::UI::Toplevel
		1924	x => "center",
		1925	y => "center",
		1926	z => 3,
		1927	name => 'tip_of_the_day',
		1928	force_w => int $WIDTH * 4/9,
		1929	force_h => int $WIDTH * 2/9,
		1930	title => "Tip of the day #" . (1 + $todindex),
		1931	child => my $vbox = new CFPlus::UI::VBox,
		1932	has_close_button => 1,
		1933	on_delete => $close,
		1934	;
		1935
		1936	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1937	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1938	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1939
		1940	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
		1941
		1942	$table->add_at (0, 0, new CFPlus::UI::Button
		1943	text => "Close",
		1944	tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
		1945	on_activate => $close,
		1946	);
		1947
		1948	$table->add_at (2, 0, new CFPlus::UI::Button
		1949	text => "Next",
		1950	tooltip => "Show the next <b>Tip of the day</b>.",
		1951	on_activate => sub {
		1952	$close->();
		1953	&show_tip_of_the_day;
		1954	},
		1955	);
		1956
		1957	$dialog->show;
1573	};	1958	};
1574
1575	$dialog = new CFPlus::UI::Toplevel
1576	x => "center",
1577	y => "center",
1578	z => 3,
1579	name => 'tip_of_the_day',
1580	force_w => int $WIDTH * 4/9,
1581	force_h => int $WIDTH * 2/9,
1582	title => "Tip of the day #" . (1 + $todindex),
1583	child => my $vbox = new CFPlus::UI::VBox,
1584	has_close_button => 1,
1585	on_delete => $close,
1586	;
1587
1588	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1589	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1590	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1591
1592	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1593
1594	$table->add (0, 0, new CFPlus::UI::Button
1595	text => "Close",
1596	tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1597	on_activate => $close,
1598	);
1599
1600	$table->add (2, 0, new CFPlus::UI::Button
1601	text => "Next",
1602	tooltip => "Show the next <b>Tip of the day</b>.",
1603	on_activate => sub {
1604	$close->();
1605	&show_tip_of_the_day;
1606	},
1607	);
1608
1609	$dialog->show;
1610	}	1959	}
1611		1960
1612	sub sdl_init {	1961	sub sdl_init {
1613	CFPlus::SDL_Init	1962	CFPlus::SDL_Init
1614	and die "SDL::Init failed!\n";	1963	and die "SDL::Init failed!\n";
1615	}	1964	}
1616		1965
1617	sub video_init {	1966	sub video_init {
1618	sdl_init;
1619
1620	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	1967	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1621		1968
1622	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	1969	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1623		1970
1624	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1971	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1625	$FULLSCREEN = $CFG->{fullscreen};	1972	$FULLSCREEN = $CFG->{fullscreen};
1626	$FAST = $CFG->{fast};	1973	$FAST = $CFG->{fast};
1627		1974
1628	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1975	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1629	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";	1976	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1630		1977
1631	$SDL_ACTIVE = 1;	1978	$SDL_ACTIVE = 1;
1632	$LAST_REFRESH = time - 0.01;	1979	$LAST_REFRESH = time - 0.01;
1633		1980
1634	CFPlus::OpenGL::init;	1981	CFPlus::OpenGL::init;
		1982	CFPlus::Macro::init;
1635		1983
1636	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1984	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1637		1985
1638	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1986	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1639		1987
1640	#############################################################################	1988	#############################################################################
1641		1989
1642	if ($DEBUG_STATUS) {	1990	if ($DEBUG_STATUS) {
1643	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1991	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1644	} else {	1992	} else {
1645	# create the widgets	1993	# create/configure the widgets
		1994
		1995	$CFPlus::UI::ROOT->connect (key_down => sub {
		1996	my (undef, $ev) = @_;
		1997
		1998	if (my @macros = CFPlus::Macro::find $ev) {
		1999	CFPlus::Macro::execute $_ for @macros;
		2000
		2001	return 1;
		2002	}
		2003
		2004	0
		2005	});
1646		2006
1647	$DEBUG_STATUS = new CFPlus::UI::Label	2007	$DEBUG_STATUS = new CFPlus::UI::Label
1648	padding => 0,	2008	padding => 0,
1649	z => 100,	2009	z => 100,
1650	force_x => "max",	2010	force_x => "max",
…		…
1675		2035
1676	$MAPWIDGET = new CFPlus::MapWidget;	2036	$MAPWIDGET = new CFPlus::MapWidget;
1677	$MAPWIDGET->connect (activate_console => sub {	2037	$MAPWIDGET->connect (activate_console => sub {
1678	my ($mapwidget, $preset) = @_;	2038	my ($mapwidget, $preset) = @_;
1679		2039
1680	if ($CONSOLE) {	2040	$MESSAGE_WINDOW->activate_console ($preset)
1681	$CONSOLE->{input}->{auto_activated} = 1;	2041	if $MESSAGE_WINDOW;
1682	$CONSOLE->{input}->grab_focus;
1683
1684	if ($preset && $CONSOLE->{input}->get_text eq '') {
1685	$CONSOLE->{input}->set_text ($preset);
1686	}
1687	}
1688	});	2042	});
1689	$MAPWIDGET->show;	2043	$MAPWIDGET->show;
1690	$MAPWIDGET->grab_focus;	2044	$MAPWIDGET->grab_focus;
1691		2045
1692	$LOGVIEW = new CFPlus::UI::TextScroller	2046	$COMPLETER = new CFPlus::MapWidget::Command::
1693	expand => 1,	2047	command => { },
1694	font => $FONT_FIXED,	2048	tooltip => "#completer_help",
1695	fontsize => $::CFG->{log_fontsize},
1696	indent => -4,
1697	can_hover => 1,
1698	can_events => 1,
1699	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1700	;	2049	;
1701		2050
1702	$SETUP_DIALOG = new CFPlus::UI::Toplevel	2051	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1703	title => "Setup",	2052	title => "Setup",
1704	name => "setup_dialog",	2053	name => "setup_dialog",
…		…
1709	force_h => $::HEIGHT * 0.6,	2058	force_h => $::HEIGHT * 0.6,
1710	has_close_button => 1,	2059	has_close_button => 1,
1711	;	2060	;
1712		2061
1713	$METASERVER = metaserver_dialog;	2062	$METASERVER = metaserver_dialog;
		2063	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1714		2064
1715	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,	2065	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1716	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	2066	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1717		2067
1718	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	2068	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1719	"Configure the server to play on, your username, password and other server-related options.");	2069	"Configure the server to play on, your username, password and other server-related options.");
1720	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	2070	$SETUP_NOTEBOOK->add_tab (Client => client_setup,
1721	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	2071	"Configure various client-specific settings.");
1722	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	2072	$SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1723	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	2073	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1724	$SETUP_NOTEBOOK->add (Audio => audio_setup,	2074	$SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1725	"Configure the use of audio, sound effects and background music.");	2075	"Configure the use of audio, sound effects and background music.");
1726	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	2076	$SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1727	"Lets you define, edit and delete key bindings."	2077	"Lets you define, edit and delete key bindings."
1728	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "	2078	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1729	. "with nothing set and the recording started. After doing the actions you "	2079	. "with nothing set and the recording started. After doing the actions you "
1730	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	2080	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1731	. "After pressing the combo the binding will be saved automatically and the "	2081	. "After pressing the combo the binding will be saved automatically and the "
1732	. "binding editor closes");	2082	. "binding editor closes");
1733	$SETUP_NOTEBOOK->add (Debug => debug_setup,	2083	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1734	"Some debuggin' options. Do not ask.");	2084	"Some debuggin' options. Do not ask.");
1735		2085
1736	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	2086	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1737		2087
1738	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	2088	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1739	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	2089	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1740		2090
1741	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	2091	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1742	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	2092	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1743		2093
1744	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	2094	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1745		2095
1746	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,	2096	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
…		…
1766	tooltip => "Terminates the program",	2116	tooltip => "Terminates the program",
1767	on_activate => sub {	2117	on_activate => sub {
1768	if ($CONN) {	2118	if ($CONN) {
1769	open_quit_dialog;	2119	open_quit_dialog;
1770	} else {	2120	} else {
1771	exit;	2121	Event::unloop_all;
1772	}	2122	}
1773	0	2123	0
1774	},	2124	},
1775	);	2125	);
1776		2126
1777	$BUTTONBAR->show;	2127	$BUTTONBAR->show;
1778	$SETUP_DIALOG->show;	2128	$SETUP_DIALOG->show;
		2129	$MESSAGE_WINDOW->show;
1779	}	2130	}
1780		2131
1781	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	2132	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1782	}
1783
1784	sub setup_build_button {
1785	my ($enabled) = @_;
1786	if ($enabled) {
1787	$BUILD_BUTTON->hide if $BUILD_BUTTON;
1788	$BUILD_BUTTON ||= new CFPlus::UI::Button
1789	text => "Build",
1790	tooltip => "Opens the ingame builder",
1791	on_activate => sub {
1792	if ($CONN) {
1793	$CONN->send_ext_req (builder_player_items => sub {
1794	open_ingame_editor ($_[0]) if exists $_[0]->{items};
1795	});
1796	}
1797	0
1798	};
1799	$BUTTONBAR->add ($BUILD_BUTTON);
1800	} else {
1801	$BUILD_BUTTON->hide if $BUILD_BUTTON;
1802	}
1803	}
1804
1805	sub open_ingame_editor {
1806	my ($msg) = @_;
1807
1808	my $win = new CFPlus::UI::Toplevel
1809	x => 0,
1810	y => 'center',
1811	z => 4,
1812	name => 'builder_window',
1813	force_w => int $WIDTH * 1/4,
1814	force_h => int $HEIGHT * 3/4,
1815	title => "In game builder",
1816	has_close_button => 1;
1817
1818	my $r = new CFPlus::UI::ScrolledWindow (
1819	expand => 1,
1820	scroll_y => 1
1821	);
1822	$r->add (my $vb = new CFPlus::UI::VBox);
1823	$win->add ($r);
1824
1825
1826	$vb->add (
1827	new CFPlus::UI::Button
1828	text => "Disable build mode",
1829	on_activate => sub { $::IN_BUILD_MODE = undef }
1830	);
1831	$vb->add (
1832	new CFPlus::UI::Button
1833	text => "ERASE",
1834	on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1835	);
1836
1837	for my $itemarchname (
1838	sort {
1839	$msg->{items}->{$a}->{build_arch_name}
1840	cmp $msg->{items}->{$b}->{build_arch_name}
1841	} keys %{$msg->{items}}
1842	) {
1843	my $info = $msg->{items}->{$itemarchname};
1844	$vb->add (
1845	new CFPlus::UI::Button text => $info->{build_arch_name},
1846	on_activate => sub {
1847	$::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1848
1849	if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1850	build_mode_query_arch_info ();
1851	}
1852	}
1853	);
1854	}
1855
1856	$win->show;
1857	}
1858
1859	sub build_mode_query_arch_info {
1860	my ($iteminfo) = $::IN_BUILD_MODE;
1861	my $itemarchname = $iteminfo->{item};
1862	my $info = $iteminfo->{info};
1863
1864	my $dialog = new CFPlus::UI::Toplevel
1865	x => "center",
1866	y => "center",
1867	z => 50,
1868	force_w => int $WIDTH * 1/2,
1869	title => "Enter information for placement of '$itemarchname'",
1870	has_close_button => 1;
1871
1872	$dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1873
1874	$vb->add (my $table = new CFPlus::UI::Table expand => 1);
1875	my $row = 0;
1876	if ($info->{has_name}) {
1877	$table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1878	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1879	}
1880	if ($info->{has_text}) {
1881	$table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1882	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1883	}
1884	if ($info->{has_connection}) {
1885	$table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1886	$table->add (1, $row++,
1887	new CFPlus::UI::Entry
1888	expand => 1,
1889	on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1890	tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1891	);
1892	}
1893
1894	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1895	$hb->add (new CFPlus::UI::Button
1896	text => "Close",
1897	expand => 1,
1898	on_activate => sub { $dialog->hide; 0 },
1899	);
1900	$dialog->show;
1901	}	2133	}
1902		2134
1903	sub video_shutdown {	2135	sub video_shutdown {
1904	CFPlus::OpenGL::shutdown;	2136	CFPlus::OpenGL::shutdown;
1905		2137
1906	undef $SDL_ACTIVE;	2138	undef $SDL_ACTIVE;
1907	}	2139	}
1908		2140
1909	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1910	my $bgmusic;#TODO#hack#d#
1911
1912	sub audio_channel_finished {
1913	my ($channel) = @_;
1914
1915	#warn "channel $channel finished\n";#d#
1916	}
1917
1918	sub audio_music_finished {
1919	return unless $CFG->{bgm_enable};
1920
1921	# TODO: hack, do play loop and mood music
1922	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1923	$bgmusic->play (0);
1924
1925	push @bgmusic, shift @bgmusic;
1926	}
1927
1928	sub audio_init {
1929	if ($CFG->{audio_enable}) {
1930	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1931	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1932
1933	unless ($SDL_MIXER) {
1934	status "Unable to open sound device: there will be no sound";
1935	return;
1936	}
1937
1938	CFPlus::Mix_AllocateChannels 8;
1939	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1940
1941	audio_music_finished;
1942
1943	local $_;
1944	while (<$fh>) {
1945	next if /^\s*#/;
1946	next if /^\s*$/;
1947
1948	my ($file, $volume, $event) = split /\s+/, $_, 3;
1949
1950	push @SOUNDS, "$volume,$file";
1951
1952	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1953	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1954	$chunk->volume ($volume * 128 / 100);
1955	$chunk
1956	};
1957	}
1958	} else {
1959	status "unable to open sound config: $!";
1960	}
1961	}
1962	}
1963
1964	sub audio_shutdown {
1965	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1966	undef $SDL_MIXER;
1967	@SOUNDS = ();
1968	%AUDIO_CHUNKS = ();
1969	}
1970
1971	my %animate_object;	2141	my %animate_object;
1972	my $animate_timer;	2142	my $animate_timer;
1973		2143
1974	my $fps = 9;	2144	my $fps = 9;
1975		2145
1976	my %demo;#d#
1977
1978	sub force_refresh {	2146	sub force_refresh {
		2147	if ($ENV{CFPLUS_DEBUG} & 4) {
1979	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2148	$fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1980	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2149	debug sprintf "%3.2f", $fps;
		2150	}
1981		2151
1982	$CFPlus::UI::ROOT->draw;	2152	$CFPlus::UI::ROOT->draw;
1983		2153	CFPlus::SDL_GL_SwapBuffers;
1984	$WANT_REFRESH = 0;
1985	$CAN_REFRESH = 0;
1986	$LAST_REFRESH = $NOW;	2154	$LAST_REFRESH = $NOW;
1987		2155	$WANT_REFRESH->stop;
1988	CFPlus::SDL_GL_SwapBuffers;
1989	}	2156	}
1990		2157
		2158	$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
		2159
1991	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2160	my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1992	$NOW = time;	2161	$NOW = time;
1993		2162
1994	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2163	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1995	for CFPlus::SDL_PollEvent;	2164	for CFPlus::poll_events;
1996		2165
1997	if (%animate_object) {	2166	if (%animate_object) {
1998	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2167	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1999	$WANT_REFRESH++;	2168	$WANT_REFRESH->start;
2000	}
2001
2002	if ($WANT_REFRESH) {
2003	force_refresh;
2004	} else {
2005	$CAN_REFRESH = 1;
2006	}	2169	}
2007	});	2170	});
2008		2171
2009	sub animation_start {	2172	sub animation_start {
2010	my ($widget) = @_;	2173	my ($widget) = @_;
…		…
2014	sub animation_stop {	2177	sub animation_stop {
2015	my ($widget) = @_;	2178	my ($widget) = @_;
2016	delete $animate_object{$widget};	2179	delete $animate_object{$widget};
2017	}	2180	}
2018		2181
2019	# check once/second for faces that need to be prefetched
2020	# this should, of course, only run on demand, but
2021	# SDL forces worse things on us....
2022
2023	Event->timer (after => 1, interval => 0.25, cb => sub {
2024	$CONN->face_prefetch
2025	if $CONN;
2026	});
2027
2028	%SDL_CB = (	2182	%SDL_CB = (
2029	CFPlus::SDL_QUIT => sub {	2183	CFPlus::SDL_QUIT => sub {
2030	Event::unloop -1;	2184	Event::unloop_all;
2031	},	2185	},
2032	CFPlus::SDL_VIDEORESIZE => sub {	2186	CFPlus::SDL_VIDEORESIZE => sub {
2033	},	2187	},
2034	CFPlus::SDL_VIDEOEXPOSE => sub {	2188	CFPlus::SDL_VIDEOEXPOSE => sub {
2035	CFPlus::UI::full_refresh;	2189	CFPlus::UI::full_refresh;
2036	},	2190	},
2037	CFPlus::SDL_ACTIVEEVENT => sub {	2191	CFPlus::SDL_ACTIVEEVENT => sub {
2038	# not useful, as APPACTIVE include sonly iconified state, not unmapped	2192	# not useful, as APPACTIVE include sonly iconified state, not unmapped
2039	# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#	2193	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
		2194	# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2040	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;	2195	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2041	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;	2196	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2042	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;	2197	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2043	},	2198	},
2044	CFPlus::SDL_KEYDOWN => sub {	2199	CFPlus::SDL_KEYDOWN => sub {
…		…
2068		2223
2069	$SIG{INT} = $SIG{TERM} = sub { exit };	2224	$SIG{INT} = $SIG{TERM} = sub { exit };
2070		2225
2071	{	2226	{
2072	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";	2227	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
		2228	CFPlus::DB::Server::run;
		2229
2073	CFPlus::UI::set_layout ($::CFG->{layout});	2230	CFPlus::UI::set_layout ($::CFG->{layout});
2074		2231
2075	my %DEF_CFG = (	2232	my %DEF_CFG = (
2076	sdl_mode => 0,	2233	sdl_mode => 0,
2077	width => 640,
2078	height => 480,
2079	fullscreen => 0,	2234	fullscreen => 0,
2080	fast => 0,	2235	fast => 0,
		2236	force_opengl11 => undef,
		2237	texture_compression => 1,
2081	map_scale => 1,	2238	map_scale => 1,
2082	fow_enable => 1,	2239	fow_enable => 1,
2083	fow_intensity => 0.45,	2240	fow_intensity => 0,
2084	fow_smooth => 0,	2241	map_smoothing => 1,
2085	gui_fontsize => 1,	2242	gui_fontsize => 1,
2086	log_fontsize => 0.7,	2243	log_fontsize => 0.7,
2087	gauge_fontsize => 1,	2244	gauge_fontsize => 1,
2088	gauge_size => 0.35,	2245	gauge_size => 0.35,
2089	stat_fontsize => 0.7,	2246	stat_fontsize => 0.7,
2090	mapsize => 100,	2247	mapsize => 100,
2091	say_command => 'chat',
2092	audio_enable => 1,	2248	audio_enable => 1,
		2249	effects_enable => 1,
		2250	effects_volume => 1,
2093	bgm_enable => 1,	2251	bgm_enable => 1,
2094	bgm_volume => 0.25,	2252	bgm_volume => 0.5,
2095	face_prefetch => 0,
2096	output_sync => 1,	2253	output_sync => 1,
2097	output_count => 1,	2254	output_count => 1,
		2255	output_rate => "",
2098	pickup => 0,	2256	pickup => 0,
2099	inv_sort => "mtime",	2257	inv_sort => "mtime",
2100	default => "profile", # default profile	2258	default => "profile", # default profile
2101	show_tips => 1,	2259	show_tips => 1,
		2260	logview_max_par => 1000,
2102	);	2261	);
2103		2262
2104	while (my ($k, $v) = each %DEF_CFG) {	2263	while (my ($k, $v) = each %DEF_CFG) {
2105	$CFG->{$k} = $v unless exists $CFG->{$k};	2264	$CFG->{$k} = $v unless exists $CFG->{$k};
2106	}	2265	}
…		…
2120	}	2279	}
2121	}	2280	}
2122		2281
2123	sdl_init;	2282	sdl_init;
2124		2283
2125	@SDL_MODES = reverse	2284	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2126	grep $_->[0] >= 640 && $_->[1] >= 480,	2285	@SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2127	CFPlus::SDL_ListModes;
2128
2129	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2286	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2287
		2288	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2130		2289
2131	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2290	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2132		2291
2133	{	2292	{
2134	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(	2293	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
…		…
2163	# }	2322	# }
2164	# my $t2 = Time::HiRes::time;	2323	# my $t2 = Time::HiRes::time;
2165	# warn $t2-$t1;	2324	# warn $t2-$t1;
2166	# }	2325	# }
2167		2326
2168	$startup_done->();
2169
2170	video_init;	2327	video_init;
2171	audio_init;	2328	audio_init;
2172	}	2329	}
2173		2330
2174	show_tip_of_the_day if $CFG->{show_tips};	2331	show_tip_of_the_day if $CFG->{show_tips};
2175		2332
		2333	Event->idle (cb => sub {
		2334	$_[0]->w->cancel;
		2335	$startup_done->();
		2336	});
		2337
2176	Event::loop;	2338	Event::loop;
		2339
		2340	#video_shutdown;
		2341	#audio_shutdown;
2177	#CFPlus::SDL_Quit;	2342	CFPlus::SDL_Quit;
2178	#CFPlus::_exit 0;	2343	CFPlus::DB::Server::stop;
2179
2180	END { CFPlus::SDL_Quit }
2181		2344
2182	=head1 NAME	2345	=head1 NAME
2183		2346
2184	cfplus - A Crossfire+ and Crossfire game client	2347	cfplus - A Crossfire TRT and Crossfire game client
2185		2348
2186	=head1 SYNOPSIS	2349	=head1 SYNOPSIS
2187		2350
2188	Just run it - no commandline arguments are supported.	2351	Just run it - no commandline arguments are supported.
2189		2352
2190	=head1 USAGE	2353	=head1 USAGE
2191		2354
2192	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used	2355	cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2193	fullscreen and interactively.	2356	be used in fullscreen mode and interactively.
2194		2357
2195	=head1 DEBUGGING	2358	=head1 DEBUGGING
2196		2359
2197		2360
2198	CFPLUS_DEBUG - environment variable	2361	CFPLUS_DEBUG - environment variable

Diff Legend

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