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

Diff Legend

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