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.103 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.197 by root, Tue Jul 31 02:25:52 2007 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
		2
		3	my $startup_done = sub { };
		4	our $PANGO = "1.5.0";
		5
		6	# do splash-screen thingy on win32
		7	BEGIN {
		8	if (%PAR::LibCache && $^O eq "MSWin32") {
		9	while (my ($filename, $zip) = each %PAR::LibCache) {
		10	$zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
		11	}
		12
		13	require Win32::GUI::SplashScreen;
		14
		15	Win32::GUI::SplashScreen::Show (
		16	-file => "$ENV{PAR_TEMP}/SPLASH.bmp",
		17	);
		18
		19	$startup_done = sub {
		20	Win32::GUI::SplashScreen::Done (1);
		21	};
		22	}
		23	}
2		24
3	use strict;	25	use strict;
4	use utf8;	26	use utf8;
		27
		28	use Carp 'verbose';
5		29
6	# do things only needed for single-binary version (par)	30	# do things only needed for single-binary version (par)
7	BEGIN {	31	BEGIN {
8	if (%PAR::LibCache) {	32	if (%PAR::LibCache) {
9	@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
10		34
		35	my $tmp = $ENV{PAR_TEMP};
		36
11	while (my ($filename, $zip) = each %PAR::LibCache) {	37	while (my ($filename, $zip) = each %PAR::LibCache) {
12	for ($zip->memberNames) {	38	for ($zip->memberNames) {
13	next unless /^\/root\/(.*)/;	39	next unless /^root\/(.*)/;
14	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")	40	$zip->extractMember ($_, "$tmp/$1")
15	unless -e "$ENV{PAR_TEMP}/$1";	41	unless -e "$tmp/$1";
16	}	42	}
17	}	43	}
18		44
19	# 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
20		54
21	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;
22	}	67	}
23	}	68	}
24		69
25	# 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
26	unshift @INC, $ENV{PAR_TEMP}	71	unshift @INC, $ENV{PAR_TEMP}
27	if %PAR::LibCache;	72	if %PAR::LibCache;
28		73
29	use Time::HiRes 'time';	74	use Time::HiRes 'time';
30	use Event;	75	use Event;
		76	use List::Util qw(max min);
31		77
32	use Crossfire;	78	use Crossfire;
33	use Crossfire::Protocol::Constants;	79	use Crossfire::Protocol::Constants;
34		80
35	use Compress::LZF;	81	use Compress::LZF;
36		82
37	use CFClient;	83	use CFPlus;
38	use CFClient::OpenGL ();	84	use CFPlus::OpenGL ();
39	use CFClient::Protocol;	85	use CFPlus::Protocol;
		86	use CFPlus::DB;
40	use CFClient::UI;	87	use CFPlus::UI;
		88	use CFPlus::UI::Canvas;
		89	use CFPlus::UI::Inventory;
		90	use CFPlus::UI::SpellList;
		91	use CFPlus::UI::MessageWindow;
41	use CFClient::Pod;	92	use CFPlus::Pod;
42	use CFClient::BindingEditor;
43	use CFClient::MapWidget;	93	use CFPlus::MapWidget;
		94	use CFPlus::Macro;
44		95
45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	96	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46	$SIG{PIPE} = 'IGNORE';	97	$SIG{PIPE} = 'IGNORE';
47		98
48	$Event::Eval = 0;	99	$Event::Eval = 1;
49	$Event::DIED = sub {	100	$Event::DIED = sub {
50	# TODO: display dialog box or so	101	CFPlus::fatal Carp::longmess $_[1]
51	Carp::cluck $_[1];#d#TODO: remove when stable
52	CFClient::error $_[1];
53	};	102	};
54
55	$SIG{__DIE__} = sub {
56	return if CFClient::in_destruct;
57	Carp::cluck $_[0];
58	CFClient::error $_[0];
59	return;#d#
60	#return unless defined $^S && !$^S;
61	$Event::DIED->(undef, $_[0]);
62	};
63
64	our $VERSION = '0.1';
65		103
66	my $MAX_FPS = 60;	104	my $MAX_FPS = 60;
67	my $MIN_FPS = 5; # unused as of yet	105	my $MIN_FPS = 5; # unused as of yet
68		106
69	our $META_SERVER = "crossfire.real-time.com:13326";	107	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70		108
71	our $LAST_REFRESH;	109	our $LAST_REFRESH;
72	our $NOW;	110	our $NOW;
73		111
74	our $CFG;	112	our $CFG;
75	our $CONN;	113	our $CONN;
		114	our $PROFILE; # current profile
76	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	115	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77		116
78	our $WANT_REFRESH;	117	our $WANT_REFRESH;
79	our $CAN_REFRESH;	118	our $CAN_REFRESH;
80		119
…		…
89		128
90	our $MAP;	129	our $MAP;
91	our $MAPMAP;	130	our $MAPMAP;
92	our $MAPWIDGET;	131	our $MAPWIDGET;
93	our $BUTTONBAR;	132	our $BUTTONBAR;
94	our $LOGVIEW;
95	our $CONSOLE;
96	our $METASERVER;	133	our $METASERVER;
97	our $LOGIN_BUTTON;	134	our $LOGIN_BUTTON;
98	our $QUIT_DIALOG;	135	our $QUIT_DIALOG;
99	our $HOST_ENTRY;	136	our $HOST_ENTRY;
100	our $FULLSCREEN_ENABLE;	137	our $FULLSCREEN_ENABLE;
…		…
111		148
112	our $INVENTORY_PAGE;	149	our $INVENTORY_PAGE;
113	our $STATS_PAGE;	150	our $STATS_PAGE;
114	our $SKILL_PAGE;	151	our $SKILL_PAGE;
115	our $SPELL_PAGE;	152	our $SPELL_PAGE;
		153	our $SPELL_LIST;
116		154
117	our $HELP_WINDOW;	155	our $HELP_WINDOW;
118	our $MESSAGE_WINDOW;	156	our $MESSAGE_WINDOW;
119	our $FLOORBOX;	157	our $FLOORBOX;
120	our $GAUGES;	158	our $GAUGES;
…		…
122		160
123	our $SDL_ACTIVE;	161	our $SDL_ACTIVE;
124	our %SDL_CB;	162	our %SDL_CB;
125		163
126	our $SDL_MIXER;	164	our $SDL_MIXER;
		165	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
		166	our $MUSIC_WANT; # arryref of ambient music
		167	our @MUSIC_HAVE; # ambient music we want now
		168	our $MUSIC_START;
		169	our @MUSIC_JINGLE; # which jingles to play
		170	our $MUSIC_PLAYING_DATA;
		171	our $MUSIC_PLAYING_META;
		172	our $MUSIC_PLAYER;
		173	our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
127	our @SOUNDS; # event => file mapping	174	our @SOUNDS; # event => file mapping
128	our %AUDIO_CHUNKS; # audio files	175	our %AUDIO_CHUNK; # audio files
129		176
130	our $ALT_ENTER_MESSAGE;	177	our $ALT_ENTER_MESSAGE;
131	our $STATUSBOX;	178	our $STATUSBOX;
132	our $DEBUG_STATUS;	179	our $DEBUG_STATUS;
133		180
134	our $INV;	181	our $INV;
135	our $INVR;	182	our $INVR;
136	our $INV_RIGHT_HB;	183	our $INV_RIGHT_HB;
137		184
138	our $BIND_EDITOR;
139	our $BIND_UPD_CB;
140
141	our $PICKUP_CFG;	185	our $PICKUP_CFG;
142		186
		187	#############################################################################
		188	#TODO: maybe move into own audio module...
		189
		190	sub audio_channel_finished {
		191	my ($channel) = @_;
		192
		193	# warn "channel $channel finished\n";#d#
		194	}
		195
		196	our %AUDIO_PLAY;
		197	our %AUDIO_CHUNK;
		198
		199	sub audio_sound_push($) {
		200	my ($face) = @_;
		201
		202	if (my $chunk = $AUDIO_CHUNK{$face}) {
		203	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
		204	my (undef, $dx, $dy, $vol) = @$_;
		205
		206	my $channel = CFPlus::Channel::find;
		207	$channel->volume ($vol * 128 / 255);
		208	$dx = $dx / 10 * 255;
		209	$channel->set_panning (255 - $dx, 255 + $dx);
		210
		211	# my $angle = $dx ? : $dx < 0 ?
		212	# my $distance = -$vol;
		213	# $channel->set_position ($angle, $distance);
		214
		215	$chunk->play ($channel);
		216	}
		217	} else {
		218	# sound_meta not set means data is in flight either way
		219	my $meta = $CONN->{sound_meta}{$face}
		220	or return;
		221
		222	# if its a jingle, play it as ambient music
		223	if ($meta->{meta}{jingle}) {
		224	push @MUSIC_JINGLE, $meta;
		225	delete $AUDIO_PLAY{$face};
		226	&audio_music_push ($face);
		227	} else {
		228	# fetch from database
		229	CFPlus::DB::get res_data => $meta->{name}, sub {
		230	my $rwops = new CFPlus::RW $_[0];
		231	my $chunk = new CFPlus::MixChunk $rwops;
		232	$chunk->volume (($meta->{meta}{volume} || 1) * 128);
		233	$AUDIO_CHUNK{$face} = $chunk;
		234
		235	audio_sound_push ($face);
		236	};
		237	}
		238	}
		239	}
		240
		241	sub audio_sound_play {
		242	my ($face, $dx, $dy, $vol) = @_;
		243
		244	$SDL_MIXER
		245	or return;
		246
		247	my $queue = $AUDIO_PLAY{$face} ||= [];
		248	push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
		249	audio_sound_push $face
		250	unless @$queue > 1;
		251	}
		252
		253	sub audio_music_update_volume {
		254	return unless $MUSIC_PLAYING_META;
		255	my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
		256	my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
		257	CFPlus::MixMusic::volume $base * $volume * 128;
		258	}
		259
		260	sub audio_music_start {
		261	my $meta = $MUSIC_PLAYING_META;
		262
		263	CFPlus::DB::get res_data => $meta->{name}, sub {
		264	return unless $SDL_MIXER;
		265
		266	# music might have changed...
		267	$meta eq $MUSIC_PLAYING_META
		268	or return &audio_music_start ();
		269
		270	audio_music_update_volume;
		271
		272	$MUSIC_PLAYING_DATA = \$_[0];
		273
		274	my $rwops = $meta->{path}
		275	? new_from_file CFPlus::RW $meta->{path}
		276	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
		277
		278	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
		279	or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
		280
		281	my $NOW = time;
		282
		283	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
		284	my $pos = $MUSIC_PLAYING_META->{stop_pos};
		285	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
		286	$MUSIC_START = time - $pos;
		287	} else {
		288	$MUSIC_PLAYER->play (0);
		289	$MUSIC_START = time;
		290	}
		291
		292	delete $MUSIC_PLAYING_META->{stop_time};
		293	delete $MUSIC_PLAYING_META->{stop_pos};
		294	}
		295	}
		296
		297	sub audio_music_push {
		298	return unless $SDL_MIXER;
		299
		300	my $fade_out;
		301
		302	if (@MUSIC_JINGLE) {
		303	@MUSIC_HAVE = $MUSIC_JINGLE[0];
		304	$fade_out = 333;
		305	} else {
		306	return unless $CFG->{bgm_enable};
		307
		308	my @have =
		309	grep $_,
		310	map $CONN->{music_meta}{$_},
		311	@$MUSIC_WANT;
		312
		313	@MUSIC_HAVE = @have
		314	if @have;
		315
		316	# default MUSIC_HAVE == MUSIC_DEFAULT
		317	@MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
		318	$fade_out = 1000;
		319	}
		320
		321	# if the currently playing song is acceptable, let it continue
		322	return if $MUSIC_PLAYING_META
		323	&& grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
		324
		325	my $NOW = time;
		326
		327	if ($MUSIC_PLAYING_META) {
		328	$MUSIC_PLAYING_META->{stop_time} = $NOW;
		329	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
		330	CFPlus::MixMusic::fade_out $fade_out;
		331	} else {
		332	# sort by stop time, oldest first
		333	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
		334
		335	# if the most recently-played piece played very recently,
		336	# resume it, else choose the oldest piece for rotation.
		337	$MUSIC_PLAYING_META =
		338	$MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
		339	? $MUSIC_HAVE[-1]
		340	: $MUSIC_HAVE[0];
		341
		342	audio_music_start;
		343	}
		344	}
		345
		346	sub audio_music_set_ambient {
		347	my ($songs) = @_;
		348
		349	$MUSIC_WANT = $songs;
		350	audio_music_push;
		351	}
		352
		353	sub audio_music_finished {
		354	shift @MUSIC_JINGLE
		355	if $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
		356
		357	undef $MUSIC_PLAYER;
		358	undef $MUSIC_PLAYING_META;
		359	undef $MUSIC_PLAYING_DATA;
		360
		361	audio_music_push;
		362	}
		363
		364	#############################################################################
		365
143	sub status {	366	sub status {
144	$STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	367	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145	}	368	}
146		369
147	sub debug {	370	sub debug {
148	$DEBUG_STATUS->set_text ($_[0]);	371	$DEBUG_STATUS->set_text ($_[0]);
		372	}
		373
		374	sub message {
		375	my ($para) = @_;
		376	$MESSAGE_WINDOW->message ($para);
149	}	377	}
150		378
151	sub destroy_query_dialog {	379	sub destroy_query_dialog {
152	(delete $_[0]{query_dialog})->destroy	380	(delete $_[0]{query_dialog})->destroy
153	if $_[0]{query_dialog};	381	if $_[0]{query_dialog};
154	}	382	}
155		383
		384	# FIXME: a very ugly hack to wait for stat update look below! #d#
		385	our $QUERY_TIMER; #d#
		386
156	# server query dialog	387	# server query dialog
157	sub server_query {	388	sub server_query {
158	my ($conn, $flags, $prompt) = @_;	389	my ($conn, $flags, $prompt) = @_;
159		390
		391	# FIXME: a very ugly hack to wait for stat update #d#
		392	if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
		393	unless ($QUERY_TIMER) {
		394	$QUERY_TIMER =
		395	Event->timer (
		396	after => 1,
		397	cb => sub {
		398	server_query ($conn, $flags, $prompt, 1);
		399	$QUERY_TIMER = undef
		400	}
		401	);
		402	return;
		403	}
		404	}
		405
160	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame	406	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161	x => "center",	407	x => "center",
162	y => "center",	408	y => "center",
163	title => "Server Query",	409	title => "Server Query",
164	child => my $vbox = new CFClient::UI::VBox,	410	child => my $vbox = new CFPlus::UI::VBox,
165	;	411	;
166		412
167	my @dialog = my $label = new CFClient::UI::Label	413	my @dialog = my $label = new CFPlus::UI::Label
168	max_w => $::WIDTH * 0.4,	414	max_w => $::WIDTH * 0.8,
169	ellipsise => 0,	415	ellipsise => 0,
170	text => $prompt;	416	text => $prompt;
171		417
172	if ($flags & CS_QUERY_YESNO) {	418	if ($flags & CS_QUERY_YESNO) {
173	push @dialog, my $hbox = new CFClient::UI::HBox;	419	push @dialog, my $hbox = new CFPlus::UI::HBox;
174		420
175	$hbox->add (new CFClient::UI::Button	421	$hbox->add (new CFPlus::UI::Button
176	text => "No",	422	text => "No",
177	on_activate => sub {	423	on_activate => sub {
178	$conn->send ("reply n");	424	$conn->send ("reply n");
179	$dialog->destroy;	425	$dialog->destroy;
180	0	426	0
181	}	427	}
182	);	428	);
183	$hbox->add (new CFClient::UI::Button	429	$hbox->add (new CFPlus::UI::Button
184	text => "Yes",	430	text => "Yes",
185	on_activate => sub {	431	on_activate => sub {
186	$conn->send ("reply y");	432	$conn->send ("reply y");
187	destroy_query_dialog $conn;	433	destroy_query_dialog $conn;
188	0	434	0
…		…
190	);	436	);
191		437
192	$dialog->grab_focus;	438	$dialog->grab_focus;
193		439
194	} elsif ($flags & CS_QUERY_SINGLECHAR) {	440	} elsif ($flags & CS_QUERY_SINGLECHAR) {
195	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
196
197	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	441	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198	$MESSAGE_WINDOW->show;	442	$dialog->{tooltip} = "#charcreation_focus";
199		443
200	unshift @dialog, new CFClient::UI::Label	444	unshift @dialog, new CFPlus::UI::Label
201	max_w => $::WIDTH * 0.4,	445	max_w => $::WIDTH * 0.8,
202	ellipsise => 0,	446	ellipsise => 0,
203	markup => "\nOr use your keyboard and the text entry below:\n";	447	markup => "\nOr use your keyboard and the text entry below:\n";
204		448
205	unshift @dialog, my $table = new CFClient::UI::Table;	449	unshift @dialog, my $table = new CFPlus::UI::Table;
206		450
207	$table->add (0, 0, new CFClient::UI::Button	451	$table->add_at (0, 0, new CFPlus::UI::Button
208	text => "Next Race",	452	text => "Next Race",
209	on_activate => sub {	453	on_activate => sub {
210	$conn->send ("reply n");	454	$conn->send ("reply n");
211	destroy_query_dialog $conn;	455	destroy_query_dialog $conn;
212	0	456	0
213	},	457	},
214	);	458	);
215	$table->add (2, 0, new CFClient::UI::Button	459	$table->add_at (2, 0, new CFPlus::UI::Button
216	text => "Accept",	460	text => "Accept",
217	on_activate => sub {	461	on_activate => sub {
218	$conn->send ("reply d");	462	$conn->send ("reply d");
219	destroy_query_dialog $conn;	463	destroy_query_dialog $conn;
220	0	464	0
221	},	465	},
222	);	466	);
223		467
		468	if ($conn->{chargen_race_description}) {
		469	unshift @dialog, new CFPlus::UI::Label
		470	max_w => $::WIDTH * 0.8,
		471	ellipsise => 0,
		472	markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
		473	;
		474	}
		475
		476	unshift @dialog, new CFPlus::UI::Face
		477	face => $conn->{player}{face},
		478	bg => [.2, .2, .2, 1],
		479	min_w => 64,
		480	min_h => 64,
		481	;
		482
		483	if ($conn->{chargen_race_title}) {
		484	unshift @dialog, new CFPlus::UI::Label
		485	allign => 1,
		486	ellipsise => 0,
		487	markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
		488	;
		489	}
		490
224	unshift @dialog, new CFClient::UI::Label	491	unshift @dialog, new CFPlus::UI::Label
225	max_w => $::WIDTH * 0.4,	492	max_w => $::WIDTH * 0.4,
226	ellipsise => 0,	493	ellipsise => 0,
227	markup =>	494	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228	"<big><b>Character Creation: Race</b></big>\n\n"
229	. "Look at the <b>Messages</b> window to see a description of this race "
230	. "and the center of the screen to see how this race looks like "
231	. "(<small>below this dialog window: you may need to move the dialog away and "
232	. "click into the display area to make it visible</small>).\n\n"
233	. "You can look at another race, or accept this race (you will cycle back to "
234	. "this race eventually, so you can take your time making this important choice."
235	;	495	;
236		496
237	} elsif ($prompt =~ /roll new stats/) {	497	} elsif ($prompt =~ /roll new stats/) {
238	if (my $stat = delete $conn->{stat_change_with}) {	498	if (my $stat = delete $conn->{stat_change_with}) {
239	$conn->send ("reply $stat");	499	$conn->send ("reply $stat");
240	destroy_query_dialog $conn;	500	destroy_query_dialog $conn;
241	return;	501	return;
242	}	502	}
243		503
244	$STATS_PAGE->show;
245	$MESSAGE_WINDOW->hide;
246
247	unshift @dialog, new CFClient::UI::Label	504	unshift @dialog, new CFPlus::UI::Label
248	max_w => $::WIDTH * 0.4,	505	max_w => $::WIDTH * 0.4,
249	ellipsise => 0,	506	ellipsise => 0,
250	markup => "\nOr use your keyboard and the text entry below:\n";	507	markup => "\nOr use your keyboard and the text entry below:\n";
251		508
252	unshift @dialog, my $table = new CFClient::UI::Table;	509	unshift @dialog, my $table = new CFPlus::UI::Table;
253		510
254	# left: re-roll	511	# left: re-roll
255	$table->add (0, 0, new CFClient::UI::Button	512	$table->add_at (0, 0, new CFPlus::UI::Button
256	text => "Roll Again",	513	text => "Roll Again",
257	on_activate => sub {	514	on_activate => sub {
258	$conn->send ("reply y");	515	$conn->send ("reply y");
259	destroy_query_dialog $conn;	516	destroy_query_dialog $conn;
260	0	517	0
261	},	518	},
262	);	519	);
263		520
264	# center: swap stats	521	# center: swap stats
265	my ($sw1, $sw2) = map +(new CFClient::UI::Selector	522	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
266	expand => 1,	523	expand => 1,
267	value => $_,	524	value => $_,
268	options => [	525	options => [
269	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	526	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
270	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	527	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
…		…
274	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	531	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
275	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	532	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
276	],	533	],
277	), 1 .. 2;	534	), 1 .. 2;
278		535
279	$table->add (2, 0, new CFClient::UI::Button	536	$table->add_at (2, 0, new CFPlus::UI::Button
280	text => "Swap Stats",	537	text => "Swap Stats",
281	on_activate => sub {	538	on_activate => sub {
282	$conn->{stat_change_with} = $sw2->{value};	539	$conn->{stat_change_with} = $sw2->{value};
283	$conn->send ("reply $sw1->{value}");	540	$conn->send ("reply $sw1->{value}");
284	destroy_query_dialog $conn;	541	destroy_query_dialog $conn;
285	0	542	0
286	},	543	},
287	);	544	);
288	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	545	$table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
289		546
290	# right: accept	547	# right: accept
291	$table->add (4, 0, new CFClient::UI::Button	548	$table->add_at (4, 0, new CFPlus::UI::Button
292	text => "Accept",	549	text => "Accept",
293	on_activate => sub {	550	on_activate => sub {
294	$conn->send ("reply n");	551	$conn->send ("reply n");
295	$STATS_PAGE->hide;	552	$STATS_PAGE->hide;
296	destroy_query_dialog $conn;	553	destroy_query_dialog $conn;
297	0	554	0
298	},	555	},
299	);	556	);
300		557
301	unshift @dialog, my $hbox = new CFClient::UI::HBox;	558	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
302	for (	559	for (
303	[Str => CS_STAT_STR],	560	[Str => CS_STAT_STR],
304	[Dex => CS_STAT_DEX],	561	[Dex => CS_STAT_DEX],
305	[Con => CS_STAT_CON],	562	[Con => CS_STAT_CON],
306	[Int => CS_STAT_INT],	563	[Int => CS_STAT_INT],
307	[Wis => CS_STAT_WIS],	564	[Wis => CS_STAT_WIS],
308	[Pow => CS_STAT_POW],	565	[Pow => CS_STAT_POW],
309	[Cha => CS_STAT_CHA],	566	[Cha => CS_STAT_CHA],
310	) {	567	) {
311	my ($name, $id) = @$_;	568	my ($name, $id) = @$_;
312	$hbox->add (new CFClient::UI::Label	569	$hbox->add (new CFPlus::UI::Label
313	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",	570	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
314	align => 0,	571	align => 0,
315	expand => 1,	572	expand => 1,
316	can_events => 1,	573	can_events => 1,
317	can_hover => 1,	574	can_hover => 1,
318	tooltip => $CFClient::STAT_TOOLTIP{$name},	575	tooltip => "#stat_$name",
319	);	576	);
320	}	577	}
321		578
322	unshift @dialog, new CFClient::UI::Label	579	unshift @dialog, new CFPlus::UI::Label
323	max_w => $::WIDTH * 0.4,	580	max_w => $::WIDTH * 0.4,
324	ellipsise => 0,	581	ellipsise => 0,
325	markup =>	582	markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
326	"<big><b>Character Creation: Stats</b></big>\n\n"
327	. "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
328	. "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
329	. "They will be modified later by both the race and the class you choose.\n\n"
330	. "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
331	;	583	;
332	}	584	}
333		585
334	push @dialog, my $entry = new CFClient::UI::Entry	586	push @dialog, my $entry = new CFPlus::UI::Entry
335	on_changed => sub {	587	on_changed => sub {
336	$conn->send ("reply $_[1]");	588	$conn->send ("reply $_[1]");
337	destroy_query_dialog $conn;	589	destroy_query_dialog $conn;
338	0	590	0
339	},	591	},
…		…
342	$entry->grab_focus;	594	$entry->grab_focus;
343		595
344	} else {	596	} else {
345	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	597	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
346		598
347	push @dialog, my $entry = new CFClient::UI::Entry	599	push @dialog, my $entry = new CFPlus::UI::Entry
348	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	600	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
349	on_activate => sub {	601	on_activate => sub {
350	$conn->send ("reply $_[1]");	602	$conn->send ("reply $_[1]");
351	destroy_query_dialog $conn;	603	destroy_query_dialog $conn;
352	0	604	0
…		…
366	$LOGIN_BUTTON->set_text ("Logout");	618	$LOGIN_BUTTON->set_text ("Logout");
367	$SETUP_DIALOG->hide;	619	$SETUP_DIALOG->hide;
368		620
369	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	621	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370		622
371	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};	623	my ($host, $port) = split /:/, $PROFILE->{host};
372		624
373	$MAP = new CFClient::Map $mapsize, $mapsize;	625	$MAP = new CFPlus::Map;
374		626
375	$CONN = eval {	627	$CONN = eval {
376	new CFClient::Protocol	628	new CFPlus::Protocol
377	host => $host,	629	host => $host,
378	port => $port || 13327,	630	port => $port || 13327,
379	user => $CFG->{profile}{default}{user},	631	user => $PROFILE->{user},
380	pass => $CFG->{profile}{default}{password},	632	pass => $PROFILE->{password},
381	mapw => $mapsize,	633	mapw => $mapsize,
382	maph => $mapsize,	634	maph => $mapsize,
383		635
		636	client => "cfplus $CFPlus::VERSION $] $^O",
		637
384	map_widget => $MAPWIDGET,	638	map_widget => $MAPWIDGET,
385	logview => $LOGVIEW,
386	statusbox => $STATUSBOX,	639	statusbox => $STATUSBOX,
387	map => $MAP,	640	map => $MAP,
388	mapmap => $MAPMAP,	641	mapmap => $MAPMAP,
389	query => \&server_query,	642	query => \&server_query,
390		643
391	sound_play => sub {	644	setup_req => {
392	my ($x, $y, $soundnum, $type) = @_;	645	smoothing => $CFG->{map_smoothing}*1,
393
394	$SDL_MIXER
395	or return;
396
397	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
398	or return;
399
400	$chunk->play;
401	},	646	},
402	};	647	};
403		648
404	if ($CONN) {	649	if ($CONN) {
405	CFClient::lowdelay fileno $CONN->{fh};	650	CFPlus::lowdelay fileno $CONN->{fh};
406		651
407	status "login successful";	652	status "login successful";
408	} else {	653	} else {
409	status "unable to connect";	654	status "unable to connect";
410	stop_game();	655	stop_game();
…		…
414	sub stop_game {	659	sub stop_game {
415	$LOGIN_BUTTON->set_text ("Login");	660	$LOGIN_BUTTON->set_text ("Login");
416	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	661	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
417	$SETUP_DIALOG->show;	662	$SETUP_DIALOG->show;
418	$PL_WINDOW->hide;	663	$PL_WINDOW->hide;
419	$SPELL_PAGE->clear_spells;	664	$SPELL_LIST->clear_spells;
		665	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
		666
		667	&audio_music_set_ambient ([]);
420		668
421	return unless $CONN;	669	return unless $CONN;
422		670
423	status "connection closed";	671	status "connection closed";
424		672
…		…
428		676
429	undef $MAP;	677	undef $MAP;
430	}	678	}
431		679
432	sub graphics_setup {	680	sub graphics_setup {
433	my $vbox = new CFClient::UI::VBox;	681	my $vbox = new CFPlus::UI::VBox;
434		682
435	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	683	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
436		684
		685	my $row = 0;
		686
		687	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
		688	$table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
		689	can_events => 1,
		690	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
		691
		692	my $vidmode_tooltip =
		693	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
		694	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
		695
437	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	696	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
438	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	697	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
439		698
		699	$hbox->add (my $mode_slider = new CFPlus::UI::Slider
440	$hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	700	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
441	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	701	tooltip => $vidmode_tooltip);
		702	$hbox->add (my $mode_label = new CFPlus::UI::Label
		703	align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
		704	can_events => 1, tooltip => $vidmode_tooltip);
442		705
443	$mode_slider->connect (changed => sub {	706	$mode_slider->connect (changed => sub {
444	my ($self, $value) = @_;	707	my ($self, $value) = @_;
445		708
446	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	709	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
447	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	710	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
448	});	711	});
449	$mode_slider->emit (changed => $mode_slider->{range}[0]);	712	$mode_slider->emit (changed => $mode_slider->{range}[0]);
450		713
451	my $row = 1;
452
453	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	714	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
454	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox	715	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
455	state => $CFG->{fullscreen},	716	state => $CFG->{fullscreen},
456	tooltip => "Bring the client into fullscreen mode.",	717	tooltip => "Bring the client into fullscreen mode.",
457	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	718	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
458	);	719	);
459		720
460	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	721	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
461	$table->add (1, $row++, new CFClient::UI::CheckBox	722	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
462	state => $CFG->{fast},	723	state => $CFG->{fast},
463	tooltip => "Lower the visual quality considerably to speed up rendering.",	724	tooltip => "Lower the visual quality considerably to speed up rendering.",
464	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	725	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
465	);	726	);
466		727
		728	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
		729	$table->add_at (1, $row++, new CFPlus::UI::Slider
		730	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
		731	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
		732	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
		733	);
		734
		735	$table->add_at (1, $row++, new CFPlus::UI::Button
		736	expand => 1, align => 0, text => "Apply",
		737	tooltip => "Apply the video settings above.",
		738	on_activate => sub {
		739	video_shutdown ();
		740	video_init ();
		741	0
		742	}
		743	);
		744
467	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	745	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
468	$table->add (1, $row++, new CFClient::UI::Slider	746	$table->add_at (1, $row++, new CFPlus::UI::Slider
469	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	747	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
470	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	748	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
471	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	749	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
472	);	750	);
473		751
		752	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
		753	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		754	state => $CFG->{map_smoothing},
		755	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
		756	. "This increases load on the graphics subsystem and works only with 2.x servers. "
		757	. "Changes take effect at next connection only.",
		758	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
		759	);
		760
474	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	761	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
475	$table->add (1, $row++, new CFClient::UI::CheckBox	762	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
476	state => $CFG->{fow_enable},	763	state => $CFG->{fow_enable},
477	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	764	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
478	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	765	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
479	);	766	);
480		767
481	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	768	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
482	$table->add (1, $row++, new CFClient::UI::Slider	769	$table->add_at (1, $row++, new CFPlus::UI::Slider
483	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	770	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
484	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	771	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
485	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	772	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
486	);	773	);
487		774
488	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
489	$table->add (1, $row++, new CFClient::UI::CheckBox
490	state => $CFG->{fow_smooth},
491	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
492	on_changed => sub {
493	my ($self, $value) = @_;
494	$CFG->{fow_smooth} = $value;
495	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
496	0
497	}
498	);
499
500	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
501	$table->add (1, $row++, new CFClient::UI::Slider
502	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
503	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
504	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
505	);
506
507	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	775	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
508	$table->add (1, $row++, new CFClient::UI::Slider	776	$table->add_at (1, $row++, new CFPlus::UI::Slider
509	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	777	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
510	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	778	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
511	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	779	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
512	);	780	);
513		781
514	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	782	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
515	$table->add (1, $row++, new CFClient::UI::Slider	783	$table->add_at (1, $row++, new CFPlus::UI::Slider
516	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	784	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
517	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	785	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
518	on_changed => sub {	786	on_changed => sub {
519	$CFG->{gauge_fontsize} = $_[1];	787	$CFG->{gauge_fontsize} = $_[1];
520	&set_gauge_window_fontsize;	788	&set_gauge_window_fontsize;
521	0	789	0
522	}	790	}
523	);	791	);
524		792
525	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	793	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
526	$table->add (1, $row++, new CFClient::UI::Slider	794	$table->add_at (1, $row++, new CFPlus::UI::Slider
527	range => [$CFG->{gauge_size}, 0.2, 0.8],	795	range => [$CFG->{gauge_size}, 0.2, 0.8],
528	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	796	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
529	on_changed => sub {	797	on_changed => sub {
530	$CFG->{gauge_size} = $_[1];	798	$CFG->{gauge_size} = $_[1];
531	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	799	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
532	0	800	0
533	}	801	}
534	);	802	);
535		803
536	$table->add (1, $row++, new CFClient::UI::Button
537	expand => 1, align => 0, text => "Apply",
538	tooltip => "Apply the video settings",
539	on_activate => sub {
540	video_shutdown ();
541	video_init ();
542	0
543	}
544	);
545
546	$vbox	804	$vbox
547	}	805	}
548		806
549	sub audio_setup {	807	sub audio_setup {
550	my $vbox = new CFClient::UI::VBox;	808	my $vbox = new CFPlus::UI::VBox;
551		809
552	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	810	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
553		811
554	my $row = 0;	812	my $row = 0;
555		813
556	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	814	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
557	$table->add (1, $row++, new CFClient::UI::CheckBox	815	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
558	state => $CFG->{audio_enable},	816	state => $CFG->{audio_enable},
559	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.",	817	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.",
560	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	818	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
561	);	819	);
562	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	820	# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
563	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	821	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
564	# $CFG->{effects_volume} = $_[1];	822	# $CFG->{effects_volume} = $_[1];
565	# });	823	# });
566	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	824	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
567	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	825	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
568	$hbox->add (new CFClient::UI::CheckBox	826	$hbox->add (new CFPlus::UI::CheckBox
569	expand => 1, state => $CFG->{bgm_enable},	827	expand => 1, state => $CFG->{bgm_enable},
570	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	828	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
571	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	829	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
572	);	830	);
573	$hbox->add (new CFClient::UI::Slider	831	$hbox->add (new CFPlus::UI::Slider
574	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	832	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
575	tooltip => "The volume of the background music. Changes are instant.",	833	tooltip => "The volume of the background music. Changes are instant.",
576	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }	834	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
577	);	835	);
578		836
579	$table->add (1, $row++, new CFClient::UI::Button	837	$table->add_at (1, $row++, new CFPlus::UI::Button
580	expand => 1, align => 0, text => "Apply",	838	expand => 1, align => 0, text => "Apply",
581	tooltip => "Apply the audio settings",	839	tooltip => "Apply the audio settings",
582	on_activate => sub {	840	on_activate => sub {
583	audio_shutdown ();	841	audio_shutdown ();
584	audio_init ();	842	audio_init ();
…		…
596	}	854	}
597		855
598	sub make_gauge_window {	856	sub make_gauge_window {
599	my $gh = int $HEIGHT * $CFG->{gauge_size};	857	my $gh = int $HEIGHT * $CFG->{gauge_size};
600		858
601	my $win = new CFClient::UI::Frame (	859	my $win = new CFPlus::UI::Frame (
602	force_x => 0,	860	force_x => 0,
603	force_y => "max",	861	force_y => "max",
604	force_w => $WIDTH,	862	force_w => $WIDTH,
605	force_h => $gh,	863	force_h => $gh,
606	);	864	);
607		865
608	$win->add (my $hbox = new CFClient::UI::HBox	866	$win->add (my $hbox = new CFPlus::UI::HBox
609	children => [	867	children => [
610	(new CFClient::UI::HBox expand => 1),	868	(new CFPlus::UI::HBox expand => 1),
611	(new CFClient::UI::VBox children => [	869	(new CFPlus::UI::VBox children => [
612	(new CFClient::UI::Empty expand => 1),	870	(new CFPlus::UI::Empty expand => 1),
613	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	871	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
614	]),	872	]),
615	(my $vbox = new CFClient::UI::VBox),	873	(my $vbox = new CFPlus::UI::VBox),
616	],	874	],
617	);	875	);
618		876
619	$vbox->add (new CFClient::UI::HBox	877	$vbox->add (new CFPlus::UI::HBox
620	expand => 1,	878	expand => 1,
621	children => [	879	children => [
622	(new CFClient::UI::Empty expand => 1),	880	(new CFPlus::UI::Empty expand => 1),
623	(my $hb = new CFClient::UI::HBox),	881	(my $hb = new CFPlus::UI::HBox),
624	],	882	],
625	);	883	);
626		884
627	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	885	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
628	tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
629	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	886	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
630	tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
631	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	887	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
632	tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
633	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	888	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
634	tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
635		889
636	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	890	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
637	tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
638	$vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	891	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
639	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
640		892
641	$GAUGES = {	893	$GAUGES = {
642	exp => $exp, win => $win, range => $rng,	894	exp => $exp, win => $win, range => $rng,
643	food => $fg, mana => $mg, hp => $hg, grace => $gg	895	food => $fg, mana => $mg, hp => $hg, grace => $gg
644	};	896	};
…		…
647		899
648	$win	900	$win
649	}	901	}
650		902
651	sub debug_setup {	903	sub debug_setup {
652	my $table = new CFClient::UI::Table;	904	my $table = new CFPlus::UI::Table;
653		905
654	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	906	$table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
655	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	907	$table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
656	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");	908	$table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
657	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	909	$table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
658	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");	910	$table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
659	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	911	$table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
660	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");	912	$table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
661	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	913	$table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		914	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
662		915
663	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	916	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
664		917
665	for my $x (0..2) {	918	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
666	for my $y (0 .. 2) {	919	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
667	$table->add ($x + 3, $y,	920	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
668	new CFClient::UI::Entry	921	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
669	text => $default_smooth[$x * 3 + $y],	922	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
670	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },	923	$t->add_at (1,1, new CFPlus::UI::Label text => "e");
671	);	924
672	}	925	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
		926
		927	$c->add_items ({
		928	type => "line_loop",
		929	color => [0, 1, 0],
		930	width => 9,
		931	coord_mode => "abs",
		932	coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
673	}	933	});
674		934
		935	$c->add_items ({
		936	type => "lines",
		937	color => [1, 1, 0],
		938	width => 2,
		939	coord_mode => "rel",
		940	coord => [[0,0], [1,1], [1,0], [0,1]],
		941	});
		942
		943	$c->add_items ({
		944	type => "polygon",
		945	color => [0, 0.43, 0],
		946	width => 2,
		947	coord_mode => "rel",
		948	coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
		949	});
675		950
676	$table	951	$table
677	}	952	}
678		953
679	sub stats_window {	954	sub stats_window {
680	my $r = new CFClient::UI::ScrolledWindow (	955	my $r = new CFPlus::UI::ScrolledWindow (
681	expand => 1,	956	expand => 1,
682	scroll_y => 1	957	scroll_y => 1
683	);	958	);
684	$r->add (my $vb = new CFClient::UI::VBox);	959	$r->add (my $vb = new CFPlus::UI::VBox);
685		960
		961	$vb->add (new CFPlus::UI::FancyFrame
		962	label => "Player",
		963	child => (my $pi = new CFPlus::UI::VBox),
		964	);
		965
686	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	966	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687	can_hover => 1, can_events => 1,	967	can_hover => 1, can_events => 1,
688	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	968	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
689	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	969	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690	can_hover => 1, can_events => 1,	970	can_hover => 1, can_events => 1,
691	tooltip => "The map you are currently on (if supported by the server).");	971	tooltip => "The map you are currently on (if supported by the server).");
692		972
693	$vb->add (my $hb0 = new CFClient::UI::HBox);	973	$pi->add (my $hb0 = new CFPlus::UI::HBox);
694	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	974	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695	can_hover => 1, can_events => 1,	975	can_hover => 1, can_events => 1,
696	tooltip => "The weight of the player including all inventory items.");	976	tooltip => "The weight of the player including all inventory items.");
697	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	977	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
698	can_hover => 1, can_events => 1,	978	can_hover => 1, can_events => 1,
699	tooltip => "The weight limit: you cannot carry more than this.");	979	tooltip => "The weight limit: you cannot carry more than this.");
700		980
		981	$vb->add (new CFPlus::UI::FancyFrame
		982	label => "Primary/Secondary Statistics",
701	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	983	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		984	);
702	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	985	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703		986
704	my $color2 = [1, 1, 0];	987	my $color2 = [1, 1, 0];
705		988
706	for (	989	for (
707	[0, 0, st_str => "Str", 30],	990	[0, 0, st_str => "Str", 30],
…		…
719	[2, 4, st_spd => "Spd", 10.54],	1002	[2, 4, st_spd => "Spd", 10.54],
720	[2, 5, st_wspd => "WSp", 10.54],	1003	[2, 5, st_wspd => "WSp", 10.54],
721	) {	1004	) {
722	my ($col, $row, $id, $label, $template) = @$_;	1005	my ($col, $row, $id, $label, $template) = @$_;
723		1006
724	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	1007	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
725	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	1008	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726	align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});	1009	align => +1, template => $template, tooltip => "#stat_$label");
727	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	1010	$tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
728	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	1011	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729	align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});	1012	align => -1, text => $label, tooltip => "#stat_$label");
730	}	1013	}
731		1014
		1015	$vb->add (new CFPlus::UI::FancyFrame
		1016	label => "Resistancies",
732	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	1017	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		1018	);
733		1019
734	my $row = 0;	1020	my $row = 0;
735	my $col = 0;	1021	my $col = 0;
736		1022
737	my %resist_names = (	1023	my %resist_names = (
…		…
770	cold => ["Cold",	1056	cold => ["Cold",
771	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],	1057	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
772	ghit => ["Ghost hit",	1058	ghit => ["Ghost hit",
773	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],	1059	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
774	);	1060	);
		1061
775	for (qw/slow holyw conf fire depl magic	1062	for (qw/slow holyw conf fire depl magic
776	drain acid pois para deat phys	1063	drain acid pois para deat phys
777	blind fear tund elec cold ghit/)	1064	blind fear tund elec cold ghit/)
778	{	1065	{
779	$tbl2->add ($col, $row,	1066	$tbl2->add_at ($col, $row,
780	$STATWIDS->{"res_$_"} =	1067	$STATWIDS->{"res_$_"} =
781	new CFClient::UI::Label	1068	new CFPlus::UI::Label
782	font => $FONT_FIXED,	1069	font => $FONT_FIXED,
783	template => "-100%",	1070	template => "-100%",
784	align => +1,	1071	align => +1,
785	valign => 0,	1072	valign => 0,
786	can_events => 1,	1073	can_events => 1,
787	can_hover => 1,	1074	can_hover => 1,
788	tooltip => $resist_names{$_}->[1],	1075	tooltip => $resist_names{$_}->[1],
789	);	1076	);
790	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	1077	$tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
791	font => $FONT_FIXED,	1078	font => $FONT_FIXED,
792	can_hover => 1,	1079	can_hover => 1,
793	can_events => 1,	1080	can_events => 1,
794	path => "ui/resist/resist_$_.png",	1081	path => "ui/resist/resist_$_.png",
795	tooltip => $resist_names{$_}->[1],	1082	tooltip => $resist_names{$_}->[1],
796	);	1083	);
797	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	1084	$tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
798	text => $resist_names{$_}->[0],	1085	text => $resist_names{$_}->[0],
799	font => $FONT_FIXED,	1086	font => $FONT_FIXED,
800	can_hover => 1,	1087	can_hover => 1,
801	can_events => 1,	1088	can_events => 1,
802	tooltip => $resist_names{$_}->[1],	1089	tooltip => $resist_names{$_}->[1],
…		…
813		1100
814	$r	1101	$r
815	}	1102	}
816		1103
817	sub skill_window {	1104	sub skill_window {
818	my $sw = new CFClient::UI::ScrolledWindow (expand => 1);	1105	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
819	$sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);	1106	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
820	$sw	1107	$sw
821	}	1108	}
822		1109
823	sub formsep($) {	1110	sub formsep($) {
824	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	1111	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
…		…
835	return if $METASERVER_ATIME > time;	1122	return if $METASERVER_ATIME > time;
836	$METASERVER_ATIME = time + 60;	1123	$METASERVER_ATIME = time + 60;
837		1124
838	my $table = $METASERVER->{table};	1125	my $table = $METASERVER->{table};
839	$table->clear;	1126	$table->clear;
840	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	1127	$table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
841		1128
842	my $buf;	1129	my $ok = 0;
843		1130
844	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	1131	CFPlus::background {
		1132	my $ua = CFPlus::lwp_useragent;
845		1133
846	unless ($fh) {	1134	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
847	$label->set_text ("unable to contact metaserver: $!");	1135	} sub {
848	return;	1136	my ($msg) = @_;
849	}	1137	if ($msg) {
850
851	Event->io (fd => $fh, poll => 'r', cb => sub {
852	my $res = sysread $fh, $buf, 8192, length $buf;
853
854	if (!defined $res) {
855	$_[0]->w->cancel;
856	$label->set_text ("error while retrieving server list: $!");
857	} elsif ($res == 0) {
858	$_[0]->w->cancel;
859	status "server list retrieved";
860
861	utf8::decode $buf if utf8::valid $buf;
862
863	$table->clear;	1138	$table->clear;
864		1139
865	my @tip = (	1140	my @tip = (
866	"The current number of users logged in on the server.",	1141	"The current number of users logged in on the server.",
867	"The hostname of the server.",	1142	"The hostname of the server.",
868	"The time this server has been running without being restarted.",	1143	"The time this server has been running without being restarted.",
869	"The server software version - a '+' indicates a Crossfire+ server.",	1144	"The server software version - a '+' indicates a Crossfire+ server.",
870	"Short information about this server provided by its admins.",	1145	"Short information about this server provided by its admins.",
871	);	1146	);
872	my @col = qw(#Users Host Uptime Version Description);	1147	my @col = qw(#Users Host Uptime Version Description);
873	$table->add ($_, 0, new CFClient::UI::Label	1148	$table->add_at ($_, 0, new CFPlus::UI::Label
874	can_hover => 1, can_events => 1,	1149	can_hover => 1, can_events => 1,
875	align => 0, fg => [1, 1, 0],	1150	align => 0, fg => [1, 1, 0],
876	text => $col[$_], tooltip => $tip[$_])	1151	text => $col[$_], tooltip => $tip[$_])
877	for 0 .. $#col;	1152	for 0 .. $#col;
878		1153
879	my @align = qw(1 0 1 1 -1);	1154	my @align = qw(1 0 1 1 -1);
880		1155
881	my $y = 0;	1156	my $y = 0;
882	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	1157	for my $m (@{ $msg->{servers} }) {
883	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	1158	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
		1159	@$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
884		1160
885	for ($desc) {	1161	for ($desc) {
886	s/<br>/\n/gi;	1162	s/<br>/\n/gi;
887	s/<li>/\n· /gi;	1163	s/<li>/\n· /gi;
888	s/<.*?>//sgi;	1164	s/<.*?>//sgi;
889	s/&/&amp;/g;	1165	s/&amp;/&/g;
890	s/</&lt;/g;	1166	s/&lt;/</g;
891	s/>/&gt;/g;	1167	s/&gt;/>/g;
892	}	1168	}
893		1169
894	$uptime = sprintf "%dd %02d:%02d:%02d",	1170	$uptime = sprintf "%dd %02d:%02d:%02d",
895	(int $m->[8] / 86400),	1171	(int $uptime / 86400),
896	(int $m->[8] / 3600) % 24,	1172	(int $uptime / 3600) % 24,
897	(int $m->[8] / 60) % 60,	1173	(int $uptime / 60) % 60,
898	$m->[8] % 60;	1174	$uptime % 60;
899		1175
900	$m = [$users, $host, $uptime, $version, $desc];	1176	$m = [$users, $host, $uptime, $version, $desc];
901		1177
902	$y++;	1178	$y++;
903		1179
904	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	1180	$table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
905	(new CFClient::UI::Button	1181	(new CFPlus::UI::Button
906	text => "Use",	1182	text => "Use",
907	tooltip => "Put this server into the <b>Host:Port</b> field",	1183	tooltip => "Put this server into the <b>Host:Port</b> field",
908	on_activate => sub {	1184	on_activate => sub {
909	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1185	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
910	$METASERVER->hide;	1186	$METASERVER->hide;
911	0	1187	0
912	},	1188	},
913	),	1189	),
914	(new CFClient::UI::Empty expand => 1),	1190	(new CFPlus::UI::Empty expand => 1),
915	]);	1191	]);
916		1192
917	$table->add ($_, $y, new CFClient::UI::Label	1193	$table->add_at ($_, $y, new CFPlus::UI::Label
		1194	max_w => $::WIDTH * 0.4,
918	ellipsise => 0,	1195	ellipsise => 0,
919	align => $align[$_],	1196	align => $align[$_],
920	text => $m->[$_],	1197	text => $m->[$_],
921	tooltip => $tip[$_],	1198	tooltip => $tip[$_],
		1199	fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
922	can_hover => 1,	1200	can_hover => 1,
923	can_events => 1,	1201	can_events => 1,
924	fontsize => 0.8)	1202	fontsize => 0.8)
925	for 0 .. $#$m;	1203	for 0 .. $#$m;
926	}	1204	}
		1205	} else {
		1206	$ok or $label->set_text ("error while contacting metaserver");
927	}	1207	}
928	});	1208	};
		1209
929	}	1210	}
930		1211
931	sub metaserver_dialog {	1212	sub metaserver_dialog {
932	my $vbox = new CFClient::UI::VBox;	1213	my $vbox = new CFPlus::UI::VBox;
933	my $table = new CFClient::UI::Table;	1214	my $table = new CFPlus::UI::Table;
934	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	1215	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935		1216
936	my $dialog = new CFClient::UI::FancyFrame	1217	my $dialog = new CFPlus::UI::Toplevel
937	title => "Server List",	1218	title => "Server List",
938	name => 'metaserver_dialog',	1219	name => 'metaserver_dialog',
939	x => 'center',	1220	x => 'center',
940	y => 'center',	1221	y => 'center',
941	z => 3,	1222	z => 3,
		1223	force_w => $::WIDTH * 0.9,
942	force_h => $::HEIGHT * 0.4,	1224	force_h => $::HEIGHT * 0.7,
943	child => $vbox,	1225	child => $vbox,
944	has_close_button => 1,	1226	has_close_button => 1,
945	table => $table,	1227	table => $table,
946	on_visibility_change => sub {	1228	on_visibility_change => sub {
947	update_metaserver ($_[0]) if $_[1];	1229	update_metaserver ($_[0]) if $_[1];
…		…
951		1233
952	$dialog	1234	$dialog
953	}	1235	}
954		1236
955	sub server_setup {	1237	sub server_setup {
956	my $vbox = new CFClient::UI::VBox;	1238	my $vbox = new CFPlus::UI::VBox;
957		1239
		1240	$vbox->add (new CFPlus::UI::FancyFrame
		1241	label => "Connection Settings",
958	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	1242	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		1243	);
959	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	1244	$table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960		1245
961	{	1246	{
962	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	1247	$table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
963		1248
964	$vbox->add (	1249	$vbox->add (
965	$HOST_ENTRY = new CFClient::UI::Entry	1250	$HOST_ENTRY = new CFPlus::UI::Entry
966	expand => 1,	1251	expand => 1,
967	text => $CFG->{profile}{default}{host},	1252	text => $CFG->{profile}{default}{host},
968	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	1253	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
969	on_changed => sub {	1254	on_changed => sub {
970	my ($self, $value) = @_;	1255	my ($self, $value) = @_;
971	$CFG->{profile}{default}{host} = $value;	1256	$CFG->{profile}{default}{host} = $value;
972	0	1257	1
973	}	1258	}
974	);	1259	);
975		1260
976	$vbox->add (new CFClient::UI::Button	1261	$vbox->add (new CFPlus::UI::Button
977	expand => 1,	1262	expand => 1,
978	text => "Server List",	1263	text => "Server List",
979	other => $METASERVER,	1264	other => $METASERVER,
980	tooltip => "Show a list of available crossfire servers",	1265	tooltip => "Show a list of available crossfire servers",
981	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1266	on_activate => sub { $METASERVER->toggle_visibility; 0 },
982	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1267	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
983	);	1268	);
984	}	1269	}
985		1270
986	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	1271	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
987	$table->add (1, 4, new CFClient::UI::Entry	1272	$table->add_at (1, 4, new CFPlus::UI::Entry
988	text => $CFG->{profile}{default}{user},	1273	text => $CFG->{profile}{default}{user},
989	tooltip => "The name of your character on the server",	1274	tooltip => "The name of your character on the server",
990	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1275	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
991	);	1276	);
992		1277
993	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1278	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
994	$table->add (1, 5, new CFClient::UI::Entry	1279	$table->add_at (1, 5, new CFPlus::UI::Entry
995	text => $CFG->{profile}{default}{password},	1280	text => $CFG->{profile}{default}{password},
996	hidden => 1,	1281	hidden => 1,
997	tooltip => "The password for your character",	1282	tooltip => "The password for your character",
998	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1283	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
999	);	1284	);
1000		1285
1001	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1286	$table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1002	$table->add (1, 7, new CFClient::UI::Slider	1287	$table->add_at (1, 7, new CFPlus::UI::Slider
1003	force_w => 100,	1288	force_w => 100,
1004	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1289	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1005	tooltip => "This is the size of the portion of the map update the server sends you. "	1290	tooltip => "This is the size of the portion of the map update the server sends you. "
1006	. "If you set this to a high value you will be able to see further, "	1291	. "If you set this to a high value you will be able to see further, "
1007	. "but you also increase bandwidth requirements and latency. "	1292	. "but you also increase bandwidth requirements and latency. "
1008	. "This option is only used once at log-in.",	1293	. "This option is only used once at log-in.",
1009	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1294	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1010	);	1295	);
1011		1296
1012	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1297	$table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1013	$table->add (1, 8, new CFClient::UI::CheckBox	1298	$table->add_at (1, 8, new CFPlus::UI::Entry
1014	state => $CFG->{face_prefetch},	1299	text => $CFG->{output_rate},
1015	tooltip => "<b>Background Image Prefetch</b>\n\n"	1300	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1016	. "If enabled, the client automatically pre-fetches images from the server. "	1301	. "when sending data. When 0 or unset, the server "
1017	. "This might increase or create lag, but increases the chances "	1302	. "default will be used, which is usually around 100kb/s. Most servers will "
1018	. "of faces being ready for display when you encounter them. "	1303	. "dynamically find an optimal rate, so adjust this only when necessary.",
1019	. "It also uses up server bandwidth on every connect, "
1020	. "so only set it if you really need to prefetch images. "
1021	. "This option can be set and unset any time.",
1022	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1304	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1023	);	1305	);
1024		1306
1025	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1307	$table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1026	$table->add (1, 9, new CFClient::UI::Entry	1308	$table->add_at (1, 9, new CFPlus::UI::Entry
1027	text => $CFG->{output_count},	1309	text => $CFG->{output_count},
1028	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1310	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1029	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1311	on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1030	);	1312	);
1031		1313
1032	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1314	$table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1033	$table->add (1, 10, new CFClient::UI::Entry	1315	$table->add_at (1, 10, new CFPlus::UI::Entry
1034	text => $CFG->{output_sync},	1316	text => $CFG->{output_sync},
1035	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1317	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1036	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1318	on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1037	);	1319	);
1038		1320
1039	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1321	$table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1040	expand => 1,	1322	expand => 1,
1041	align => 0,	1323	align => 0,
1042	text => "Login",	1324	text => "Login",
1043	on_activate => sub {	1325	on_activate => sub {
1044	$CONN ? stop_game	1326	$CONN ? stop_game
1045	: start_game;	1327	: start_game;
		1328	1
		1329	},
		1330	);
		1331
		1332	$vbox->add (new CFPlus::UI::FancyFrame
		1333	label => "Server Info",
		1334	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1335	);
		1336
		1337	$vbox
		1338	}
		1339
		1340	sub client_setup {
		1341	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
		1342
		1343	my $row = 0;
		1344
		1345	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
		1346	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		1347	state => $CFG->{show_tips},
		1348	tooltip => "Show the <b>Tip of the day</b> window at startup?",
		1349	on_changed => sub {
		1350	my ($self, $value) = @_;
		1351	$CFG->{show_tips} = $value;
		1352	0
		1353	}
		1354	);
		1355
		1356	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
		1357	$table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
		1358	text => $CFG->{logview_max_par},
		1359	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
		1360	. "sends more messages than this number, older messages get removed to save memory and "
		1361	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
		1362	on_changed => sub {
		1363	my ($self, $value) = @_;
		1364	$MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1046	0	1365	0
1047	},	1366	},
1048	);	1367	);
1049		1368
1050	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1369	$table
1051	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1052	text => $CFG->{say_command},
1053	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. "
1054	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1055	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056	on_changed => sub {
1057	my ($self, $value) = @_;
1058	$CFG->{say_command} = $value;
1059	0
1060	}
1061	);
1062
1063	$vbox->add (new CFClient::UI::Label
1064	text => "Server Info",
1065	fontsize => 1.2,
1066	padding_y => 8,
1067	fg => [1, 1, 0, 1],
1068	);
1069
1070	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1071
1072	$vbox
1073	}
1074
1075	sub message_window {
1076	my $window = new CFClient::UI::FancyFrame
1077	name => "message_window",
1078	title => "Messages",
1079	border_bg => [1, 1, 1, 1],
1080	x => "max",
1081	y => 0,
1082	force_w => $::WIDTH * 0.4,
1083	force_h => $::HEIGHT * 0.5,
1084	child => (my $vbox = new CFClient::UI::VBox),
1085	has_close_button => 1;
1086
1087	$vbox->add ($LOGVIEW);
1088
1089	$vbox->add (my $input = new CFClient::UI::Entry
1090	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1091	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1092	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1093	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1094	on_focus_in => sub {
1095	my ($input, $prev_focus) = @_;
1096
1097	delete $input->{refocus_map};
1098
1099	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1100	$input->{refocus_map} = 1;
1101	}
1102	delete $input->{auto_activated};
1103
1104	0
1105	},
1106	on_activate => sub {
1107	my ($input, $text) = @_;
1108	$input->set_text ('');
1109
1110	if ($text =~ /^\/(.*)/) {
1111	$::CONN->user_send ($1);
1112	} else {
1113	my $say_cmd = $::CFG->{say_command} || 'say';
1114	$::CONN->user_send ("$say_cmd $text");
1115	}
1116	if ($input->{refocus_map}) {
1117	delete $input->{refocus_map};
1118	$MAPWIDGET->focus_in
1119	}
1120
1121	0
1122	},
1123	on_escape => sub {
1124	$MAPWIDGET->grab_focus;
1125
1126	0
1127	},
1128	);
1129
1130	$CONSOLE = {
1131	window => $window,
1132	input => $input,
1133	};
1134
1135	$window
1136	}
1137
1138	sub open_quit_dialog {
1139	unless ($QUIT_DIALOG) {
1140	$QUIT_DIALOG = new CFClient::UI::FancyFrame
1141	x => "center",
1142	y => "center",
1143	z => 50,
1144	title => "Really Quit?",
1145	on_key_down => sub {
1146	my ($dialog, $ev) = @_;
1147	$ev->{sym} == 27 and $dialog->hide;
1148	}
1149	;
1150
1151	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1152
1153	$vb->add (new CFClient::UI::Label
1154	text => "You should find a savebed and apply it first!",
1155	max_w => $WIDTH * 0.25,
1156	ellipsize => 0,
1157	);
1158	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1159	$hb->add (new CFClient::UI::Button
1160	text => "Ok",
1161	expand => 1,
1162	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1163	);
1164	$hb->add (new CFClient::UI::Button
1165	text => "Quit anyway",
1166	expand => 1,
1167	on_activate => sub { exit },
1168	);
1169	}
1170
1171	$QUIT_DIALOG->show;
1172	$QUIT_DIALOG->grab_focus;
1173	}	1370	}
1174		1371
1175	sub autopickup_setup {	1372	sub autopickup_setup {
		1373	my $r = new CFPlus::UI::ScrolledWindow (
		1374	expand => 1,
		1375	scroll_y => 1
		1376	);
1176	my $table = new CFClient::UI::Table;	1377	$r->add (my $table = new CFPlus::UI::Table
		1378	row_expand => [0],
		1379	col_expand => [0, 1, 0, 1],
		1380	);
1177		1381
1178	for (	1382	for (
1179	["General", 0, 0,	1383	["General", 0, 0,
1180	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1384	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1181	["Inhibit autopickup" => PICKUP_INHIBIT],	1385	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1195	["Boots" => PICKUP_BOOTS],	1399	["Boots" => PICKUP_BOOTS],
1196	["Gloves" => PICKUP_GLOVES],	1400	["Gloves" => PICKUP_GLOVES],
1197	["Cloaks" => PICKUP_CLOAK],	1401	["Cloaks" => PICKUP_CLOAK],
1198	],	1402	],
1199		1403
1200	["Readables", 2, 2,	1404	["Readables", 2, 0,
1201	["Spellbooks" => PICKUP_SPELLBOOK],	1405	["Spellbooks" => PICKUP_SPELLBOOK],
1202	["Skillscrolls" => PICKUP_SKILLSCROLL],	1406	["Skillscrolls" => PICKUP_SKILLSCROLL],
1203	["Normal Books/Scrolls" => PICKUP_READABLES],	1407	["Normal Books/Scrolls" => PICKUP_READABLES],
1204	],	1408	],
1205	["Misc", 2, 7,	1409	["Misc", 2, 5,
1206	["Food" => PICKUP_FOOD],	1410	["Food" => PICKUP_FOOD],
1207	["Drinks" => PICKUP_DRINK],	1411	["Drinks" => PICKUP_DRINK],
1208	["Valuables (Money, Gems)" => PICKUP_VALUABLES],	1412	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1209	["Keys" => PICKUP_KEY],	1413	["Keys" => PICKUP_KEY],
1210	["Magical Items" => PICKUP_MAGICAL],	1414	["Magical Items" => PICKUP_MAGICAL],
1211	["Potions" => PICKUP_POTION],	1415	["Potions" => PICKUP_POTION],
1212	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1416	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1213	["Ignore cursed" => PICKUP_NOT_CURSED],	1417	["Ignore cursed" => PICKUP_NOT_CURSED],
1214	["Jewelery" => PICKUP_JEWELS],	1418	["Jewelery" => PICKUP_JEWELS],
		1419	["Flesh" => PICKUP_FLESH],
1215	],	1420	],
1216	["Weight/Value ratio", 2, 17]	1421	["Weight/Value ratio", 2, 17]
1217	)	1422	)
1218	{	1423	{
1219	my ($title, $x, $y, @bits) = @$_;	1424	my ($title, $x, $y, @bits) = @$_;
1220	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1425	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1221		1426
1222	for (@bits) {	1427	for (@bits) {
1223	++$y;	1428	++$y;
1224		1429
1225	my $mask = $_->[1];	1430	my $mask = $_->[1];
1226	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1431	$table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1227	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1432	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1228	state => $::CFG->{pickup} & $mask,	1433	state => $::CFG->{pickup} & $mask,
1229	on_changed => sub {	1434	on_changed => sub {
1230	my ($box, $value) = @_;	1435	my ($box, $value) = @_;
1231		1436
1232	if ($value) {	1437	if ($value) {
…		…
1243		1448
1244	${$_->[2]} = $checkbox if $_->[2];	1449	${$_->[2]} = $checkbox if $_->[2];
1245	}	1450	}
1246	}	1451	}
1247		1452
1248	$table->add (2, 18, new CFClient::UI::ValSlider	1453	$table->add_at (2, 18, new CFPlus::UI::ValSlider
1249	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1454	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1250	template => ">= 99",	1455	template => ">= 99",
1251	to_value => sub { ">= " . 5 * $_[0] },	1456	to_value => sub { ">= " . 5 * $_[0] },
1252	on_changed => sub {	1457	on_changed => sub {
1253	my ($slider, $value) = @_;	1458	my ($slider, $value) = @_;
…		…
1256	$::CFG->{pickup} |= int $value	1461	$::CFG->{pickup} |= int $value
1257	if $value;	1462	if $value;
1258	1;	1463	1;
1259	});	1464	});
1260		1465
1261	$table->add (3, 18, new CFClient::UI::Button	1466	$table->add_at (3, 18, new CFPlus::UI::Button
1262	text => "set",	1467	text => "set",
1263	on_activate => sub {	1468	on_activate => sub {
1264	$::CONN->send_command ("pickup $::CFG->{pickup}")	1469	$::CONN->send_command ("pickup $::CFG->{pickup}")
1265	if defined $::CONN;	1470	if defined $::CONN;
1266	0	1471	0
1267	});	1472	});
1268		1473
1269	$table	1474	$r
1270	}	1475	}
1271		1476
1272	my %SORT_ORDER = (	1477	my %SORT_ORDER = (
1273	type => undef,	1478	type => undef,
1274	mtime => sub { sort {	1479	mtime => sub {
		1480	my $NOW = time;
		1481	sort {
		1482	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1483	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1484
1275	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)	1485	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1276	or $b->{mtime} <=> $a->{mtime}	1486	or $btime <=> $atime
1277	or $a->{type} <=> $b->{type}	1487	or $a->{type} <=> $b->{type}
		1488	} @_
1278	} @_ },	1489	},
1279	weight => sub { sort {	1490	weight => sub { sort {
1280	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)	1491	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1281	or $a->{type} <=> $b->{type}	1492	or $a->{type} <=> $b->{type}
1282	} @_ },	1493	} @_ },
1283	);	1494	);
1284		1495
1285	sub inventory_widget {	1496	sub inventory_widget {
1286	my $hb = new CFClient::UI::HBox homogeneous => 1;	1497	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1287		1498
1288	$hb->add (my $vb1 = new CFClient::UI::VBox);	1499	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1289	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1500	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1290		1501
1291	$vb1->add (my $hb1 = new CFClient::UI::HBox);	1502	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
1292		1503
1293	use sort 'stable';	1504	use sort 'stable';
1294		1505
1295	$hb1->add (new CFClient::UI::Selector	1506	$hb1->add (new CFPlus::UI::Selector
1296	value => $::CFG->{inv_sort},	1507	value => $::CFG->{inv_sort},
1297	options => [	1508	options => [
1298	[type => "Type/Name"],	1509	[type => "Type/Name"],
1299	[mtime => "Recent/Normal/Locked"],	1510	[mtime => "Recent/Normal/Locked"],
1300	[weight => "Weight/Type"],	1511	[weight => "Weight/Type"],
…		…
1302	on_changed => sub {	1513	on_changed => sub {
1303	$::CFG->{inv_sort} = $_[1];	1514	$::CFG->{inv_sort} = $_[1];
1304	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1515	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1305	},	1516	},
1306	);	1517	);
1307	$hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);	1518	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1308	#TODO# update to weigh/maxweight	1519	#TODO# update to weigh/maxweight
1309	$hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);	1520	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1310		1521
1311	$vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1522	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1312	$sw1->add ($INV = new CFClient::UI::Inventory);	1523	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1524	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1313		1525
1314	$hb->add (my $vb2 = new CFClient::UI::VBox);	1526	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1315		1527
1316	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1528	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1317		1529
1318	$vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1530	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1319	$sw2->add ($INVR = new CFClient::UI::Inventory);	1531	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1320		1532
1321	# XXX: Call after $INVR = ... because set_opencont sets the items	1533	# XXX: Call after $INVR = ... because set_opencont sets the items
1322	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1534	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1323		1535
1324	$hb	1536	$hb
1325	}	1537	}
1326		1538
1327	sub toggle_player_page {	1539	sub toggle_player_page {
…		…
1334	$PL_WINDOW->show;	1546	$PL_WINDOW->show;
1335	}	1547	}
1336	}	1548	}
1337		1549
1338	sub player_window {	1550	sub player_window {
1339	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1551	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1340	x => "center",	1552	x => "center",
1341	y => "center",	1553	y => "center",
1342	force_w => $WIDTH * 9/10,	1554	force_w => $WIDTH * 9/10,
1343	force_h => $HEIGHT * 9/10,	1555	force_h => $HEIGHT * 9/10,
1344	title => "Player",	1556	title => "Player",
…		…
1346	has_close_button => 1	1558	has_close_button => 1
1347	;	1559	;
1348		1560
1349	my $ntb =	1561	my $ntb =
1350	$PL_NOTEBOOK =	1562	$PL_NOTEBOOK =
1351	new CFClient::UI::Notebook expand => 1, debug => 1;	1563	new CFPlus::UI::Notebook expand => 1;
1352		1564
1353	$ntb->add (	1565	$ntb->add_tab (
1354	"Statistics (F2)" => $STATS_PAGE = stats_window,	1566	"Statistics (F2)" => $STATS_PAGE = stats_window,
1355	"Shows statistics, where all your Stats and Resistances are shown."	1567	"Shows statistics, where all your Stats and Resistances are shown."
1356	);	1568	);
1357	$ntb->add (	1569	$ntb->add_tab (
1358	"Skills (F3)" => $SKILL_PAGE = skill_window,	1570	"Skills (F3)" => $SKILL_PAGE = skill_window,
1359	"Shows all your Skills."	1571	"Shows all your Skills."
1360	);	1572	);
1361		1573
1362	my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1574	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1363	$spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);	1575	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1364	$ntb->add (	1576	$ntb->add_tab (
1365	"Spellbook (F4)" => $spellsw,	1577	"Spellbook (F4)" => $spellsw,
1366	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1578	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1367	);	1579	);
1368	$ntb->add (	1580	$ntb->add_tab (
1369	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1581	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1370	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1582	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1371	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1583	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1372	);	1584	);
		1585	$ntb->add_tab (Pickup => autopickup_setup,
		1586	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1373		1587
1374	$ntb->set_current_page ($INVENTORY_PAGE);	1588	$ntb->set_current_page ($INVENTORY_PAGE);
1375		1589
1376	$plwin->add ($ntb);	1590	$plwin->add ($ntb);
1377	$plwin	1591	$plwin
1378	}	1592	}
1379		1593
1380	sub update_bindings {
1381	$BIND_UPD_CB->() if $BIND_UPD_CB;
1382	}
1383
1384	sub keyboard_setup {	1594	sub keyboard_setup {
1385	my $binding_list = new CFClient::UI::VBox;	1595	CFPlus::Macro::keyboard_setup
1386
1387	my $refresh;
1388	$refresh = $BIND_UPD_CB = sub {
1389	$binding_list->clear ();
1390
1391	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1392	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1393	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1394	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1395
1396	my $lbl = join "; ", @$cmds;
1397	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1398	$binding_list->add (my $hb = new CFClient::UI::HBox);
1399	$hb->add (new CFClient::UI::Button
1400	text => "delete",
1401	tooltip => "Deletes the binding",
1402	on_activate => sub {
1403	$binding_list->remove ($hb);
1404	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1405	0
1406	});
1407
1408	$hb->add (new CFClient::UI::Button
1409	text => "edit",
1410	tooltip => "Edits the binding",
1411	on_activate => sub {
1412	$::BIND_EDITOR->set_binding (
1413	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1414	sub {
1415	my ($nmod, $nsym, $ncmds) = @_;
1416	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1417	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1418	$refresh->();
1419	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1420	$SETUP_DIALOG->show;
1421	},
1422	sub {
1423	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1424	$SETUP_DIALOG->show;
1425	});
1426	$::BIND_EDITOR->show;
1427	$SETUP_DIALOG->hide;
1428	0
1429	});
1430
1431	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1432	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1433	}
1434	}
1435	};
1436
1437	my $vb = new CFClient::UI::VBox;
1438	$vb->add (my $hb = new CFClient::UI::HBox);
1439	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1440	$hb->add (new CFClient::UI::CheckBox
1441	expand => 1,
1442	state => $CFG->{shift_fire_stop},
1443	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1444	on_changed => sub {
1445	my ($cbox, $value) = @_;
1446	$CFG->{shift_fire_stop} = $value;
1447	0
1448	});
1449
1450	$vb->add ($binding_list);
1451	$vb->add (my $hb = new CFClient::UI::HBox);
1452
1453	$hb->add (new CFClient::UI::Button
1454	text => "record new",
1455	expand => 1,
1456	tooltip => "This button opens the binding editor with an empty binding.",
1457	on_activate => sub {
1458	$::BIND_EDITOR->set_binding (undef, undef, [],
1459	sub {
1460	my ($mod, $sym, $cmds) = @_;
1461	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1462	$refresh->();
1463	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1464	$SETUP_DIALOG->show;
1465	},
1466	sub {
1467	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1468	$SETUP_DIALOG->show;
1469	},
1470	);
1471	$SETUP_DIALOG->hide;
1472	$::BIND_EDITOR->show;
1473	0
1474	},
1475	);
1476
1477	$hb->add (new CFClient::UI::Button
1478	text => "close",
1479	tooltip => "Closes the binding window",
1480	expand => 1,
1481	on_activate => sub {
1482	$SETUP_DIALOG->hide;
1483	0
1484	}
1485	);
1486
1487	$refresh->();
1488
1489	$vb
1490	}	1596	}
1491		1597
1492	sub help_window {	1598	sub help_window {
1493	my $win = new CFClient::UI::FancyFrame	1599	my $win = new CFPlus::UI::Toplevel
1494	x => 'center',	1600	x => 'center',
1495	y => 'center',	1601	y => 'center',
1496	z => 2,	1602	z => 4,
1497	name => 'doc_browser',	1603	name => 'doc_browser',
1498	force_w => int $WIDTH * 7/8,	1604	force_w => int $WIDTH * 7/8,
1499	force_h => int $HEIGHT * 7/8,	1605	force_h => int $HEIGHT * 7/8,
1500	title => "Help Browser",	1606	title => "Help Browser",
1501	has_close_button => 1;	1607	has_close_button => 1;
1502		1608
1503	$win->add (my $vbox = new CFClient::UI::VBox);	1609	$win->add (my $vbox = new CFPlus::UI::VBox);
1504		1610
1505	$vbox->add (my $buttons = new CFClient::UI::HBox);	1611	$vbox->add (new CFPlus::UI::FancyFrame
		1612	label => "Navigation",
		1613	child => (my $buttons = new CFPlus::UI::HBox),
		1614	);
1506	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1615	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1507	expand => 1, fontsize => 0.8, padding_x => 4);	1616	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1508		1617
1509	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1618	my @history;
1510	$buttons->add (my $combo = new CFClient::UI::Selector	1619	my @future;
1511	value => undef,	1620	my $curnode;
1512	options => [	1621
1513	[intro => "Introduction"],	1622	my $load_node; $load_node = sub {
1514	[manual => "Main Manual"],	1623	my ($node, $para) = @_;
1515	[skill_help => "Skill Reference"],	1624
1516	[command_help => "Command Reference"],	1625	$buttons->clear;
1517	[dmcommand_help => "DM Commands"],	1626
1518	[COPYING => "License Terms"],	1627	$buttons->add (new CFPlus::UI::Button
1519	],	1628	text => "⇤",
		1629	tooltip => "back to the starting page",
1520	on_changed => sub {	1630	on_activate => sub {
1521	my ($self, $pod) = @_;	1631	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1522		1632	unshift @future, @history;
1523	$viewer->clear;	1633	@history = ();
1524	$viewer->add_paragraph (@{ CFClient::Pod::pod_paragraphs $pod });	1634	$load_node->(@{shift @future});
1525	$viewer->set_offset (0);
1526
1527	0	1635	},
		1636	);
		1637
		1638	if (@history) {
		1639	$buttons->add (new CFPlus::UI::Button
		1640	text => "⋘",
		1641	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1642	on_activate => sub {
		1643	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1644	$load_node->(@{pop @history});
		1645	},
		1646	);
1528	},	1647	}
1529	on_visibility_change => sub {	1648
1530	my ($self, $visible) = @_;	1649	if (@future) {
1531	return unless $visible;	1650	$buttons->add (new CFPlus::UI::Button
1532	return if $self->{value};	1651	text => "⋙",
1533	$self->set_value ("intro");	1652	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1653	on_activate => sub {
		1654	push @history, [$curnode, $viewer->current_paragraph];
		1655	$load_node->(@{shift @future});
		1656	},
1534	0	1657	);
1535	},	1658	}
		1659
		1660	$buttons->add (new CFPlus::UI::Label text => " ");
		1661
		1662	my @path = CFPlus::Pod::full_path_of $node;
		1663	pop @path; # drop current node
		1664
		1665	for my $node (@path) {
		1666	$buttons->add (new CFPlus::UI::Button
		1667	text => $node->{kw}[0],
		1668	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1669	on_activate => sub {
		1670	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1671	$load_node->($node);
		1672	},
		1673	);
		1674	$buttons->add (new CFPlus::UI::Label text => "/");
		1675	}
		1676
		1677	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1678
		1679	$curnode = $node;
		1680
		1681	$viewer->clear;
		1682	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1683	$viewer->scroll_to ($para);
1536	);	1684	};
		1685
		1686	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1687
		1688	$CFPlus::Pod::goto_document = sub {
		1689	my (@path) = @_;
		1690
		1691	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1692
		1693	$load_node->((CFPlus::Pod::find @path)[0]);
		1694	$win->show;
		1695	};
1537		1696
1538	$win	1697	$win
1539	}	1698	}
1540		1699
		1700	sub open_string_query {
		1701	my ($title, $cb, $txt, $tooltip) = @_;
		1702	my $dialog = new CFPlus::UI::Toplevel
		1703	x => "center",
		1704	y => "center",
		1705	z => 50,
		1706	force_w => $WIDTH * 4/5,
		1707	title => $title;
		1708
		1709	$dialog->add (
		1710	my $e = new CFPlus::UI::Entry
		1711	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1712	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1713	tooltip => $tooltip
		1714	);
		1715
		1716	$e->grab_focus;
		1717	$e->set_text ($txt) if $txt;
		1718	$dialog->show;
		1719	}
		1720
		1721	sub open_quit_dialog {
		1722	unless ($QUIT_DIALOG) {
		1723	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1724	x => "center",
		1725	y => "center",
		1726	z => 50,
		1727	title => "Really Quit?",
		1728	on_key_down => sub {
		1729	my ($dialog, $ev) = @_;
		1730	$ev->{sym} == 27 and $dialog->hide;
		1731	}
		1732	;
		1733
		1734	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1735
		1736	$vb->add (new CFPlus::UI::Label
		1737	text => "You should find a savebed and apply it first!",
		1738	max_w => $WIDTH * 0.25,
		1739	ellipsize => 0,
		1740	);
		1741	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1742	$hb->add (new CFPlus::UI::Button
		1743	text => "Ok",
		1744	expand => 1,
		1745	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1746	);
		1747	$hb->add (new CFPlus::UI::Button
		1748	text => "Quit anyway",
		1749	expand => 1,
		1750	on_activate => sub { exit },
		1751	);
		1752	}
		1753
		1754	$QUIT_DIALOG->show;
		1755	$QUIT_DIALOG->grab_focus;
		1756	}
		1757
		1758	sub show_tip_of_the_day {
		1759	# find all tips
		1760	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
		1761
		1762	CFPlus::DB::get state => "tip_of_the_day", sub {
		1763	my ($todindex) = @_;
		1764	$todindex = 0 if $todindex >= @tod;
		1765	CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
		1766
		1767	# create dialog
		1768	my $dialog;
		1769
		1770	my $close = sub {
		1771	$dialog->destroy;
		1772	};
		1773
		1774	$dialog = new CFPlus::UI::Toplevel
		1775	x => "center",
		1776	y => "center",
		1777	z => 3,
		1778	name => 'tip_of_the_day',
		1779	force_w => int $WIDTH * 4/9,
		1780	force_h => int $WIDTH * 2/9,
		1781	title => "Tip of the day #" . (1 + $todindex),
		1782	child => my $vbox = new CFPlus::UI::VBox,
		1783	has_close_button => 1,
		1784	on_delete => $close,
		1785	;
		1786
		1787	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1788	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1789	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1790
		1791	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
		1792
		1793	$table->add_at (0, 0, new CFPlus::UI::Button
		1794	text => "Close",
		1795	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>.",
		1796	on_activate => $close,
		1797	);
		1798
		1799	$table->add_at (2, 0, new CFPlus::UI::Button
		1800	text => "Next",
		1801	tooltip => "Show the next <b>Tip of the day</b>.",
		1802	on_activate => sub {
		1803	$close->();
		1804	&show_tip_of_the_day;
		1805	},
		1806	);
		1807
		1808	$dialog->show;
		1809	};
		1810	}
		1811
1541	sub sdl_init {	1812	sub sdl_init {
1542	CFClient::SDL_Init	1813	CFPlus::SDL_Init
1543	and die "SDL::Init failed!\n";	1814	and die "SDL::Init failed!\n";
1544	}	1815	}
1545		1816
1546	sub video_init {	1817	sub video_init {
1547	sdl_init;
1548
1549	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	1818	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1550		1819
1551	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	1820	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1552		1821
1553	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1822	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1554	$FULLSCREEN = $CFG->{fullscreen};	1823	$FULLSCREEN = $CFG->{fullscreen};
1555	$FAST = $CFG->{fast};	1824	$FAST = $CFG->{fast};
1556		1825
1557	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1826	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1558	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1827	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1559		1828
1560	$SDL_ACTIVE = 1;	1829	$SDL_ACTIVE = 1;
1561	$LAST_REFRESH = time - 0.01;	1830	$LAST_REFRESH = time - 0.01;
1562		1831
1563	CFClient::OpenGL::init;	1832	CFPlus::OpenGL::init;
1564		1833
1565	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1834	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1566		1835
1567	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1836	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1568		1837
1569	#############################################################################	1838	#############################################################################
1570		1839
1571	if ($DEBUG_STATUS) {	1840	if ($DEBUG_STATUS) {
1572	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1841	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1573	} else {	1842	} else {
1574	# create the widgets	1843	# create the widgets
1575		1844
1576	$DEBUG_STATUS = new CFClient::UI::Label	1845	$DEBUG_STATUS = new CFPlus::UI::Label
1577	padding => 0,	1846	padding => 0,
1578	z => 100,	1847	z => 100,
1579	force_x => "max",	1848	force_x => "max",
1580	force_y => 0;	1849	force_y => 0;
1581	$DEBUG_STATUS->show;	1850	$DEBUG_STATUS->show;
1582		1851
1583	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1584
1585	$STATUSBOX = new CFClient::UI::Statusbox;	1852	$STATUSBOX = new CFPlus::UI::Statusbox;
1586	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1853	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1587		1854
1588	(new CFClient::UI::Frame	1855	(new CFPlus::UI::Frame
1589	bg => [0, 0, 0, 0.4],	1856	bg => [0, 0, 0, 0.4],
1590	force_x => 0,	1857	force_x => 0,
1591	force_y => "max",	1858	force_y => "max",
1592	child => $STATUSBOX,	1859	child => $STATUSBOX,
1593	)->show;	1860	)->show;
1594		1861
1595	CFClient::UI::FancyFrame->new (	1862	CFPlus::UI::Toplevel->new (
1596	title => "Map",	1863	title => "Map",
1597	name => "mapmap",	1864	name => "mapmap",
1598	x => 0,	1865	x => 0,
1599	y => $FONTSIZE + 8,	1866	y => $FONTSIZE + 8,
1600	border_bg => [1, 1, 1, 192/255],	1867	border_bg => [1, 1, 1, 192/255],
1601	bg => [1, 1, 1, 0],	1868	bg => [1, 1, 1, 0],
1602	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1869	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1603	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1870	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1604	),	1871	),
1605	)->show;	1872	)->show;
1606		1873
1607	$MAPWIDGET = new CFClient::MapWidget;	1874	$MAPWIDGET = new CFPlus::MapWidget;
1608	$MAPWIDGET->connect (activate_console => sub {	1875	$MAPWIDGET->connect (activate_console => sub {
1609	my ($mapwidget, $preset) = @_;	1876	my ($mapwidget, $preset) = @_;
1610		1877
1611	if ($CONSOLE) {	1878	$MESSAGE_WINDOW->activate_console ($preset)
1612	$CONSOLE->{input}->{auto_activated} = 1;	1879	if $MESSAGE_WINDOW;
1613	$CONSOLE->{input}->grab_focus;
1614
1615	if ($preset && $CONSOLE->{input}->get_text eq '') {
1616	$CONSOLE->{input}->set_text ($preset);
1617	}
1618	}
1619	});	1880	});
1620	$MAPWIDGET->show;	1881	$MAPWIDGET->show;
1621	$MAPWIDGET->grab_focus;	1882	$MAPWIDGET->grab_focus;
1622		1883
1623	$LOGVIEW = new CFClient::UI::TextScroller
1624	expand => 1,
1625	font => $FONT_FIXED,
1626	fontsize => $::CFG->{log_fontsize},
1627	indent => -4,
1628	can_hover => 1,
1629	can_events => 1,
1630	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1631	;
1632
1633	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1884	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1634	title => "Setup",	1885	title => "Setup",
1635	name => "setup_dialog",	1886	name => "setup_dialog",
1636	x => 'center',	1887	x => 'center',
1637	y => 'center',	1888	y => 'center',
1638	z => 2,	1889	z => 2,
…		…
1640	force_h => $::HEIGHT * 0.6,	1891	force_h => $::HEIGHT * 0.6,
1641	has_close_button => 1,	1892	has_close_button => 1,
1642	;	1893	;
1643		1894
1644	$METASERVER = metaserver_dialog;	1895	$METASERVER = metaserver_dialog;
		1896	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1645		1897
1646	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1898	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1647	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1899	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1648		1900
1649	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1901	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1650	"Configure the server to play on, your username, password and other server-related options.");	1902	"Configure the server to play on, your username, password and other server-related options.");
1651	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1903	$SETUP_NOTEBOOK->add_tab (Client => client_setup,
1652	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1904	"Configure various client-specific settings.");
1653	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1905	$SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1654	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1906	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1655	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1907	$SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1656	"Configure the use of audio, sound effects and background music.");	1908	"Configure the use of audio, sound effects and background music.");
1657	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1909	$SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1658	"Lets you define, edit and delete key bindings."	1910	"Lets you define, edit and delete key bindings."
1659	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "	1911	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1660	. "with nothing set and the recording started. After doing the actions you "	1912	. "with nothing set and the recording started. After doing the actions you "
1661	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1913	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1662	. "After pressing the combo the binding will be saved automatically and the "	1914	. "After pressing the combo the binding will be saved automatically and the "
1663	. "binding editor closes");	1915	. "binding editor closes");
1664	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1916	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1665	"Some debuggin' options. Do not ask.");	1917	"Some debuggin' options. Do not ask.");
1666		1918
1667	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1919	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1668		1920
1669	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1921	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1670	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1922	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1671		1923
1672	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1924	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1673	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1925	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1674		1926
1675	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	1927	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
1676		1928
1677	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1929	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1678	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");	1930	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1679		1931
1680	$BUTTONBAR->add (new CFClient::UI::Button	1932	$BUTTONBAR->add (new CFPlus::UI::Button
1681	text => "Save Config",	1933	text => "Save Config",
1682	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1934	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1683	on_activate => sub {	1935	on_activate => sub {
1684	$::CFG->{layout} = CFClient::UI::get_layout;	1936	$::CFG->{layout} = CFPlus::UI::get_layout;
1685	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1937	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1686	status "Configuration Saved";	1938	status "Configuration Saved";
1687	0	1939	0
1688	},	1940	},
1689	);	1941	);
1690		1942
1691	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	1943	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1692	tooltip => "View Documentation");	1944	tooltip => "View Documentation");
1693		1945
		1946
1694	$BUTTONBAR->add (new CFClient::UI::Button	1947	$BUTTONBAR->add (new CFPlus::UI::Button
1695	text => "Quit",	1948	text => "Quit",
1696	tooltip => "Terminates the program",	1949	tooltip => "Terminates the program",
1697	on_activate => sub {	1950	on_activate => sub {
1698	if ($CONN) {	1951	if ($CONN) {
1699	open_quit_dialog;	1952	open_quit_dialog;
…		…
1710		1963
1711	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1964	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1712	}	1965	}
1713		1966
1714	sub video_shutdown {	1967	sub video_shutdown {
1715	CFClient::OpenGL::shutdown;	1968	CFPlus::OpenGL::shutdown;
1716		1969
1717	undef $SDL_ACTIVE;	1970	undef $SDL_ACTIVE;
1718	}	1971	}
1719		1972
1720	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1721	my $bgmusic;#TODO#hack#d#
1722
1723	sub audio_channel_finished {
1724	my ($channel) = @_;
1725
1726	#warn "channel $channel finished\n";#d#
1727	}
1728
1729	sub audio_music_finished {
1730	return unless $CFG->{bgm_enable};
1731
1732	# TODO: hack, do play loop and mood music
1733	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1734	$bgmusic->play (0);
1735
1736	push @bgmusic, shift @bgmusic;
1737	}
1738
1739	sub audio_init {	1973	sub audio_init {
1740	if ($CFG->{audio_enable}) {	1974	if ($CFG->{audio_enable}) {
1741	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	1975	$ENV{MIX_EFFECTSMAXSPEED} = 1;
1742	$SDL_MIXER = !CFClient::Mix_OpenAudio;	1976	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1743		1977
1744	unless ($SDL_MIXER) {	1978	unless ($SDL_MIXER) {
1745	status "Unable to open sound device: there will be no sound";	1979	status "Unable to open sound device: there will be no sound";
1746	return;	1980	return;
1747	}
1748
1749	CFClient::Mix_AllocateChannels 8;
1750	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
1751
1752	audio_music_finished;
1753
1754	while (<$fh>) {
1755	next if /^\s*#/;
1756	next if /^\s*$/;
1757
1758	my ($file, $volume, $event) = split /\s+/, $_, 3;
1759
1760	push @SOUNDS, "$volume,$file";
1761
1762	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1763	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
1764	$chunk->volume ($volume * 128 / 100);
1765	$chunk
1766	};
1767	}
1768	} else {
1769	status "unable to open sound config: $!";
1770	}	1981	}
		1982
		1983	CFPlus::Mix_AllocateChannels 16;
		1984
		1985	audio_music_finished;
		1986	} else {
		1987	undef $SDL_MIXER;
1771	}	1988	}
1772	}	1989	}
1773		1990
1774	sub audio_shutdown {	1991	sub audio_shutdown {
1775	CFClient::Mix_CloseAudio if $SDL_MIXER;	1992	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1776	undef $SDL_MIXER;	1993	undef $SDL_MIXER;
1777	@SOUNDS = ();	1994	@SOUNDS = ();
1778	%AUDIO_CHUNKS = ();	1995	%AUDIO_CHUNK = ();
1779	}	1996	}
1780		1997
1781	my %animate_object;	1998	my %animate_object;
1782	my $animate_timer;	1999	my $animate_timer;
1783		2000
1784	my $fps = 9;	2001	my $fps = 9;
1785
1786	my %demo;#d#
1787		2002
1788	sub force_refresh {	2003	sub force_refresh {
1789	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2004	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1790	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2005	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1791		2006
1792	$CFClient::UI::ROOT->draw;	2007	$CFPlus::UI::ROOT->draw;
1793		2008
1794	$WANT_REFRESH = 0;	2009	$WANT_REFRESH = 0;
1795	$CAN_REFRESH = 0;	2010	$CAN_REFRESH = 0;
1796	$LAST_REFRESH = $NOW;	2011	$LAST_REFRESH = $NOW;
1797		2012
1798	CFClient::SDL_GL_SwapBuffers;	2013	CFPlus::SDL_GL_SwapBuffers;
1799	}	2014	}
1800		2015
1801	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2016	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1802	$NOW = time;	2017	$NOW = time;
1803		2018
1804	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2019	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1805	for CFClient::SDL_PollEvent;	2020	for CFPlus::poll_events;
1806		2021
1807	if (%animate_object) {	2022	if (%animate_object) {
1808	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2023	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1809	$WANT_REFRESH++;	2024	++$WANT_REFRESH;
1810	}	2025	}
1811		2026
1812	if ($WANT_REFRESH) {	2027	if ($WANT_REFRESH) {
1813	force_refresh;	2028	force_refresh;
1814	} else {	2029	} else {
…		…
1824	sub animation_stop {	2039	sub animation_stop {
1825	my ($widget) = @_;	2040	my ($widget) = @_;
1826	delete $animate_object{$widget};	2041	delete $animate_object{$widget};
1827	}	2042	}
1828		2043
1829	# check once/second for faces that need to be prefetched
1830	# this should, of course, only run on demand, but
1831	# SDL forces worse things on us....
1832
1833	Event->timer (after => 1, interval => 0.25, cb => sub {
1834	$CONN->face_prefetch
1835	if $CONN;
1836	});
1837
1838	%SDL_CB = (	2044	%SDL_CB = (
1839	CFClient::SDL_QUIT => sub {	2045	CFPlus::SDL_QUIT => sub {
1840	Event::unloop -1;	2046	exit;
1841	},	2047	},
1842	CFClient::SDL_VIDEORESIZE => sub {	2048	CFPlus::SDL_VIDEORESIZE => sub {
1843	},	2049	},
1844	CFClient::SDL_VIDEOEXPOSE => sub {	2050	CFPlus::SDL_VIDEOEXPOSE => sub {
1845	CFClient::UI::full_refresh;	2051	CFPlus::UI::full_refresh;
1846	},	2052	},
1847	CFClient::SDL_ACTIVEEVENT => sub {	2053	CFPlus::SDL_ACTIVEEVENT => sub {
1848	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2054	# not useful, as APPACTIVE include sonly iconified state, not unmapped
		2055	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
		2056	# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
		2057	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
		2058	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
		2059	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1849	},	2060	},
1850	CFClient::SDL_KEYDOWN => sub {	2061	CFPlus::SDL_KEYDOWN => sub {
1851	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2062	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1852	# alt-enter	2063	# alt-enter
1853	$FULLSCREEN_ENABLE->toggle;	2064	$FULLSCREEN_ENABLE->toggle;
1854	video_shutdown;	2065	video_shutdown;
1855	video_init;	2066	video_init;
1856	} else {	2067	} else {
1857	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2068	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1858	}	2069	}
1859	},	2070	},
1860	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2071	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1861	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2072	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1862	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2073	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1863	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2074	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1864	CFClient::SDL_USEREVENT => sub {	2075	CFPlus::SDL_USEREVENT => sub {
1865	if ($_[0]{code} == 1) {	2076	if ($_[0]{code} == 1) {
1866	audio_channel_finished $_[0]{data1};	2077	audio_channel_finished $_[0]{data1};
1867	} elsif ($_[0]{code} == 0) {	2078	} elsif ($_[0]{code} == 0) {
1868	audio_music_finished;	2079	audio_music_finished;
1869	}	2080	}
…		…
1873	#############################################################################	2084	#############################################################################
1874		2085
1875	$SIG{INT} = $SIG{TERM} = sub { exit };	2086	$SIG{INT} = $SIG{TERM} = sub { exit };
1876		2087
1877	{	2088	{
1878	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	2089	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
		2090	CFPlus::DB::Server::run;
		2091
1879	CFClient::UI::set_layout ($::CFG->{layout});	2092	CFPlus::UI::set_layout ($::CFG->{layout});
1880		2093
1881	my %DEF_CFG = (	2094	my %DEF_CFG = (
1882	sdl_mode => 0,	2095	sdl_mode => 0,
1883	width => 640,
1884	height => 480,
1885	fullscreen => 0,	2096	fullscreen => 0,
1886	fast => 0,	2097	fast => 0,
1887	map_scale => 1,	2098	map_scale => 1,
1888	fow_enable => 1,	2099	fow_enable => 1,
1889	fow_intensity => 0.45,	2100	fow_intensity => 0,
1890	fow_smooth => 0,	2101	map_smoothing => 1,
1891	gui_fontsize => 1,	2102	gui_fontsize => 1,
1892	log_fontsize => 0.7,	2103	log_fontsize => 0.7,
1893	gauge_fontsize => 1,	2104	gauge_fontsize => 1,
1894	gauge_size => 0.35,	2105	gauge_size => 0.35,
1895	stat_fontsize => 0.7,	2106	stat_fontsize => 0.7,
1896	mapsize => 100,	2107	mapsize => 100,
1897	say_command => 'say',
1898	audio_enable => 1,	2108	audio_enable => 1,
1899	bgm_enable => 1,	2109	bgm_enable => 1,
1900	bgm_volume => 0.25,	2110	bgm_volume => 0.25,
1901	face_prefetch => 0,
1902	output_sync => 1,	2111	output_sync => 1,
1903	output_count => 1,	2112	output_count => 1,
		2113	output_rate => "",
1904	pickup => 0,	2114	pickup => 0,
1905	inv_sort => "mtime",	2115	inv_sort => "mtime",
1906	default => "profile", # default profile	2116	default => "profile", # default profile
		2117	show_tips => 1,
		2118	logview_max_par => 1000,
1907	);	2119	);
1908		2120
1909	while (my ($k, $v) = each %DEF_CFG) {	2121	while (my ($k, $v) = each %DEF_CFG) {
1910	$CFG->{$k} = $v unless exists $CFG->{$k};	2122	$CFG->{$k} = $v unless exists $CFG->{$k};
1911	}	2123	}
1912		2124
1913	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";	2125	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		2126	$PROFILE = $CFG->{profile}{default};
		2127
		2128	# convert old bindings (only default profile matters)
		2129	if (my $bindings = delete $PROFILE->{bindings}) {
		2130	while (my ($mod, $syms) = each %$bindings) {
		2131	while (my ($sym, $cmds) = each %$syms) {
		2132	push @{ $PROFILE->{macro} }, {
		2133	accelkey => [$mod*1, $sym*1],
		2134	action => $cmds,
		2135	};
		2136	}
		2137	}
		2138	}
1914		2139
1915	sdl_init;	2140	sdl_init;
1916		2141
1917	@SDL_MODES = reverse	2142	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1918	grep $_->[0] >= 640 && $_->[1] >= 480,	2143	@SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1919	CFClient::SDL_ListModes;
1920
1921	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2144	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2145
		2146	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1922		2147
1923	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2148	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1924		2149
1925	{	2150	{
1926	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2151	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1927	DejaVuSans.ttf	2152	DejaVuSans.ttf
1928	DejaVuSansMono.ttf	2153	DejaVuSansMono.ttf
1929	DejaVuSans-Bold.ttf	2154	DejaVuSans-Bold.ttf
1930	DejaVuSansMono-Bold.ttf	2155	DejaVuSansMono-Bold.ttf
1931	DejaVuSans-Oblique.ttf	2156	DejaVuSans-Oblique.ttf
1932	DejaVuSansMono-Oblique.ttf	2157	DejaVuSansMono-Oblique.ttf
1933	DejaVuSans-BoldOblique.ttf	2158	DejaVuSans-BoldOblique.ttf
1934	DejaVuSansMono-BoldOblique.ttf	2159	DejaVuSansMono-BoldOblique.ttf
1935	);	2160	);
1936		2161
1937	CFClient::add_font $_ for @fonts;	2162	CFPlus::add_font $_ for @fonts;
1938		2163
1939	CFClient::pango_init;	2164	CFPlus::pango_init;
1940		2165
1941	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2166	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1942	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2167	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1943		2168
1944	$FONT_PROP->make_default;	2169	$FONT_PROP->make_default;
1945	}	2170	}
1946		2171
1947	# compare mono (ft) vs. rgba (cairo)	2172	# compare mono (ft) vs. rgba (cairo)
1948	# ft - 1.8s, cairo 3s, even in alpha-only mode	2173	# ft - 1.8s, cairo 3s, even in alpha-only mode
1949	# for my $rgba (0..1) {	2174	# for my $rgba (0..1) {
1950	# my $t1 = Time::HiRes::time;	2175	# my $t1 = Time::HiRes::time;
1951	# for (1..1000) {	2176	# for (1..1000) {
1952	# my $layout = CFClient::Layout->new ($rgba);	2177	# my $layout = CFPlus::Layout->new ($rgba);
1953	# $layout->set_text ("hallo" x 100);	2178	# $layout->set_text ("hallo" x 100);
1954	# $layout->render;	2179	# $layout->render;
1955	# }	2180	# }
1956	# my $t2 = Time::HiRes::time;	2181	# my $t2 = Time::HiRes::time;
1957	# warn $t2-$t1;	2182	# warn $t2-$t1;
1958	# }	2183	# }
1959		2184
		2185	$startup_done->();
		2186
1960	video_init;	2187	video_init;
1961	audio_init;	2188	audio_init;
1962	}	2189	}
1963		2190
		2191	show_tip_of_the_day if $CFG->{show_tips};
		2192
1964	Event::loop;	2193	Event::loop;
1965	#CFClient::SDL_Quit;	2194	#CFPlus::SDL_Quit;
1966	#CFClient::_exit 0;	2195	#CFPlus::_exit 0;
1967		2196
1968	END { CFClient::SDL_Quit }	2197	END {
		2198	CFPlus::SDL_Quit;
		2199	CFPlus::DB::Server::stop;
		2200	}
1969		2201
1970	=head1 NAME	2202	=head1 NAME
1971		2203
1972	cfplus - A Crossfire+ and Crossfire game client	2204	cfplus - A Crossfire+ and Crossfire game client
1973		2205

Diff Legend

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