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

Diff Legend

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