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.177 by root, Thu Jul 19 15:43:14 2007 UTC vs.
Revision 1.205 by root, Thu Aug 9 03:40:02 2007 UTC

…		…
71	unshift @INC, $ENV{PAR_TEMP}	71	unshift @INC, $ENV{PAR_TEMP}
72	if %PAR::LibCache;	72	if %PAR::LibCache;
73		73
74	use Time::HiRes 'time';	74	use Time::HiRes 'time';
75	use Event;	75	use Event;
		76	use List::Util qw(max min);
76		77
77	use Crossfire;	78	use Crossfire;
78	use Crossfire::Protocol::Constants;	79	use Crossfire::Protocol::Constants;
79		80
80	use Compress::LZF;	81	use Compress::LZF;
…		…
82	use CFPlus;	83	use CFPlus;
83	use CFPlus::OpenGL ();	84	use CFPlus::OpenGL ();
84	use CFPlus::Protocol;	85	use CFPlus::Protocol;
85	use CFPlus::DB;	86	use CFPlus::DB;
86	use CFPlus::UI;	87	use CFPlus::UI;
		88	use CFPlus::UI::Canvas;
87	use CFPlus::UI::Inventory;	89	use CFPlus::UI::Inventory;
88	use CFPlus::UI::SpellList;	90	use CFPlus::UI::SpellList;
		91	use CFPlus::UI::MessageWindow;
89	use CFPlus::Pod;	92	use CFPlus::Pod;
90	use CFPlus::MapWidget;	93	use CFPlus::MapWidget;
91	use CFPlus::Macro;	94	use CFPlus::Macro;
92		95
93	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	96	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
…		…
125		128
126	our $MAP;	129	our $MAP;
127	our $MAPMAP;	130	our $MAPMAP;
128	our $MAPWIDGET;	131	our $MAPWIDGET;
129	our $BUTTONBAR;	132	our $BUTTONBAR;
130	our $LOGVIEW;
131	our $CONSOLE;
132	our $METASERVER;	133	our $METASERVER;
133	our $LOGIN_BUTTON;	134	our $LOGIN_BUTTON;
134	our $QUIT_DIALOG;	135	our $QUIT_DIALOG;
135	our $HOST_ENTRY;	136	our $HOST_ENTRY;
136	our $FULLSCREEN_ENABLE;	137	our $FULLSCREEN_ENABLE;
…		…
143	our $SETUP_KEYBOARD;	144	our $SETUP_KEYBOARD;
144		145
145	our $PL_NOTEBOOK;	146	our $PL_NOTEBOOK;
146	our $PL_WINDOW;	147	our $PL_WINDOW;
147		148
		149	our $MUSIC_PLAYING_WIDGET;
		150	our $LICENSE_WIDGET;
		151
148	our $INVENTORY_PAGE;	152	our $INVENTORY_PAGE;
149	our $STATS_PAGE;	153	our $STATS_PAGE;
150	our $SKILL_PAGE;	154	our $SKILL_PAGE;
151	our $SPELL_PAGE;	155	our $SPELL_PAGE;
152	our $SPELL_LIST;	156	our $SPELL_LIST;
…		…
158	our $STATWIDS;	162	our $STATWIDS;
159		163
160	our $SDL_ACTIVE;	164	our $SDL_ACTIVE;
161	our %SDL_CB;	165	our %SDL_CB;
162		166
163	our $SDL_MIXER;
164	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165	our @MUSIC_WANT;
166	our $MUSIC_START;
167	our $MUSIC_PLAYING;
168	our $MUSIC_PLAYER;
169	our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
170	our @SOUNDS; # event => file mapping
171	our %AUDIO_CHUNKS; # audio files
172
173	our $ALT_ENTER_MESSAGE;	167	our $ALT_ENTER_MESSAGE;
174	our $STATUSBOX;	168	our $STATUSBOX;
175	our $DEBUG_STATUS;	169	our $DEBUG_STATUS;
176		170
177	our $INV;	171	our $INV;
178	our $INVR;	172	our $INVR;
179	our $INV_RIGHT_HB;	173	our $INV_RIGHT_HB;
180		174
181	our $PICKUP_CFG;	175	our $PICKUP_CFG;
182		176
183	our $IN_BUILD_MODE;	177	#############################################################################
184	our $BUILD_BUTTON;
185		178
186	sub status {	179	sub status {
187	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	180	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
188	}	181	}
189		182
…		…
191	$DEBUG_STATUS->set_text ($_[0]);	184	$DEBUG_STATUS->set_text ($_[0]);
192	}	185	}
193		186
194	sub message {	187	sub message {
195	my ($para) = @_;	188	my ($para) = @_;
196		189	$MESSAGE_WINDOW->message ($para);
197	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
198
199	$para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
200
201	$LOGVIEW->add_paragraph ($para);
202	$LOGVIEW->scroll_to_bottom;
203	}	190	}
		191
		192	#############################################################################
		193	#TODO: maybe move into own audio module...
		194
		195	our $SDL_MIXER;
		196
		197	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
		198	our $MUSIC_WANT; # arryref of ambient music we want to play
		199	our @MUSIC_HAVE; # ambient music we have on disk
		200	our $MUSIC_START;
		201	our @MUSIC_JINGLE; # which jingles to play next
		202	our $MUSIC_PLAYING_DATA;
		203	our $MUSIC_PLAYING_META;
		204	our $MUSIC_PLAYER;
		205	our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
		206
		207	our %AUDIO_CHUNK; # audio "files"
		208	our %AUDIO_PLAY; # which audio faces should be played
		209
		210	sub audio_channel_finished {
		211	my ($channel) = @_;
		212
		213	# warn "channel $channel finished\n";#d#
		214	}
		215
		216	sub audio_sound_push($) {
		217	my ($face) = @_;
		218
		219	$CFG->{effects_enable}
		220	or return;
		221
		222	if (my $chunk = $AUDIO_CHUNK{$face}) {
		223	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
		224	my (undef, $dx, $dy, $vol) = @$_;
		225
		226	my $channel = CFPlus::Channel::find;
		227	$channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
		228	$dx = $dx / 10 * 255;
		229	$channel->set_panning (255 - $dx, 255 + $dx);
		230
		231	# my $angle = $dx ? : $dx < 0 ?
		232	# my $distance = -$vol;
		233	# $channel->set_position ($angle, $distance);
		234
		235	$chunk->play ($channel);
		236	}
		237	} else {
		238	# sound_meta not set means data is in flight either way
		239	my $meta = $CONN->{sound_meta}{$face}
		240	or return;
		241
		242	# if its a jingle, play it as ambient music
		243	if ($meta->{meta}{jingle}) {
		244	if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
		245	push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
		246	&audio_music_push ($face);
		247	}
		248	} else {
		249	# fetch from database
		250	CFPlus::DB::get res_data => $meta->{name}, sub {
		251	my $rwops = new CFPlus::RW $_[0];
		252	my $chunk = new CFPlus::MixChunk $rwops
		253	or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
		254	$chunk->volume (($meta->{meta}{volume} || 1) * 128);
		255	$AUDIO_CHUNK{$face} = $chunk;
		256
		257	audio_sound_push ($face);
		258	};
		259	}
		260	}
		261	}
		262
		263	sub audio_sound_play {
		264	my ($face, $dx, $dy, $vol) = @_;
		265
		266	$SDL_MIXER
		267	or return;
		268	$CFG->{effects_enable}
		269	or return;
		270
		271	my $queue = $AUDIO_PLAY{$face} ||= [];
		272	push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
		273	audio_sound_push $face
		274	unless @$queue > 1;
		275	}
		276
		277	sub audio_music_set_meta {
		278	my ($meta) = @_;
		279
		280	$MUSIC_PLAYING_META = $meta;
		281	$MUSIC_PLAYING_WIDGET->set_markup (
		282	"<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
		283	. "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
		284	. "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
		285	. "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
		286	);
		287	}
		288
		289	sub audio_music_update_volume {
		290	return unless $MUSIC_PLAYING_META;
		291	my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
		292	my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
		293	CFPlus::MixMusic::volume $base * $volume * 128;
		294	}
		295
		296	sub audio_music_start {
		297	my $meta = $MUSIC_PLAYING_META;
		298
		299	CFPlus::DB::get res_data => $meta->{name}, sub {
		300	return unless $SDL_MIXER;
		301
		302	# music might have changed...
		303	$meta eq $MUSIC_PLAYING_META
		304	or return &audio_music_start ();
		305
		306	audio_music_update_volume;
		307
		308	$MUSIC_PLAYING_DATA = \$_[0];
		309
		310	my $rwops = $meta->{path}
		311	? new_from_file CFPlus::RW $meta->{path}
		312	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
		313
		314	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
		315	or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
		316
		317	my $NOW = time;
		318
		319	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
		320	my $pos = $MUSIC_PLAYING_META->{stop_pos};
		321	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
		322	$MUSIC_START = time - $pos;
		323	} else {
		324	$MUSIC_PLAYER->play (0);
		325	$MUSIC_START = time;
		326	}
		327
		328	delete $meta->{stop_time};
		329	delete $meta->{stop_pos};
		330	}
		331	}
		332
		333	sub audio_music_push {
		334	return unless $SDL_MIXER;
		335
		336	my $fade_out;
		337
		338	if (@MUSIC_JINGLE) {
		339	@MUSIC_HAVE = $MUSIC_JINGLE[0];
		340	$fade_out = 333;
		341	} else {
		342	return unless $CFG->{bgm_enable};
		343
		344	my @have =
		345	grep $_,
		346	map $CONN->{music_meta}{$_},
		347	@$MUSIC_WANT;
		348
		349	@MUSIC_HAVE = @have
		350	if @have;
		351
		352	# default MUSIC_HAVE == MUSIC_DEFAULT
		353	@MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
		354	$fade_out = 1000;
		355	}
		356
		357	# if the currently playing song is acceptable, let it continue
		358	return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
		359
		360	my $NOW = time;
		361
		362	if ($MUSIC_PLAYING_META) {
		363	$MUSIC_PLAYING_META->{stop_time} = $NOW;
		364	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
		365	CFPlus::MixMusic::fade_out $fade_out;
		366	} else {
		367	# sort by stop time, oldest first
		368	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
		369
		370	# if the most recently-played piece played very recently,
		371	# resume it, else choose the oldest piece for rotation.
		372	audio_music_set_meta
		373	$MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
		374	? $MUSIC_HAVE[-1]
		375	: $MUSIC_HAVE[0];
		376
		377	audio_music_start;
		378	}
		379	}
		380
		381	sub audio_music_set_ambient {
		382	my ($songs) = @_;
		383
		384	$MUSIC_WANT = $songs;
		385	audio_music_push;
		386	}
		387
		388	sub audio_music_finished {
		389	# we compress multiple jingles of the same type
		390	shift @MUSIC_JINGLE
		391	while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
		392
		393	$MUSIC_PLAYING_WIDGET->clear;
		394
		395	undef $MUSIC_PLAYER;
		396	undef $MUSIC_PLAYING_META;
		397	undef $MUSIC_PLAYING_DATA;
		398
		399	audio_music_push;
		400	}
		401
		402	sub audio_init {
		403	if ($CFG->{audio_enable}) {
		404	$ENV{MIX_EFFECTSMAXSPEED} = 1;
		405	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
		406
		407	unless ($SDL_MIXER) {
		408	status "Unable to open sound device: there will be no sound";
		409	return;
		410	}
		411
		412	CFPlus::Mix_AllocateChannels 16;
		413
		414	audio_music_finished;
		415	} else {
		416	undef $SDL_MIXER;
		417	}
		418	}
		419
		420	sub audio_shutdown {
		421	undef $MUSIC_PLAYER;
		422	undef $MUSIC_PLAYING_META;
		423	undef $MUSIC_PLAYING_DATA;
		424
		425	$MUSIC_WANT = [];
		426	@MUSIC_JINGLE = ();
		427	%AUDIO_PLAY = ();
		428	%AUDIO_CHUNK = ();
		429
		430	CFPlus::Mix_CloseAudio if $SDL_MIXER;
		431	undef $SDL_MIXER;
		432	}
		433
		434	#############################################################################
204		435
205	sub destroy_query_dialog {	436	sub destroy_query_dialog {
206	(delete $_[0]{query_dialog})->destroy	437	(delete $_[0]{query_dialog})->destroy
207	if $_[0]{query_dialog};	438	if $_[0]{query_dialog};
208	}	439	}
…		…
272	ellipsise => 0,	503	ellipsise => 0,
273	markup => "\nOr use your keyboard and the text entry below:\n";	504	markup => "\nOr use your keyboard and the text entry below:\n";
274		505
275	unshift @dialog, my $table = new CFPlus::UI::Table;	506	unshift @dialog, my $table = new CFPlus::UI::Table;
276		507
277	$table->add (0, 0, new CFPlus::UI::Button	508	$table->add_at (0, 0, new CFPlus::UI::Button
278	text => "Next Race",	509	text => "Next Race",
279	on_activate => sub {	510	on_activate => sub {
280	$conn->send ("reply n");	511	$conn->send ("reply n");
281	destroy_query_dialog $conn;	512	destroy_query_dialog $conn;
282	0	513	0
283	},	514	},
284	);	515	);
285	$table->add (2, 0, new CFPlus::UI::Button	516	$table->add_at (2, 0, new CFPlus::UI::Button
286	text => "Accept",	517	text => "Accept",
287	on_activate => sub {	518	on_activate => sub {
288	$conn->send ("reply d");	519	$conn->send ("reply d");
289	destroy_query_dialog $conn;	520	destroy_query_dialog $conn;
290	0	521	0
…		…
333	markup => "\nOr use your keyboard and the text entry below:\n";	564	markup => "\nOr use your keyboard and the text entry below:\n";
334		565
335	unshift @dialog, my $table = new CFPlus::UI::Table;	566	unshift @dialog, my $table = new CFPlus::UI::Table;
336		567
337	# left: re-roll	568	# left: re-roll
338	$table->add (0, 0, new CFPlus::UI::Button	569	$table->add_at (0, 0, new CFPlus::UI::Button
339	text => "Roll Again",	570	text => "Roll Again",
340	on_activate => sub {	571	on_activate => sub {
341	$conn->send ("reply y");	572	$conn->send ("reply y");
342	destroy_query_dialog $conn;	573	destroy_query_dialog $conn;
343	0	574	0
…		…
357	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	588	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
358	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	589	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
359	],	590	],
360	), 1 .. 2;	591	), 1 .. 2;
361		592
362	$table->add (2, 0, new CFPlus::UI::Button	593	$table->add_at (2, 0, new CFPlus::UI::Button
363	text => "Swap Stats",	594	text => "Swap Stats",
364	on_activate => sub {	595	on_activate => sub {
365	$conn->{stat_change_with} = $sw2->{value};	596	$conn->{stat_change_with} = $sw2->{value};
366	$conn->send ("reply $sw1->{value}");	597	$conn->send ("reply $sw1->{value}");
367	destroy_query_dialog $conn;	598	destroy_query_dialog $conn;
368	0	599	0
369	},	600	},
370	);	601	);
371	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);	602	$table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
372		603
373	# right: accept	604	# right: accept
374	$table->add (4, 0, new CFPlus::UI::Button	605	$table->add_at (4, 0, new CFPlus::UI::Button
375	text => "Accept",	606	text => "Accept",
376	on_activate => sub {	607	on_activate => sub {
377	$conn->send ("reply n");	608	$conn->send ("reply n");
378	$STATS_PAGE->hide;	609	$STATS_PAGE->hide;
379	destroy_query_dialog $conn;	610	destroy_query_dialog $conn;
…		…
460	maph => $mapsize,	691	maph => $mapsize,
461		692
462	client => "cfplus $CFPlus::VERSION $] $^O",	693	client => "cfplus $CFPlus::VERSION $] $^O",
463		694
464	map_widget => $MAPWIDGET,	695	map_widget => $MAPWIDGET,
465	logview => $LOGVIEW,
466	statusbox => $STATUSBOX,	696	statusbox => $STATUSBOX,
467	map => $MAP,	697	map => $MAP,
468	mapmap => $MAPMAP,	698	mapmap => $MAPMAP,
469	query => \&server_query,	699	query => \&server_query,
470		700
471	setup_req => {	701	setup_req => {
472	smoothing => $CFG->{map_smoothing}*1,	702	smoothing => $CFG->{map_smoothing}*1,
473	},
474
475	sound_play => sub {
476	my ($x, $y, $soundnum, $type) = @_;
477
478	$SDL_MIXER
479	or return;
480
481	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
482	or return;
483
484	$chunk->play;
485	},	703	},
486	};	704	};
487		705
488	if ($CONN) {	706	if ($CONN) {
489	CFPlus::lowdelay fileno $CONN->{fh};	707	CFPlus::lowdelay fileno $CONN->{fh};
…		…
501	$SETUP_DIALOG->show;	719	$SETUP_DIALOG->show;
502	$PL_WINDOW->hide;	720	$PL_WINDOW->hide;
503	$SPELL_LIST->clear_spells;	721	$SPELL_LIST->clear_spells;
504	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);	722	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505		723
506	&audio_music_set ([]);	724	&audio_music_set_ambient ([]);
507		725
508	return unless $CONN;	726	return unless $CONN;
509		727
510	status "connection closed";	728	status "connection closed";
511		729
…		…
521		739
522	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	740	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
523		741
524	my $row = 0;	742	my $row = 0;
525		743
526	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");	744	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
527	$table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,	745	$table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
528	can_events => 1,	746	can_events => 1,
529	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");	747	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
530		748
531	my $vidmode_tooltip =	749	my $vidmode_tooltip =
532	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "	750	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
533	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";	751	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
534		752
535	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");	753	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
536	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);	754	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
537		755
538	$hbox->add (my $mode_slider = new CFPlus::UI::Slider	756	$hbox->add (my $mode_slider = new CFPlus::UI::Slider
539	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],	757	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
540	tooltip => $vidmode_tooltip);	758	tooltip => $vidmode_tooltip);
541	$hbox->add (my $mode_label = new CFPlus::UI::Label	759	$hbox->add (my $mode_label = new CFPlus::UI::Label
…		…
548	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	766	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
549	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});	767	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
550	});	768	});
551	$mode_slider->emit (changed => $mode_slider->{range}[0]);	769	$mode_slider->emit (changed => $mode_slider->{range}[0]);
552		770
553	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");	771	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
554	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox	772	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
555	state => $CFG->{fullscreen},	773	state => $CFG->{fullscreen},
556	tooltip => "Bring the client into fullscreen mode.",	774	tooltip => "Bring the client into fullscreen mode.",
557	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	775	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
558	);	776	);
559		777
560	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	778	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
561	$table->add (1, $row++, new CFPlus::UI::CheckBox	779	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
562	state => $CFG->{fast},	780	state => $CFG->{fast},
563	tooltip => "Lower the visual quality considerably to speed up rendering.",	781	tooltip => "Lower the visual quality considerably to speed up rendering.",
564	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	782	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
565	);	783	);
566		784
567	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	785	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
568	$table->add (1, $row++, new CFPlus::UI::Slider	786	$table->add_at (1, $row++, new CFPlus::UI::Slider
569	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	787	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
570	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	788	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
571	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },	789	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
572	);	790	);
573		791
574	$table->add (1, $row++, new CFPlus::UI::Button	792	$table->add_at (1, $row++, new CFPlus::UI::Button
575	expand => 1, align => 0, text => "Apply",	793	expand => 1, align => 0, text => "Apply",
576	tooltip => "Apply the video settings above.",	794	tooltip => "Apply the video settings above.",
577	on_activate => sub {	795	on_activate => sub {
578	video_shutdown ();	796	video_shutdown ();
579	video_init ();	797	video_init ();
580	0	798	0
581	}	799	}
582	);	800	);
583		801
584	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");	802	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
585	$table->add (1, $row++, new CFPlus::UI::Slider	803	$table->add_at (1, $row++, new CFPlus::UI::Slider
586	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	804	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
587	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	805	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
588	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	806	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
589	);	807	);
590		808
591	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");	809	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
592	$table->add (1, $row++, new CFPlus::UI::CheckBox	810	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
593	state => $CFG->{map_smoothing},	811	state => $CFG->{map_smoothing},
594	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "	812	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
595	. "This increases load on the graphics subsystem and works only with 2.x servers. "	813	. "This increases load on the graphics subsystem and works only with 2.x servers. "
596	. "Changes take effect at next connection only.",	814	. "Changes take effect at next connection only.",
597	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }	815	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
598	);	816	);
599		817
600	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");	818	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
601	$table->add (1, $row++, new CFPlus::UI::CheckBox	819	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
602	state => $CFG->{fow_enable},	820	state => $CFG->{fow_enable},
603	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	821	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
604	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	822	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
605	);	823	);
606		824
607	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");	825	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
608	$table->add (1, $row++, new CFPlus::UI::Slider	826	$table->add_at (1, $row++, new CFPlus::UI::Slider
609	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	827	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
610	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	828	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
611	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	829	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
612	);	830	);
613		831
614	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");	832	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
615	$table->add (1, $row++, new CFPlus::UI::Slider	833	$table->add_at (1, $row++, new CFPlus::UI::Slider
616	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	834	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
617	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	835	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
618	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	836	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
619	);	837	);
620		838
621	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	839	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
622	$table->add (1, $row++, new CFPlus::UI::Slider	840	$table->add_at (1, $row++, new CFPlus::UI::Slider
623	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	841	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
624	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	842	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
625	on_changed => sub {	843	on_changed => sub {
626	$CFG->{gauge_fontsize} = $_[1];	844	$CFG->{gauge_fontsize} = $_[1];
627	&set_gauge_window_fontsize;	845	&set_gauge_window_fontsize;
628	0	846	0
629	}	847	}
630	);	848	);
631		849
632	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");	850	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
633	$table->add (1, $row++, new CFPlus::UI::Slider	851	$table->add_at (1, $row++, new CFPlus::UI::Slider
634	range => [$CFG->{gauge_size}, 0.2, 0.8],	852	range => [$CFG->{gauge_size}, 0.2, 0.8],
635	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	853	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
636	on_changed => sub {	854	on_changed => sub {
637	$CFG->{gauge_size} = $_[1];	855	$CFG->{gauge_size} = $_[1];
638	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	856	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
…		…
644	}	862	}
645		863
646	sub audio_setup {	864	sub audio_setup {
647	my $vbox = new CFPlus::UI::VBox;	865	my $vbox = new CFPlus::UI::VBox;
648		866
649	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	867	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
650		868
651	my $row = 0;	869	my $row = 0;
652		870
653	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");	871	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
654	$table->add (1, $row++, new CFPlus::UI::CheckBox	872	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
655	state => $CFG->{audio_enable},	873	state => $CFG->{audio_enable},
656	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.",	874	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.",
657	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	875	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
658	);	876	);
659	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");	877	# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
660	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	878	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
661	# $CFG->{effects_volume} = $_[1];	879	# $CFG->{effects_volume} = $_[1];
662	# });	880	# });
		881
		882	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
		883	$table->add_at (1, $row, new CFPlus::UI::CheckBox
		884	expand => 1, state => $CFG->{effects_enable},
		885	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
		886	on_changed => sub {
		887	$CFG->{effects_enable} = $_[1];
		888	$CONN->update_fx_want if $CONN;
		889	0
		890	}
		891	);
		892	$table->add_at (2, $row++, new CFPlus::UI::Slider
		893	expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
		894	tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
		895	. "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
		896	on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
		897	);
		898
663	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");	899	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
664	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
665	$hbox->add (new CFPlus::UI::CheckBox	900	$table->add_at (1, $row, new CFPlus::UI::CheckBox
666	expand => 1, state => $CFG->{bgm_enable},	901	expand => 1, state => $CFG->{bgm_enable},
667	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	902	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
668	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	903	on_changed => sub {
		904	$CFG->{bgm_enable} = $_[1];
		905	$CONN->update_fx_want if $CONN;
		906	0
		907	}
669	);	908	);
670	$hbox->add (new CFPlus::UI::Slider	909	$table->add_at (2, $row++, new CFPlus::UI::Slider
671	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	910	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
672	tooltip => "The volume of the background music. Changes are instant.",	911	tooltip => "The volume of the background music. Changes are instant.",
673	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }	912	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
674	);	913	);
675		914
676	$table->add (1, $row++, new CFPlus::UI::Button	915	$table->add_at (1, $row++, new CFPlus::UI::Button
677	expand => 1, align => 0, text => "Apply",	916	c_colspan => 2, expand => 1, align => 0, text => "Apply",
678	tooltip => "Apply the audio settings",	917	tooltip => "Apply the audio settings",
679	on_activate => sub {	918	on_activate => sub {
680	audio_shutdown ();	919	audio_shutdown ();
681	audio_init ();	920	audio_init ();
682	0	921	0
…		…
740	}	979	}
741		980
742	sub debug_setup {	981	sub debug_setup {
743	my $table = new CFPlus::UI::Table;	982	my $table = new CFPlus::UI::Table;
744		983
745	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");	984	$table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
746	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	985	$table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
747	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");	986	$table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
748	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	987	$table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
749	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");	988	$table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
750	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	989	$table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
751	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");	990	$table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
752	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	991	$table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
753	$table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );	992	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
754		993
755	$table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#	994	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
		995
		996	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
		997	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
		998	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
		999	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
		1000	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
		1001	$t->add_at (1,1, new CFPlus::UI::Label text => "e");
		1002
		1003	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
		1004
		1005	$c->add_items ({
		1006	type => "line_loop",
		1007	color => [0, 1, 0],
		1008	width => 9,
		1009	coord_mode => "abs",
		1010	coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
		1011	});
		1012
		1013	$c->add_items ({
		1014	type => "lines",
		1015	color => [1, 1, 0],
		1016	width => 2,
		1017	coord_mode => "rel",
		1018	coord => [[0,0], [1,1], [1,0], [0,1]],
		1019	});
		1020
		1021	$c->add_items ({
		1022	type => "polygon",
		1023	color => [0, 0.43, 0],
		1024	width => 2,
		1025	coord_mode => "rel",
		1026	coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
		1027	});
756		1028
757	$table	1029	$table
758	}	1030	}
759		1031
760	sub stats_window {	1032	sub stats_window {
…		…
808	[2, 4, st_spd => "Spd", 10.54],	1080	[2, 4, st_spd => "Spd", 10.54],
809	[2, 5, st_wspd => "WSp", 10.54],	1081	[2, 5, st_wspd => "WSp", 10.54],
810	) {	1082	) {
811	my ($col, $row, $id, $label, $template) = @$_;	1083	my ($col, $row, $id, $label, $template) = @$_;
812		1084
813	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label	1085	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
814	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	1086	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
815	align => +1, template => $template, tooltip => "#stat_$label");	1087	align => +1, template => $template, tooltip => "#stat_$label");
816	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label	1088	$tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
817	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	1089	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
818	align => -1, text => $label, tooltip => "#stat_$label");	1090	align => -1, text => $label, tooltip => "#stat_$label");
819	}	1091	}
820		1092
821	$vb->add (new CFPlus::UI::FancyFrame	1093	$vb->add (new CFPlus::UI::FancyFrame
…		…
862	cold => ["Cold",	1134	cold => ["Cold",
863	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],	1135	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
864	ghit => ["Ghost hit",	1136	ghit => ["Ghost hit",
865	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],	1137	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
866	);	1138	);
		1139
867	for (qw/slow holyw conf fire depl magic	1140	for (qw/slow holyw conf fire depl magic
868	drain acid pois para deat phys	1141	drain acid pois para deat phys
869	blind fear tund elec cold ghit/)	1142	blind fear tund elec cold ghit/)
870	{	1143	{
871	$tbl2->add ($col, $row,	1144	$tbl2->add_at ($col, $row,
872	$STATWIDS->{"res_$_"} =	1145	$STATWIDS->{"res_$_"} =
873	new CFPlus::UI::Label	1146	new CFPlus::UI::Label
874	font => $FONT_FIXED,	1147	font => $FONT_FIXED,
875	template => "-100%",	1148	template => "-100%",
876	align => +1,	1149	align => +1,
877	valign => 0,	1150	valign => 0,
878	can_events => 1,	1151	can_events => 1,
879	can_hover => 1,	1152	can_hover => 1,
880	tooltip => $resist_names{$_}->[1],	1153	tooltip => $resist_names{$_}->[1],
881	);	1154	);
882	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image	1155	$tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
883	font => $FONT_FIXED,	1156	font => $FONT_FIXED,
884	can_hover => 1,	1157	can_hover => 1,
885	can_events => 1,	1158	can_events => 1,
886	path => "ui/resist/resist_$_.png",	1159	path => "ui/resist/resist_$_.png",
887	tooltip => $resist_names{$_}->[1],	1160	tooltip => $resist_names{$_}->[1],
888	);	1161	);
889	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label	1162	$tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
890	text => $resist_names{$_}->[0],	1163	text => $resist_names{$_}->[0],
891	font => $FONT_FIXED,	1164	font => $FONT_FIXED,
892	can_hover => 1,	1165	can_hover => 1,
893	can_events => 1,	1166	can_events => 1,
894	tooltip => $resist_names{$_}->[1],	1167	tooltip => $resist_names{$_}->[1],
…		…
927	return if $METASERVER_ATIME > time;	1200	return if $METASERVER_ATIME > time;
928	$METASERVER_ATIME = time + 60;	1201	$METASERVER_ATIME = time + 60;
929		1202
930	my $table = $METASERVER->{table};	1203	my $table = $METASERVER->{table};
931	$table->clear;	1204	$table->clear;
932	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	1205	$table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
933		1206
934	my $ok = 0;	1207	my $ok = 0;
935		1208
936	CFPlus::background {	1209	CFPlus::background {
937	my $ua = CFPlus::lwp_useragent;	1210	my $ua = CFPlus::lwp_useragent;
…		…
948	"The time this server has been running without being restarted.",	1221	"The time this server has been running without being restarted.",
949	"The server software version - a '+' indicates a Crossfire+ server.",	1222	"The server software version - a '+' indicates a Crossfire+ server.",
950	"Short information about this server provided by its admins.",	1223	"Short information about this server provided by its admins.",
951	);	1224	);
952	my @col = qw(#Users Host Uptime Version Description);	1225	my @col = qw(#Users Host Uptime Version Description);
953	$table->add ($_, 0, new CFPlus::UI::Label	1226	$table->add_at ($_, 0, new CFPlus::UI::Label
954	can_hover => 1, can_events => 1,	1227	can_hover => 1, can_events => 1,
955	align => 0, fg => [1, 1, 0],	1228	align => 0, fg => [1, 1, 0],
956	text => $col[$_], tooltip => $tip[$_])	1229	text => $col[$_], tooltip => $tip[$_])
957	for 0 .. $#col;	1230	for 0 .. $#col;
958		1231
…		…
980		1253
981	$m = [$users, $host, $uptime, $version, $desc];	1254	$m = [$users, $host, $uptime, $version, $desc];
982		1255
983	$y++;	1256	$y++;
984		1257
985	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [	1258	$table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
986	(new CFPlus::UI::Button	1259	(new CFPlus::UI::Button
987	text => "Use",	1260	text => "Use",
988	tooltip => "Put this server into the <b>Host:Port</b> field",	1261	tooltip => "Put this server into the <b>Host:Port</b> field",
989	on_activate => sub {	1262	on_activate => sub {
990	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1263	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
…		…
993	},	1266	},
994	),	1267	),
995	(new CFPlus::UI::Empty expand => 1),	1268	(new CFPlus::UI::Empty expand => 1),
996	]);	1269	]);
997		1270
998	$table->add ($_, $y, new CFPlus::UI::Label	1271	$table->add_at ($_, $y, new CFPlus::UI::Label
999	max_w => $::WIDTH * 0.4,	1272	max_w => $::WIDTH * 0.4,
1000	ellipsise => 0,	1273	ellipsise => 0,
1001	align => $align[$_],	1274	align => $align[$_],
1002	text => $m->[$_],	1275	text => $m->[$_],
1003	tooltip => $tip[$_],	1276	tooltip => $tip[$_],
…		…
1044		1317
1045	$vbox->add (new CFPlus::UI::FancyFrame	1318	$vbox->add (new CFPlus::UI::FancyFrame
1046	label => "Connection Settings",	1319	label => "Connection Settings",
1047	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),	1320	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1048	);	1321	);
1049	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");	1322	$table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1050		1323
1051	{	1324	{
1052	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);	1325	$table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1053		1326
1054	$vbox->add (	1327	$vbox->add (
1055	$HOST_ENTRY = new CFPlus::UI::Entry	1328	$HOST_ENTRY = new CFPlus::UI::Entry
1056	expand => 1,	1329	expand => 1,
1057	text => $CFG->{profile}{default}{host},	1330	text => $CFG->{profile}{default}{host},
1058	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	1331	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1059	on_changed => sub {	1332	on_changed => sub {
1060	my ($self, $value) = @_;	1333	my ($self, $value) = @_;
1061	$CFG->{profile}{default}{host} = $value;	1334	$CFG->{profile}{default}{host} = $value;
1062	0	1335	1
1063	}	1336	}
1064	);	1337	);
1065		1338
1066	$vbox->add (new CFPlus::UI::Button	1339	$vbox->add (new CFPlus::UI::Button
1067	expand => 1,	1340	expand => 1,
1068	text => "Server List",	1341	text => "Server List",
1069	other => $METASERVER,	1342	other => $METASERVER,
1070	tooltip => "Show a list of available crossfire servers",	1343	tooltip => "Show a list of available crossfire servers",
1071	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1344	on_activate => sub { $METASERVER->toggle_visibility; 0 },
1072	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1345	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1073	);	1346	);
1074	}	1347	}
1075		1348
1076	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");	1349	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1077	$table->add (1, 4, new CFPlus::UI::Entry	1350	$table->add_at (1, 4, new CFPlus::UI::Entry
1078	text => $CFG->{profile}{default}{user},	1351	text => $CFG->{profile}{default}{user},
1079	tooltip => "The name of your character on the server",	1352	tooltip => "The name of your character on the server",
1080	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1353	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1081	);	1354	);
1082		1355
1083	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");	1356	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1084	$table->add (1, 5, new CFPlus::UI::Entry	1357	$table->add_at (1, 5, new CFPlus::UI::Entry
1085	text => $CFG->{profile}{default}{password},	1358	text => $CFG->{profile}{default}{password},
1086	hidden => 1,	1359	hidden => 1,
1087	tooltip => "The password for your character",	1360	tooltip => "The password for your character",
1088	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1361	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1089	);	1362	);
1090		1363
1091	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");	1364	$table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1092	$table->add (1, 7, new CFPlus::UI::Slider	1365	$table->add_at (1, 7, new CFPlus::UI::Slider
1093	force_w => 100,	1366	force_w => 100,
1094	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1367	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1095	tooltip => "This is the size of the portion of the map update the server sends you. "	1368	tooltip => "This is the size of the portion of the map update the server sends you. "
1096	. "If you set this to a high value you will be able to see further, "	1369	. "If you set this to a high value you will be able to see further, "
1097	. "but you also increase bandwidth requirements and latency. "	1370	. "but you also increase bandwidth requirements and latency. "
1098	. "This option is only used once at log-in.",	1371	. "This option is only used once at log-in.",
1099	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1372	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1100	);	1373	);
1101		1374
1102	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1103	$table->add (1, 8, new CFPlus::UI::CheckBox
1104	state => $CFG->{face_prefetch},
1105	tooltip => "<b>Background Image Prefetch</b>\n\n"
1106	. "If enabled, the client automatically pre-fetches images from the server. "
1107	. "This might increase or create lag, but increases the chances "
1108	. "of faces being ready for display when you encounter them. "
1109	. "It also uses up server bandwidth on every connect, "
1110	. "so only set it if you really need to prefetch images. "
1111	. "This option can be set and unset any time.",
1112	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1113	);
1114
1115	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");	1375	$table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1116	$table->add (1, 9, new CFPlus::UI::Entry	1376	$table->add_at (1, 8, new CFPlus::UI::Entry
1117	text => $CFG->{output_rate},	1377	text => $CFG->{output_rate},
1118	tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "	1378	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1119	. "when sending images, to ensure interactiveness. When 0 or unset, the server "	1379	. "when sending data. When 0 or unset, the server "
1120	. "default will be used, which is usually around 100kb/s.",	1380	. "default will be used, which is usually around 100kb/s. Most servers will "
		1381	. "dynamically find an optimal rate, so adjust this only when necessary.",
1121	on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },	1382	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1122	);	1383	);
1123		1384
1124	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");	1385	$table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1125	$table->add (1, 10, new CFPlus::UI::Entry	1386	$table->add_at (1, 9, new CFPlus::UI::Entry
1126	text => $CFG->{output_count},	1387	text => $CFG->{output_count},
1127	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1388	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1128	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1389	on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1129	);	1390	);
1130		1391
1131	$table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");	1392	$table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1132	$table->add (1, 11, new CFPlus::UI::Entry	1393	$table->add_at (1, 10, new CFPlus::UI::Entry
1133	text => $CFG->{output_sync},	1394	text => $CFG->{output_sync},
1134	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1395	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1135	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1396	on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1136	);	1397	);
1137		1398
1138	$table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button	1399	$table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1139	expand => 1,	1400	expand => 1,
1140	align => 0,	1401	align => 0,
1141	text => "Login",	1402	text => "Login",
1142	on_activate => sub {	1403	on_activate => sub {
1143	$CONN ? stop_game	1404	$CONN ? stop_game
1144	: start_game;	1405	: start_game;
1145	0	1406	1
1146	},	1407	},
1147	);	1408	);
1148		1409
1149	$vbox->add (new CFPlus::UI::FancyFrame	1410	$vbox->add (new CFPlus::UI::FancyFrame
1150	label => "Server Info",	1411	label => "Server Info",
…		…
1157	sub client_setup {	1418	sub client_setup {
1158	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];	1419	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1159		1420
1160	my $row = 0;	1421	my $row = 0;
1161		1422
1162	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1163	$table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1164	text => $CFG->{say_command},
1165	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. "
1166	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1167	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1168	on_changed => sub {
1169	my ($self, $value) = @_;
1170	$CFG->{say_command} = $value;
1171	0
1172	}
1173	);
1174
1175	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");	1423	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1176	$table->add (1, $row++, new CFPlus::UI::CheckBox	1424	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
1177	state => $CFG->{show_tips},	1425	state => $CFG->{show_tips},
1178	tooltip => "Show the <b>Tip of the day</b> window at startup?",	1426	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1179	on_changed => sub {	1427	on_changed => sub {
1180	my ($self, $value) = @_;	1428	my ($self, $value) = @_;
1181	$CFG->{show_tips} = $value;	1429	$CFG->{show_tips} = $value;
1182	0	1430	0
1183	}	1431	}
1184	);	1432	);
1185		1433
1186	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");	1434	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1187	$table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry	1435	$table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1188	text => $CFG->{logview_max_par},	1436	text => $CFG->{logview_max_par},
1189	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "	1437	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1190	. "sends more messages than this number, older messages get removed to save memory and "	1438	. "sends more messages than this number, older messages get removed to save memory and "
1191	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",	1439	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1192	on_changed => sub {	1440	on_changed => sub {
1193	my ($self, $value) = @_;	1441	my ($self, $value) = @_;
1194	$LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;	1442	$MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1195	0	1443	0
1196	},	1444	},
1197	);	1445	);
1198		1446
1199	$table	1447	$table
1200	}
1201
1202	sub message_window {
1203	my $window = new CFPlus::UI::Toplevel
1204	name => "message_window",
1205	title => "Messages",
1206	border_bg => [1, 1, 1, 1],
1207	x => "max",
1208	y => 0,
1209	force_w => $::WIDTH * 0.4,
1210	force_h => $::HEIGHT * 0.5,
1211	child => (my $vbox = new CFPlus::UI::VBox),
1212	has_close_button => 1;
1213
1214	$vbox->add ($LOGVIEW);
1215
1216	$vbox->add (my $input = new CFPlus::UI::Entry
1217	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1218	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1219	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1220	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1221	on_focus_in => sub {
1222	my ($input, $prev_focus) = @_;
1223
1224	delete $input->{refocus_map};
1225
1226	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1227	$input->{refocus_map} = 1;
1228	}
1229	delete $input->{auto_activated};
1230
1231	0
1232	},
1233	on_activate => sub {
1234	my ($input, $text) = @_;
1235	$input->set_text ('');
1236
1237	if ($text =~ /^\/(.*)/) {
1238	$::CONN->user_send ($1);
1239	} else {
1240	my $say_cmd = $::CFG->{say_command} || 'say';
1241	$::CONN->user_send ("$say_cmd $text");
1242	}
1243	if ($input->{refocus_map}) {
1244	delete $input->{refocus_map};
1245	$MAPWIDGET->focus_in
1246	}
1247
1248	0
1249	},
1250	on_escape => sub {
1251	$MAPWIDGET->grab_focus;
1252
1253	0
1254	},
1255	);
1256
1257	$CONSOLE = {
1258	window => $window,
1259	input => $input,
1260	};
1261
1262	$window
1263	}	1448	}
1264		1449
1265	sub autopickup_setup {	1450	sub autopickup_setup {
1266	my $r = new CFPlus::UI::ScrolledWindow (	1451	my $r = new CFPlus::UI::ScrolledWindow (
1267	expand => 1,	1452	expand => 1,
…		…
1313	],	1498	],
1314	["Weight/Value ratio", 2, 17]	1499	["Weight/Value ratio", 2, 17]
1315	)	1500	)
1316	{	1501	{
1317	my ($title, $x, $y, @bits) = @$_;	1502	my ($title, $x, $y, @bits) = @$_;
1318	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1503	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1319		1504
1320	for (@bits) {	1505	for (@bits) {
1321	++$y;	1506	++$y;
1322		1507
1323	my $mask = $_->[1];	1508	my $mask = $_->[1];
1324	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);	1509	$table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1325	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox	1510	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1326	state => $::CFG->{pickup} & $mask,	1511	state => $::CFG->{pickup} & $mask,
1327	on_changed => sub {	1512	on_changed => sub {
1328	my ($box, $value) = @_;	1513	my ($box, $value) = @_;
1329		1514
1330	if ($value) {	1515	if ($value) {
…		…
1341		1526
1342	${$_->[2]} = $checkbox if $_->[2];	1527	${$_->[2]} = $checkbox if $_->[2];
1343	}	1528	}
1344	}	1529	}
1345		1530
1346	$table->add (2, 18, new CFPlus::UI::ValSlider	1531	$table->add_at (2, 18, new CFPlus::UI::ValSlider
1347	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1532	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1348	template => ">= 99",	1533	template => ">= 99",
1349	to_value => sub { ">= " . 5 * $_[0] },	1534	to_value => sub { ">= " . 5 * $_[0] },
1350	on_changed => sub {	1535	on_changed => sub {
1351	my ($slider, $value) = @_;	1536	my ($slider, $value) = @_;
…		…
1354	$::CFG->{pickup} |= int $value	1539	$::CFG->{pickup} |= int $value
1355	if $value;	1540	if $value;
1356	1;	1541	1;
1357	});	1542	});
1358		1543
1359	$table->add (3, 18, new CFPlus::UI::Button	1544	$table->add_at (3, 18, new CFPlus::UI::Button
1360	text => "set",	1545	text => "set",
1361	on_activate => sub {	1546	on_activate => sub {
1362	$::CONN->send_command ("pickup $::CFG->{pickup}")	1547	$::CONN->send_command ("pickup $::CFG->{pickup}")
1363	if defined $::CONN;	1548	if defined $::CONN;
1364	0	1549	0
…		…
1427	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");	1612	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1428		1613
1429	$hb	1614	$hb
1430	}	1615	}
1431		1616
		1617	sub media_window {
		1618	my $vb = new CFPlus::UI::VBox;
		1619
		1620	$vb->add (new CFPlus::UI::FancyFrame
		1621	label => "Currently playing music",
		1622	child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
		1623	child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
		1624	);
		1625
		1626	$vb->add (new CFPlus::UI::FancyFrame
		1627	label => "Other media used in this session",
		1628	expand => 1,
		1629	child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
		1630	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
		1631	);
		1632
		1633	$vb
		1634	}
		1635
		1636	sub add_license {
		1637	my ($meta) = @_;
		1638
		1639	$meta = $meta->{meta}
		1640	or return;
		1641
		1642	$meta->{license} || $meta->{author} || $meta->{source}
		1643	or return;
		1644
		1645	$LICENSE_WIDGET->add_paragraph ({
		1646	fg => [1, 1, 1, 1],
		1647	markup => "<small>"
		1648	. "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
		1649	. "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
		1650	. "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
		1651	. "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
		1652	. "</small>",
		1653	});
		1654	$LICENSE_WIDGET->scroll_to_bottom;
		1655	}
		1656
1432	sub toggle_player_page {	1657	sub toggle_player_page {
1433	my ($widget) = @_;	1658	my ($widget) = @_;
1434		1659
1435	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {	1660	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1436	$PL_WINDOW->hide;	1661	$PL_WINDOW->hide;
…		…
1453		1678
1454	my $ntb =	1679	my $ntb =
1455	$PL_NOTEBOOK =	1680	$PL_NOTEBOOK =
1456	new CFPlus::UI::Notebook expand => 1;	1681	new CFPlus::UI::Notebook expand => 1;
1457		1682
1458	$ntb->add (	1683	$ntb->add_tab (
1459	"Statistics (F2)" => $STATS_PAGE = stats_window,	1684	"Statistics (F2)" => $STATS_PAGE = stats_window,
1460	"Shows statistics, where all your Stats and Resistances are shown."	1685	"Shows statistics, where all your Stats and Resistances are shown."
1461	);	1686	);
1462	$ntb->add (	1687	$ntb->add_tab (
1463	"Skills (F3)" => $SKILL_PAGE = skill_window,	1688	"Skills (F3)" => $SKILL_PAGE = skill_window,
1464	"Shows all your Skills."	1689	"Shows all your Skills."
1465	);	1690	);
1466		1691
1467	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1692	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1468	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);	1693	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1469	$ntb->add (	1694	$ntb->add_tab (
1470	"Spellbook (F4)" => $spellsw,	1695	"Spellbook (F4)" => $spellsw,
1471	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1696	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1472	);	1697	);
1473	$ntb->add (	1698	$ntb->add_tab (
1474	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1699	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1475	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1700	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1476	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1701	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1477	);	1702	);
1478	$ntb->add (Pickup => autopickup_setup,	1703	$ntb->add_tab (Pickup => autopickup_setup,
1479	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1704	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
		1705
		1706	$ntb->add_tab (Media => media_window,
		1707	"License, Author and Source info for media sent by the server.");
1480		1708
1481	$ntb->set_current_page ($INVENTORY_PAGE);	1709	$ntb->set_current_page ($INVENTORY_PAGE);
1482		1710
1483	$plwin->add ($ntb);	1711	$plwin->add ($ntb);
1484	$plwin	1712	$plwin
…		…
1681	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);	1909	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);	1910	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683		1911
1684	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);	1912	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1685		1913
1686	$table->add (0, 0, new CFPlus::UI::Button	1914	$table->add_at (0, 0, new CFPlus::UI::Button
1687	text => "Close",	1915	text => "Close",
1688	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>.",	1916	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>.",
1689	on_activate => $close,	1917	on_activate => $close,
1690	);	1918	);
1691		1919
1692	$table->add (2, 0, new CFPlus::UI::Button	1920	$table->add_at (2, 0, new CFPlus::UI::Button
1693	text => "Next",	1921	text => "Next",
1694	tooltip => "Show the next <b>Tip of the day</b>.",	1922	tooltip => "Show the next <b>Tip of the day</b>.",
1695	on_activate => sub {	1923	on_activate => sub {
1696	$close->();	1924	$close->();
1697	&show_tip_of_the_day;	1925	&show_tip_of_the_day;
…		…
1766		1994
1767	$MAPWIDGET = new CFPlus::MapWidget;	1995	$MAPWIDGET = new CFPlus::MapWidget;
1768	$MAPWIDGET->connect (activate_console => sub {	1996	$MAPWIDGET->connect (activate_console => sub {
1769	my ($mapwidget, $preset) = @_;	1997	my ($mapwidget, $preset) = @_;
1770		1998
1771	if ($CONSOLE) {	1999	$MESSAGE_WINDOW->activate_console ($preset)
1772	$CONSOLE->{input}->{auto_activated} = 1;	2000	if $MESSAGE_WINDOW;
1773	$CONSOLE->{input}->grab_focus;
1774
1775	if ($preset && $CONSOLE->{input}->get_text eq '') {
1776	$CONSOLE->{input}->set_text ($preset);
1777	}
1778	}
1779	});	2001	});
1780	$MAPWIDGET->show;	2002	$MAPWIDGET->show;
1781	$MAPWIDGET->grab_focus;	2003	$MAPWIDGET->grab_focus;
1782
1783	$LOGVIEW = new CFPlus::UI::TextScroller
1784	expand => 1,
1785	font => $FONT_FIXED,
1786	fontsize => $::CFG->{log_fontsize},
1787	indent => -4,
1788	can_hover => 1,
1789	can_events => 1,
1790	max_par => $CFG->{logview_max_par},
1791	tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1792	;
1793		2004
1794	$SETUP_DIALOG = new CFPlus::UI::Toplevel	2005	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1795	title => "Setup",	2006	title => "Setup",
1796	name => "setup_dialog",	2007	name => "setup_dialog",
1797	x => 'center',	2008	x => 'center',
…		…
1801	force_h => $::HEIGHT * 0.6,	2012	force_h => $::HEIGHT * 0.6,
1802	has_close_button => 1,	2013	has_close_button => 1,
1803	;	2014	;
1804		2015
1805	$METASERVER = metaserver_dialog;	2016	$METASERVER = metaserver_dialog;
		2017	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1806		2018
1807	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,	2019	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1808	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	2020	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1809		2021
1810	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	2022	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1811	"Configure the server to play on, your username, password and other server-related options.");	2023	"Configure the server to play on, your username, password and other server-related options.");
1812	$SETUP_NOTEBOOK->add (Client => client_setup,	2024	$SETUP_NOTEBOOK->add_tab (Client => client_setup,
1813	"Configure various client-specific settings.");	2025	"Configure various client-specific settings.");
1814	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	2026	$SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1815	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	2027	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1816	$SETUP_NOTEBOOK->add (Audio => audio_setup,	2028	$SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1817	"Configure the use of audio, sound effects and background music.");	2029	"Configure the use of audio, sound effects and background music.");
1818	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	2030	$SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1819	"Lets you define, edit and delete key bindings."	2031	"Lets you define, edit and delete key bindings."
1820	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "	2032	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1821	. "with nothing set and the recording started. After doing the actions you "	2033	. "with nothing set and the recording started. After doing the actions you "
1822	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	2034	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1823	. "After pressing the combo the binding will be saved automatically and the "	2035	. "After pressing the combo the binding will be saved automatically and the "
1824	. "binding editor closes");	2036	. "binding editor closes");
1825	$SETUP_NOTEBOOK->add (Debug => debug_setup,	2037	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1826	"Some debuggin' options. Do not ask.");	2038	"Some debuggin' options. Do not ask.");
1827		2039
1828	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	2040	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1829		2041
1830	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	2042	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1831	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	2043	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1832		2044
1833	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	2045	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1834	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	2046	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1835		2047
1836	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	2048	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
1837		2049
1838	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,	2050	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
…		…
1871	}	2083	}
1872		2084
1873	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	2085	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1874	}	2086	}
1875		2087
1876	sub setup_build_button {
1877	my ($enabled) = @_;
1878	if ($enabled) {
1879	$BUILD_BUTTON->hide if $BUILD_BUTTON;
1880	$BUILD_BUTTON ||= new CFPlus::UI::Button
1881	text => "Build",
1882	tooltip => "Opens the ingame builder",
1883	on_activate => sub {
1884	if ($CONN) {
1885	$CONN->send_ext_req (builder_player_items => sub {
1886	open_ingame_editor ($_[0]) if exists $_[0]->{items};
1887	});
1888	}
1889	0
1890	};
1891	$BUTTONBAR->add ($BUILD_BUTTON);
1892	} else {
1893	$BUILD_BUTTON->hide if $BUILD_BUTTON;
1894	}
1895	}
1896
1897	sub open_ingame_editor {
1898	my ($msg) = @_;
1899
1900	my $win = new CFPlus::UI::Toplevel
1901	x => 0,
1902	y => 'center',
1903	z => 4,
1904	name => 'builder_window',
1905	force_w => int $WIDTH * 1/4,
1906	force_h => int $HEIGHT * 3/4,
1907	title => "In game builder",
1908	has_close_button => 1;
1909
1910	my $r = new CFPlus::UI::ScrolledWindow (
1911	expand => 1,
1912	scroll_y => 1
1913	);
1914	$r->add (my $vb = new CFPlus::UI::VBox);
1915	$win->add ($r);
1916
1917
1918	$vb->add (
1919	new CFPlus::UI::Button
1920	text => "Disable build mode",
1921	on_activate => sub { $::IN_BUILD_MODE = undef }
1922	);
1923	$vb->add (
1924	new CFPlus::UI::Button
1925	text => "ERASE",
1926	on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1927	);
1928
1929	for my $itemarchname (
1930	sort {
1931	$msg->{items}->{$a}->{build_arch_name}
1932	cmp $msg->{items}->{$b}->{build_arch_name}
1933	} keys %{$msg->{items}}
1934	) {
1935	my $info = $msg->{items}->{$itemarchname};
1936	$vb->add (
1937	new CFPlus::UI::Button text => $info->{build_arch_name},
1938	on_activate => sub {
1939	$::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1940
1941	if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1942	build_mode_query_arch_info ();
1943	}
1944	}
1945	);
1946	}
1947
1948	$win->show;
1949	}
1950
1951	sub build_mode_query_arch_info {
1952	my ($iteminfo) = $::IN_BUILD_MODE;
1953	my $itemarchname = $iteminfo->{item};
1954	my $info = $iteminfo->{info};
1955
1956	my $dialog = new CFPlus::UI::Toplevel
1957	x => "center",
1958	y => "center",
1959	z => 50,
1960	force_w => int $WIDTH * 1/2,
1961	title => "Enter information for placement of '$itemarchname'",
1962	has_close_button => 1;
1963
1964	$dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1965
1966	$vb->add (my $table = new CFPlus::UI::Table expand => 1);
1967	my $row = 0;
1968	if ($info->{has_name}) {
1969	$table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1970	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1971	}
1972	if ($info->{has_text}) {
1973	$table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1974	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1975	}
1976	if ($info->{has_connection}) {
1977	$table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1978	$table->add (1, $row++,
1979	new CFPlus::UI::Entry
1980	expand => 1,
1981	on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1982	tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1983	);
1984	}
1985
1986	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1987	$hb->add (new CFPlus::UI::Button
1988	text => "Close",
1989	expand => 1,
1990	on_activate => sub { $dialog->hide; 0 },
1991	);
1992	$dialog->show;
1993	}
1994
1995	sub video_shutdown {	2088	sub video_shutdown {
1996	CFPlus::OpenGL::shutdown;	2089	CFPlus::OpenGL::shutdown;
1997		2090
1998	undef $SDL_ACTIVE;	2091	undef $SDL_ACTIVE;
1999	}	2092	}
2000		2093
2001	sub audio_channel_finished {
2002	my ($channel) = @_;
2003
2004	#warn "channel $channel finished\n";#d#
2005	}
2006
2007	sub audio_music_set {
2008	my ($songs) = @_;
2009
2010	my @want =
2011	grep $_,
2012	map $CONN->{music_meta}{$_},
2013	@$songs;
2014
2015	if (@want) {
2016	@MUSIC_WANT = @want;
2017	&audio_music_changed ();
2018	}
2019	}
2020
2021	sub audio_music_start {
2022	my $path = $MUSIC_PLAYING->{path}
2023	or return;
2024
2025	CFPlus::DB::prefetch_file $path, 1024_000, sub {
2026	# music might have changed...
2027	$path eq $MUSIC_PLAYING->{path}
2028	or return &audio_music_start ();
2029
2030	$MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2031
2032	my $NOW = time;
2033
2034	if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2035	my $pos = $MUSIC_PLAYING->{stop_pos};
2036	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2037	$MUSIC_START = time - $pos;
2038	} else {
2039	$MUSIC_PLAYER->play (0);
2040	$MUSIC_START = time;
2041	}
2042
2043	delete $MUSIC_PLAYING->{stop_time};
2044	delete $MUSIC_PLAYING->{stop_pos};
2045	}
2046	}
2047
2048	sub audio_music_changed {
2049	return unless $CFG->{bgm_enable};
2050
2051	# default MUSIC_WANT == MUSIC_DEFAULT
2052	@MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2053
2054	# if the currently playing song is acceptable, let it continue
2055	return if $MUSIC_PLAYING
2056	&& grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2057
2058	my $NOW = time;
2059
2060	if ($MUSIC_PLAYING) {
2061	$MUSIC_PLAYING->{stop_time} = $NOW;
2062	$MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2063	CFPlus::MixMusic::fade_out 1000;
2064	} else {
2065	# sort by stop time, oldest first
2066	@MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2067
2068	# if the most recently-played piece played very recently,
2069	# resume it, else choose the oldest piece for rotation.
2070	$MUSIC_PLAYING =
2071	$MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2072	? $MUSIC_WANT[-1]
2073	: $MUSIC_WANT[0];
2074
2075	audio_music_start;
2076	}
2077	}
2078
2079	sub audio_music_finished {
2080	$MUSIC_PLAYING = undef;
2081	undef $MUSIC_PLAYER;
2082
2083	audio_music_changed;
2084	}
2085
2086	sub audio_init {
2087	if ($CFG->{audio_enable}) {
2088	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2089	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
2090
2091	unless ($SDL_MIXER) {
2092	status "Unable to open sound device: there will be no sound";
2093	return;
2094	}
2095
2096	CFPlus::Mix_AllocateChannels 8;
2097	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2098
2099	audio_music_finished;
2100
2101	local $_;
2102	while (<$fh>) {
2103	next if /^\s*#/;
2104	next if /^\s*$/;
2105
2106	my ($file, $volume, $event) = split /\s+/, $_, 3;
2107
2108	push @SOUNDS, "$volume,$file";
2109
2110	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
2111	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2112	$chunk->volume ($volume * 128 / 100);
2113	$chunk
2114	};
2115	}
2116	} else {
2117	status "unable to open sound config: $!";
2118	}
2119	}
2120	}
2121
2122	sub audio_shutdown {
2123	CFPlus::Mix_CloseAudio if $SDL_MIXER;
2124	undef $SDL_MIXER;
2125	@SOUNDS = ();
2126	%AUDIO_CHUNKS = ();
2127	}
2128
2129	my %animate_object;	2094	my %animate_object;
2130	my $animate_timer;	2095	my $animate_timer;
2131		2096
2132	my $fps = 9;	2097	my $fps = 9;
2133
2134	my %demo;#d#
2135		2098
2136	sub force_refresh {	2099	sub force_refresh {
2137	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2100	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
2138	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2101	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2139		2102
…		…
2171		2134
2172	sub animation_stop {	2135	sub animation_stop {
2173	my ($widget) = @_;	2136	my ($widget) = @_;
2174	delete $animate_object{$widget};	2137	delete $animate_object{$widget};
2175	}	2138	}
2176
2177	# check once/second for faces that need to be prefetched
2178	# this should, of course, only run on demand, but
2179	# SDL forces worse things on us....
2180
2181	Event->timer (after => 1, interval => 0.25, cb => sub {
2182	$CONN->face_prefetch
2183	if $CONN;
2184	});
2185		2139
2186	%SDL_CB = (	2140	%SDL_CB = (
2187	CFPlus::SDL_QUIT => sub {	2141	CFPlus::SDL_QUIT => sub {
2188	exit;	2142	exit;
2189	},	2143	},
…		…
2233		2187
2234	CFPlus::UI::set_layout ($::CFG->{layout});	2188	CFPlus::UI::set_layout ($::CFG->{layout});
2235		2189
2236	my %DEF_CFG = (	2190	my %DEF_CFG = (
2237	sdl_mode => 0,	2191	sdl_mode => 0,
2238	width => 640,
2239	height => 480,
2240	fullscreen => 0,	2192	fullscreen => 0,
2241	fast => 0,	2193	fast => 0,
2242	map_scale => 1,	2194	map_scale => 1,
2243	fow_enable => 1,	2195	fow_enable => 1,
2244	fow_intensity => 0,	2196	fow_intensity => 0,
…		…
2247	log_fontsize => 0.7,	2199	log_fontsize => 0.7,
2248	gauge_fontsize => 1,	2200	gauge_fontsize => 1,
2249	gauge_size => 0.35,	2201	gauge_size => 0.35,
2250	stat_fontsize => 0.7,	2202	stat_fontsize => 0.7,
2251	mapsize => 100,	2203	mapsize => 100,
2252	say_command => 'chat',
2253	audio_enable => 1,	2204	audio_enable => 1,
		2205	effects_enable => 1,
		2206	effects_volume => 1,
2254	bgm_enable => 1,	2207	bgm_enable => 1,
2255	bgm_volume => 0.25,	2208	bgm_volume => 0.5,
2256	face_prefetch => 0,
2257	output_sync => 1,	2209	output_sync => 1,
2258	output_count => 1,	2210	output_count => 1,
2259	output_rate => "",	2211	output_rate => "",
2260	pickup => 0,	2212	pickup => 0,
2261	inv_sort => "mtime",	2213	inv_sort => "mtime",
…		…
2339	Event::loop;	2291	Event::loop;
2340	#CFPlus::SDL_Quit;	2292	#CFPlus::SDL_Quit;
2341	#CFPlus::_exit 0;	2293	#CFPlus::_exit 0;
2342		2294
2343	END {	2295	END {
		2296	video_shutdown;
		2297	audio_shutdown;
2344	CFPlus::SDL_Quit;	2298	CFPlus::SDL_Quit;
2345	CFPlus::DB::Server::stop;	2299	CFPlus::DB::Server::stop;
2346	}	2300	}
2347		2301
2348	=head1 NAME	2302	=head1 NAME
2349		2303
2350	cfplus - A Crossfire+ and Crossfire game client	2304	cfplus - A Crossfire TRT and Crossfire game client
2351		2305
2352	=head1 SYNOPSIS	2306	=head1 SYNOPSIS
2353		2307
2354	Just run it - no commandline arguments are supported.	2308	Just run it - no commandline arguments are supported.
2355		2309
2356	=head1 USAGE	2310	=head1 USAGE
2357		2311
2358	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used	2312	cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2359	fullscreen and interactively.	2313	be used in fullscreen mode and interactively.
2360		2314
2361	=head1 DEBUGGING	2315	=head1 DEBUGGING
2362		2316
2363		2317
2364	CFPLUS_DEBUG - environment variable	2318	CFPLUS_DEBUG - environment variable

Diff Legend

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