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

Diff Legend

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