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.158 by root, Sun Jul 1 03:12:35 2007 UTC

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

Diff Legend

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