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.151 by root, Mon Apr 16 21:12:51 2007 UTC vs.
Revision 1.191 by root, Sun Jul 29 21:31:48 2007 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	my $startup_done = sub { };	3	my $startup_done = sub { };
		4	our $PANGO = "1.5.0";
4		5
5	# do splash-screen thingy on win32	6	# do splash-screen thingy on win32
6	BEGIN {	7	BEGIN {
7	if (%PAR::LibCache && $^O eq "MSWin32") {	8	if (%PAR::LibCache && $^O eq "MSWin32") {
8	while (my ($filename, $zip) = each %PAR::LibCache) {	9	while (my ($filename, $zip) = each %PAR::LibCache) {
…		…
29	# do things only needed for single-binary version (par)	30	# do things only needed for single-binary version (par)
30	BEGIN {	31	BEGIN {
31	if (%PAR::LibCache) {	32	if (%PAR::LibCache) {
32	@INC = grep ref, @INC; # weed out all paths except pars loader refs	33	@INC = grep ref, @INC; # weed out all paths except pars loader refs
33		34
		35	my $tmp = $ENV{PAR_TEMP};
		36
34	while (my ($filename, $zip) = each %PAR::LibCache) {	37	while (my ($filename, $zip) = each %PAR::LibCache) {
35	for ($zip->memberNames) {	38	for ($zip->memberNames) {
36	next unless /^root\/(.*)/;	39	next unless /^root\/(.*)/;
37	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")	40	$zip->extractMember ($_, "$tmp/$1")
38	unless -e "$ENV{PAR_TEMP}/$1";	41	unless -e "$tmp/$1";
39	}	42	}
40	}	43	}
41		44
42	# TODO: pango-rc file, anybody?	45	if ($^O eq "MSWin32") {
		46	# relocatable
		47	} else {
		48	# unix, need to patch pango rc file
		49	open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
		50	or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
		51	local $/;
		52	my $rc = <$fh>;
		53	$rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43		54
44	unshift @INC, $ENV{PAR_TEMP};	55	mkdir "$tmp/pango-modules";
		56	open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
		57	or die "$tmp/pango-modules/pango.modules: $!";
		58	print $fh $rc;
		59
		60	$ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
		61	open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
		62	or die "$ENV{PANGO_RC_FILE}: $!";
		63	print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
		64	}
		65
		66	unshift @INC, $tmp;
45	}	67	}
46	}	68	}
47		69
48	# need to do it again because that pile of garbage called PAR nukes it before main	70	# need to do it again because that pile of garbage called PAR nukes it before main
49	unshift @INC, $ENV{PAR_TEMP}	71	unshift @INC, $ENV{PAR_TEMP}
50	if %PAR::LibCache;	72	if %PAR::LibCache;
51		73
52	use Time::HiRes 'time';	74	use Time::HiRes 'time';
53	use Event;	75	use Event;
		76	use List::Util qw(max min);
54		77
55	use Crossfire;	78	use Crossfire;
56	use Crossfire::Protocol::Constants;	79	use Crossfire::Protocol::Constants;
57		80
58	use Compress::LZF;	81	use Compress::LZF;
…		…
60	use CFPlus;	83	use CFPlus;
61	use CFPlus::OpenGL ();	84	use CFPlus::OpenGL ();
62	use CFPlus::Protocol;	85	use CFPlus::Protocol;
63	use CFPlus::DB;	86	use CFPlus::DB;
64	use CFPlus::UI;	87	use CFPlus::UI;
		88	use CFPlus::UI::Canvas;
65	use CFPlus::UI::Inventory;	89	use CFPlus::UI::Inventory;
66	use CFPlus::UI::SpellList;	90	use CFPlus::UI::SpellList;
		91	use CFPlus::UI::MessageWindow;
67	use CFPlus::Pod;	92	use CFPlus::Pod;
68	use CFPlus::MapWidget;	93	use CFPlus::MapWidget;
69	use CFPlus::Macro;	94	use CFPlus::Macro;
70		95
71	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	96	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
…		…
103		128
104	our $MAP;	129	our $MAP;
105	our $MAPMAP;	130	our $MAPMAP;
106	our $MAPWIDGET;	131	our $MAPWIDGET;
107	our $BUTTONBAR;	132	our $BUTTONBAR;
108	our $LOGVIEW;
109	our $CONSOLE;
110	our $METASERVER;	133	our $METASERVER;
111	our $LOGIN_BUTTON;	134	our $LOGIN_BUTTON;
112	our $QUIT_DIALOG;	135	our $QUIT_DIALOG;
113	our $HOST_ENTRY;	136	our $HOST_ENTRY;
114	our $FULLSCREEN_ENABLE;	137	our $FULLSCREEN_ENABLE;
…		…
137		160
138	our $SDL_ACTIVE;	161	our $SDL_ACTIVE;
139	our %SDL_CB;	162	our %SDL_CB;
140		163
141	our $SDL_MIXER;	164	our $SDL_MIXER;
		165	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
		166	our @MUSIC_WANT;
		167	our $MUSIC_START;
		168	our $MUSIC_PLAYING_DATA;
		169	our $MUSIC_PLAYING_META;
		170	our $MUSIC_PLAYER;
		171	our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
142	our @SOUNDS; # event => file mapping	172	our @SOUNDS; # event => file mapping
143	our %AUDIO_CHUNKS; # audio files	173	our %AUDIO_CHUNKS; # audio files
144		174
145	our $ALT_ENTER_MESSAGE;	175	our $ALT_ENTER_MESSAGE;
146	our $STATUSBOX;	176	our $STATUSBOX;
…		…
150	our $INVR;	180	our $INVR;
151	our $INV_RIGHT_HB;	181	our $INV_RIGHT_HB;
152		182
153	our $PICKUP_CFG;	183	our $PICKUP_CFG;
154		184
155	our $IN_BUILD_MODE;
156	our $BUILD_BUTTON;
157
158	sub status {	185	sub status {
159	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	186	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
160	}	187	}
161		188
162	sub debug {	189	sub debug {
163	$DEBUG_STATUS->set_text ($_[0]);	190	$DEBUG_STATUS->set_text ($_[0]);
164	}	191	}
165		192
166	sub message {	193	sub message {
167	my ($para) = @_;	194	my ($para) = @_;
168		195	$MESSAGE_WINDOW->message ($para);
169	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171	$para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173	$LOGVIEW->add_paragraph ($para);
174	$LOGVIEW->scroll_to_bottom;
175	}	196	}
176		197
177	sub destroy_query_dialog {	198	sub destroy_query_dialog {
178	(delete $_[0]{query_dialog})->destroy	199	(delete $_[0]{query_dialog})->destroy
179	if $_[0]{query_dialog};	200	if $_[0]{query_dialog};
…		…
207	title => "Server Query",	228	title => "Server Query",
208	child => my $vbox = new CFPlus::UI::VBox,	229	child => my $vbox = new CFPlus::UI::VBox,
209	;	230	;
210		231
211	my @dialog = my $label = new CFPlus::UI::Label	232	my @dialog = my $label = new CFPlus::UI::Label
212	max_w => $::WIDTH * 0.4,	233	max_w => $::WIDTH * 0.8,
213	ellipsise => 0,	234	ellipsise => 0,
214	text => $prompt;	235	text => $prompt;
215		236
216	if ($flags & CS_QUERY_YESNO) {	237	if ($flags & CS_QUERY_YESNO) {
217	push @dialog, my $hbox = new CFPlus::UI::HBox;	238	push @dialog, my $hbox = new CFPlus::UI::HBox;
…		…
234	);	255	);
235		256
236	$dialog->grab_focus;	257	$dialog->grab_focus;
237		258
238	} elsif ($flags & CS_QUERY_SINGLECHAR) {	259	} elsif ($flags & CS_QUERY_SINGLECHAR) {
239	$dialog->{tooltip} = "#charcreation_focus";
240
241	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	260	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
242	$MESSAGE_WINDOW->show;	261	$dialog->{tooltip} = "#charcreation_focus";
243		262
244	unshift @dialog, new CFPlus::UI::Label	263	unshift @dialog, new CFPlus::UI::Label
245	max_w => $::WIDTH * 0.4,	264	max_w => $::WIDTH * 0.8,
246	ellipsise => 0,	265	ellipsise => 0,
247	markup => "\nOr use your keyboard and the text entry below:\n";	266	markup => "\nOr use your keyboard and the text entry below:\n";
248		267
249	unshift @dialog, my $table = new CFPlus::UI::Table;	268	unshift @dialog, my $table = new CFPlus::UI::Table;
250		269
251	$table->add (0, 0, new CFPlus::UI::Button	270	$table->add_at (0, 0, new CFPlus::UI::Button
252	text => "Next Race",	271	text => "Next Race",
253	on_activate => sub {	272	on_activate => sub {
254	$conn->send ("reply n");	273	$conn->send ("reply n");
255	destroy_query_dialog $conn;	274	destroy_query_dialog $conn;
256	0	275	0
257	},	276	},
258	);	277	);
259	$table->add (2, 0, new CFPlus::UI::Button	278	$table->add_at (2, 0, new CFPlus::UI::Button
260	text => "Accept",	279	text => "Accept",
261	on_activate => sub {	280	on_activate => sub {
262	$conn->send ("reply d");	281	$conn->send ("reply d");
263	destroy_query_dialog $conn;	282	destroy_query_dialog $conn;
264	0	283	0
265	},	284	},
266	);	285	);
267		286
		287	if ($conn->{chargen_race_description}) {
		288	unshift @dialog, new CFPlus::UI::Label
		289	max_w => $::WIDTH * 0.8,
		290	ellipsise => 0,
		291	markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
		292	;
		293	}
		294
		295	unshift @dialog, new CFPlus::UI::Face
		296	face => $conn->{player}{face},
		297	bg => [.2, .2, .2, 1],
		298	min_w => 64,
		299	min_h => 64,
		300	;
		301
		302	if ($conn->{chargen_race_title}) {
		303	unshift @dialog, new CFPlus::UI::Label
		304	allign => 1,
		305	ellipsise => 0,
		306	markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
		307	;
		308	}
		309
268	unshift @dialog, new CFPlus::UI::Label	310	unshift @dialog, new CFPlus::UI::Label
269	max_w => $::WIDTH * 0.4,	311	max_w => $::WIDTH * 0.4,
270	ellipsise => 0,	312	ellipsise => 0,
271	markup => (CFPlus::Pod::section_label ui => "chargen_race"),	313	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
272	;	314	;
…		…
276	$conn->send ("reply $stat");	318	$conn->send ("reply $stat");
277	destroy_query_dialog $conn;	319	destroy_query_dialog $conn;
278	return;	320	return;
279	}	321	}
280		322
281	$STATS_PAGE->show;
282	$MESSAGE_WINDOW->hide;
283
284	unshift @dialog, new CFPlus::UI::Label	323	unshift @dialog, new CFPlus::UI::Label
285	max_w => $::WIDTH * 0.4,	324	max_w => $::WIDTH * 0.4,
286	ellipsise => 0,	325	ellipsise => 0,
287	markup => "\nOr use your keyboard and the text entry below:\n";	326	markup => "\nOr use your keyboard and the text entry below:\n";
288		327
289	unshift @dialog, my $table = new CFPlus::UI::Table;	328	unshift @dialog, my $table = new CFPlus::UI::Table;
290		329
291	# left: re-roll	330	# left: re-roll
292	$table->add (0, 0, new CFPlus::UI::Button	331	$table->add_at (0, 0, new CFPlus::UI::Button
293	text => "Roll Again",	332	text => "Roll Again",
294	on_activate => sub {	333	on_activate => sub {
295	$conn->send ("reply y");	334	$conn->send ("reply y");
296	destroy_query_dialog $conn;	335	destroy_query_dialog $conn;
297	0	336	0
…		…
311	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	350	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
312	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	351	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
313	],	352	],
314	), 1 .. 2;	353	), 1 .. 2;
315		354
316	$table->add (2, 0, new CFPlus::UI::Button	355	$table->add_at (2, 0, new CFPlus::UI::Button
317	text => "Swap Stats",	356	text => "Swap Stats",
318	on_activate => sub {	357	on_activate => sub {
319	$conn->{stat_change_with} = $sw2->{value};	358	$conn->{stat_change_with} = $sw2->{value};
320	$conn->send ("reply $sw1->{value}");	359	$conn->send ("reply $sw1->{value}");
321	destroy_query_dialog $conn;	360	destroy_query_dialog $conn;
322	0	361	0
323	},	362	},
324	);	363	);
325	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);	364	$table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
326		365
327	# right: accept	366	# right: accept
328	$table->add (4, 0, new CFPlus::UI::Button	367	$table->add_at (4, 0, new CFPlus::UI::Button
329	text => "Accept",	368	text => "Accept",
330	on_activate => sub {	369	on_activate => sub {
331	$conn->send ("reply n");	370	$conn->send ("reply n");
332	$STATS_PAGE->hide;	371	$STATS_PAGE->hide;
333	destroy_query_dialog $conn;	372	destroy_query_dialog $conn;
…		…
414	maph => $mapsize,	453	maph => $mapsize,
415		454
416	client => "cfplus $CFPlus::VERSION $] $^O",	455	client => "cfplus $CFPlus::VERSION $] $^O",
417		456
418	map_widget => $MAPWIDGET,	457	map_widget => $MAPWIDGET,
419	logview => $LOGVIEW,
420	statusbox => $STATUSBOX,	458	statusbox => $STATUSBOX,
421	map => $MAP,	459	map => $MAP,
422	mapmap => $MAPMAP,	460	mapmap => $MAPMAP,
423	query => \&server_query,	461	query => \&server_query,
424		462
425	setup_req => {	463	setup_req => {
426	smoothing => $CFG->{map_smoothing}*1,	464	smoothing => $CFG->{map_smoothing}*1,
427	},
428
429	sound_play => sub {
430	my ($x, $y, $soundnum, $type) = @_;
431
432	$SDL_MIXER
433	or return;
434
435	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
436	or return;
437
438	$chunk->play;
439	},	465	},
440	};	466	};
441		467
442	if ($CONN) {	468	if ($CONN) {
443	CFPlus::lowdelay fileno $CONN->{fh};	469	CFPlus::lowdelay fileno $CONN->{fh};
…		…
453	$LOGIN_BUTTON->set_text ("Login");	479	$LOGIN_BUTTON->set_text ("Login");
454	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	480	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
455	$SETUP_DIALOG->show;	481	$SETUP_DIALOG->show;
456	$PL_WINDOW->hide;	482	$PL_WINDOW->hide;
457	$SPELL_LIST->clear_spells;	483	$SPELL_LIST->clear_spells;
		484	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
		485
		486	&audio_music_set ([]);
458		487
459	return unless $CONN;	488	return unless $CONN;
460		489
461	status "connection closed";	490	status "connection closed";
462		491
…		…
472		501
473	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	502	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
474		503
475	my $row = 0;	504	my $row = 0;
476		505
477	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");	506	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
478	$table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,	507	$table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
479	can_events => 1,	508	can_events => 1,
480	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");	509	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
481		510
		511	my $vidmode_tooltip =
		512	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
		513	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
		514
482	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");	515	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
483	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);	516	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
484		517
		518	$hbox->add (my $mode_slider = new CFPlus::UI::Slider
485	$hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	519	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
486	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	520	tooltip => $vidmode_tooltip);
		521	$hbox->add (my $mode_label = new CFPlus::UI::Label
		522	align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
		523	can_events => 1, tooltip => $vidmode_tooltip);
487		524
488	$mode_slider->connect (changed => sub {	525	$mode_slider->connect (changed => sub {
489	my ($self, $value) = @_;	526	my ($self, $value) = @_;
490		527
491	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	528	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
492	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	529	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
493	});	530	});
494	$mode_slider->emit (changed => $mode_slider->{range}[0]);	531	$mode_slider->emit (changed => $mode_slider->{range}[0]);
495		532
496	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");	533	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
497	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox	534	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
498	state => $CFG->{fullscreen},	535	state => $CFG->{fullscreen},
499	tooltip => "Bring the client into fullscreen mode.",	536	tooltip => "Bring the client into fullscreen mode.",
500	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	537	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
501	);	538	);
502		539
503	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	540	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
504	$table->add (1, $row++, new CFPlus::UI::CheckBox	541	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
505	state => $CFG->{fast},	542	state => $CFG->{fast},
506	tooltip => "Lower the visual quality considerably to speed up rendering.",	543	tooltip => "Lower the visual quality considerably to speed up rendering.",
507	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	544	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
508	);	545	);
509		546
510	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	547	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
511	$table->add (1, $row++, new CFPlus::UI::Slider	548	$table->add_at (1, $row++, new CFPlus::UI::Slider
512	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	549	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
513	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	550	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
514	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },	551	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
515	);	552	);
516		553
517	$table->add (1, $row++, new CFPlus::UI::Button	554	$table->add_at (1, $row++, new CFPlus::UI::Button
518	expand => 1, align => 0, text => "Apply",	555	expand => 1, align => 0, text => "Apply",
519	tooltip => "Apply the video settings above.",	556	tooltip => "Apply the video settings above.",
520	on_activate => sub {	557	on_activate => sub {
521	video_shutdown ();	558	video_shutdown ();
522	video_init ();	559	video_init ();
523	0	560	0
524	}	561	}
525	);	562	);
526		563
527	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");	564	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
528	$table->add (1, $row++, new CFPlus::UI::Slider	565	$table->add_at (1, $row++, new CFPlus::UI::Slider
529	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	566	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
530	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	567	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
531	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	568	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
532	);	569	);
533		570
534	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");	571	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
535	$table->add (1, $row++, new CFPlus::UI::CheckBox	572	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
536	state => $CFG->{map_smoothing},	573	state => $CFG->{map_smoothing},
537	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "	574	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
538	. "This increases load on the graphics subsystem and works only with 2.x servers. "	575	. "This increases load on the graphics subsystem and works only with 2.x servers. "
539	. "Changes take effect at next connection only.",	576	. "Changes take effect at next connection only.",
540	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }	577	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
541	);	578	);
542		579
543	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");	580	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
544	$table->add (1, $row++, new CFPlus::UI::CheckBox	581	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
545	state => $CFG->{fow_enable},	582	state => $CFG->{fow_enable},
546	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	583	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
547	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	584	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
548	);	585	);
549		586
550	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");	587	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
551	$table->add (1, $row++, new CFPlus::UI::Slider	588	$table->add_at (1, $row++, new CFPlus::UI::Slider
552	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	589	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
553	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	590	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
554	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	591	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
555	);	592	);
556		593
557	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
558	$table->add (1, $row++, new CFPlus::UI::CheckBox
559	state => $CFG->{fow_smooth},
560	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
561	on_changed => sub {
562	my ($self, $value) = @_;
563	$CFG->{fow_smooth} = $value;
564	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
565	0
566	}
567	);
568
569	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");	594	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
570	$table->add (1, $row++, new CFPlus::UI::Slider	595	$table->add_at (1, $row++, new CFPlus::UI::Slider
571	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	596	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
572	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	597	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
573	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	598	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
574	);	599	);
575		600
576	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	601	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
577	$table->add (1, $row++, new CFPlus::UI::Slider	602	$table->add_at (1, $row++, new CFPlus::UI::Slider
578	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	603	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
579	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	604	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
580	on_changed => sub {	605	on_changed => sub {
581	$CFG->{gauge_fontsize} = $_[1];	606	$CFG->{gauge_fontsize} = $_[1];
582	&set_gauge_window_fontsize;	607	&set_gauge_window_fontsize;
583	0	608	0
584	}	609	}
585	);	610	);
586		611
587	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");	612	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
588	$table->add (1, $row++, new CFPlus::UI::Slider	613	$table->add_at (1, $row++, new CFPlus::UI::Slider
589	range => [$CFG->{gauge_size}, 0.2, 0.8],	614	range => [$CFG->{gauge_size}, 0.2, 0.8],
590	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	615	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
591	on_changed => sub {	616	on_changed => sub {
592	$CFG->{gauge_size} = $_[1];	617	$CFG->{gauge_size} = $_[1];
593	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	618	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
…		…
603		628
604	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	629	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
605		630
606	my $row = 0;	631	my $row = 0;
607		632
608	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");	633	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
609	$table->add (1, $row++, new CFPlus::UI::CheckBox	634	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
610	state => $CFG->{audio_enable},	635	state => $CFG->{audio_enable},
611	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.",	636	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
612	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	637	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
613	);	638	);
614	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");	639	# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
615	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	640	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
616	# $CFG->{effects_volume} = $_[1];	641	# $CFG->{effects_volume} = $_[1];
617	# });	642	# });
618	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");	643	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
619	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);	644	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
620	$hbox->add (new CFPlus::UI::CheckBox	645	$hbox->add (new CFPlus::UI::CheckBox
621	expand => 1, state => $CFG->{bgm_enable},	646	expand => 1, state => $CFG->{bgm_enable},
622	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	647	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
623	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	648	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
624	);	649	);
…		…
626	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	651	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
627	tooltip => "The volume of the background music. Changes are instant.",	652	tooltip => "The volume of the background music. Changes are instant.",
628	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }	653	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
629	);	654	);
630		655
631	$table->add (1, $row++, new CFPlus::UI::Button	656	$table->add_at (1, $row++, new CFPlus::UI::Button
632	expand => 1, align => 0, text => "Apply",	657	expand => 1, align => 0, text => "Apply",
633	tooltip => "Apply the audio settings",	658	tooltip => "Apply the audio settings",
634	on_activate => sub {	659	on_activate => sub {
635	audio_shutdown ();	660	audio_shutdown ();
636	audio_init ();	661	audio_init ();
…		…
695	}	720	}
696		721
697	sub debug_setup {	722	sub debug_setup {
698	my $table = new CFPlus::UI::Table;	723	my $table = new CFPlus::UI::Table;
699		724
700	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");	725	$table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
701	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	726	$table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
702	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");	727	$table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
703	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	728	$table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
704	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");	729	$table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
705	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	730	$table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
706	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");	731	$table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
707	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	732	$table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
708	$table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );	733	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
709		734
710	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
711
712	for my $x (0..2) {
713	for my $y (0 .. 2) {
714	$table->add ($x + 3, $y,
715	new CFPlus::UI::Entry
716	text => $default_smooth[$x * 3 + $y],
717	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
718	);
719	}
720	}
721
722	$table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#	735	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
		736
		737	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
		738	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
		739	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
		740	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
		741	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
		742	$t->add_at (1,1, new CFPlus::UI::Label text => "e");
		743
		744	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
		745
		746	$c->add_items ({
		747	type => "line_loop",
		748	color => [0, 1, 0],
		749	width => 9,
		750	coord_mode => "abs",
		751	coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
		752	});
		753
		754	$c->add_items ({
		755	type => "lines",
		756	color => [1, 1, 0],
		757	width => 2,
		758	coord_mode => "rel",
		759	coord => [[0,0], [1,1], [1,0], [0,1]],
		760	});
		761
		762	$c->add_items ({
		763	type => "polygon",
		764	color => [0, 0.43, 0],
		765	width => 2,
		766	coord_mode => "rel",
		767	coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
		768	});
723		769
724	$table	770	$table
725	}	771	}
726		772
727	sub stats_window {	773	sub stats_window {
…		…
775	[2, 4, st_spd => "Spd", 10.54],	821	[2, 4, st_spd => "Spd", 10.54],
776	[2, 5, st_wspd => "WSp", 10.54],	822	[2, 5, st_wspd => "WSp", 10.54],
777	) {	823	) {
778	my ($col, $row, $id, $label, $template) = @$_;	824	my ($col, $row, $id, $label, $template) = @$_;
779		825
780	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label	826	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
781	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	827	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
782	align => +1, template => $template, tooltip => "#stat_$label");	828	align => +1, template => $template, tooltip => "#stat_$label");
783	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label	829	$tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
784	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	830	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
785	align => -1, text => $label, tooltip => "#stat_$label");	831	align => -1, text => $label, tooltip => "#stat_$label");
786	}	832	}
787		833
788	$vb->add (new CFPlus::UI::FancyFrame	834	$vb->add (new CFPlus::UI::FancyFrame
…		…
829	cold => ["Cold",	875	cold => ["Cold",
830	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],	876	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
831	ghit => ["Ghost hit",	877	ghit => ["Ghost hit",
832	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],	878	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
833	);	879	);
		880
834	for (qw/slow holyw conf fire depl magic	881	for (qw/slow holyw conf fire depl magic
835	drain acid pois para deat phys	882	drain acid pois para deat phys
836	blind fear tund elec cold ghit/)	883	blind fear tund elec cold ghit/)
837	{	884	{
838	$tbl2->add ($col, $row,	885	$tbl2->add_at ($col, $row,
839	$STATWIDS->{"res_$_"} =	886	$STATWIDS->{"res_$_"} =
840	new CFPlus::UI::Label	887	new CFPlus::UI::Label
841	font => $FONT_FIXED,	888	font => $FONT_FIXED,
842	template => "-100%",	889	template => "-100%",
843	align => +1,	890	align => +1,
844	valign => 0,	891	valign => 0,
845	can_events => 1,	892	can_events => 1,
846	can_hover => 1,	893	can_hover => 1,
847	tooltip => $resist_names{$_}->[1],	894	tooltip => $resist_names{$_}->[1],
848	);	895	);
849	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image	896	$tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
850	font => $FONT_FIXED,	897	font => $FONT_FIXED,
851	can_hover => 1,	898	can_hover => 1,
852	can_events => 1,	899	can_events => 1,
853	path => "ui/resist/resist_$_.png",	900	path => "ui/resist/resist_$_.png",
854	tooltip => $resist_names{$_}->[1],	901	tooltip => $resist_names{$_}->[1],
855	);	902	);
856	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label	903	$tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
857	text => $resist_names{$_}->[0],	904	text => $resist_names{$_}->[0],
858	font => $FONT_FIXED,	905	font => $FONT_FIXED,
859	can_hover => 1,	906	can_hover => 1,
860	can_events => 1,	907	can_events => 1,
861	tooltip => $resist_names{$_}->[1],	908	tooltip => $resist_names{$_}->[1],
…		…
894	return if $METASERVER_ATIME > time;	941	return if $METASERVER_ATIME > time;
895	$METASERVER_ATIME = time + 60;	942	$METASERVER_ATIME = time + 60;
896		943
897	my $table = $METASERVER->{table};	944	my $table = $METASERVER->{table};
898	$table->clear;	945	$table->clear;
899	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	946	$table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
900		947
901	my $ok = 0;	948	my $ok = 0;
902		949
903	CFPlus::background {	950	CFPlus::background {
904	my $ua = CFPlus::lwp_useragent;	951	my $ua = CFPlus::lwp_useragent;
…		…
915	"The time this server has been running without being restarted.",	962	"The time this server has been running without being restarted.",
916	"The server software version - a '+' indicates a Crossfire+ server.",	963	"The server software version - a '+' indicates a Crossfire+ server.",
917	"Short information about this server provided by its admins.",	964	"Short information about this server provided by its admins.",
918	);	965	);
919	my @col = qw(#Users Host Uptime Version Description);	966	my @col = qw(#Users Host Uptime Version Description);
920	$table->add ($_, 0, new CFPlus::UI::Label	967	$table->add_at ($_, 0, new CFPlus::UI::Label
921	can_hover => 1, can_events => 1,	968	can_hover => 1, can_events => 1,
922	align => 0, fg => [1, 1, 0],	969	align => 0, fg => [1, 1, 0],
923	text => $col[$_], tooltip => $tip[$_])	970	text => $col[$_], tooltip => $tip[$_])
924	for 0 .. $#col;	971	for 0 .. $#col;
925		972
…		…
947		994
948	$m = [$users, $host, $uptime, $version, $desc];	995	$m = [$users, $host, $uptime, $version, $desc];
949		996
950	$y++;	997	$y++;
951		998
952	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [	999	$table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
953	(new CFPlus::UI::Button	1000	(new CFPlus::UI::Button
954	text => "Use",	1001	text => "Use",
955	tooltip => "Put this server into the <b>Host:Port</b> field",	1002	tooltip => "Put this server into the <b>Host:Port</b> field",
956	on_activate => sub {	1003	on_activate => sub {
957	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1004	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
…		…
960	},	1007	},
961	),	1008	),
962	(new CFPlus::UI::Empty expand => 1),	1009	(new CFPlus::UI::Empty expand => 1),
963	]);	1010	]);
964		1011
965	$table->add ($_, $y, new CFPlus::UI::Label	1012	$table->add_at ($_, $y, new CFPlus::UI::Label
966	max_w => $::WIDTH * 0.4,	1013	max_w => $::WIDTH * 0.4,
967	ellipsise => 0,	1014	ellipsise => 0,
968	align => $align[$_],	1015	align => $align[$_],
969	text => $m->[$_],	1016	text => $m->[$_],
970	tooltip => $tip[$_],	1017	tooltip => $tip[$_],
…		…
1011		1058
1012	$vbox->add (new CFPlus::UI::FancyFrame	1059	$vbox->add (new CFPlus::UI::FancyFrame
1013	label => "Connection Settings",	1060	label => "Connection Settings",
1014	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),	1061	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1015	);	1062	);
1016	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");	1063	$table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1017		1064
1018	{	1065	{
1019	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);	1066	$table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1020		1067
1021	$vbox->add (	1068	$vbox->add (
1022	$HOST_ENTRY = new CFPlus::UI::Entry	1069	$HOST_ENTRY = new CFPlus::UI::Entry
1023	expand => 1,	1070	expand => 1,
1024	text => $CFG->{profile}{default}{host},	1071	text => $CFG->{profile}{default}{host},
…		…
1038	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1085	on_activate => sub { $METASERVER->toggle_visibility; 0 },
1039	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1086	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1040	);	1087	);
1041	}	1088	}
1042		1089
1043	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");	1090	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1044	$table->add (1, 4, new CFPlus::UI::Entry	1091	$table->add_at (1, 4, new CFPlus::UI::Entry
1045	text => $CFG->{profile}{default}{user},	1092	text => $CFG->{profile}{default}{user},
1046	tooltip => "The name of your character on the server",	1093	tooltip => "The name of your character on the server",
1047	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1094	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1048	);	1095	);
1049		1096
1050	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");	1097	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1051	$table->add (1, 5, new CFPlus::UI::Entry	1098	$table->add_at (1, 5, new CFPlus::UI::Entry
1052	text => $CFG->{profile}{default}{password},	1099	text => $CFG->{profile}{default}{password},
1053	hidden => 1,	1100	hidden => 1,
1054	tooltip => "The password for your character",	1101	tooltip => "The password for your character",
1055	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1102	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1056	);	1103	);
1057		1104
1058	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");	1105	$table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1059	$table->add (1, 7, new CFPlus::UI::Slider	1106	$table->add_at (1, 7, new CFPlus::UI::Slider
1060	force_w => 100,	1107	force_w => 100,
1061	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1108	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1062	tooltip => "This is the size of the portion of the map update the server sends you. "	1109	tooltip => "This is the size of the portion of the map update the server sends you. "
1063	. "If you set this to a high value you will be able to see further, "	1110	. "If you set this to a high value you will be able to see further, "
1064	. "but you also increase bandwidth requirements and latency. "	1111	. "but you also increase bandwidth requirements and latency. "
1065	. "This option is only used once at log-in.",	1112	. "This option is only used once at log-in.",
1066	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1113	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1067	);	1114	);
1068		1115
1069	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1070	$table->add (1, 8, new CFPlus::UI::CheckBox
1071	state => $CFG->{face_prefetch},
1072	tooltip => "<b>Background Image Prefetch</b>\n\n"
1073	. "If enabled, the client automatically pre-fetches images from the server. "
1074	. "This might increase or create lag, but increases the chances "
1075	. "of faces being ready for display when you encounter them. "
1076	. "It also uses up server bandwidth on every connect, "
1077	. "so only set it if you really need to prefetch images. "
1078	. "This option can be set and unset any time.",
1079	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1080	);
1081
1082	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");	1116	$table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1083	$table->add (1, 9, new CFPlus::UI::Entry	1117	$table->add_at (1, 8, new CFPlus::UI::Entry
1084	text => $CFG->{output_rate},	1118	text => $CFG->{output_rate},
1085	tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "	1119	tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1086	. "when sending images, to ensure interactiveness. When 0 or unset, the server "	1120	. "when sending images, to ensure interactiveness. When 0 or unset, the server "
1087	. "default will be used, which is usually around 100kb/s.",	1121	. "default will be used, which is usually around 100kb/s.",
1088	on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },	1122	on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1089	);	1123	);
1090		1124
1091	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");	1125	$table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1092	$table->add (1, 10, new CFPlus::UI::Entry	1126	$table->add_at (1, 9, new CFPlus::UI::Entry
1093	text => $CFG->{output_count},	1127	text => $CFG->{output_count},
1094	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1128	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1095	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1129	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1096	);	1130	);
1097		1131
1098	$table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");	1132	$table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1099	$table->add (1, 11, new CFPlus::UI::Entry	1133	$table->add_at (1, 10, new CFPlus::UI::Entry
1100	text => $CFG->{output_sync},	1134	text => $CFG->{output_sync},
1101	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1135	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1102	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1136	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1103	);	1137	);
1104		1138
1105	$table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button	1139	$table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1106	expand => 1,	1140	expand => 1,
1107	align => 0,	1141	align => 0,
1108	text => "Login",	1142	text => "Login",
1109	on_activate => sub {	1143	on_activate => sub {
1110	$CONN ? stop_game	1144	$CONN ? stop_game
…		…
1124	sub client_setup {	1158	sub client_setup {
1125	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];	1159	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1126		1160
1127	my $row = 0;	1161	my $row = 0;
1128		1162
1129	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1130	$table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1131	text => $CFG->{say_command},
1132	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. "
1133	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1134	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1135	on_changed => sub {
1136	my ($self, $value) = @_;
1137	$CFG->{say_command} = $value;
1138	0
1139	}
1140	);
1141
1142	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");	1163	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1143	$table->add (1, $row++, new CFPlus::UI::CheckBox	1164	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
1144	state => $CFG->{show_tips},	1165	state => $CFG->{show_tips},
1145	tooltip => "Show the <b>Tip of the day</b> window at startup?",	1166	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1146	on_changed => sub {	1167	on_changed => sub {
1147	my ($self, $value) = @_;	1168	my ($self, $value) = @_;
1148	$CFG->{show_tips} = $value;	1169	$CFG->{show_tips} = $value;
1149	0	1170	0
1150	}	1171	}
1151	);	1172	);
1152		1173
1153	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");	1174	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1154	$table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry	1175	$table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1155	text => $CFG->{logview_max_par},	1176	text => $CFG->{logview_max_par},
1156	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "	1177	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1157	. "sends more messages than this number, older messages get removed to save memory and "	1178	. "sends more messages than this number, older messages get removed to save memory and "
1158	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",	1179	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1159	on_changed => sub {	1180	on_changed => sub {
1160	my ($self, $value) = @_;	1181	my ($self, $value) = @_;
1161	$LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;	1182	$MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1162	0	1183	0
1163	},	1184	},
1164	);	1185	);
1165		1186
1166	$table	1187	$table
1167	}	1188	}
1168		1189
1169	sub message_window {
1170	my $window = new CFPlus::UI::Toplevel
1171	name => "message_window",
1172	title => "Messages",
1173	border_bg => [1, 1, 1, 1],
1174	x => "max",
1175	y => 0,
1176	force_w => $::WIDTH * 0.4,
1177	force_h => $::HEIGHT * 0.5,
1178	child => (my $vbox = new CFPlus::UI::VBox),
1179	has_close_button => 1;
1180
1181	$vbox->add ($LOGVIEW);
1182
1183	$vbox->add (my $input = new CFPlus::UI::Entry
1184	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1185	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1186	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1187	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1188	on_focus_in => sub {
1189	my ($input, $prev_focus) = @_;
1190
1191	delete $input->{refocus_map};
1192
1193	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1194	$input->{refocus_map} = 1;
1195	}
1196	delete $input->{auto_activated};
1197
1198	0
1199	},
1200	on_activate => sub {
1201	my ($input, $text) = @_;
1202	$input->set_text ('');
1203
1204	if ($text =~ /^\/(.*)/) {
1205	$::CONN->user_send ($1);
1206	} else {
1207	my $say_cmd = $::CFG->{say_command} || 'say';
1208	$::CONN->user_send ("$say_cmd $text");
1209	}
1210	if ($input->{refocus_map}) {
1211	delete $input->{refocus_map};
1212	$MAPWIDGET->focus_in
1213	}
1214
1215	0
1216	},
1217	on_escape => sub {
1218	$MAPWIDGET->grab_focus;
1219
1220	0
1221	},
1222	);
1223
1224	$CONSOLE = {
1225	window => $window,
1226	input => $input,
1227	};
1228
1229	$window
1230	}
1231
1232	sub autopickup_setup {	1190	sub autopickup_setup {
		1191	my $r = new CFPlus::UI::ScrolledWindow (
		1192	expand => 1,
		1193	scroll_y => 1
		1194	);
1233	my $table = new CFPlus::UI::Table;	1195	$r->add (my $table = new CFPlus::UI::Table
		1196	row_expand => [0],
		1197	col_expand => [0, 1, 0, 1],
		1198	);
1234		1199
1235	for (	1200	for (
1236	["General", 0, 0,	1201	["General", 0, 0,
1237	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1202	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1238	["Inhibit autopickup" => PICKUP_INHIBIT],	1203	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1273	],	1238	],
1274	["Weight/Value ratio", 2, 17]	1239	["Weight/Value ratio", 2, 17]
1275	)	1240	)
1276	{	1241	{
1277	my ($title, $x, $y, @bits) = @$_;	1242	my ($title, $x, $y, @bits) = @$_;
1278	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1243	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1279		1244
1280	for (@bits) {	1245	for (@bits) {
1281	++$y;	1246	++$y;
1282		1247
1283	my $mask = $_->[1];	1248	my $mask = $_->[1];
1284	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);	1249	$table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1285	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox	1250	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1286	state => $::CFG->{pickup} & $mask,	1251	state => $::CFG->{pickup} & $mask,
1287	on_changed => sub {	1252	on_changed => sub {
1288	my ($box, $value) = @_;	1253	my ($box, $value) = @_;
1289		1254
1290	if ($value) {	1255	if ($value) {
…		…
1301		1266
1302	${$_->[2]} = $checkbox if $_->[2];	1267	${$_->[2]} = $checkbox if $_->[2];
1303	}	1268	}
1304	}	1269	}
1305		1270
1306	$table->add (2, 18, new CFPlus::UI::ValSlider	1271	$table->add_at (2, 18, new CFPlus::UI::ValSlider
1307	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1272	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1308	template => ">= 99",	1273	template => ">= 99",
1309	to_value => sub { ">= " . 5 * $_[0] },	1274	to_value => sub { ">= " . 5 * $_[0] },
1310	on_changed => sub {	1275	on_changed => sub {
1311	my ($slider, $value) = @_;	1276	my ($slider, $value) = @_;
…		…
1314	$::CFG->{pickup} |= int $value	1279	$::CFG->{pickup} |= int $value
1315	if $value;	1280	if $value;
1316	1;	1281	1;
1317	});	1282	});
1318		1283
1319	$table->add (3, 18, new CFPlus::UI::Button	1284	$table->add_at (3, 18, new CFPlus::UI::Button
1320	text => "set",	1285	text => "set",
1321	on_activate => sub {	1286	on_activate => sub {
1322	$::CONN->send_command ("pickup $::CFG->{pickup}")	1287	$::CONN->send_command ("pickup $::CFG->{pickup}")
1323	if defined $::CONN;	1288	if defined $::CONN;
1324	0	1289	0
1325	});	1290	});
1326		1291
1327	$table	1292	$r
1328	}	1293	}
1329		1294
1330	my %SORT_ORDER = (	1295	my %SORT_ORDER = (
1331	type => undef,	1296	type => undef,
1332	mtime => sub {	1297	mtime => sub {
…		…
1411	has_close_button => 1	1376	has_close_button => 1
1412	;	1377	;
1413		1378
1414	my $ntb =	1379	my $ntb =
1415	$PL_NOTEBOOK =	1380	$PL_NOTEBOOK =
1416	new CFPlus::UI::Notebook expand => 1, debug => 1;	1381	new CFPlus::UI::Notebook expand => 1;
1417		1382
1418	$ntb->add (	1383	$ntb->add_tab (
1419	"Statistics (F2)" => $STATS_PAGE = stats_window,	1384	"Statistics (F2)" => $STATS_PAGE = stats_window,
1420	"Shows statistics, where all your Stats and Resistances are shown."	1385	"Shows statistics, where all your Stats and Resistances are shown."
1421	);	1386	);
1422	$ntb->add (	1387	$ntb->add_tab (
1423	"Skills (F3)" => $SKILL_PAGE = skill_window,	1388	"Skills (F3)" => $SKILL_PAGE = skill_window,
1424	"Shows all your Skills."	1389	"Shows all your Skills."
1425	);	1390	);
1426		1391
1427	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1392	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1428	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);	1393	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1429	$ntb->add (	1394	$ntb->add_tab (
1430	"Spellbook (F4)" => $spellsw,	1395	"Spellbook (F4)" => $spellsw,
1431	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1396	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1432	);	1397	);
1433	$ntb->add (	1398	$ntb->add_tab (
1434	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1399	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1435	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1400	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1436	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1401	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1437	);	1402	);
		1403	$ntb->add_tab (Pickup => autopickup_setup,
		1404	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1438		1405
1439	$ntb->set_current_page ($INVENTORY_PAGE);	1406	$ntb->set_current_page ($INVENTORY_PAGE);
1440		1407
1441	$plwin->add ($ntb);	1408	$plwin->add ($ntb);
1442	$plwin	1409	$plwin
…		…
1639	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);	1606	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1640	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);	1607	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1641		1608
1642	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);	1609	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1643		1610
1644	$table->add (0, 0, new CFPlus::UI::Button	1611	$table->add_at (0, 0, new CFPlus::UI::Button
1645	text => "Close",	1612	text => "Close",
1646	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>.",	1613	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>.",
1647	on_activate => $close,	1614	on_activate => $close,
1648	);	1615	);
1649		1616
1650	$table->add (2, 0, new CFPlus::UI::Button	1617	$table->add_at (2, 0, new CFPlus::UI::Button
1651	text => "Next",	1618	text => "Next",
1652	tooltip => "Show the next <b>Tip of the day</b>.",	1619	tooltip => "Show the next <b>Tip of the day</b>.",
1653	on_activate => sub {	1620	on_activate => sub {
1654	$close->();	1621	$close->();
1655	&show_tip_of_the_day;	1622	&show_tip_of_the_day;
…		…
1664	CFPlus::SDL_Init	1631	CFPlus::SDL_Init
1665	and die "SDL::Init failed!\n";	1632	and die "SDL::Init failed!\n";
1666	}	1633	}
1667		1634
1668	sub video_init {	1635	sub video_init {
1669	sdl_init;
1670
1671	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	1636	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1672		1637
1673	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	1638	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1674		1639
1675	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1640	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1676	$FULLSCREEN = $CFG->{fullscreen};	1641	$FULLSCREEN = $CFG->{fullscreen};
1677	$FAST = $CFG->{fast};	1642	$FAST = $CFG->{fast};
1678		1643
1679	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1644	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1680	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";	1645	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1681		1646
1682	$SDL_ACTIVE = 1;	1647	$SDL_ACTIVE = 1;
1683	$LAST_REFRESH = time - 0.01;	1648	$LAST_REFRESH = time - 0.01;
1684		1649
…		…
1726		1691
1727	$MAPWIDGET = new CFPlus::MapWidget;	1692	$MAPWIDGET = new CFPlus::MapWidget;
1728	$MAPWIDGET->connect (activate_console => sub {	1693	$MAPWIDGET->connect (activate_console => sub {
1729	my ($mapwidget, $preset) = @_;	1694	my ($mapwidget, $preset) = @_;
1730		1695
1731	if ($CONSOLE) {	1696	$MESSAGE_WINDOW->activate_console ($preset)
1732	$CONSOLE->{input}->{auto_activated} = 1;	1697	if $MESSAGE_WINDOW;
1733	$CONSOLE->{input}->grab_focus;
1734
1735	if ($preset && $CONSOLE->{input}->get_text eq '') {
1736	$CONSOLE->{input}->set_text ($preset);
1737	}
1738	}
1739	});	1698	});
1740	$MAPWIDGET->show;	1699	$MAPWIDGET->show;
1741	$MAPWIDGET->grab_focus;	1700	$MAPWIDGET->grab_focus;
1742
1743	$LOGVIEW = new CFPlus::UI::TextScroller
1744	expand => 1,
1745	font => $FONT_FIXED,
1746	fontsize => $::CFG->{log_fontsize},
1747	indent => -4,
1748	can_hover => 1,
1749	can_events => 1,
1750	max_par => $CFG->{logview_max_par},
1751	tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1752	;
1753		1701
1754	$SETUP_DIALOG = new CFPlus::UI::Toplevel	1702	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1755	title => "Setup",	1703	title => "Setup",
1756	name => "setup_dialog",	1704	name => "setup_dialog",
1757	x => 'center',	1705	x => 'center',
…		…
1761	force_h => $::HEIGHT * 0.6,	1709	force_h => $::HEIGHT * 0.6,
1762	has_close_button => 1,	1710	has_close_button => 1,
1763	;	1711	;
1764		1712
1765	$METASERVER = metaserver_dialog;	1713	$METASERVER = metaserver_dialog;
		1714	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1766		1715
1767	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,	1716	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1768	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	1717	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1769		1718
1770	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1719	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1771	"Configure the server to play on, your username, password and other server-related options.");	1720	"Configure the server to play on, your username, password and other server-related options.");
1772	$SETUP_NOTEBOOK->add (Client => client_setup,	1721	$SETUP_NOTEBOOK->add_tab (Client => client_setup,
1773	"Configure various client-specific settings.");	1722	"Configure various client-specific settings.");
1774	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1775	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1776	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1723	$SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1777	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1724	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1778	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1725	$SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1779	"Configure the use of audio, sound effects and background music.");	1726	"Configure the use of audio, sound effects and background music.");
1780	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1727	$SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1781	"Lets you define, edit and delete key bindings."	1728	"Lets you define, edit and delete key bindings."
1782	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "	1729	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1783	. "with nothing set and the recording started. After doing the actions you "	1730	. "with nothing set and the recording started. After doing the actions you "
1784	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1731	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1785	. "After pressing the combo the binding will be saved automatically and the "	1732	. "After pressing the combo the binding will be saved automatically and the "
1786	. "binding editor closes");	1733	. "binding editor closes");
1787	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1734	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1788	"Some debuggin' options. Do not ask.");	1735	"Some debuggin' options. Do not ask.");
1789		1736
1790	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1737	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1791		1738
1792	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1739	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1793	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1740	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1794		1741
1795	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1742	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1796	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1743	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1797		1744
1798	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	1745	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
1799		1746
1800	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,	1747	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
…		…
1833	}	1780	}
1834		1781
1835	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1782	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1836	}	1783	}
1837		1784
1838	sub setup_build_button {
1839	my ($enabled) = @_;
1840	if ($enabled) {
1841	$BUILD_BUTTON->hide if $BUILD_BUTTON;
1842	$BUILD_BUTTON ||= new CFPlus::UI::Button
1843	text => "Build",
1844	tooltip => "Opens the ingame builder",
1845	on_activate => sub {
1846	if ($CONN) {
1847	$CONN->send_ext_req (builder_player_items => sub {
1848	open_ingame_editor ($_[0]) if exists $_[0]->{items};
1849	});
1850	}
1851	0
1852	};
1853	$BUTTONBAR->add ($BUILD_BUTTON);
1854	} else {
1855	$BUILD_BUTTON->hide if $BUILD_BUTTON;
1856	}
1857	}
1858
1859	sub open_ingame_editor {
1860	my ($msg) = @_;
1861
1862	my $win = new CFPlus::UI::Toplevel
1863	x => 0,
1864	y => 'center',
1865	z => 4,
1866	name => 'builder_window',
1867	force_w => int $WIDTH * 1/4,
1868	force_h => int $HEIGHT * 3/4,
1869	title => "In game builder",
1870	has_close_button => 1;
1871
1872	my $r = new CFPlus::UI::ScrolledWindow (
1873	expand => 1,
1874	scroll_y => 1
1875	);
1876	$r->add (my $vb = new CFPlus::UI::VBox);
1877	$win->add ($r);
1878
1879
1880	$vb->add (
1881	new CFPlus::UI::Button
1882	text => "Disable build mode",
1883	on_activate => sub { $::IN_BUILD_MODE = undef }
1884	);
1885	$vb->add (
1886	new CFPlus::UI::Button
1887	text => "ERASE",
1888	on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1889	);
1890
1891	for my $itemarchname (
1892	sort {
1893	$msg->{items}->{$a}->{build_arch_name}
1894	cmp $msg->{items}->{$b}->{build_arch_name}
1895	} keys %{$msg->{items}}
1896	) {
1897	my $info = $msg->{items}->{$itemarchname};
1898	$vb->add (
1899	new CFPlus::UI::Button text => $info->{build_arch_name},
1900	on_activate => sub {
1901	$::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1902
1903	if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1904	build_mode_query_arch_info ();
1905	}
1906	}
1907	);
1908	}
1909
1910	$win->show;
1911	}
1912
1913	sub build_mode_query_arch_info {
1914	my ($iteminfo) = $::IN_BUILD_MODE;
1915	my $itemarchname = $iteminfo->{item};
1916	my $info = $iteminfo->{info};
1917
1918	my $dialog = new CFPlus::UI::Toplevel
1919	x => "center",
1920	y => "center",
1921	z => 50,
1922	force_w => int $WIDTH * 1/2,
1923	title => "Enter information for placement of '$itemarchname'",
1924	has_close_button => 1;
1925
1926	$dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1927
1928	$vb->add (my $table = new CFPlus::UI::Table expand => 1);
1929	my $row = 0;
1930	if ($info->{has_name}) {
1931	$table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1932	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1933	}
1934	if ($info->{has_text}) {
1935	$table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1936	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1937	}
1938	if ($info->{has_connection}) {
1939	$table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1940	$table->add (1, $row++,
1941	new CFPlus::UI::Entry
1942	expand => 1,
1943	on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1944	tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1945	);
1946	}
1947
1948	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1949	$hb->add (new CFPlus::UI::Button
1950	text => "Close",
1951	expand => 1,
1952	on_activate => sub { $dialog->hide; 0 },
1953	);
1954	$dialog->show;
1955	}
1956
1957	sub video_shutdown {	1785	sub video_shutdown {
1958	CFPlus::OpenGL::shutdown;	1786	CFPlus::OpenGL::shutdown;
1959		1787
1960	undef $SDL_ACTIVE;	1788	undef $SDL_ACTIVE;
1961	}	1789	}
1962		1790
1963	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1964	my $bgmusic;#TODO#hack#d#
1965
1966	sub audio_channel_finished {	1791	sub audio_channel_finished {
1967	my ($channel) = @_;	1792	my ($channel) = @_;
1968		1793
1969	#warn "channel $channel finished\n";#d#	1794	# warn "channel $channel finished\n";#d#
		1795	}
		1796
		1797	our %AUDIO_PLAY;
		1798	our %AUDIO_CHUNK;
		1799
		1800	sub audio_sound_push($) {
		1801	my ($face) = @_;
		1802
		1803	if (my $chunk = $AUDIO_CHUNK{$face}) {
		1804	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
		1805	my (undef, $dx, $dy, $vol) = @$_;
		1806
		1807	my $channel = $chunk->play
		1808	or return;
		1809
		1810	$channel->volume (128 + $vol);
		1811	$dx = $dx / 10 * 255;
		1812	$channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
		1813	# my $angle = $dx ? : $dx < 0 ?
		1814	# my $distance = -$vol;
		1815	# $channel->set_position ($angle, $distance);
		1816	}
		1817	} else {
		1818	# sound_meta not set means data is in flight either way
		1819	my $meta = $CONN->{sound_meta}{$face}
		1820	or return;
		1821
		1822	# fetch from database
		1823	CFPlus::DB::get res_data => $meta->{name}, sub {
		1824	my $vol = $meta->{meta}{volume} || 100;
		1825	my $rwops = new CFPlus::RW $_[0];
		1826	my $chunk = new CFPlus::MixChunk $rwops;
		1827	$chunk->volume ($vol * 128 / 100);
		1828	$AUDIO_CHUNK{$face} = $chunk;
		1829
		1830	audio_sound_push ($face);
		1831	};
		1832	}
		1833	}
		1834
		1835	sub audio_sound_play {
		1836	my ($face, $dx, $dy, $vol) = @_;
		1837
		1838	$SDL_MIXER
		1839	or return;
		1840
		1841	my $queue = $AUDIO_PLAY{$face} ||= [];
		1842	push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
		1843	audio_sound_push $face
		1844	unless @$queue > 1;
		1845	}
		1846
		1847	sub audio_music_set {
		1848	my ($songs) = @_;
		1849
		1850	my @want =
		1851	grep $_,
		1852	map $CONN->{music_meta}{$_},
		1853	@$songs;
		1854
		1855	if (@want) {
		1856	@MUSIC_WANT = @want;
		1857	&audio_music_changed ();
		1858	}
		1859	}
		1860
		1861	sub audio_music_start {
		1862	my $meta = $MUSIC_PLAYING_META;
		1863
		1864	CFPlus::DB::get res_data => $meta->{name}, sub {
		1865	return unless $SDL_MIXER;
		1866
		1867	# music might have changed...
		1868	$meta eq $MUSIC_PLAYING_META
		1869	or return &audio_music_start ();
		1870
		1871	$MUSIC_PLAYING_DATA = \$_[0];
		1872
		1873	my $rwops = $meta->{path}
		1874	? new_from_file CFPlus::RW $meta->{path}
		1875	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
		1876
		1877	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
		1878	or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
		1879
		1880	my $NOW = time;
		1881
		1882	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
		1883	my $pos = $MUSIC_PLAYING_META->{stop_pos};
		1884	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
		1885	$MUSIC_START = time - $pos;
		1886	} else {
		1887	$MUSIC_PLAYER->play (0);
		1888	$MUSIC_START = time;
		1889	}
		1890
		1891	delete $MUSIC_PLAYING_META->{stop_time};
		1892	delete $MUSIC_PLAYING_META->{stop_pos};
		1893	}
		1894	}
		1895
		1896	sub audio_music_changed {
		1897	return unless $CFG->{bgm_enable};
		1898	return unless $SDL_MIXER;
		1899
		1900	# default MUSIC_WANT == MUSIC_DEFAULT
		1901	@MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
		1902
		1903	# if the currently playing song is acceptable, let it continue
		1904	return if $MUSIC_PLAYING_META
		1905	&& grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
		1906
		1907	my $NOW = time;
		1908
		1909	if ($MUSIC_PLAYING_META) {
		1910	$MUSIC_PLAYING_META->{stop_time} = $NOW;
		1911	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
		1912	CFPlus::MixMusic::fade_out 1000;
		1913	} else {
		1914	# sort by stop time, oldest first
		1915	@MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
		1916
		1917	# if the most recently-played piece played very recently,
		1918	# resume it, else choose the oldest piece for rotation.
		1919	$MUSIC_PLAYING_META =
		1920	$MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
		1921	? $MUSIC_WANT[-1]
		1922	: $MUSIC_WANT[0];
		1923
		1924	audio_music_start;
		1925	}
1970	}	1926	}
1971		1927
1972	sub audio_music_finished {	1928	sub audio_music_finished {
1973	return unless $CFG->{bgm_enable};	1929	undef $MUSIC_PLAYER;
		1930	undef $MUSIC_PLAYING_META;
		1931	undef $MUSIC_PLAYING_DATA;
1974		1932
1975	# TODO: hack, do play loop and mood music	1933	audio_music_changed;
1976	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1977	$bgmusic->play (0);
1978
1979	push @bgmusic, shift @bgmusic;
1980	}	1934	}
1981		1935
1982	sub audio_init {	1936	sub audio_init {
1983	if ($CFG->{audio_enable}) {	1937	if ($CFG->{audio_enable}) {
1984	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {	1938	$ENV{MIX_EFFECTSMAXSPEED} = 1;
1985	$SDL_MIXER = !CFPlus::Mix_OpenAudio;	1939	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1986		1940
1987	unless ($SDL_MIXER) {	1941	unless ($SDL_MIXER) {
1988	status "Unable to open sound device: there will be no sound";	1942	status "Unable to open sound device: there will be no sound";
1989	return;	1943	return;
1990	}
1991
1992	CFPlus::Mix_AllocateChannels 8;
1993	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1994
1995	audio_music_finished;
1996
1997	local $_;
1998	while (<$fh>) {
1999	next if /^\s*#/;
2000	next if /^\s*$/;
2001
2002	my ($file, $volume, $event) = split /\s+/, $_, 3;
2003
2004	push @SOUNDS, "$volume,$file";
2005
2006	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
2007	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2008	$chunk->volume ($volume * 128 / 100);
2009	$chunk
2010	};
2011	}
2012	} else {
2013	status "unable to open sound config: $!";
2014	}	1944	}
		1945
		1946	CFPlus::Mix_AllocateChannels 16;
		1947	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
		1948
		1949	audio_music_finished;
		1950	} else {
		1951	undef $SDL_MIXER;
2015	}	1952	}
2016	}	1953	}
2017		1954
2018	sub audio_shutdown {	1955	sub audio_shutdown {
2019	CFPlus::Mix_CloseAudio if $SDL_MIXER;	1956	CFPlus::Mix_CloseAudio if $SDL_MIXER;
…		…
2034	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	1971	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2035		1972
2036	$CFPlus::UI::ROOT->draw;	1973	$CFPlus::UI::ROOT->draw;
2037		1974
2038	$WANT_REFRESH = 0;	1975	$WANT_REFRESH = 0;
2039	$CAN_REFRESH = 0;	1976	$CAN_REFRESH = 0;
2040	$LAST_REFRESH = $NOW;	1977	$LAST_REFRESH = $NOW;
2041		1978
2042	CFPlus::SDL_GL_SwapBuffers;	1979	CFPlus::SDL_GL_SwapBuffers;
2043	}	1980	}
2044		1981
2045	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	1982	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2046	$NOW = time;	1983	$NOW = time;
2047		1984
2048	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	1985	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2049	for CFPlus::SDL_PollEvent;	1986	for CFPlus::poll_events;
2050		1987
2051	if (%animate_object) {	1988	if (%animate_object) {
2052	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	1989	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2053	$WANT_REFRESH++;	1990	++$WANT_REFRESH;
2054	}	1991	}
2055		1992
2056	if ($WANT_REFRESH) {	1993	if ($WANT_REFRESH) {
2057	force_refresh;	1994	force_refresh;
2058	} else {	1995	} else {
…		…
2067		2004
2068	sub animation_stop {	2005	sub animation_stop {
2069	my ($widget) = @_;	2006	my ($widget) = @_;
2070	delete $animate_object{$widget};	2007	delete $animate_object{$widget};
2071	}	2008	}
2072
2073	# check once/second for faces that need to be prefetched
2074	# this should, of course, only run on demand, but
2075	# SDL forces worse things on us....
2076
2077	Event->timer (after => 1, interval => 0.25, cb => sub {
2078	$CONN->face_prefetch
2079	if $CONN;
2080	});
2081		2009
2082	%SDL_CB = (	2010	%SDL_CB = (
2083	CFPlus::SDL_QUIT => sub {	2011	CFPlus::SDL_QUIT => sub {
2084	exit;	2012	exit;
2085	},	2013	},
…		…
2088	CFPlus::SDL_VIDEOEXPOSE => sub {	2016	CFPlus::SDL_VIDEOEXPOSE => sub {
2089	CFPlus::UI::full_refresh;	2017	CFPlus::UI::full_refresh;
2090	},	2018	},
2091	CFPlus::SDL_ACTIVEEVENT => sub {	2019	CFPlus::SDL_ACTIVEEVENT => sub {
2092	# not useful, as APPACTIVE include sonly iconified state, not unmapped	2020	# not useful, as APPACTIVE include sonly iconified state, not unmapped
2093	# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#	2021	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
		2022	# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2094	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;	2023	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2095	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;	2024	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2096	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;	2025	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2097	},	2026	},
2098	CFPlus::SDL_KEYDOWN => sub {	2027	CFPlus::SDL_KEYDOWN => sub {
…		…
2134	height => 480,	2063	height => 480,
2135	fullscreen => 0,	2064	fullscreen => 0,
2136	fast => 0,	2065	fast => 0,
2137	map_scale => 1,	2066	map_scale => 1,
2138	fow_enable => 1,	2067	fow_enable => 1,
2139	fow_intensity => 0.45,	2068	fow_intensity => 0,
2140	fow_smooth => 0,
2141	map_smoothing => 1,	2069	map_smoothing => 1,
2142	gui_fontsize => 1,	2070	gui_fontsize => 1,
2143	log_fontsize => 0.7,	2071	log_fontsize => 0.7,
2144	gauge_fontsize => 1,	2072	gauge_fontsize => 1,
2145	gauge_size => 0.35,	2073	gauge_size => 0.35,
2146	stat_fontsize => 0.7,	2074	stat_fontsize => 0.7,
2147	mapsize => 100,	2075	mapsize => 100,
2148	say_command => 'chat',
2149	audio_enable => 1,	2076	audio_enable => 1,
2150	bgm_enable => 1,	2077	bgm_enable => 1,
2151	bgm_volume => 0.25,	2078	bgm_volume => 0.25,
2152	face_prefetch => 0,
2153	output_sync => 1,	2079	output_sync => 1,
2154	output_count => 1,	2080	output_count => 1,
2155	output_rate => "",	2081	output_rate => "",
2156	pickup => 0,	2082	pickup => 0,
2157	inv_sort => "mtime",	2083	inv_sort => "mtime",
…		…
2179	}	2105	}
2180	}	2106	}
2181		2107
2182	sdl_init;	2108	sdl_init;
2183		2109
2184	@SDL_MODES = reverse	2110	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2185	grep $_->[0] >= 640 && $_->[1] >= 480,	2111	@SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2186	CFPlus::SDL_ListModes;
2187
2188	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2112	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2113
		2114	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2189		2115
2190	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2116	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2191		2117
2192	{	2118	{
2193	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(	2119	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(

Diff Legend

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