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.175 by root, Tue Jul 17 22:08:57 2007 UTC vs.
Revision 1.202 by root, Sat Aug 4 03:29:03 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	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	} 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	$chunk->volume (($meta->{meta}{volume} || 1) * 128);
		253	$AUDIO_CHUNK{$face} = $chunk;
		254
		255	audio_sound_push ($face);
		256	};
		257	}
		258	}
		259	}
		260
		261	sub audio_sound_play {
		262	my ($face, $dx, $dy, $vol) = @_;
		263
		264	$SDL_MIXER
		265	or return;
		266	$CFG->{effects_enable}
		267	or return;
		268
		269	my $queue = $AUDIO_PLAY{$face} ||= [];
		270	push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
		271	audio_sound_push $face
		272	unless @$queue > 1;
		273	}
		274
		275	sub audio_music_set_meta {
		276	my ($meta) = @_;
		277
		278	$MUSIC_PLAYING_META = $meta;
		279	$MUSIC_PLAYING_WIDGET->set_markup (
		280	"<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
		281	. "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
		282	. "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
		283	. "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
		284	);
		285	}
		286
		287	sub audio_music_update_volume {
		288	return unless $MUSIC_PLAYING_META;
		289	my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
		290	my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
		291	CFPlus::MixMusic::volume $base * $volume * 128;
		292	}
		293
		294	sub audio_music_start {
		295	my $meta = $MUSIC_PLAYING_META;
		296
		297	CFPlus::DB::get res_data => $meta->{name}, sub {
		298	return unless $SDL_MIXER;
		299
		300	# music might have changed...
		301	$meta eq $MUSIC_PLAYING_META
		302	or return &audio_music_start ();
		303
		304	audio_music_update_volume;
		305
		306	$MUSIC_PLAYING_DATA = \$_[0];
		307
		308	my $rwops = $meta->{path}
		309	? new_from_file CFPlus::RW $meta->{path}
		310	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
		311
		312	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
		313	or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
		314
		315	my $NOW = time;
		316
		317	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
		318	my $pos = $MUSIC_PLAYING_META->{stop_pos};
		319	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
		320	$MUSIC_START = time - $pos;
		321	} else {
		322	$MUSIC_PLAYER->play (0);
		323	$MUSIC_START = time;
		324	}
		325
		326	delete $meta->{stop_time};
		327	delete $meta->{stop_pos};
		328	}
		329	}
		330
		331	sub audio_music_push {
		332	return unless $SDL_MIXER;
		333
		334	my $fade_out;
		335
		336	if (@MUSIC_JINGLE) {
		337	@MUSIC_HAVE = $MUSIC_JINGLE[0];
		338	$fade_out = 333;
		339	} else {
		340	return unless $CFG->{bgm_enable};
		341
		342	my @have =
		343	grep $_,
		344	map $CONN->{music_meta}{$_},
		345	@$MUSIC_WANT;
		346
		347	@MUSIC_HAVE = @have
		348	if @have;
		349
		350	# default MUSIC_HAVE == MUSIC_DEFAULT
		351	@MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
		352	$fade_out = 1000;
		353	}
		354
		355	# if the currently playing song is acceptable, let it continue
		356	return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
		357
		358	my $NOW = time;
		359
		360	if ($MUSIC_PLAYING_META) {
		361	$MUSIC_PLAYING_META->{stop_time} = $NOW;
		362	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
		363	CFPlus::MixMusic::fade_out $fade_out;
		364	} else {
		365	# sort by stop time, oldest first
		366	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
		367
		368	# if the most recently-played piece played very recently,
		369	# resume it, else choose the oldest piece for rotation.
		370	audio_music_set_meta
		371	$MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
		372	? $MUSIC_HAVE[-1]
		373	: $MUSIC_HAVE[0];
		374
		375	audio_music_start;
		376	}
		377	}
		378
		379	sub audio_music_set_ambient {
		380	my ($songs) = @_;
		381
		382	$MUSIC_WANT = $songs;
		383	audio_music_push;
		384	}
		385
		386	sub audio_music_finished {
		387	# we compress multiple jingles of the same type
		388	shift @MUSIC_JINGLE
		389	while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
		390
		391	$MUSIC_PLAYING_WIDGET->clear;
		392
		393	undef $MUSIC_PLAYER;
		394	undef $MUSIC_PLAYING_META;
		395	undef $MUSIC_PLAYING_DATA;
		396
		397	audio_music_push;
		398	}
		399
		400	sub audio_init {
		401	if ($CFG->{audio_enable}) {
		402	$ENV{MIX_EFFECTSMAXSPEED} = 1;
		403	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
		404
		405	unless ($SDL_MIXER) {
		406	status "Unable to open sound device: there will be no sound";
		407	return;
		408	}
		409
		410	CFPlus::Mix_AllocateChannels 16;
		411
		412	audio_music_finished;
		413	} else {
		414	undef $SDL_MIXER;
		415	}
		416	}
		417
		418	sub audio_shutdown {
		419	undef $MUSIC_PLAYER;
		420	undef $MUSIC_PLAYING_META;
		421	undef $MUSIC_PLAYING_DATA;
		422
		423	audio_music_set_meta { };
		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 => "FoW Smoothing");
615	$table->add (1, $row++, new CFPlus::UI::CheckBox
616	state => $CFG->{fow_smooth},
617	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
618	on_changed => sub {
619	my ($self, $value) = @_;
620	$CFG->{fow_smooth} = $value;
621	0
622	}
623	);
624
625	$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");
626	$table->add (1, $row++, new CFPlus::UI::Slider	833	$table->add_at (1, $row++, new CFPlus::UI::Slider
627	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	834	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
628	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.",
629	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	836	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
630	);	837	);
631		838
632	$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");
633	$table->add (1, $row++, new CFPlus::UI::Slider	840	$table->add_at (1, $row++, new CFPlus::UI::Slider
634	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	841	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
635	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.",
636	on_changed => sub {	843	on_changed => sub {
637	$CFG->{gauge_fontsize} = $_[1];	844	$CFG->{gauge_fontsize} = $_[1];
638	&set_gauge_window_fontsize;	845	&set_gauge_window_fontsize;
639	0	846	0
640	}	847	}
641	);	848	);
642		849
643	$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");
644	$table->add (1, $row++, new CFPlus::UI::Slider	851	$table->add_at (1, $row++, new CFPlus::UI::Slider
645	range => [$CFG->{gauge_size}, 0.2, 0.8],	852	range => [$CFG->{gauge_size}, 0.2, 0.8],
646	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.",
647	on_changed => sub {	854	on_changed => sub {
648	$CFG->{gauge_size} = $_[1];	855	$CFG->{gauge_size} = $_[1];
649	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	856	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
…		…
655	}	862	}
656		863
657	sub audio_setup {	864	sub audio_setup {
658	my $vbox = new CFPlus::UI::VBox;	865	my $vbox = new CFPlus::UI::VBox;
659		866
660	$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]);
661		868
662	my $row = 0;	869	my $row = 0;
663		870
664	$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");
665	$table->add (1, $row++, new CFPlus::UI::CheckBox	872	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
666	state => $CFG->{audio_enable},	873	state => $CFG->{audio_enable},
667	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.",
668	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	875	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
669	);	876	);
670	# $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");
671	# $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 {
672	# $CFG->{effects_volume} = $_[1];	879	# $CFG->{effects_volume} = $_[1];
673	# });	880	# });
		881
		882	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
		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 { $CFG->{effects_enable} = $_[1]; 0 }
		887	);
		888	$table->add_at (2, $row++, new CFPlus::UI::Slider
		889	expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
		890	tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
		891	. "is set highest and you use your operating system volume setting. Changes are instant.",
		892	on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
		893	);
		894
674	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");	895	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
675	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
676	$hbox->add (new CFPlus::UI::CheckBox	896	$table->add_at (1, $row, new CFPlus::UI::CheckBox
677	expand => 1, state => $CFG->{bgm_enable},	897	expand => 1, state => $CFG->{bgm_enable},
678	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	898	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
679	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	899	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
680	);	900	);
681	$hbox->add (new CFPlus::UI::Slider	901	$table->add_at (2, $row++, new CFPlus::UI::Slider
682	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	902	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
683	tooltip => "The volume of the background music. Changes are instant.",	903	tooltip => "The volume of the background music. Changes are instant.",
684	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }	904	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
685	);	905	);
686		906
687	$table->add (1, $row++, new CFPlus::UI::Button	907	$table->add_at (1, $row++, new CFPlus::UI::Button
688	expand => 1, align => 0, text => "Apply",	908	c_colspan => 2, expand => 1, align => 0, text => "Apply",
689	tooltip => "Apply the audio settings",	909	tooltip => "Apply the audio settings",
690	on_activate => sub {	910	on_activate => sub {
691	audio_shutdown ();	911	audio_shutdown ();
692	audio_init ();	912	audio_init ();
693	0	913	0
…		…
751	}	971	}
752		972
753	sub debug_setup {	973	sub debug_setup {
754	my $table = new CFPlus::UI::Table;	974	my $table = new CFPlus::UI::Table;
755		975
756	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");	976	$table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
757	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	977	$table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
758	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");	978	$table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
759	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	979	$table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
760	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");	980	$table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
761	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	981	$table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
762	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");	982	$table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
763	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	983	$table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
764	$table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );	984	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
765		985
766	$table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#	986	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
		987
		988	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
		989	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
		990	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
		991	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
		992	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
		993	$t->add_at (1,1, new CFPlus::UI::Label text => "e");
		994
		995	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
		996
		997	$c->add_items ({
		998	type => "line_loop",
		999	color => [0, 1, 0],
		1000	width => 9,
		1001	coord_mode => "abs",
		1002	coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
		1003	});
		1004
		1005	$c->add_items ({
		1006	type => "lines",
		1007	color => [1, 1, 0],
		1008	width => 2,
		1009	coord_mode => "rel",
		1010	coord => [[0,0], [1,1], [1,0], [0,1]],
		1011	});
		1012
		1013	$c->add_items ({
		1014	type => "polygon",
		1015	color => [0, 0.43, 0],
		1016	width => 2,
		1017	coord_mode => "rel",
		1018	coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
		1019	});
767		1020
768	$table	1021	$table
769	}	1022	}
770		1023
771	sub stats_window {	1024	sub stats_window {
…		…
819	[2, 4, st_spd => "Spd", 10.54],	1072	[2, 4, st_spd => "Spd", 10.54],
820	[2, 5, st_wspd => "WSp", 10.54],	1073	[2, 5, st_wspd => "WSp", 10.54],
821	) {	1074	) {
822	my ($col, $row, $id, $label, $template) = @$_;	1075	my ($col, $row, $id, $label, $template) = @$_;
823		1076
824	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label	1077	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
825	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	1078	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
826	align => +1, template => $template, tooltip => "#stat_$label");	1079	align => +1, template => $template, tooltip => "#stat_$label");
827	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label	1080	$tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
828	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	1081	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
829	align => -1, text => $label, tooltip => "#stat_$label");	1082	align => -1, text => $label, tooltip => "#stat_$label");
830	}	1083	}
831		1084
832	$vb->add (new CFPlus::UI::FancyFrame	1085	$vb->add (new CFPlus::UI::FancyFrame
…		…
873	cold => ["Cold",	1126	cold => ["Cold",
874	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],	1127	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
875	ghit => ["Ghost hit",	1128	ghit => ["Ghost hit",
876	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],	1129	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
877	);	1130	);
		1131
878	for (qw/slow holyw conf fire depl magic	1132	for (qw/slow holyw conf fire depl magic
879	drain acid pois para deat phys	1133	drain acid pois para deat phys
880	blind fear tund elec cold ghit/)	1134	blind fear tund elec cold ghit/)
881	{	1135	{
882	$tbl2->add ($col, $row,	1136	$tbl2->add_at ($col, $row,
883	$STATWIDS->{"res_$_"} =	1137	$STATWIDS->{"res_$_"} =
884	new CFPlus::UI::Label	1138	new CFPlus::UI::Label
885	font => $FONT_FIXED,	1139	font => $FONT_FIXED,
886	template => "-100%",	1140	template => "-100%",
887	align => +1,	1141	align => +1,
888	valign => 0,	1142	valign => 0,
889	can_events => 1,	1143	can_events => 1,
890	can_hover => 1,	1144	can_hover => 1,
891	tooltip => $resist_names{$_}->[1],	1145	tooltip => $resist_names{$_}->[1],
892	);	1146	);
893	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image	1147	$tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
894	font => $FONT_FIXED,	1148	font => $FONT_FIXED,
895	can_hover => 1,	1149	can_hover => 1,
896	can_events => 1,	1150	can_events => 1,
897	path => "ui/resist/resist_$_.png",	1151	path => "ui/resist/resist_$_.png",
898	tooltip => $resist_names{$_}->[1],	1152	tooltip => $resist_names{$_}->[1],
899	);	1153	);
900	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label	1154	$tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
901	text => $resist_names{$_}->[0],	1155	text => $resist_names{$_}->[0],
902	font => $FONT_FIXED,	1156	font => $FONT_FIXED,
903	can_hover => 1,	1157	can_hover => 1,
904	can_events => 1,	1158	can_events => 1,
905	tooltip => $resist_names{$_}->[1],	1159	tooltip => $resist_names{$_}->[1],
…		…
938	return if $METASERVER_ATIME > time;	1192	return if $METASERVER_ATIME > time;
939	$METASERVER_ATIME = time + 60;	1193	$METASERVER_ATIME = time + 60;
940		1194
941	my $table = $METASERVER->{table};	1195	my $table = $METASERVER->{table};
942	$table->clear;	1196	$table->clear;
943	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	1197	$table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
944		1198
945	my $ok = 0;	1199	my $ok = 0;
946		1200
947	CFPlus::background {	1201	CFPlus::background {
948	my $ua = CFPlus::lwp_useragent;	1202	my $ua = CFPlus::lwp_useragent;
…		…
959	"The time this server has been running without being restarted.",	1213	"The time this server has been running without being restarted.",
960	"The server software version - a '+' indicates a Crossfire+ server.",	1214	"The server software version - a '+' indicates a Crossfire+ server.",
961	"Short information about this server provided by its admins.",	1215	"Short information about this server provided by its admins.",
962	);	1216	);
963	my @col = qw(#Users Host Uptime Version Description);	1217	my @col = qw(#Users Host Uptime Version Description);
964	$table->add ($_, 0, new CFPlus::UI::Label	1218	$table->add_at ($_, 0, new CFPlus::UI::Label
965	can_hover => 1, can_events => 1,	1219	can_hover => 1, can_events => 1,
966	align => 0, fg => [1, 1, 0],	1220	align => 0, fg => [1, 1, 0],
967	text => $col[$_], tooltip => $tip[$_])	1221	text => $col[$_], tooltip => $tip[$_])
968	for 0 .. $#col;	1222	for 0 .. $#col;
969		1223
…		…
991		1245
992	$m = [$users, $host, $uptime, $version, $desc];	1246	$m = [$users, $host, $uptime, $version, $desc];
993		1247
994	$y++;	1248	$y++;
995		1249
996	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [	1250	$table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
997	(new CFPlus::UI::Button	1251	(new CFPlus::UI::Button
998	text => "Use",	1252	text => "Use",
999	tooltip => "Put this server into the <b>Host:Port</b> field",	1253	tooltip => "Put this server into the <b>Host:Port</b> field",
1000	on_activate => sub {	1254	on_activate => sub {
1001	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1255	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
…		…
1004	},	1258	},
1005	),	1259	),
1006	(new CFPlus::UI::Empty expand => 1),	1260	(new CFPlus::UI::Empty expand => 1),
1007	]);	1261	]);
1008		1262
1009	$table->add ($_, $y, new CFPlus::UI::Label	1263	$table->add_at ($_, $y, new CFPlus::UI::Label
1010	max_w => $::WIDTH * 0.4,	1264	max_w => $::WIDTH * 0.4,
1011	ellipsise => 0,	1265	ellipsise => 0,
1012	align => $align[$_],	1266	align => $align[$_],
1013	text => $m->[$_],	1267	text => $m->[$_],
1014	tooltip => $tip[$_],	1268	tooltip => $tip[$_],
…		…
1055		1309
1056	$vbox->add (new CFPlus::UI::FancyFrame	1310	$vbox->add (new CFPlus::UI::FancyFrame
1057	label => "Connection Settings",	1311	label => "Connection Settings",
1058	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),	1312	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1059	);	1313	);
1060	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");	1314	$table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1061		1315
1062	{	1316	{
1063	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);	1317	$table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1064		1318
1065	$vbox->add (	1319	$vbox->add (
1066	$HOST_ENTRY = new CFPlus::UI::Entry	1320	$HOST_ENTRY = new CFPlus::UI::Entry
1067	expand => 1,	1321	expand => 1,
1068	text => $CFG->{profile}{default}{host},	1322	text => $CFG->{profile}{default}{host},
1069	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	1323	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1070	on_changed => sub {	1324	on_changed => sub {
1071	my ($self, $value) = @_;	1325	my ($self, $value) = @_;
1072	$CFG->{profile}{default}{host} = $value;	1326	$CFG->{profile}{default}{host} = $value;
1073	0	1327	1
1074	}	1328	}
1075	);	1329	);
1076		1330
1077	$vbox->add (new CFPlus::UI::Button	1331	$vbox->add (new CFPlus::UI::Button
1078	expand => 1,	1332	expand => 1,
1079	text => "Server List",	1333	text => "Server List",
1080	other => $METASERVER,	1334	other => $METASERVER,
1081	tooltip => "Show a list of available crossfire servers",	1335	tooltip => "Show a list of available crossfire servers",
1082	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1336	on_activate => sub { $METASERVER->toggle_visibility; 0 },
1083	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1337	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1084	);	1338	);
1085	}	1339	}
1086		1340
1087	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");	1341	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1088	$table->add (1, 4, new CFPlus::UI::Entry	1342	$table->add_at (1, 4, new CFPlus::UI::Entry
1089	text => $CFG->{profile}{default}{user},	1343	text => $CFG->{profile}{default}{user},
1090	tooltip => "The name of your character on the server",	1344	tooltip => "The name of your character on the server",
1091	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1345	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1092	);	1346	);
1093		1347
1094	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");	1348	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1095	$table->add (1, 5, new CFPlus::UI::Entry	1349	$table->add_at (1, 5, new CFPlus::UI::Entry
1096	text => $CFG->{profile}{default}{password},	1350	text => $CFG->{profile}{default}{password},
1097	hidden => 1,	1351	hidden => 1,
1098	tooltip => "The password for your character",	1352	tooltip => "The password for your character",
1099	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1353	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1100	);	1354	);
1101		1355
1102	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");	1356	$table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1103	$table->add (1, 7, new CFPlus::UI::Slider	1357	$table->add_at (1, 7, new CFPlus::UI::Slider
1104	force_w => 100,	1358	force_w => 100,
1105	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1359	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1106	tooltip => "This is the size of the portion of the map update the server sends you. "	1360	tooltip => "This is the size of the portion of the map update the server sends you. "
1107	. "If you set this to a high value you will be able to see further, "	1361	. "If you set this to a high value you will be able to see further, "
1108	. "but you also increase bandwidth requirements and latency. "	1362	. "but you also increase bandwidth requirements and latency. "
1109	. "This option is only used once at log-in.",	1363	. "This option is only used once at log-in.",
1110	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1364	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1111	);	1365	);
1112		1366
1113	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1114	$table->add (1, 8, new CFPlus::UI::CheckBox
1115	state => $CFG->{face_prefetch},
1116	tooltip => "<b>Background Image Prefetch</b>\n\n"
1117	. "If enabled, the client automatically pre-fetches images from the server. "
1118	. "This might increase or create lag, but increases the chances "
1119	. "of faces being ready for display when you encounter them. "
1120	. "It also uses up server bandwidth on every connect, "
1121	. "so only set it if you really need to prefetch images. "
1122	. "This option can be set and unset any time.",
1123	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1124	);
1125
1126	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");	1367	$table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1127	$table->add (1, 9, new CFPlus::UI::Entry	1368	$table->add_at (1, 8, new CFPlus::UI::Entry
1128	text => $CFG->{output_rate},	1369	text => $CFG->{output_rate},
1129	tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "	1370	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1130	. "when sending images, to ensure interactiveness. When 0 or unset, the server "	1371	. "when sending data. When 0 or unset, the server "
1131	. "default will be used, which is usually around 100kb/s.",	1372	. "default will be used, which is usually around 100kb/s. Most servers will "
		1373	. "dynamically find an optimal rate, so adjust this only when necessary.",
1132	on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },	1374	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1133	);	1375	);
1134		1376
1135	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");	1377	$table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1136	$table->add (1, 10, new CFPlus::UI::Entry	1378	$table->add_at (1, 9, new CFPlus::UI::Entry
1137	text => $CFG->{output_count},	1379	text => $CFG->{output_count},
1138	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1380	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1139	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1381	on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1140	);	1382	);
1141		1383
1142	$table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");	1384	$table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1143	$table->add (1, 11, new CFPlus::UI::Entry	1385	$table->add_at (1, 10, new CFPlus::UI::Entry
1144	text => $CFG->{output_sync},	1386	text => $CFG->{output_sync},
1145	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1387	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1146	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1388	on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1147	);	1389	);
1148		1390
1149	$table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button	1391	$table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1150	expand => 1,	1392	expand => 1,
1151	align => 0,	1393	align => 0,
1152	text => "Login",	1394	text => "Login",
1153	on_activate => sub {	1395	on_activate => sub {
1154	$CONN ? stop_game	1396	$CONN ? stop_game
1155	: start_game;	1397	: start_game;
1156	0	1398	1
1157	},	1399	},
1158	);	1400	);
1159		1401
1160	$vbox->add (new CFPlus::UI::FancyFrame	1402	$vbox->add (new CFPlus::UI::FancyFrame
1161	label => "Server Info",	1403	label => "Server Info",
…		…
1168	sub client_setup {	1410	sub client_setup {
1169	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];	1411	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1170		1412
1171	my $row = 0;	1413	my $row = 0;
1172		1414
1173	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1174	$table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1175	text => $CFG->{say_command},
1176	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. "
1177	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1178	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1179	on_changed => sub {
1180	my ($self, $value) = @_;
1181	$CFG->{say_command} = $value;
1182	0
1183	}
1184	);
1185
1186	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");	1415	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1187	$table->add (1, $row++, new CFPlus::UI::CheckBox	1416	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
1188	state => $CFG->{show_tips},	1417	state => $CFG->{show_tips},
1189	tooltip => "Show the <b>Tip of the day</b> window at startup?",	1418	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1190	on_changed => sub {	1419	on_changed => sub {
1191	my ($self, $value) = @_;	1420	my ($self, $value) = @_;
1192	$CFG->{show_tips} = $value;	1421	$CFG->{show_tips} = $value;
1193	0	1422	0
1194	}	1423	}
1195	);	1424	);
1196		1425
1197	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");	1426	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1198	$table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry	1427	$table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1199	text => $CFG->{logview_max_par},	1428	text => $CFG->{logview_max_par},
1200	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "	1429	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1201	. "sends more messages than this number, older messages get removed to save memory and "	1430	. "sends more messages than this number, older messages get removed to save memory and "
1202	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",	1431	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1203	on_changed => sub {	1432	on_changed => sub {
1204	my ($self, $value) = @_;	1433	my ($self, $value) = @_;
1205	$LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;	1434	$MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1206	0	1435	0
1207	},	1436	},
1208	);	1437	);
1209		1438
1210	$table	1439	$table
1211	}
1212
1213	sub message_window {
1214	my $window = new CFPlus::UI::Toplevel
1215	name => "message_window",
1216	title => "Messages",
1217	border_bg => [1, 1, 1, 1],
1218	x => "max",
1219	y => 0,
1220	force_w => $::WIDTH * 0.4,
1221	force_h => $::HEIGHT * 0.5,
1222	child => (my $vbox = new CFPlus::UI::VBox),
1223	has_close_button => 1;
1224
1225	$vbox->add ($LOGVIEW);
1226
1227	$vbox->add (my $input = new CFPlus::UI::Entry
1228	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1229	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1230	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1231	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1232	on_focus_in => sub {
1233	my ($input, $prev_focus) = @_;
1234
1235	delete $input->{refocus_map};
1236
1237	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1238	$input->{refocus_map} = 1;
1239	}
1240	delete $input->{auto_activated};
1241
1242	0
1243	},
1244	on_activate => sub {
1245	my ($input, $text) = @_;
1246	$input->set_text ('');
1247
1248	if ($text =~ /^\/(.*)/) {
1249	$::CONN->user_send ($1);
1250	} else {
1251	my $say_cmd = $::CFG->{say_command} || 'say';
1252	$::CONN->user_send ("$say_cmd $text");
1253	}
1254	if ($input->{refocus_map}) {
1255	delete $input->{refocus_map};
1256	$MAPWIDGET->focus_in
1257	}
1258
1259	0
1260	},
1261	on_escape => sub {
1262	$MAPWIDGET->grab_focus;
1263
1264	0
1265	},
1266	);
1267
1268	$CONSOLE = {
1269	window => $window,
1270	input => $input,
1271	};
1272
1273	$window
1274	}	1440	}
1275		1441
1276	sub autopickup_setup {	1442	sub autopickup_setup {
1277	my $r = new CFPlus::UI::ScrolledWindow (	1443	my $r = new CFPlus::UI::ScrolledWindow (
1278	expand => 1,	1444	expand => 1,
…		…
1324	],	1490	],
1325	["Weight/Value ratio", 2, 17]	1491	["Weight/Value ratio", 2, 17]
1326	)	1492	)
1327	{	1493	{
1328	my ($title, $x, $y, @bits) = @$_;	1494	my ($title, $x, $y, @bits) = @$_;
1329	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1495	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1330		1496
1331	for (@bits) {	1497	for (@bits) {
1332	++$y;	1498	++$y;
1333		1499
1334	my $mask = $_->[1];	1500	my $mask = $_->[1];
1335	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);	1501	$table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1336	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox	1502	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1337	state => $::CFG->{pickup} & $mask,	1503	state => $::CFG->{pickup} & $mask,
1338	on_changed => sub {	1504	on_changed => sub {
1339	my ($box, $value) = @_;	1505	my ($box, $value) = @_;
1340		1506
1341	if ($value) {	1507	if ($value) {
…		…
1352		1518
1353	${$_->[2]} = $checkbox if $_->[2];	1519	${$_->[2]} = $checkbox if $_->[2];
1354	}	1520	}
1355	}	1521	}
1356		1522
1357	$table->add (2, 18, new CFPlus::UI::ValSlider	1523	$table->add_at (2, 18, new CFPlus::UI::ValSlider
1358	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1524	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1359	template => ">= 99",	1525	template => ">= 99",
1360	to_value => sub { ">= " . 5 * $_[0] },	1526	to_value => sub { ">= " . 5 * $_[0] },
1361	on_changed => sub {	1527	on_changed => sub {
1362	my ($slider, $value) = @_;	1528	my ($slider, $value) = @_;
…		…
1365	$::CFG->{pickup} |= int $value	1531	$::CFG->{pickup} |= int $value
1366	if $value;	1532	if $value;
1367	1;	1533	1;
1368	});	1534	});
1369		1535
1370	$table->add (3, 18, new CFPlus::UI::Button	1536	$table->add_at (3, 18, new CFPlus::UI::Button
1371	text => "set",	1537	text => "set",
1372	on_activate => sub {	1538	on_activate => sub {
1373	$::CONN->send_command ("pickup $::CFG->{pickup}")	1539	$::CONN->send_command ("pickup $::CFG->{pickup}")
1374	if defined $::CONN;	1540	if defined $::CONN;
1375	0	1541	0
…		…
1438	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");	1604	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1439		1605
1440	$hb	1606	$hb
1441	}	1607	}
1442		1608
		1609	sub media_window {
		1610	my $vb = new CFPlus::UI::VBox;
		1611
		1612	$vb->add (new CFPlus::UI::FancyFrame
		1613	label => "Currently playing music",
		1614	child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
		1615	child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
		1616	);
		1617
		1618	$vb->add (new CFPlus::UI::FancyFrame
		1619	label => "Other media used in this session",
		1620	expand => 1,
		1621	child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
		1622	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
		1623	);
		1624
		1625	$vb
		1626	}
		1627
		1628	sub add_license {
		1629	my ($meta) = @_;
		1630
		1631	$meta = $meta->{meta}
		1632	or return;
		1633
		1634	$meta->{license} || $meta->{author} || $meta->{source}
		1635	or return;
		1636
		1637	$LICENSE_WIDGET->add_paragraph ({
		1638	fg => [1, 1, 1, 1],
		1639	markup => "<small>"
		1640	. "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
		1641	. "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
		1642	. "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
		1643	. "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
		1644	. "</small>",
		1645	});
		1646	$LICENSE_WIDGET->scroll_to_bottom;
		1647	}
		1648
1443	sub toggle_player_page {	1649	sub toggle_player_page {
1444	my ($widget) = @_;	1650	my ($widget) = @_;
1445		1651
1446	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {	1652	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1447	$PL_WINDOW->hide;	1653	$PL_WINDOW->hide;
…		…
1464		1670
1465	my $ntb =	1671	my $ntb =
1466	$PL_NOTEBOOK =	1672	$PL_NOTEBOOK =
1467	new CFPlus::UI::Notebook expand => 1;	1673	new CFPlus::UI::Notebook expand => 1;
1468		1674
1469	$ntb->add (	1675	$ntb->add_tab (
1470	"Statistics (F2)" => $STATS_PAGE = stats_window,	1676	"Statistics (F2)" => $STATS_PAGE = stats_window,
1471	"Shows statistics, where all your Stats and Resistances are shown."	1677	"Shows statistics, where all your Stats and Resistances are shown."
1472	);	1678	);
1473	$ntb->add (	1679	$ntb->add_tab (
1474	"Skills (F3)" => $SKILL_PAGE = skill_window,	1680	"Skills (F3)" => $SKILL_PAGE = skill_window,
1475	"Shows all your Skills."	1681	"Shows all your Skills."
1476	);	1682	);
1477		1683
1478	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1684	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1479	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);	1685	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1480	$ntb->add (	1686	$ntb->add_tab (
1481	"Spellbook (F4)" => $spellsw,	1687	"Spellbook (F4)" => $spellsw,
1482	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1688	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1483	);	1689	);
1484	$ntb->add (	1690	$ntb->add_tab (
1485	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1691	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1486	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1692	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1487	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1693	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1488	);	1694	);
1489	$ntb->add (Pickup => autopickup_setup,	1695	$ntb->add_tab (Pickup => autopickup_setup,
1490	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1696	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
		1697
		1698	$ntb->add_tab (Media => media_window,
		1699	"License, Author and Source info for media sent by the server.");
1491		1700
1492	$ntb->set_current_page ($INVENTORY_PAGE);	1701	$ntb->set_current_page ($INVENTORY_PAGE);
1493		1702
1494	$plwin->add ($ntb);	1703	$plwin->add ($ntb);
1495	$plwin	1704	$plwin
…		…
1692	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);	1901	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1693	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);	1902	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1694		1903
1695	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);	1904	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1696		1905
1697	$table->add (0, 0, new CFPlus::UI::Button	1906	$table->add_at (0, 0, new CFPlus::UI::Button
1698	text => "Close",	1907	text => "Close",
1699	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>.",	1908	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>.",
1700	on_activate => $close,	1909	on_activate => $close,
1701	);	1910	);
1702		1911
1703	$table->add (2, 0, new CFPlus::UI::Button	1912	$table->add_at (2, 0, new CFPlus::UI::Button
1704	text => "Next",	1913	text => "Next",
1705	tooltip => "Show the next <b>Tip of the day</b>.",	1914	tooltip => "Show the next <b>Tip of the day</b>.",
1706	on_activate => sub {	1915	on_activate => sub {
1707	$close->();	1916	$close->();
1708	&show_tip_of_the_day;	1917	&show_tip_of_the_day;
…		…
1777		1986
1778	$MAPWIDGET = new CFPlus::MapWidget;	1987	$MAPWIDGET = new CFPlus::MapWidget;
1779	$MAPWIDGET->connect (activate_console => sub {	1988	$MAPWIDGET->connect (activate_console => sub {
1780	my ($mapwidget, $preset) = @_;	1989	my ($mapwidget, $preset) = @_;
1781		1990
1782	if ($CONSOLE) {	1991	$MESSAGE_WINDOW->activate_console ($preset)
1783	$CONSOLE->{input}->{auto_activated} = 1;	1992	if $MESSAGE_WINDOW;
1784	$CONSOLE->{input}->grab_focus;
1785
1786	if ($preset && $CONSOLE->{input}->get_text eq '') {
1787	$CONSOLE->{input}->set_text ($preset);
1788	}
1789	}
1790	});	1993	});
1791	$MAPWIDGET->show;	1994	$MAPWIDGET->show;
1792	$MAPWIDGET->grab_focus;	1995	$MAPWIDGET->grab_focus;
1793
1794	$LOGVIEW = new CFPlus::UI::TextScroller
1795	expand => 1,
1796	font => $FONT_FIXED,
1797	fontsize => $::CFG->{log_fontsize},
1798	indent => -4,
1799	can_hover => 1,
1800	can_events => 1,
1801	max_par => $CFG->{logview_max_par},
1802	tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1803	;
1804		1996
1805	$SETUP_DIALOG = new CFPlus::UI::Toplevel	1997	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1806	title => "Setup",	1998	title => "Setup",
1807	name => "setup_dialog",	1999	name => "setup_dialog",
1808	x => 'center',	2000	x => 'center',
…		…
1812	force_h => $::HEIGHT * 0.6,	2004	force_h => $::HEIGHT * 0.6,
1813	has_close_button => 1,	2005	has_close_button => 1,
1814	;	2006	;
1815		2007
1816	$METASERVER = metaserver_dialog;	2008	$METASERVER = metaserver_dialog;
		2009	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1817		2010
1818	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,	2011	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1819	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	2012	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1820		2013
1821	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	2014	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1822	"Configure the server to play on, your username, password and other server-related options.");	2015	"Configure the server to play on, your username, password and other server-related options.");
1823	$SETUP_NOTEBOOK->add (Client => client_setup,	2016	$SETUP_NOTEBOOK->add_tab (Client => client_setup,
1824	"Configure various client-specific settings.");	2017	"Configure various client-specific settings.");
1825	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	2018	$SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1826	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	2019	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1827	$SETUP_NOTEBOOK->add (Audio => audio_setup,	2020	$SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1828	"Configure the use of audio, sound effects and background music.");	2021	"Configure the use of audio, sound effects and background music.");
1829	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	2022	$SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1830	"Lets you define, edit and delete key bindings."	2023	"Lets you define, edit and delete key bindings."
1831	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "	2024	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1832	. "with nothing set and the recording started. After doing the actions you "	2025	. "with nothing set and the recording started. After doing the actions you "
1833	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	2026	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1834	. "After pressing the combo the binding will be saved automatically and the "	2027	. "After pressing the combo the binding will be saved automatically and the "
1835	. "binding editor closes");	2028	. "binding editor closes");
1836	$SETUP_NOTEBOOK->add (Debug => debug_setup,	2029	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1837	"Some debuggin' options. Do not ask.");	2030	"Some debuggin' options. Do not ask.");
1838		2031
1839	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	2032	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1840		2033
1841	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	2034	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1842	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	2035	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1843		2036
1844	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	2037	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1845	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	2038	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1846		2039
1847	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	2040	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
1848		2041
1849	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,	2042	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
…		…
1882	}	2075	}
1883		2076
1884	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	2077	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1885	}	2078	}
1886		2079
1887	sub setup_build_button {
1888	my ($enabled) = @_;
1889	if ($enabled) {
1890	$BUILD_BUTTON->hide if $BUILD_BUTTON;
1891	$BUILD_BUTTON ||= new CFPlus::UI::Button
1892	text => "Build",
1893	tooltip => "Opens the ingame builder",
1894	on_activate => sub {
1895	if ($CONN) {
1896	$CONN->send_ext_req (builder_player_items => sub {
1897	open_ingame_editor ($_[0]) if exists $_[0]->{items};
1898	});
1899	}
1900	0
1901	};
1902	$BUTTONBAR->add ($BUILD_BUTTON);
1903	} else {
1904	$BUILD_BUTTON->hide if $BUILD_BUTTON;
1905	}
1906	}
1907
1908	sub open_ingame_editor {
1909	my ($msg) = @_;
1910
1911	my $win = new CFPlus::UI::Toplevel
1912	x => 0,
1913	y => 'center',
1914	z => 4,
1915	name => 'builder_window',
1916	force_w => int $WIDTH * 1/4,
1917	force_h => int $HEIGHT * 3/4,
1918	title => "In game builder",
1919	has_close_button => 1;
1920
1921	my $r = new CFPlus::UI::ScrolledWindow (
1922	expand => 1,
1923	scroll_y => 1
1924	);
1925	$r->add (my $vb = new CFPlus::UI::VBox);
1926	$win->add ($r);
1927
1928
1929	$vb->add (
1930	new CFPlus::UI::Button
1931	text => "Disable build mode",
1932	on_activate => sub { $::IN_BUILD_MODE = undef }
1933	);
1934	$vb->add (
1935	new CFPlus::UI::Button
1936	text => "ERASE",
1937	on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1938	);
1939
1940	for my $itemarchname (
1941	sort {
1942	$msg->{items}->{$a}->{build_arch_name}
1943	cmp $msg->{items}->{$b}->{build_arch_name}
1944	} keys %{$msg->{items}}
1945	) {
1946	my $info = $msg->{items}->{$itemarchname};
1947	$vb->add (
1948	new CFPlus::UI::Button text => $info->{build_arch_name},
1949	on_activate => sub {
1950	$::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1951
1952	if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1953	build_mode_query_arch_info ();
1954	}
1955	}
1956	);
1957	}
1958
1959	$win->show;
1960	}
1961
1962	sub build_mode_query_arch_info {
1963	my ($iteminfo) = $::IN_BUILD_MODE;
1964	my $itemarchname = $iteminfo->{item};
1965	my $info = $iteminfo->{info};
1966
1967	my $dialog = new CFPlus::UI::Toplevel
1968	x => "center",
1969	y => "center",
1970	z => 50,
1971	force_w => int $WIDTH * 1/2,
1972	title => "Enter information for placement of '$itemarchname'",
1973	has_close_button => 1;
1974
1975	$dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1976
1977	$vb->add (my $table = new CFPlus::UI::Table expand => 1);
1978	my $row = 0;
1979	if ($info->{has_name}) {
1980	$table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1981	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1982	}
1983	if ($info->{has_text}) {
1984	$table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1985	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1986	}
1987	if ($info->{has_connection}) {
1988	$table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1989	$table->add (1, $row++,
1990	new CFPlus::UI::Entry
1991	expand => 1,
1992	on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1993	tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1994	);
1995	}
1996
1997	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1998	$hb->add (new CFPlus::UI::Button
1999	text => "Close",
2000	expand => 1,
2001	on_activate => sub { $dialog->hide; 0 },
2002	);
2003	$dialog->show;
2004	}
2005
2006	sub video_shutdown {	2080	sub video_shutdown {
2007	CFPlus::OpenGL::shutdown;	2081	CFPlus::OpenGL::shutdown;
2008		2082
2009	undef $SDL_ACTIVE;	2083	undef $SDL_ACTIVE;
2010	}	2084	}
2011		2085
2012	sub audio_channel_finished {
2013	my ($channel) = @_;
2014
2015	#warn "channel $channel finished\n";#d#
2016	}
2017
2018	sub audio_music_set {
2019	my ($songs) = @_;
2020
2021	my @want =
2022	grep $_,
2023	map $CONN->{music_meta}{$_},
2024	@$songs;
2025
2026	if (@want) {
2027	@MUSIC_WANT = @want;
2028	&audio_music_changed ();
2029	}
2030	}
2031
2032	sub audio_music_start {
2033	my $path = $MUSIC_PLAYING->{path}
2034	or return;
2035
2036	CFPlus::DB::prefetch_file $path, 1024_000, sub {
2037	# music might have changed...
2038	$path eq $MUSIC_PLAYING->{path}
2039	or return &audio_music_start ();
2040
2041	$MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2042
2043	my $NOW = time;
2044
2045	if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2046	my $pos = $MUSIC_PLAYING->{stop_pos};
2047	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2048	$MUSIC_START = time - $pos;
2049	} else {
2050	$MUSIC_PLAYER->play (0);
2051	$MUSIC_START = time;
2052	}
2053
2054	delete $MUSIC_PLAYING->{stop_time};
2055	delete $MUSIC_PLAYING->{stop_pos};
2056	}
2057	}
2058
2059	sub audio_music_changed {
2060	return unless $CFG->{bgm_enable};
2061
2062	# default MUSIC_WANT == MUSIC_DEFAULT
2063	@MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2064
2065	# if the currently playing song is acceptable, let it continue
2066	return if $MUSIC_PLAYING
2067	&& grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2068
2069	my $NOW = time;
2070
2071	if ($MUSIC_PLAYING) {
2072	$MUSIC_PLAYING->{stop_time} = $NOW;
2073	$MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2074	CFPlus::MixMusic::fade_out 1000;
2075	} else {
2076	# sort by stop time, oldest first
2077	@MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2078
2079	# if the most recently-played piece played very recently,
2080	# resume it, else choose the oldest piece for rotation.
2081	$MUSIC_PLAYING =
2082	$MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2083	? $MUSIC_WANT[-1]
2084	: $MUSIC_WANT[0];
2085
2086	audio_music_start;
2087	}
2088	}
2089
2090	sub audio_music_finished {
2091	$MUSIC_PLAYING = undef;
2092	undef $MUSIC_PLAYER;
2093
2094	audio_music_changed;
2095	}
2096
2097	sub audio_init {
2098	if ($CFG->{audio_enable}) {
2099	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
2100	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
2101
2102	unless ($SDL_MIXER) {
2103	status "Unable to open sound device: there will be no sound";
2104	return;
2105	}
2106
2107	CFPlus::Mix_AllocateChannels 8;
2108	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2109
2110	audio_music_finished;
2111
2112	local $_;
2113	while (<$fh>) {
2114	next if /^\s*#/;
2115	next if /^\s*$/;
2116
2117	my ($file, $volume, $event) = split /\s+/, $_, 3;
2118
2119	push @SOUNDS, "$volume,$file";
2120
2121	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
2122	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2123	$chunk->volume ($volume * 128 / 100);
2124	$chunk
2125	};
2126	}
2127	} else {
2128	status "unable to open sound config: $!";
2129	}
2130	}
2131	}
2132
2133	sub audio_shutdown {
2134	CFPlus::Mix_CloseAudio if $SDL_MIXER;
2135	undef $SDL_MIXER;
2136	@SOUNDS = ();
2137	%AUDIO_CHUNKS = ();
2138	}
2139
2140	my %animate_object;	2086	my %animate_object;
2141	my $animate_timer;	2087	my $animate_timer;
2142		2088
2143	my $fps = 9;	2089	my $fps = 9;
2144
2145	my %demo;#d#
2146		2090
2147	sub force_refresh {	2091	sub force_refresh {
2148	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2092	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
2149	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2093	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2150		2094
…		…
2182		2126
2183	sub animation_stop {	2127	sub animation_stop {
2184	my ($widget) = @_;	2128	my ($widget) = @_;
2185	delete $animate_object{$widget};	2129	delete $animate_object{$widget};
2186	}	2130	}
2187
2188	# check once/second for faces that need to be prefetched
2189	# this should, of course, only run on demand, but
2190	# SDL forces worse things on us....
2191
2192	Event->timer (after => 1, interval => 0.25, cb => sub {
2193	$CONN->face_prefetch
2194	if $CONN;
2195	});
2196		2131
2197	%SDL_CB = (	2132	%SDL_CB = (
2198	CFPlus::SDL_QUIT => sub {	2133	CFPlus::SDL_QUIT => sub {
2199	exit;	2134	exit;
2200	},	2135	},
…		…
2244		2179
2245	CFPlus::UI::set_layout ($::CFG->{layout});	2180	CFPlus::UI::set_layout ($::CFG->{layout});
2246		2181
2247	my %DEF_CFG = (	2182	my %DEF_CFG = (
2248	sdl_mode => 0,	2183	sdl_mode => 0,
2249	width => 640,
2250	height => 480,
2251	fullscreen => 0,	2184	fullscreen => 0,
2252	fast => 0,	2185	fast => 0,
2253	map_scale => 1,	2186	map_scale => 1,
2254	fow_enable => 1,	2187	fow_enable => 1,
2255	fow_intensity => 0,	2188	fow_intensity => 0,
2256	fow_smooth => 1,
2257	map_smoothing => 1,	2189	map_smoothing => 1,
2258	gui_fontsize => 1,	2190	gui_fontsize => 1,
2259	log_fontsize => 0.7,	2191	log_fontsize => 0.7,
2260	gauge_fontsize => 1,	2192	gauge_fontsize => 1,
2261	gauge_size => 0.35,	2193	gauge_size => 0.35,
2262	stat_fontsize => 0.7,	2194	stat_fontsize => 0.7,
2263	mapsize => 100,	2195	mapsize => 100,
2264	say_command => 'chat',
2265	audio_enable => 1,	2196	audio_enable => 1,
		2197	effects_enable => 1,
		2198	effects_volume => 1,
2266	bgm_enable => 1,	2199	bgm_enable => 1,
2267	bgm_volume => 0.25,	2200	bgm_volume => 0.5,
2268	face_prefetch => 0,
2269	output_sync => 1,	2201	output_sync => 1,
2270	output_count => 1,	2202	output_count => 1,
2271	output_rate => "",	2203	output_rate => "",
2272	pickup => 0,	2204	pickup => 0,
2273	inv_sort => "mtime",	2205	inv_sort => "mtime",
…		…
2298	sdl_init;	2230	sdl_init;
2299		2231
2300	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;	2232	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2301	@SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;	2233	@SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2302	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2234	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2235
		2236	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2303		2237
2304	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2238	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2305		2239
2306	{	2240	{
2307	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(	2241	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(

Diff Legend

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