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.95 by root, Sun Jul 16 23:30:08 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;
41	use CFClient::BindingEditor;	86	use CFPlus::UI::Inventory;
		87	use CFPlus::UI::SpellList;
		88	use CFPlus::Pod;
42	use CFClient::MapWidget;	89	use CFPlus::MapWidget;
		90	use CFPlus::Macro;
43		91
44	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	92	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45	$SIG{PIPE} = 'IGNORE';	93	$SIG{PIPE} = 'IGNORE';
46		94
		95	$Event::Eval = 1;
47	$Event::DIED = sub {	96	$Event::DIED = sub {
48	# TODO: display dialog box or so	97	CFPlus::fatal Carp::longmess $_[1]
49	Carp::confess $_[1];#d#TODO: remove when stable
50	CFClient::error $_[1];
51	};	98	};
52
53	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
54
55	our $VERSION = '0.1';
56		99
57	my $MAX_FPS = 60;	100	my $MAX_FPS = 60;
58	my $MIN_FPS = 5; # unused as of yet	101	my $MIN_FPS = 5; # unused as of yet
59		102
60	our $META_SERVER = "crossfire.real-time.com:13326";	103	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
61		104
62	our $LAST_REFRESH;	105	our $LAST_REFRESH;
63	our $NOW;	106	our $NOW;
64		107
65	our $CFG;	108	our $CFG;
66	our $CONN;	109	our $CONN;
		110	our $PROFILE; # current profile
67	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	111	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
68		112
69	our $WANT_REFRESH;	113	our $WANT_REFRESH;
70	our $CAN_REFRESH;	114	our $CAN_REFRESH;
71		115
…		…
102		146
103	our $INVENTORY_PAGE;	147	our $INVENTORY_PAGE;
104	our $STATS_PAGE;	148	our $STATS_PAGE;
105	our $SKILL_PAGE;	149	our $SKILL_PAGE;
106	our $SPELL_PAGE;	150	our $SPELL_PAGE;
		151	our $SPELL_LIST;
107		152
108	our $HELP_WINDOW;	153	our $HELP_WINDOW;
109	our $MESSAGE_WINDOW;	154	our $MESSAGE_WINDOW;
110	our $FLOORBOX;	155	our $FLOORBOX;
111	our $GAUGES;	156	our $GAUGES;
…		…
124		169
125	our $INV;	170	our $INV;
126	our $INVR;	171	our $INVR;
127	our $INV_RIGHT_HB;	172	our $INV_RIGHT_HB;
128		173
129	our $BIND_EDITOR;
130	our $BIND_UPD_CB;
131
132	our $PICKUP_CFG;	174	our $PICKUP_CFG;
133		175
		176	our $IN_BUILD_MODE;
		177	our $BUILD_BUTTON;
		178
134	sub status {	179	sub status {
135	$STATUSBOX->add (CFClient::UI::Label::escape $_[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]);
136	}	181	}
137		182
138	sub debug {	183	sub debug {
139	$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;
140	}	196	}
141		197
142	sub destroy_query_dialog {	198	sub destroy_query_dialog {
143	(delete $_[0]{query_dialog})->destroy	199	(delete $_[0]{query_dialog})->destroy
144	if $_[0]{query_dialog};	200	if $_[0]{query_dialog};
145	}	201	}
146		202
		203	# FIXME: a very ugly hack to wait for stat update look below! #d#
		204	our $QUERY_TIMER; #d#
		205
147	# server query dialog	206	# server query dialog
148	sub server_query {	207	sub server_query {
149	my ($conn, $flags, $prompt) = @_;	208	my ($conn, $flags, $prompt) = @_;
150		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
151	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame	225	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
152	x => "center",	226	x => "center",
153	y => "center",	227	y => "center",
154	title => "Server Query",	228	title => "Server Query",
155	child => my $vbox = new CFClient::UI::VBox,	229	child => my $vbox = new CFPlus::UI::VBox,
156	;	230	;
157		231
158	my @dialog = my $label = new CFClient::UI::Label	232	my @dialog = my $label = new CFPlus::UI::Label
159	max_w => $::WIDTH * 0.4,	233	max_w => $::WIDTH * 0.8,
160	ellipsise => 0,	234	ellipsise => 0,
161	text => $prompt;	235	text => $prompt;
162		236
163	if ($flags & CS_QUERY_YESNO) {	237	if ($flags & CS_QUERY_YESNO) {
164	push @dialog, my $hbox = new CFClient::UI::HBox;	238	push @dialog, my $hbox = new CFPlus::UI::HBox;
165		239
166	$hbox->add (new CFClient::UI::Button	240	$hbox->add (new CFPlus::UI::Button
167	text => "No",	241	text => "No",
168	on_activate => sub {	242	on_activate => sub {
169	$conn->send ("reply n");	243	$conn->send ("reply n");
170	$dialog->destroy;	244	$dialog->destroy;
171	0	245	0
172	}	246	}
173	);	247	);
174	$hbox->add (new CFClient::UI::Button	248	$hbox->add (new CFPlus::UI::Button
175	text => "Yes",	249	text => "Yes",
176	on_activate => sub {	250	on_activate => sub {
177	$conn->send ("reply y");	251	$conn->send ("reply y");
178	destroy_query_dialog $conn;	252	destroy_query_dialog $conn;
179	0	253	0
…		…
181	);	255	);
182		256
183	$dialog->grab_focus;	257	$dialog->grab_focus;
184		258
185	} elsif ($flags & CS_QUERY_SINGLECHAR) {	259	} elsif ($flags & CS_QUERY_SINGLECHAR) {
186	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
187
188	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) {
189	$MESSAGE_WINDOW->show;	261	$dialog->{tooltip} = "#charcreation_focus";
190		262
191	unshift @dialog, new CFClient::UI::Label	263	unshift @dialog, new CFPlus::UI::Label
192	max_w => $::WIDTH * 0.4,	264	max_w => $::WIDTH * 0.8,
193	ellipsise => 0,	265	ellipsise => 0,
194	markup => "\nOr use your keyboard:\n";	266	markup => "\nOr use your keyboard and the text entry below:\n";
195		267
196	unshift @dialog, my $table = new CFClient::UI::Table;	268	unshift @dialog, my $table = new CFPlus::UI::Table;
197		269
198	$table->add (0, 0, new CFClient::UI::Button	270	$table->add (0, 0, new CFPlus::UI::Button
199	text => "Next Race",	271	text => "Next Race",
200	on_activate => sub {	272	on_activate => sub {
201	$conn->send ("reply n");	273	$conn->send ("reply n");
202	destroy_query_dialog $conn;	274	destroy_query_dialog $conn;
203	0	275	0
204	},	276	},
205	);	277	);
206	$table->add (2, 0, new CFClient::UI::Button	278	$table->add (2, 0, new CFPlus::UI::Button
207	text => "Accept",	279	text => "Accept",
208	on_activate => sub {	280	on_activate => sub {
209	$conn->send ("reply d");	281	$conn->send ("reply d");
210	destroy_query_dialog $conn;	282	destroy_query_dialog $conn;
211	0	283	0
212	},	284	},
213	);	285	);
214		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
215	unshift @dialog, new CFClient::UI::Label	310	unshift @dialog, new CFPlus::UI::Label
216	max_w => $::WIDTH * 0.4,	311	max_w => $::WIDTH * 0.4,
217	ellipsise => 0,	312	ellipsise => 0,
218	markup =>	313	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
219	"<big><b>Character Creation: Race</b></big>\n\n"
220	. "Look at the <b>Messages</b> window to see a description of this race "
221	. "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
222	. "and the center of the screen to see how this race looks like "
223	. "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
224	. "You can look at another race, or accept this race (you will come back to this race eventually, "
225	. "so you can take your time making this important choice."
226	;	314	;
227		315
228	} elsif ($prompt =~ /roll new stats/) {	316	} elsif ($prompt =~ /roll new stats/) {
229	if (my $stat = delete $conn->{stat_change_with}) {	317	if (my $stat = delete $conn->{stat_change_with}) {
230	$conn->send ("reply $stat");	318	$conn->send ("reply $stat");
…		…
233	}	321	}
234		322
235	$STATS_PAGE->show;	323	$STATS_PAGE->show;
236	$MESSAGE_WINDOW->hide;	324	$MESSAGE_WINDOW->hide;
237		325
238	unshift @dialog, new CFClient::UI::Label	326	unshift @dialog, new CFPlus::UI::Label
239	max_w => $::WIDTH * 0.4,	327	max_w => $::WIDTH * 0.4,
240	ellipsise => 0,	328	ellipsise => 0,
241	markup => "\nOr use your keyboard:\n";	329	markup => "\nOr use your keyboard and the text entry below:\n";
242		330
243	unshift @dialog, my $table = new CFClient::UI::Table;	331	unshift @dialog, my $table = new CFPlus::UI::Table;
244		332
245	# left: re-roll	333	# left: re-roll
246	$table->add (0, 0, new CFClient::UI::Button	334	$table->add (0, 0, new CFPlus::UI::Button
247	text => "Roll Again",	335	text => "Roll Again",
248	on_activate => sub {	336	on_activate => sub {
249	$conn->send ("reply y");	337	$conn->send ("reply y");
250	destroy_query_dialog $conn;	338	destroy_query_dialog $conn;
251	0	339	0
252	},	340	},
253	);	341	);
254		342
255	# center: swap stats	343	# center: swap stats
256	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox	344	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
		345	expand => 1,
257	value => $_,	346	value => $_,
258	options => [	347	options => [
259	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	348	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
260	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	349	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
261	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],	350	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
…		…
264	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	353	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
265	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	354	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
266	],	355	],
267	), 1 .. 2;	356	), 1 .. 2;
268		357
269	$table->add (2, 0, new CFClient::UI::Button	358	$table->add (2, 0, new CFPlus::UI::Button
270	text => "Swap Stats",	359	text => "Swap Stats",
271	on_activate => sub {	360	on_activate => sub {
272	$conn->{stat_change_with} = $sw2->{value};	361	$conn->{stat_change_with} = $sw2->{value};
273	$conn->send ("reply $sw1->{value}");	362	$conn->send ("reply $sw1->{value}");
274	destroy_query_dialog $conn;	363	destroy_query_dialog $conn;
275	0	364	0
276	},	365	},
277	);	366	);
278	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	367	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
279		368
280	# right: accept	369	# right: accept
281	$table->add (4, 0, new CFClient::UI::Button	370	$table->add (4, 0, new CFPlus::UI::Button
282	text => "Accept",	371	text => "Accept",
283	on_activate => sub {	372	on_activate => sub {
284	$conn->send ("reply n");	373	$conn->send ("reply n");
285	$STATS_PAGE->hide;	374	$STATS_PAGE->hide;
286	destroy_query_dialog $conn;	375	destroy_query_dialog $conn;
287	0	376	0
288	},	377	},
289	);	378	);
290		379
		380	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
		381	for (
		382	[Str => CS_STAT_STR],
		383	[Dex => CS_STAT_DEX],
		384	[Con => CS_STAT_CON],
		385	[Int => CS_STAT_INT],
		386	[Wis => CS_STAT_WIS],
		387	[Pow => CS_STAT_POW],
		388	[Cha => CS_STAT_CHA],
		389	) {
		390	my ($name, $id) = @$_;
		391	$hbox->add (new CFPlus::UI::Label
		392	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
		393	align => 0,
		394	expand => 1,
		395	can_events => 1,
		396	can_hover => 1,
		397	tooltip => "#stat_$name",
		398	);
		399	}
		400
291	unshift @dialog, new CFClient::UI::Label	401	unshift @dialog, new CFPlus::UI::Label
292	max_w => $::WIDTH * 0.4,	402	max_w => $::WIDTH * 0.4,
293	ellipsise => 0,	403	ellipsise => 0,
294	markup =>	404	markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
295	"<big><b>Character Creation: Stats</b></big>\n\n"
296	. "Look at the <b>Stats</b> window to see your basic stats "
297	. "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
298	. "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
299	. "Race selection will influence those values later on."
300	;	405	;
301	}	406	}
302		407
303	push @dialog, my $entry = new CFClient::UI::Entry	408	push @dialog, my $entry = new CFPlus::UI::Entry
304	on_changed => sub {	409	on_changed => sub {
305	$conn->send ("reply $_[1]");	410	$conn->send ("reply $_[1]");
306	destroy_query_dialog $conn;	411	destroy_query_dialog $conn;
307	0	412	0
308	},	413	},
…		…
311	$entry->grab_focus;	416	$entry->grab_focus;
312		417
313	} else {	418	} else {
314	$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)";
315		420
316	push @dialog, my $entry = new CFClient::UI::Entry	421	push @dialog, my $entry = new CFPlus::UI::Entry
317	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	422	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
318	on_activate => sub {	423	on_activate => sub {
319	$conn->send ("reply $_[1]");	424	$conn->send ("reply $_[1]");
320	destroy_query_dialog $conn;	425	destroy_query_dialog $conn;
321	0	426	0
…		…
335	$LOGIN_BUTTON->set_text ("Logout");	440	$LOGIN_BUTTON->set_text ("Logout");
336	$SETUP_DIALOG->hide;	441	$SETUP_DIALOG->hide;
337		442
338	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;
339		444
340	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};	445	my ($host, $port) = split /:/, $PROFILE->{host};
341		446
342	$MAP = new CFClient::Map $mapsize, $mapsize;	447	$MAP = new CFPlus::Map;
343		448
344	$CONN = eval {	449	$CONN = eval {
345	new CFClient::Protocol	450	new CFPlus::Protocol
346	host => $host,	451	host => $host,
347	port => $port || 13327,	452	port => $port || 13327,
348	user => $CFG->{profile}{default}{user},	453	user => $PROFILE->{user},
349	pass => $CFG->{profile}{default}{password},	454	pass => $PROFILE->{password},
350	mapw => $mapsize,	455	mapw => $mapsize,
351	maph => $mapsize,	456	maph => $mapsize,
		457
		458	client => "cfplus $CFPlus::VERSION $] $^O",
352		459
353	map_widget => $MAPWIDGET,	460	map_widget => $MAPWIDGET,
354	logview => $LOGVIEW,	461	logview => $LOGVIEW,
355	statusbox => $STATUSBOX,	462	statusbox => $STATUSBOX,
356	map => $MAP,	463	map => $MAP,
357	mapmap => $MAPMAP,	464	mapmap => $MAPMAP,
358	query => \&server_query,	465	query => \&server_query,
359		466
		467	setup_req => {
		468	smoothing => $CFG->{map_smoothing}*1,
		469	},
		470
360	sound_play => sub {	471	sound_play => sub {
361	my ($x, $y, $soundnum, $type) = @_;	472	my ($x, $y, $soundnum, $type) = @_;
362		473
363	$SDL_MIXER	474	$SDL_MIXER
364	or return;	475	or return;
…		…
369	$chunk->play;	480	$chunk->play;
370	},	481	},
371	};	482	};
372		483
373	if ($CONN) {	484	if ($CONN) {
374	CFClient::lowdelay fileno $CONN->{fh};	485	CFPlus::lowdelay fileno $CONN->{fh};
375		486
376	status "login successful";	487	status "login successful";
377	} else {	488	} else {
378	status "unable to connect";	489	status "unable to connect";
379	stop_game();	490	stop_game();
…		…
383	sub stop_game {	494	sub stop_game {
384	$LOGIN_BUTTON->set_text ("Login");	495	$LOGIN_BUTTON->set_text ("Login");
385	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	496	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
386	$SETUP_DIALOG->show;	497	$SETUP_DIALOG->show;
387	$PL_WINDOW->hide;	498	$PL_WINDOW->hide;
388	$SPELL_PAGE->clear_spells;	499	$SPELL_LIST->clear_spells;
		500	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
389		501
390	return unless $CONN;	502	return unless $CONN;
391		503
392	status "connection closed";	504	status "connection closed";
393		505
…		…
397		509
398	undef $MAP;	510	undef $MAP;
399	}	511	}
400		512
401	sub graphics_setup {	513	sub graphics_setup {
402	my $vbox = new CFClient::UI::VBox;	514	my $vbox = new CFPlus::UI::VBox;
403		515
404	$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]);
405		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
406	$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");
407	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	526	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
408		527
409	$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]);
410	$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");
411		530
412	$mode_slider->connect (changed => sub {	531	$mode_slider->connect (changed => sub {
413	my ($self, $value) = @_;	532	my ($self, $value) = @_;
414		533
415	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	534	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
416	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	535	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
417	});	536	});
418	$mode_slider->emit (changed => $mode_slider->{range}[0]);	537	$mode_slider->emit (changed => $mode_slider->{range}[0]);
419		538
420	my $row = 1;
421
422	$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");
423	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox	540	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
424	state => $CFG->{fullscreen},	541	state => $CFG->{fullscreen},
425	tooltip => "Bring the client into fullscreen mode.",	542	tooltip => "Bring the client into fullscreen mode.",
426	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	543	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
427	);	544	);
428		545
429	$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");
430	$table->add (1, $row++, new CFClient::UI::CheckBox	547	$table->add (1, $row++, new CFPlus::UI::CheckBox
431	state => $CFG->{fast},	548	state => $CFG->{fast},
432	tooltip => "Lower the visual quality considerably to speed up rendering.",	549	tooltip => "Lower the visual quality considerably to speed up rendering.",
433	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	550	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
434	);	551	);
435		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
436	$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");
437	$table->add (1, $row++, new CFClient::UI::Slider	571	$table->add (1, $row++, new CFPlus::UI::Slider
438	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	572	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
439	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	573	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
440	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 }
441	);	575	);
442		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
443	$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");
444	$table->add (1, $row++, new CFClient::UI::CheckBox	587	$table->add (1, $row++, new CFPlus::UI::CheckBox
445	state => $CFG->{fow_enable},	588	state => $CFG->{fow_enable},
446	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.",
447	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	590	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
448	);	591	);
449		592
450	$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");
451	$table->add (1, $row++, new CFClient::UI::Slider	594	$table->add (1, $row++, new CFPlus::UI::Slider
452	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	595	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
453	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.",
454	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	597	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
455	);	598	);
456		599
457	$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");
458	$table->add (1, $row++, new CFClient::UI::CheckBox	601	$table->add (1, $row++, new CFPlus::UI::CheckBox
459	state => $CFG->{fow_smooth},	602	state => $CFG->{fow_smooth},
460	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.",
461	on_changed => sub {	604	on_changed => sub {
462	my ($self, $value) = @_;	605	my ($self, $value) = @_;
463	$CFG->{fow_smooth} = $value;	606	$CFG->{fow_smooth} = $value;
464	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;
465	0	608	0
466	}	609	}
467	);	610	);
468		611
469	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
470	$table->add (1, $row++, new CFClient::UI::Slider
471	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
472	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
473	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
474	);
475
476	$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");
477	$table->add (1, $row++, new CFClient::UI::Slider	613	$table->add (1, $row++, new CFPlus::UI::Slider
478	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	614	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
479	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.",
480	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	616	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
481	);	617	);
482		618
483	$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");
484	$table->add (1, $row++, new CFClient::UI::Slider	620	$table->add (1, $row++, new CFPlus::UI::Slider
485	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	621	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
486	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.",
487	on_changed => sub {	623	on_changed => sub {
488	$CFG->{gauge_fontsize} = $_[1];	624	$CFG->{gauge_fontsize} = $_[1];
489	&set_gauge_window_fontsize;	625	&set_gauge_window_fontsize;
490	0	626	0
491	}	627	}
492	);	628	);
493		629
494	$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");
495	$table->add (1, $row++, new CFClient::UI::Slider	631	$table->add (1, $row++, new CFPlus::UI::Slider
496	range => [$CFG->{gauge_size}, 0.2, 0.8],	632	range => [$CFG->{gauge_size}, 0.2, 0.8],
497	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.",
498	on_changed => sub {	634	on_changed => sub {
499	$CFG->{gauge_size} = $_[1];	635	$CFG->{gauge_size} = $_[1];
500	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	636	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
501	0	637	0
502	}	638	}
503	);	639	);
504		640
505	$table->add (1, $row++, new CFClient::UI::Button
506	expand => 1, align => 0, text => "Apply",
507	tooltip => "Apply the video settings",
508	on_activate => sub {
509	video_shutdown ();
510	video_init ();
511	0
512	}
513	);
514
515	$vbox	641	$vbox
516	}	642	}
517		643
518	sub audio_setup {	644	sub audio_setup {
519	my $vbox = new CFClient::UI::VBox;	645	my $vbox = new CFPlus::UI::VBox;
520		646
521	$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]);
522		648
523	my $row = 0;	649	my $row = 0;
524		650
525	$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");
526	$table->add (1, $row++, new CFClient::UI::CheckBox	652	$table->add (1, $row++, new CFPlus::UI::CheckBox
527	state => $CFG->{audio_enable},	653	state => $CFG->{audio_enable},
528	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.",
529	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	655	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
530	);	656	);
531	# $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");
532	# $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 {
533	# $CFG->{effects_volume} = $_[1];	659	# $CFG->{effects_volume} = $_[1];
534	# });	660	# });
535	$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");
536	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	662	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
537	$hbox->add (new CFClient::UI::CheckBox	663	$hbox->add (new CFPlus::UI::CheckBox
538	expand => 1, state => $CFG->{bgm_enable},	664	expand => 1, state => $CFG->{bgm_enable},
539	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.",
540	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	666	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541	);	667	);
542	$hbox->add (new CFClient::UI::Slider	668	$hbox->add (new CFPlus::UI::Slider
543	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	669	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
544	tooltip => "The volume of the background music. Changes are instant.",	670	tooltip => "The volume of the background music. Changes are instant.",
545	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 }
546	);	672	);
547		673
548	$table->add (1, $row++, new CFClient::UI::Button	674	$table->add (1, $row++, new CFPlus::UI::Button
549	expand => 1, align => 0, text => "Apply",	675	expand => 1, align => 0, text => "Apply",
550	tooltip => "Apply the audio settings",	676	tooltip => "Apply the audio settings",
551	on_activate => sub {	677	on_activate => sub {
552	audio_shutdown ();	678	audio_shutdown ();
553	audio_init ();	679	audio_init ();
…		…
565	}	691	}
566		692
567	sub make_gauge_window {	693	sub make_gauge_window {
568	my $gh = int $HEIGHT * $CFG->{gauge_size};	694	my $gh = int $HEIGHT * $CFG->{gauge_size};
569		695
570	my $win = new CFClient::UI::Frame (	696	my $win = new CFPlus::UI::Frame (
571	force_x => 0,	697	force_x => 0,
572	force_y => "max",	698	force_y => "max",
573	force_w => $WIDTH,	699	force_w => $WIDTH,
574	force_h => $gh,	700	force_h => $gh,
575	);	701	);
576		702
577	$win->add (my $hbox = new CFClient::UI::HBox	703	$win->add (my $hbox = new CFPlus::UI::HBox
578	children => [	704	children => [
579	(new CFClient::UI::HBox expand => 1),	705	(new CFPlus::UI::HBox expand => 1),
580	(new CFClient::UI::VBox children => [	706	(new CFPlus::UI::VBox children => [
581	(new CFClient::UI::Empty expand => 1),	707	(new CFPlus::UI::Empty expand => 1),
582	(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)),
583	]),	709	]),
584	(my $vbox = new CFClient::UI::VBox),	710	(my $vbox = new CFPlus::UI::VBox),
585	],	711	],
586	);	712	);
587		713
588	$vbox->add (new CFClient::UI::HBox	714	$vbox->add (new CFPlus::UI::HBox
589	expand => 1,	715	expand => 1,
590	children => [	716	children => [
591	(new CFClient::UI::Empty expand => 1),	717	(new CFPlus::UI::Empty expand => 1),
592	(my $hb = new CFClient::UI::HBox),	718	(my $hb = new CFPlus::UI::HBox),
593	],	719	],
594	);	720	);
595		721
596	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	722	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
597	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.");
598	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	723	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
599	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.");
600	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	724	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
601	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.");
602	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	725	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
603	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.");
604		726
605	$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");
606	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.");
607	$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");
608	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
609		729
610	$GAUGES = {	730	$GAUGES = {
611	exp => $exp, win => $win, range => $rng,	731	exp => $exp, win => $win, range => $rng,
612	food => $fg, mana => $mg, hp => $hg, grace => $gg	732	food => $fg, mana => $mg, hp => $hg, grace => $gg
613	};	733	};
…		…
616		736
617	$win	737	$win
618	}	738	}
619		739
620	sub debug_setup {	740	sub debug_setup {
621	my $table = new CFClient::UI::Table;	741	my $table = new CFPlus::UI::Table;
622		742
623	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	743	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
624	$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 });
625	$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");
626	$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 });
627	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");	747	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
628	$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 });
629	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");	749	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
630	$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() } );
631		752
632	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);
633		754
634	for my $x (0..2) {	755	for my $x (0..2) {
635	for my $y (0 .. 2) {	756	for my $y (0 .. 2) {
636	$table->add ($x + 3, $y,	757	$table->add ($x + 3, $y,
637	new CFClient::UI::Entry	758	new CFPlus::UI::Entry
638	text => $default_smooth[$x * 3 + $y],	759	text => $default_smooth[$x * 3 + $y],
639	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 },
640	);	761	);
641	}	762	}
642	}	763	}
643		764
		765	$table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
644		766
645	$table	767	$table
646	}	768	}
647		769
648	sub stats_window {	770	sub stats_window {
		771	my $r = new CFPlus::UI::ScrolledWindow (
		772	expand => 1,
		773	scroll_y => 1
		774	);
649	my $vb = new CFClient::UI::VBox;	775	$r->add (my $vb = new CFPlus::UI::VBox);
650		776
		777	$vb->add (new CFPlus::UI::FancyFrame
		778	label => "Player",
		779	child => (my $pi = new CFPlus::UI::VBox),
		780	);
		781
651	$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,
652	can_hover => 1, can_events => 1,	783	can_hover => 1, can_events => 1,
653	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.");
654	$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,
655	can_hover => 1, can_events => 1,	786	can_hover => 1, can_events => 1,
656	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).");
657		788
658	$vb->add (my $hb0 = new CFClient::UI::HBox);	789	$pi->add (my $hb0 = new CFPlus::UI::HBox);
659	$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,
660	can_hover => 1, can_events => 1,	791	can_hover => 1, can_events => 1,
661	tooltip => "The weight of the player including all inventory items.");	792	tooltip => "The weight of the player including all inventory items.");
662	$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,
663	can_hover => 1, can_events => 1,	794	can_hover => 1, can_events => 1,
664	tooltip => "The weight limit: you cannot carry more than this.");	795	tooltip => "The weight limit: you cannot carry more than this.");
665		796
666		797	$vb->add (new CFPlus::UI::FancyFrame
		798	label => "Primary/Secondary Statistics",
667	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	799	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		800	);
668	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	801	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
669		802
670	my $color2 = [1, 1, 0];	803	my $color2 = [1, 1, 0];
671		804
672	for (	805	for (
673	[0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],	806	[0, 0, st_str => "Str", 30],
674	[0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],	807	[0, 1, st_dex => "Dex", 30],
675	[0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],	808	[0, 2, st_con => "Con", 30],
676	[0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],	809	[0, 3, st_int => "Int", 30],
677	[0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],	810	[0, 4, st_wis => "Wis", 30],
678	[0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],	811	[0, 5, st_pow => "Pow", 30],
679	[0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],	812	[0, 6, st_cha => "Cha", 30],
680		813
681	[2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],	814	[2, 0, st_wc => "Wc", -120],
682	[2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],	815	[2, 1, st_ac => "Ac", -120],
683	[2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],	816	[2, 2, st_dam => "Dam", 120],
684	[2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],	817	[2, 3, st_arm => "Arm", 120],
685	[2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],	818	[2, 4, st_spd => "Spd", 10.54],
686	[2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],	819	[2, 5, st_wspd => "WSp", 10.54],
687	) {	820	) {
688	my ($col, $row, $id, $label, $template, $tooltip) = @$_;	821	my ($col, $row, $id, $label, $template) = @$_;
689		822
690	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	823	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
691	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);	824	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
		825	align => +1, template => $template, tooltip => "#stat_$label");
692	$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
693	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);	827	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
		828	align => -1, text => $label, tooltip => "#stat_$label");
694	}	829	}
695		830
		831	$vb->add (new CFPlus::UI::FancyFrame
		832	label => "Resistancies",
696	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	833	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		834	);
697		835
698	my $row = 0;	836	my $row = 0;
699	my $col = 0;	837	my $col = 0;
700		838
701	my %resist_names = (	839	my %resist_names = (
…		…
740	drain acid pois para deat phys	878	drain acid pois para deat phys
741	blind fear tund elec cold ghit/)	879	blind fear tund elec cold ghit/)
742	{	880	{
743	$tbl2->add ($col, $row,	881	$tbl2->add ($col, $row,
744	$STATWIDS->{"res_$_"} =	882	$STATWIDS->{"res_$_"} =
745	new CFClient::UI::Label	883	new CFPlus::UI::Label
746	font => $FONT_FIXED,	884	font => $FONT_FIXED,
747	template => "-100%",	885	template => "-100%",
748	align => +1,	886	align => +1,
749	valign => 0,	887	valign => 0,
750	can_events => 1,	888	can_events => 1,
751	can_hover => 1,	889	can_hover => 1,
752	tooltip => $resist_names{$_}->[1],	890	tooltip => $resist_names{$_}->[1],
753	);	891	);
754	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	892	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
755	font => $FONT_FIXED,	893	font => $FONT_FIXED,
756	can_hover => 1,	894	can_hover => 1,
757	can_events => 1,	895	can_events => 1,
758	path => "ui/resist/resist_$_.png",	896	path => "ui/resist/resist_$_.png",
759	tooltip => $resist_names{$_}->[1],	897	tooltip => $resist_names{$_}->[1],
760	);	898	);
761	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	899	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
762	text => $resist_names{$_}->[0],	900	text => $resist_names{$_}->[0],
763	font => $FONT_FIXED,	901	font => $FONT_FIXED,
764	can_hover => 1,	902	can_hover => 1,
765	can_events => 1,	903	can_events => 1,
766	tooltip => $resist_names{$_}->[1],	904	tooltip => $resist_names{$_}->[1],
…		…
773	}	911	}
774	}	912	}
775		913
776	#update_stats_window ({});	914	#update_stats_window ({});
777		915
778	$vb	916	$r
779	}	917	}
780		918
781	sub skill_window {	919	sub skill_window {
		920	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
782	$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]);
		922	$sw
783	}	923	}
784		924
785	sub formsep($) {	925	sub formsep($) {
786	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	926	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
787	}	927	}
…		…
797	return if $METASERVER_ATIME > time;	937	return if $METASERVER_ATIME > time;
798	$METASERVER_ATIME = time + 60;	938	$METASERVER_ATIME = time + 60;
799		939
800	my $table = $METASERVER->{table};	940	my $table = $METASERVER->{table};
801	$table->clear;	941	$table->clear;
802	$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...");
803		943
804	my $buf;	944	my $ok = 0;
805		945
806	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	946	CFPlus::background {
		947	my $ua = CFPlus::lwp_useragent;
807		948
808	unless ($fh) {	949	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
809	$label->set_text ("unable to contact metaserver: $!");	950	} sub {
810	return;	951	my ($msg) = @_;
811	}	952	if ($msg) {
812
813	Event->io (fd => $fh, poll => 'r', cb => sub {
814	my $res = sysread $fh, $buf, 8192, length $buf;
815
816	if (!defined $res) {
817	$_[0]->w->cancel;
818	$label->set_text ("error while retrieving server list: $!");
819	} elsif ($res == 0) {
820	$_[0]->w->cancel;
821	status "server list retrieved";
822
823	utf8::decode $buf if utf8::valid $buf;
824
825	$table->clear;	953	$table->clear;
826		954
827	my @tip = (	955	my @tip = (
828	"The current number of users logged in on the server.",	956	"The current number of users logged in on the server.",
829	"The hostname of the server.",	957	"The hostname of the server.",
830	"The time this server has been running without being restarted.",	958	"The time this server has been running without being restarted.",
831	"The server software version - a '+' indicates a Crossfire+ server.",	959	"The server software version - a '+' indicates a Crossfire+ server.",
832	"Short information about this server provided by its admins.",	960	"Short information about this server provided by its admins.",
833	);	961	);
834	my @col = qw(#Users Host Uptime Version Description);	962	my @col = qw(#Users Host Uptime Version Description);
835	$table->add ($_, 0, new CFClient::UI::Label	963	$table->add ($_, 0, new CFPlus::UI::Label
836	can_hover => 1, can_events => 1,	964	can_hover => 1, can_events => 1,
837	align => 0, fg => [1, 1, 0],	965	align => 0, fg => [1, 1, 0],
838	text => $col[$_], tooltip => $tip[$_])	966	text => $col[$_], tooltip => $tip[$_])
839	for 0 .. $#col;	967	for 0 .. $#col;
840		968
841	my @align = qw(1 0 1 1 -1);	969	my @align = qw(1 0 1 1 -1);
842		970
843	my $y = 0;	971	my $y = 0;
844	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	972	for my $m (@{ $msg->{servers} }) {
845	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)};
846		975
847	for ($desc) {	976	for ($desc) {
848	s/<br>/\n/gi;	977	s/<br>/\n/gi;
849	s/<li>/\n· /gi;	978	s/<li>/\n· /gi;
850	s/<.*?>//sgi;	979	s/<.*?>//sgi;
851	s/&/&amp;/g;	980	s/&amp;/&/g;
852	s/</&lt;/g;	981	s/&lt;/</g;
853	s/>/&gt;/g;	982	s/&gt;/>/g;
854	}	983	}
855		984
856	$uptime = sprintf "%dd %02d:%02d:%02d",	985	$uptime = sprintf "%dd %02d:%02d:%02d",
857	(int $m->[8] / 86400),	986	(int $uptime / 86400),
858	(int $m->[8] / 3600) % 24,	987	(int $uptime / 3600) % 24,
859	(int $m->[8] / 60) % 60,	988	(int $uptime / 60) % 60,
860	$m->[8] % 60;	989	$uptime % 60;
861		990
862	$m = [$users, $host, $uptime, $version, $desc];	991	$m = [$users, $host, $uptime, $version, $desc];
863		992
864	$y++;	993	$y++;
865		994
866	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	995	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
867	(new CFClient::UI::Button	996	(new CFPlus::UI::Button
868	text => "Use",	997	text => "Use",
869	tooltip => "Put this server into the <b>Host:Port</b> field",	998	tooltip => "Put this server into the <b>Host:Port</b> field",
870	on_activate => sub {	999	on_activate => sub {
871	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1000	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
872	$METASERVER->hide;	1001	$METASERVER->hide;
873	0	1002	0
874	},	1003	},
875	),	1004	),
876	(new CFClient::UI::Empty expand => 1),	1005	(new CFPlus::UI::Empty expand => 1),
877	]);	1006	]);
878		1007
879	$table->add ($_, $y, new CFClient::UI::Label	1008	$table->add ($_, $y, new CFPlus::UI::Label
		1009	max_w => $::WIDTH * 0.4,
880	ellipsise => 0,	1010	ellipsise => 0,
881	align => $align[$_],	1011	align => $align[$_],
882	text => $m->[$_],	1012	text => $m->[$_],
883	tooltip => $tip[$_],	1013	tooltip => $tip[$_],
		1014	fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
884	can_hover => 1,	1015	can_hover => 1,
885	can_events => 1,	1016	can_events => 1,
886	fontsize => 0.8)	1017	fontsize => 0.8)
887	for 0 .. $#$m;	1018	for 0 .. $#$m;
888	}	1019	}
		1020	} else {
		1021	$ok or $label->set_text ("error while contacting metaserver");
889	}	1022	}
890	});	1023	};
		1024
891	}	1025	}
892		1026
893	sub metaserver_dialog {	1027	sub metaserver_dialog {
894	my $vbox = new CFClient::UI::VBox;	1028	my $vbox = new CFPlus::UI::VBox;
895	my $table = new CFClient::UI::Table;	1029	my $table = new CFPlus::UI::Table;
896	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	1030	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
897		1031
898	my $dialog = new CFClient::UI::FancyFrame	1032	my $dialog = new CFPlus::UI::Toplevel
899	title => "Server List",	1033	title => "Server List",
900	name => 'metaserver_dialog',	1034	name => 'metaserver_dialog',
901	x => 'center',	1035	x => 'center',
902	y => 'center',	1036	y => 'center',
903	z => 3,	1037	z => 3,
		1038	force_w => $::WIDTH * 0.9,
904	force_h => $::HEIGHT * 0.4,	1039	force_h => $::HEIGHT * 0.7,
905	child => $vbox,	1040	child => $vbox,
906	has_close_button => 1,	1041	has_close_button => 1,
907	table => $table,	1042	table => $table,
908	on_visibility_change => sub {	1043	on_visibility_change => sub {
909	update_metaserver ($_[0]) if $_[1];	1044	update_metaserver ($_[0]) if $_[1];
…		…
913		1048
914	$dialog	1049	$dialog
915	}	1050	}
916		1051
917	sub server_setup {	1052	sub server_setup {
918	my $vbox = new CFClient::UI::VBox;	1053	my $vbox = new CFPlus::UI::VBox;
919		1054
		1055	$vbox->add (new CFPlus::UI::FancyFrame
		1056	label => "Connection Settings",
920	$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	);
921	$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");
922		1060
923	{	1061	{
924	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	1062	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
925		1063
926	$vbox->add (	1064	$vbox->add (
927	$HOST_ENTRY = new CFClient::UI::Entry	1065	$HOST_ENTRY = new CFPlus::UI::Entry
928	expand => 1,	1066	expand => 1,
929	text => $CFG->{profile}{default}{host},	1067	text => $CFG->{profile}{default}{host},
930	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",
931	on_changed => sub {	1069	on_changed => sub {
932	my ($self, $value) = @_;	1070	my ($self, $value) = @_;
933	$CFG->{profile}{default}{host} = $value;	1071	$CFG->{profile}{default}{host} = $value;
934	0	1072	0
935	}	1073	}
936	);	1074	);
937		1075
938	$vbox->add (new CFClient::UI::Button	1076	$vbox->add (new CFPlus::UI::Button
939	expand => 1,	1077	expand => 1,
940	text => "Server List",	1078	text => "Server List",
941	other => $METASERVER,	1079	other => $METASERVER,
942	tooltip => "Show a list of available crossfire servers",	1080	tooltip => "Show a list of available crossfire servers",
943	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1081	on_activate => sub { $METASERVER->toggle_visibility; 0 },
944	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1082	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
945	);	1083	);
946	}	1084	}
947		1085
948	$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");
949	$table->add (1, 4, new CFClient::UI::Entry	1087	$table->add (1, 4, new CFPlus::UI::Entry
950	text => $CFG->{profile}{default}{user},	1088	text => $CFG->{profile}{default}{user},
951	tooltip => "The name of your character on the server",	1089	tooltip => "The name of your character on the server",
952	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1090	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
953	);	1091	);
954		1092
955	$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");
956	$table->add (1, 5, new CFClient::UI::Entry	1094	$table->add (1, 5, new CFPlus::UI::Entry
957	text => $CFG->{profile}{default}{password},	1095	text => $CFG->{profile}{default}{password},
958	hidden => 1,	1096	hidden => 1,
959	tooltip => "The password for your character",	1097	tooltip => "The password for your character",
960	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1098	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
961	);	1099	);
962		1100
963	$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");
964	$table->add (1, 7, new CFClient::UI::Slider	1102	$table->add (1, 7, new CFPlus::UI::Slider
965	force_w => 100,	1103	force_w => 100,
966	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1104	range => [$CFG->{mapsize}, 10, 100, 0, 1],
967	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. "
968	. "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, "
969	. "but you also increase bandwidth requirements and latency. "	1107	. "but you also increase bandwidth requirements and latency. "
970	. "This option is only used once at log-in.",	1108	. "This option is only used once at log-in.",
971	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 },
972	);	1110	);
973		1111
974	$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");
975	$table->add (1, 8, new CFClient::UI::CheckBox	1113	$table->add (1, 8, new CFPlus::UI::CheckBox
976	state => $CFG->{face_prefetch},	1114	state => $CFG->{face_prefetch},
977	tooltip => "<b>Background Image Prefetch</b>\n\n"	1115	tooltip => "<b>Background Image Prefetch</b>\n\n"
978	. "If enabled, the client automatically pre-fetches images from the server. "	1116	. "If enabled, the client automatically pre-fetches images from the server. "
979	. "This might increase or create lag, but increases the chances "	1117	. "This might increase or create lag, but increases the chances "
980	. "of faces being ready for display when you encounter them. "	1118	. "of faces being ready for display when you encounter them. "
…		…
982	. "so only set it if you really need to prefetch images. "	1120	. "so only set it if you really need to prefetch images. "
983	. "This option can be set and unset any time.",	1121	. "This option can be set and unset any time.",
984	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1122	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
985	);	1123	);
986		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
987	$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");
988	$table->add (1, 9, new CFClient::UI::Entry	1135	$table->add (1, 10, new CFPlus::UI::Entry
989	text => $CFG->{output_count},	1136	text => $CFG->{output_count},
990	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.",
991	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1138	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
992	);	1139	);
993		1140
994	$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");
995	$table->add (1, 10, new CFClient::UI::Entry	1142	$table->add (1, 11, new CFPlus::UI::Entry
996	text => $CFG->{output_sync},	1143	text => $CFG->{output_sync},
997	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.",
998	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1145	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
999	);	1146	);
1000		1147
1001	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1148	$table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1002	expand => 1,	1149	expand => 1,
1003	align => 0,	1150	align => 0,
1004	text => "Login",	1151	text => "Login",
1005	on_activate => sub {	1152	on_activate => sub {
1006	$CONN ? stop_game	1153	$CONN ? stop_game
1007	: start_game;	1154	: start_game;
1008	0	1155	0
1009	},	1156	},
1010	);	1157	);
1011		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
1012	$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");
1013	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1173	$table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1014	text => $CFG->{say_command},	1174	text => $CFG->{say_command},
1015	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. "
1016	. "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. "
1017	. "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.",
1018	on_changed => sub {	1178	on_changed => sub {
1019	my ($self, $value) = @_;	1179	my ($self, $value) = @_;
1020	$CFG->{say_command} = $value;	1180	$CFG->{say_command} = $value;
1021	0	1181	0
1022	}	1182	}
1023	);	1183	);
1024		1184
1025	$vbox->add (new CFClient::UI::Label	1185	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1026	text => "Server Info",	1186	$table->add (1, $row++, new CFPlus::UI::CheckBox
1027	fontsize => 1.2,	1187	state => $CFG->{show_tips},
1028	padding_y => 8,	1188	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1029	fg => [1, 1, 0, 1],	1189	on_changed => sub {
		1190	my ($self, $value) = @_;
		1191	$CFG->{show_tips} = $value;
		1192	0
		1193	}
1030	);	1194	);
1031		1195
1032	$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	);
1033		1208
1034	$vbox	1209	$table
1035	}	1210	}
1036		1211
1037	sub message_window {	1212	sub message_window {
1038	my $window = new CFClient::UI::FancyFrame	1213	my $window = new CFPlus::UI::Toplevel
1039	name => "message_window",	1214	name => "message_window",
1040	title => "Messages",	1215	title => "Messages",
1041	border_bg => [1, 1, 1, 1],	1216	border_bg => [1, 1, 1, 1],
1042	x => "max",	1217	x => "max",
1043	y => 0,	1218	y => 0,
1044	force_w => $::WIDTH * 0.4,	1219	force_w => $::WIDTH * 0.4,
1045	force_h => $::HEIGHT * 0.5,	1220	force_h => $::HEIGHT * 0.5,
1046	child => (my $vbox = new CFClient::UI::VBox),	1221	child => (my $vbox = new CFPlus::UI::VBox),
1047	has_close_button => 1;	1222	has_close_button => 1;
1048		1223
1049	$vbox->add ($LOGVIEW);	1224	$vbox->add ($LOGVIEW);
1050		1225
1051	$vbox->add (my $input = new CFClient::UI::Entry	1226	$vbox->add (my $input = new CFPlus::UI::Entry
1052	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> "
1053	. "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>...). "
1054	. "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). "
1055	. "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.",
1056	on_focus_in => sub {	1231	on_focus_in => sub {
…		…
1095	};	1270	};
1096		1271
1097	$window	1272	$window
1098	}	1273	}
1099		1274
1100	sub open_quit_dialog {
1101	unless ($QUIT_DIALOG) {
1102	$QUIT_DIALOG = new CFClient::UI::FancyFrame
1103	x => "center",
1104	y => "center",
1105	z => 50,
1106	title => "Really Quit?",
1107	;
1108
1109	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1110
1111	$vb->add (new CFClient::UI::Label
1112	text => "You should find a savebed and apply it first!",
1113	max_w => $WIDTH * 0.25,
1114	ellipsize => 0,
1115	);
1116	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1117	$hb->add (new CFClient::UI::Button
1118	text => "Ok",
1119	expand => 1,
1120	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1121	);
1122	$hb->add (new CFClient::UI::Button
1123	text => "Quit anyway",
1124	expand => 1,
1125	on_activate => sub { exit },
1126	);
1127	}
1128
1129	$QUIT_DIALOG->show;
1130	}
1131
1132	sub autopickup_setup {	1275	sub autopickup_setup {
1133	my $table = new CFClient::UI::Table;	1276	my $table = new CFPlus::UI::Table;
1134		1277
1135	for (	1278	for (
1136	["General", 0, 0,	1279	["General", 0, 0,
1137	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1280	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1138	["Inhibit autopickup" => PICKUP_INHIBIT],	1281	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1152	["Boots" => PICKUP_BOOTS],	1295	["Boots" => PICKUP_BOOTS],
1153	["Gloves" => PICKUP_GLOVES],	1296	["Gloves" => PICKUP_GLOVES],
1154	["Cloaks" => PICKUP_CLOAK],	1297	["Cloaks" => PICKUP_CLOAK],
1155	],	1298	],
1156		1299
1157	["Readables", 2, 2,	1300	["Readables", 2, 0,
1158	["Spellbooks" => PICKUP_SPELLBOOK],	1301	["Spellbooks" => PICKUP_SPELLBOOK],
1159	["Skillscrolls" => PICKUP_SKILLSCROLL],	1302	["Skillscrolls" => PICKUP_SKILLSCROLL],
1160	["Normal Books/Scrolls" => PICKUP_READABLES],	1303	["Normal Books/Scrolls" => PICKUP_READABLES],
1161	],	1304	],
1162	["Misc", 2, 7,	1305	["Misc", 2, 5,
1163	["Food" => PICKUP_FOOD],	1306	["Food" => PICKUP_FOOD],
1164	["Drinks" => PICKUP_DRINK],	1307	["Drinks" => PICKUP_DRINK],
1165	["Valuables (Money, Gems)" => PICKUP_VALUABLES],	1308	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1166	["Keys" => PICKUP_KEY],	1309	["Keys" => PICKUP_KEY],
1167	["Magical Items" => PICKUP_MAGICAL],	1310	["Magical Items" => PICKUP_MAGICAL],
1168	["Potions" => PICKUP_POTION],	1311	["Potions" => PICKUP_POTION],
1169	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1312	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1170	["Ignore cursed" => PICKUP_NOT_CURSED],	1313	["Ignore cursed" => PICKUP_NOT_CURSED],
1171	["Jewelery" => PICKUP_JEWELS],	1314	["Jewelery" => PICKUP_JEWELS],
		1315	["Flesh" => PICKUP_FLESH],
1172	],	1316	],
1173	["Weight/Value ratio", 2, 17]	1317	["Weight/Value ratio", 2, 17]
1174	)	1318	)
1175	{	1319	{
1176	my ($title, $x, $y, @bits) = @$_;	1320	my ($title, $x, $y, @bits) = @$_;
1177	$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]);
1178		1322
1179	for (@bits) {	1323	for (@bits) {
1180	++$y;	1324	++$y;
1181		1325
1182	my $mask = $_->[1];	1326	my $mask = $_->[1];
1183	$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);
1184	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1328	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1185	state => $::CFG->{pickup} & $mask,	1329	state => $::CFG->{pickup} & $mask,
1186	on_changed => sub {	1330	on_changed => sub {
1187	my ($box, $value) = @_;	1331	my ($box, $value) = @_;
1188		1332
1189	if ($value) {	1333	if ($value) {
…		…
1200		1344
1201	${$_->[2]} = $checkbox if $_->[2];	1345	${$_->[2]} = $checkbox if $_->[2];
1202	}	1346	}
1203	}	1347	}
1204		1348
1205	$table->add (2, 18, new CFClient::UI::ValSlider	1349	$table->add (2, 18, new CFPlus::UI::ValSlider
1206	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1350	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1207	template => ">= 99",	1351	template => ">= 99",
1208	to_value => sub { ">= " . 5 * $_[0] },	1352	to_value => sub { ">= " . 5 * $_[0] },
1209	on_changed => sub {	1353	on_changed => sub {
1210	my ($slider, $value) = @_;	1354	my ($slider, $value) = @_;
…		…
1213	$::CFG->{pickup} |= int $value	1357	$::CFG->{pickup} |= int $value
1214	if $value;	1358	if $value;
1215	1;	1359	1;
1216	});	1360	});
1217		1361
1218	$table->add (3, 18, new CFClient::UI::Button	1362	$table->add (3, 18, new CFPlus::UI::Button
1219	text => "set",	1363	text => "set",
1220	on_activate => sub {	1364	on_activate => sub {
1221	$::CONN->send_command ("pickup $::CFG->{pickup}")	1365	$::CONN->send_command ("pickup $::CFG->{pickup}")
1222	if defined $::CONN;	1366	if defined $::CONN;
1223	0	1367	0
1224	});	1368	});
1225		1369
1226	$table	1370	$table
1227	}	1371	}
1228		1372
		1373	my %SORT_ORDER = (
		1374	type => undef,
		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
		1381	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1382	or $btime <=> $atime
		1383	or $a->{type} <=> $b->{type}
		1384	} @_
		1385	},
		1386	weight => sub { sort {
		1387	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1388	or $a->{type} <=> $b->{type}
		1389	} @_ },
		1390	);
		1391
1229	sub inventory_widget {	1392	sub inventory_widget {
1230	my $hb = new CFClient::UI::HBox homogeneous => 1;	1393	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1231		1394
1232	$hb->add (my $vb1 = new CFClient::UI::VBox);	1395	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1233	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1396	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
		1397
		1398	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
		1399
		1400	use sort 'stable';
		1401
		1402	$hb1->add (new CFPlus::UI::Selector
		1403	value => $::CFG->{inv_sort},
		1404	options => [
		1405	[type => "Type/Name"],
		1406	[mtime => "Recent/Normal/Locked"],
		1407	[weight => "Weight/Type"],
		1408	],
		1409	on_changed => sub {
		1410	$::CFG->{inv_sort} = $_[1];
		1411	$INV->set_sort_order ($SORT_ORDER{$_[1]});
		1412	},
		1413	);
		1414	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
		1415	#TODO# update to weigh/maxweight
		1416	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
		1417
		1418	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1234	$vb1->add ($INV = new CFClient::UI::Inventory);	1419	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1420	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1235		1421
1236	$hb->add (my $vb2 = new CFClient::UI::VBox);	1422	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1237		1423
1238	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1424	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1239		1425
		1426	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1240	$vb2->add ($INVR = new CFClient::UI::Inventory);	1427	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1241		1428
1242	# XXX: Call after $INVR = ... because set_opencont sets the items	1429	# XXX: Call after $INVR = ... because set_opencont sets the items
1243	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1430	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1244		1431
1245	$hb	1432	$hb
1246	}	1433	}
1247		1434
1248	sub toggle_player_page {	1435	sub toggle_player_page {
…		…
1255	$PL_WINDOW->show;	1442	$PL_WINDOW->show;
1256	}	1443	}
1257	}	1444	}
1258		1445
1259	sub player_window {	1446	sub player_window {
1260	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1447	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1261	x => "center",	1448	x => "center",
1262	y => "center",	1449	y => "center",
1263	force_w => $WIDTH * 9/10,	1450	force_w => $WIDTH * 9/10,
1264	force_h => $HEIGHT * 9/10,	1451	force_h => $HEIGHT * 9/10,
1265	title => "Player",	1452	title => "Player",
…		…
1267	has_close_button => 1	1454	has_close_button => 1
1268	;	1455	;
1269		1456
1270	my $ntb =	1457	my $ntb =
1271	$PL_NOTEBOOK =	1458	$PL_NOTEBOOK =
1272	new CFClient::UI::Notebook	1459	new CFPlus::UI::Notebook expand => 1;
1273	expand => 1,
1274	debug => 1,
1275	filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1276	;
1277		1460
1278	$ntb->add (	1461	$ntb->add (
1279	"Statistics (F2)" => $STATS_PAGE = stats_window,	1462	"Statistics (F2)" => $STATS_PAGE = stats_window,
1280	"Shows statistics, where all your Stats and Resistances are shown."	1463	"Shows statistics, where all your Stats and Resistances are shown."
1281	);	1464	);
1282	$ntb->add (	1465	$ntb->add (
1283	"Skills (F3)" => $SKILL_PAGE = skill_window,	1466	"Skills (F3)" => $SKILL_PAGE = skill_window,
1284	"Shows all your Skills."	1467	"Shows all your Skills."
1285	);	1468	);
		1469
		1470	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
		1471	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1286	$ntb->add (	1472	$ntb->add (
1287	"Spellbook (F4)" => $SPELL_PAGE = new CFClient::UI::SpellList,	1473	"Spellbook (F4)" => $spellsw,
1288	"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."
1289	);	1475	);
1290	$ntb->add (	1476	$ntb->add (
1291	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1477	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1292	"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 :). "
1293	. "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."
1294	);	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.");
1295		1483
1296	$ntb->set_current_page ($INVENTORY_PAGE);	1484	$ntb->set_current_page ($INVENTORY_PAGE);
1297		1485
1298	$plwin->add ($ntb);	1486	$plwin->add ($ntb);
1299	$plwin	1487	$plwin
1300	}	1488	}
1301		1489
1302	sub update_bindings {
1303	$BIND_UPD_CB->() if $BIND_UPD_CB;
1304	}
1305
1306	sub keyboard_setup {	1490	sub keyboard_setup {
1307	my $binding_list = new CFClient::UI::VBox;	1491	CFPlus::Macro::keyboard_setup
1308
1309	my $refresh;
1310	$refresh = $BIND_UPD_CB = sub {
1311	$binding_list->clear ();
1312
1313	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1314	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1315	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1316	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1317
1318	my $lbl = join "; ", @$cmds;
1319	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1320	$binding_list->add (my $hb = new CFClient::UI::HBox);
1321	$hb->add (new CFClient::UI::Button
1322	text => "delete",
1323	tooltip => "Deletes the binding",
1324	on_activate => sub {
1325	$binding_list->remove ($hb);
1326	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1327	0
1328	});
1329
1330	$hb->add (new CFClient::UI::Button
1331	text => "edit",
1332	tooltip => "Edits the binding",
1333	on_activate => sub {
1334	$::BIND_EDITOR->set_binding (
1335	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1336	sub {
1337	my ($nmod, $nsym, $ncmds) = @_;
1338	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1339	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1340	$refresh->();
1341	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1342	$SETUP_DIALOG->show;
1343	},
1344	sub {
1345	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1346	$SETUP_DIALOG->show;
1347	});
1348	$::BIND_EDITOR->show;
1349	$SETUP_DIALOG->hide;
1350	0
1351	});
1352
1353	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1354	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1355	}
1356	}
1357	};
1358
1359	my $vb = new CFClient::UI::VBox;
1360	$vb->add (my $hb = new CFClient::UI::HBox);
1361	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1362	$hb->add (new CFClient::UI::CheckBox
1363	expand => 1,
1364	state => $CFG->{shift_fire_stop},
1365	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1366	on_changed => sub {
1367	my ($cbox, $value) = @_;
1368	$CFG->{shift_fire_stop} = $value;
1369	0
1370	});
1371
1372	$vb->add ($binding_list);
1373	$vb->add (my $hb = new CFClient::UI::HBox);
1374
1375	$hb->add (new CFClient::UI::Button
1376	text => "record new",
1377	expand => 1,
1378	tooltip => "This button opens the binding editor with an empty binding.",
1379	on_activate => sub {
1380	$::BIND_EDITOR->set_binding (undef, undef, [],
1381	sub {
1382	my ($mod, $sym, $cmds) = @_;
1383	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1384	$refresh->();
1385	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1386	$SETUP_DIALOG->show;
1387	},
1388	sub {
1389	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1390	$SETUP_DIALOG->show;
1391	},
1392	);
1393	$SETUP_DIALOG->hide;
1394	$::BIND_EDITOR->show;
1395	0
1396	},
1397	);
1398
1399	$hb->add (new CFClient::UI::Button
1400	text => "close",
1401	tooltip => "Closes the binding window",
1402	expand => 1,
1403	on_activate => sub {
1404	$SETUP_DIALOG->hide;
1405	0
1406	}
1407	);
1408
1409	$refresh->();
1410
1411	$vb
1412	}	1492	}
1413		1493
1414	sub help_window {	1494	sub help_window {
1415	my $win = new CFClient::UI::FancyFrame	1495	my $win = new CFPlus::UI::Toplevel
1416	x => 'center',	1496	x => 'center',
1417	y => 'center',	1497	y => 'center',
1418	z => 2,	1498	z => 4,
1419	name => 'doc_browser',	1499	name => 'doc_browser',
1420	force_w => int $WIDTH * 7/8,	1500	force_w => int $WIDTH * 7/8,
1421	force_h => int $HEIGHT * 7/8,	1501	force_h => int $HEIGHT * 7/8,
1422	title => "Help Browser",	1502	title => "Help Browser",
1423	has_close_button => 1;	1503	has_close_button => 1;
1424		1504
1425	$win->add (my $vbox = new CFClient::UI::VBox);	1505	$win->add (my $vbox = new CFPlus::UI::VBox);
1426		1506
1427	$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	);
1428	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1511	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1429	expand => 1, fontsize => 0.8, padding_x => 4);	1512	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1430		1513
1431	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1514	my @history;
1432	$buttons->add (my $combo = new CFClient::UI::Combobox	1515	my @future;
1433	value => undef,	1516	my $curnode;
1434	options => [	1517
1435	[intro => "Introduction"],	1518	my $load_node; $load_node = sub {
1436	[manual => "Main Manual"],	1519	my ($node, $para) = @_;
1437	[skill_help => "Skill Reference"],	1520
1438	[command_help => "Command Reference"],	1521	$buttons->clear;
1439	[dmcommand_help => "DM Commands"],	1522
1440	[COPYING => "License Terms"],	1523	$buttons->add (new CFPlus::UI::Button
1441	],	1524	text => "⇤",
		1525	tooltip => "back to the starting page",
1442	on_changed => sub {	1526	on_activate => sub {
1443	my ($self, $pod) = @_;	1527	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1444		1528	unshift @future, @history;
1445	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",	1529	@history = ();
1446	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };	1530	$load_node->(@{shift @future});
1447
1448	$viewer->clear;
1449
1450	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1451	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1452	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1453	# ]);#d#
1454		1531	},
1455	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1532	);
1456	for @$pom;
1457		1533
1458	$viewer->set_offset (0);	1534	if (@history) {
1459		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	},
1460	0	1542	);
1461	},	1543	}
1462	on_visibility_change => sub {	1544
1463	my ($self, $visible) = @_;	1545	if (@future) {
1464	return unless $visible;	1546	$buttons->add (new CFPlus::UI::Button
1465	return if $self->{value};	1547	text => "⋙",
1466	$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	},
1467	0	1553	);
1468	},	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);
1469	);	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	};
1470		1592
1471	$win	1593	$win
1472	}	1594	}
1473		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
1474	sub sdl_init {	1708	sub sdl_init {
1475	CFClient::SDL_Init	1709	CFPlus::SDL_Init
1476	and die "SDL::Init failed!\n";	1710	and die "SDL::Init failed!\n";
1477	}	1711	}
1478		1712
1479	sub video_init {	1713	sub video_init {
1480	sdl_init;	1714	sdl_init;
…		…
1485		1719
1486	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1720	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1487	$FULLSCREEN = $CFG->{fullscreen};	1721	$FULLSCREEN = $CFG->{fullscreen};
1488	$FAST = $CFG->{fast};	1722	$FAST = $CFG->{fast};
1489		1723
1490	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1724	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1491	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1725	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1492		1726
1493	$SDL_ACTIVE = 1;	1727	$SDL_ACTIVE = 1;
1494	$LAST_REFRESH = time - 0.01;	1728	$LAST_REFRESH = time - 0.01;
1495		1729
1496	CFClient::OpenGL::init;	1730	CFPlus::OpenGL::init;
1497		1731
1498	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1732	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1499		1733
1500	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1734	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1501		1735
1502	#############################################################################	1736	#############################################################################
1503		1737
1504	if ($DEBUG_STATUS) {	1738	if ($DEBUG_STATUS) {
1505	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1739	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1506	} else {	1740	} else {
1507	# create the widgets	1741	# create the widgets
1508		1742
1509	$DEBUG_STATUS = new CFClient::UI::Label	1743	$DEBUG_STATUS = new CFPlus::UI::Label
1510	padding => 0,	1744	padding => 0,
1511	z => 100,	1745	z => 100,
1512	force_x => "max",	1746	force_x => "max",
1513	force_y => 0;	1747	force_y => 0;
1514	$DEBUG_STATUS->show;	1748	$DEBUG_STATUS->show;
1515		1749
1516	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1517
1518	$STATUSBOX = new CFClient::UI::Statusbox;	1750	$STATUSBOX = new CFPlus::UI::Statusbox;
1519	$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]);
1520		1752
1521	(new CFClient::UI::Frame	1753	(new CFPlus::UI::Frame
1522	bg => [0, 0, 0, 0.4],	1754	bg => [0, 0, 0, 0.4],
1523	force_x => 0,	1755	force_x => 0,
1524	force_y => "max",	1756	force_y => "max",
1525	child => $STATUSBOX,	1757	child => $STATUSBOX,
1526	)->show;	1758	)->show;
1527		1759
1528	CFClient::UI::FancyFrame->new (	1760	CFPlus::UI::Toplevel->new (
1529	title => "Map",	1761	title => "Map",
1530	name => "mapmap",	1762	name => "mapmap",
1531	x => 0,	1763	x => 0,
1532	y => $FONTSIZE + 8,	1764	y => $FONTSIZE + 8,
1533	border_bg => [1, 1, 1, 192/255],	1765	border_bg => [1, 1, 1, 192/255],
1534	bg => [1, 1, 1, 0],	1766	bg => [1, 1, 1, 0],
1535	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1767	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1536	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.",
1537	),	1769	),
1538	)->show;	1770	)->show;
1539		1771
1540	$MAPWIDGET = new CFClient::MapWidget;	1772	$MAPWIDGET = new CFPlus::MapWidget;
1541	$MAPWIDGET->connect (activate_console => sub {	1773	$MAPWIDGET->connect (activate_console => sub {
1542	my ($mapwidget, $preset) = @_;	1774	my ($mapwidget, $preset) = @_;
1543		1775
1544	if ($CONSOLE) {	1776	if ($CONSOLE) {
1545	$CONSOLE->{input}->{auto_activated} = 1;	1777	$CONSOLE->{input}->{auto_activated} = 1;
…		…
1551	}	1783	}
1552	});	1784	});
1553	$MAPWIDGET->show;	1785	$MAPWIDGET->show;
1554	$MAPWIDGET->grab_focus;	1786	$MAPWIDGET->grab_focus;
1555		1787
1556	$LOGVIEW = new CFClient::UI::TextScroller	1788	$LOGVIEW = new CFPlus::UI::TextScroller
1557	expand => 1,	1789	expand => 1,
1558	font => $FONT_FIXED,	1790	font => $FONT_FIXED,
1559	fontsize => $::CFG->{log_fontsize},	1791	fontsize => $::CFG->{log_fontsize},
1560	indent => -4,	1792	indent => -4,
1561	can_hover => 1,	1793	can_hover => 1,
1562	can_events => 1,	1794	can_events => 1,
		1795	max_par => $CFG->{logview_max_par},
1563	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.",
1564	;	1797	;
1565		1798
1566	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1799	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1567	title => "Setup",	1800	title => "Setup",
1568	name => "setup_dialog",	1801	name => "setup_dialog",
1569	x => 'center',	1802	x => 'center',
1570	y => 'center',	1803	y => 'center',
1571	z => 2,	1804	z => 2,
…		…
1574	has_close_button => 1,	1807	has_close_button => 1,
1575	;	1808	;
1576		1809
1577	$METASERVER = metaserver_dialog;	1810	$METASERVER = metaserver_dialog;
1578		1811
1579	$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,
1580	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1813	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1581		1814
1582	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1815	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1583	"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.");
1584	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1817	$SETUP_NOTEBOOK->add (Client => client_setup,
1585	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1818	"Configure various client-specific settings.");
1586	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1819	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1587	"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.");
1588	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1821	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1589	"Configure the use of audio, sound effects and background music.");	1822	"Configure the use of audio, sound effects and background music.");
1590	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1823	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
…		…
1595	. "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 "
1596	. "binding editor closes");	1829	. "binding editor closes");
1597	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1830	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1598	"Some debuggin' options. Do not ask.");	1831	"Some debuggin' options. Do not ask.");
1599		1832
1600	$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
1601		1834
1602	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1835	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1603	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.");
1604		1837
1605	$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,
1606	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.");
1607		1840
1608	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
1609		1842
1610	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1843	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1611	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.");
1612		1845
1613	$BUTTONBAR->add (new CFClient::UI::Button	1846	$BUTTONBAR->add (new CFPlus::UI::Button
1614	text => "Save Config",	1847	text => "Save Config",
1615	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.",
1616	on_activate => sub {	1849	on_activate => sub {
1617	$::CFG->{layout} = CFClient::UI::get_layout;	1850	$::CFG->{layout} = CFPlus::UI::get_layout;
1618	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1851	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1619	status "Configuration Saved";	1852	status "Configuration Saved";
1620	0	1853	0
1621	},	1854	},
1622	);	1855	);
1623		1856
1624	$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,
1625	tooltip => "View Documentation");	1858	tooltip => "View Documentation");
1626		1859
		1860
1627	$BUTTONBAR->add (new CFClient::UI::Button	1861	$BUTTONBAR->add (new CFPlus::UI::Button
1628	text => "Quit",	1862	text => "Quit",
1629	tooltip => "Terminates the program",	1863	tooltip => "Terminates the program",
1630	on_activate => sub {	1864	on_activate => sub {
1631	if ($CONN) {	1865	if ($CONN) {
1632	open_quit_dialog;	1866	open_quit_dialog;
…		…
1642	}	1876	}
1643		1877
1644	$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]);
1645	}	1879	}
1646		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
1647	sub video_shutdown {	2000	sub video_shutdown {
1648	CFClient::OpenGL::shutdown;	2001	CFPlus::OpenGL::shutdown;
1649		2002
1650	undef $SDL_ACTIVE;	2003	undef $SDL_ACTIVE;
1651	}	2004	}
1652		2005
1653	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#
…		…
1661		2014
1662	sub audio_music_finished {	2015	sub audio_music_finished {
1663	return unless $CFG->{bgm_enable};	2016	return unless $CFG->{bgm_enable};
1664		2017
1665	# TODO: hack, do play loop and mood music	2018	# TODO: hack, do play loop and mood music
1666	$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]";
1667	$bgmusic->play (0);	2020	$bgmusic->play (0);
1668		2021
1669	push @bgmusic, shift @bgmusic;	2022	push @bgmusic, shift @bgmusic;
1670	}	2023	}
1671		2024
1672	sub audio_init {	2025	sub audio_init {
1673	if ($CFG->{audio_enable}) {	2026	if ($CFG->{audio_enable}) {
1674	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	2027	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1675	$SDL_MIXER = !CFClient::Mix_OpenAudio;	2028	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1676		2029
1677	unless ($SDL_MIXER) {	2030	unless ($SDL_MIXER) {
1678	status "Unable to open sound device: there will be no sound";	2031	status "Unable to open sound device: there will be no sound";
1679	return;	2032	return;
1680	}	2033	}
1681		2034
1682	CFClient::Mix_AllocateChannels 8;	2035	CFPlus::Mix_AllocateChannels 8;
1683	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	2036	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1684		2037
1685	audio_music_finished;	2038	audio_music_finished;
1686		2039
		2040	local $_;
1687	while (<$fh>) {	2041	while (<$fh>) {
1688	next if /^\s*#/;	2042	next if /^\s*#/;
1689	next if /^\s*$/;	2043	next if /^\s*$/;
1690		2044
1691	my ($file, $volume, $event) = split /\s+/, $_, 3;	2045	my ($file, $volume, $event) = split /\s+/, $_, 3;
1692		2046
1693	push @SOUNDS, "$volume,$file";	2047	push @SOUNDS, "$volume,$file";
1694		2048
1695	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	2049	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1696	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";
1697	$chunk->volume ($volume * 128 / 100);	2051	$chunk->volume ($volume * 128 / 100);
1698	$chunk	2052	$chunk
1699	};	2053	};
1700	}	2054	}
1701	} else {	2055	} else {
…		…
1703	}	2057	}
1704	}	2058	}
1705	}	2059	}
1706		2060
1707	sub audio_shutdown {	2061	sub audio_shutdown {
1708	CFClient::Mix_CloseAudio if $SDL_MIXER;	2062	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1709	undef $SDL_MIXER;	2063	undef $SDL_MIXER;
1710	@SOUNDS = ();	2064	@SOUNDS = ();
1711	%AUDIO_CHUNKS = ();	2065	%AUDIO_CHUNKS = ();
1712	}	2066	}
1713		2067
…		…
1720		2074
1721	sub force_refresh {	2075	sub force_refresh {
1722	$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;
1723	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2077	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1724		2078
1725	$CFClient::UI::ROOT->draw;	2079	$CFPlus::UI::ROOT->draw;
1726		2080
1727	$WANT_REFRESH = 0;	2081	$WANT_REFRESH = 0;
1728	$CAN_REFRESH = 0;	2082	$CAN_REFRESH = 0;
1729	$LAST_REFRESH = $NOW;	2083	$LAST_REFRESH = $NOW;
1730		2084
1731	0 && do {
1732	# some weird model-drawing code, just a joke right now
1733	use CFClient::OpenGL;
1734
1735	$demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1736	$demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1737	$demo{r} ||= do {
1738	my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1739	$mod->{v} = pack "f*", @{$mod->{v}};
1740	$_ = [scalar @$_, pack "S!*", @$_]
1741	for values %{$mod->{g}};
1742	$mod
1743	};
1744
1745	my $r = $demo{r} or die;
1746
1747	glDepthMask 1;
1748	glClear GL_DEPTH_BUFFER_BIT;
1749	glEnable GL_TEXTURE_2D;
1750	glEnable GL_DEPTH_TEST;
1751	glEnable GL_CULL_FACE;
1752	glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1753
1754	glMatrixMode GL_PROJECTION;
1755	glLoadIdentity;
1756	glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1757	#glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1758	glMatrixMode GL_MODELVIEW;
1759	glLoadIdentity;
1760
1761	glPushMatrix;
1762	glTranslate 0, 0, -800;
1763	glScale 1, -1, 1;
1764	glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1765	glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1766	glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1767	glScale 50, 50, 50;
1768
1769	glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1770	while (my ($k, $v) = each %{$r->{g}}) {
1771	glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1772	glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1773	}
1774
1775	glPopMatrix;
1776
1777	glShadeModel GL_FLAT;
1778	glDisable GL_DEPTH_TEST;
1779	glDisable GL_TEXTURE_2D;
1780	glDepthMask 0;
1781
1782	$WANT_REFRESH++;
1783	};
1784
1785	CFClient::SDL_GL_SwapBuffers;	2085	CFPlus::SDL_GL_SwapBuffers;
1786	}	2086	}
1787		2087
1788	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 {
1789	$NOW = time;	2089	$NOW = time;
1790		2090
1791	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2091	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1792	for CFClient::SDL_PollEvent;	2092	for CFPlus::SDL_PollEvent;
1793		2093
1794	if (%animate_object) {	2094	if (%animate_object) {
1795	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2095	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1796	$WANT_REFRESH++;	2096	$WANT_REFRESH++;
1797	}	2097	}
…		…
1821	$CONN->face_prefetch	2121	$CONN->face_prefetch
1822	if $CONN;	2122	if $CONN;
1823	});	2123	});
1824		2124
1825	%SDL_CB = (	2125	%SDL_CB = (
1826	CFClient::SDL_QUIT => sub {	2126	CFPlus::SDL_QUIT => sub {
1827	Event::unloop -1;	2127	exit;
1828	},	2128	},
1829	CFClient::SDL_VIDEORESIZE => sub {	2129	CFPlus::SDL_VIDEORESIZE => sub {
1830	},	2130	},
1831	CFClient::SDL_VIDEOEXPOSE => sub {	2131	CFPlus::SDL_VIDEOEXPOSE => sub {
1832	CFClient::UI::full_refresh;	2132	CFPlus::UI::full_refresh;
1833	},	2133	},
1834	CFClient::SDL_ACTIVEEVENT => sub {	2134	CFPlus::SDL_ACTIVEEVENT => sub {
1835	# 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;
1836	},	2140	},
1837	CFClient::SDL_KEYDOWN => sub {	2141	CFPlus::SDL_KEYDOWN => sub {
1838	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2142	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1839	# alt-enter	2143	# alt-enter
1840	$FULLSCREEN_ENABLE->toggle;	2144	$FULLSCREEN_ENABLE->toggle;
1841	video_shutdown;	2145	video_shutdown;
1842	video_init;	2146	video_init;
1843	} else {	2147	} else {
1844	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2148	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1845	}	2149	}
1846	},	2150	},
1847	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2151	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1848	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2152	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1849	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2153	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1850	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2154	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1851	CFClient::SDL_USEREVENT => sub {	2155	CFPlus::SDL_USEREVENT => sub {
1852	if ($_[0]{code} == 1) {	2156	if ($_[0]{code} == 1) {
1853	audio_channel_finished $_[0]{data1};	2157	audio_channel_finished $_[0]{data1};
1854	} elsif ($_[0]{code} == 0) {	2158	} elsif ($_[0]{code} == 0) {
1855	audio_music_finished;	2159	audio_music_finished;
1856	}	2160	}
…		…
1860	#############################################################################	2164	#############################################################################
1861		2165
1862	$SIG{INT} = $SIG{TERM} = sub { exit };	2166	$SIG{INT} = $SIG{TERM} = sub { exit };
1863		2167
1864	{	2168	{
1865	local $SIG{__DIE__} = sub {
1866	return unless defined $^S && !$^S;
1867	Carp::confess $_[0];#d#TODO: remove when stable
1868	CFClient::fatal $_[0];
1869	};
1870
1871	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	2169	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
		2170	CFPlus::DB::Server::run;
		2171
1872	CFClient::UI::set_layout ($::CFG->{layout});	2172	CFPlus::UI::set_layout ($::CFG->{layout});
1873		2173
1874	my %DEF_CFG = (	2174	my %DEF_CFG = (
1875	sdl_mode => 0,	2175	sdl_mode => 0,
1876	width => 640,	2176	width => 640,
1877	height => 480,	2177	height => 480,
1878	fullscreen => 0,	2178	fullscreen => 0,
1879	fast => 0,	2179	fast => 0,
1880	map_scale => 1,	2180	map_scale => 1,
1881	fow_enable => 1,	2181	fow_enable => 1,
1882	fow_intensity => 0.45,	2182	fow_intensity => 0.45,
1883	fow_smooth => 0,	2183	fow_smooth => 0,
		2184	map_smoothing => 1,
1884	gui_fontsize => 1,	2185	gui_fontsize => 1,
1885	log_fontsize => 0.7,	2186	log_fontsize => 0.7,
1886	gauge_fontsize => 1,	2187	gauge_fontsize => 1,
1887	gauge_size => 0.35,	2188	gauge_size => 0.35,
1888	stat_fontsize => 0.7,	2189	stat_fontsize => 0.7,
1889	mapsize => 100,	2190	mapsize => 100,
1890	say_command => 'say',	2191	say_command => 'chat',
1891	audio_enable => 1,	2192	audio_enable => 1,
1892	bgm_enable => 1,	2193	bgm_enable => 1,
1893	bgm_volume => 0.25,	2194	bgm_volume => 0.25,
1894	face_prefetch => 0,	2195	face_prefetch => 0,
1895	output_sync => 1,	2196	output_sync => 1,
1896	output_count => 1,	2197	output_count => 1,
		2198	output_rate => "",
1897	pickup => 0,	2199	pickup => 0,
		2200	inv_sort => "mtime",
1898	default => "profile", # default profile	2201	default => "profile", # default profile
		2202	show_tips => 1,
		2203	logview_max_par => 1000,
1899	);	2204	);
1900		2205
1901	while (my ($k, $v) = each %DEF_CFG) {	2206	while (my ($k, $v) = each %DEF_CFG) {
1902	$CFG->{$k} = $v unless exists $CFG->{$k};	2207	$CFG->{$k} = $v unless exists $CFG->{$k};
1903	}	2208	}
1904		2209
1905	$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	}
1906		2224
1907	sdl_init;	2225	sdl_init;
1908		2226
1909	@SDL_MODES = reverse	2227	@SDL_MODES = reverse
1910	grep $_->[0] >= 640 && $_->[1] >= 480,	2228	grep $_->[0] >= 640 && $_->[1] >= 480,
1911	CFClient::SDL_ListModes;	2229	CFPlus::SDL_ListModes;
1912		2230
1913	@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)";
1914		2232
1915	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2233	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1916		2234
1917	{	2235	{
1918	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2236	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1919	DejaVuSans.ttf	2237	DejaVuSans.ttf
1920	DejaVuSansMono.ttf	2238	DejaVuSansMono.ttf
1921	DejaVuSans-Bold.ttf	2239	DejaVuSans-Bold.ttf
1922	DejaVuSansMono-Bold.ttf	2240	DejaVuSansMono-Bold.ttf
1923	DejaVuSans-Oblique.ttf	2241	DejaVuSans-Oblique.ttf
1924	DejaVuSansMono-Oblique.ttf	2242	DejaVuSansMono-Oblique.ttf
1925	DejaVuSans-BoldOblique.ttf	2243	DejaVuSans-BoldOblique.ttf
1926	DejaVuSansMono-BoldOblique.ttf	2244	DejaVuSansMono-BoldOblique.ttf
1927	);	2245	);
1928		2246
1929	CFClient::add_font $_ for @fonts;	2247	CFPlus::add_font $_ for @fonts;
1930		2248
1931	CFClient::pango_init;	2249	CFPlus::pango_init;
1932		2250
1933	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2251	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1934	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2252	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1935		2253
1936	$FONT_PROP->make_default;	2254	$FONT_PROP->make_default;
1937	}	2255	}
1938		2256
1939	# compare mono (ft) vs. rgba (cairo)	2257	# compare mono (ft) vs. rgba (cairo)
1940	# ft - 1.8s, cairo 3s, even in alpha-only mode	2258	# ft - 1.8s, cairo 3s, even in alpha-only mode
1941	# for my $rgba (0..1) {	2259	# for my $rgba (0..1) {
1942	# my $t1 = Time::HiRes::time;	2260	# my $t1 = Time::HiRes::time;
1943	# for (1..1000) {	2261	# for (1..1000) {
1944	# my $layout = CFClient::Layout->new ($rgba);	2262	# my $layout = CFPlus::Layout->new ($rgba);
1945	# $layout->set_text ("hallo" x 100);	2263	# $layout->set_text ("hallo" x 100);
1946	# $layout->render;	2264	# $layout->render;
1947	# }	2265	# }
1948	# my $t2 = Time::HiRes::time;	2266	# my $t2 = Time::HiRes::time;
1949	# warn $t2-$t1;	2267	# warn $t2-$t1;
1950	# }	2268	# }
1951		2269
		2270	$startup_done->();
		2271
1952	video_init;	2272	video_init;
1953	audio_init;	2273	audio_init;
1954	}	2274	}
1955		2275
		2276	show_tip_of_the_day if $CFG->{show_tips};
		2277
1956	Event::loop;	2278	Event::loop;
1957	#CFClient::SDL_Quit;	2279	#CFPlus::SDL_Quit;
1958	#CFClient::_exit 0;	2280	#CFPlus::_exit 0;
1959		2281
1960	END { CFClient::SDL_Quit }	2282	END {
		2283	CFPlus::SDL_Quit;
		2284	CFPlus::DB::Server::stop;
		2285	}
1961		2286
1962	=head1 NAME	2287	=head1 NAME
1963		2288
1964	cfplus - A Crossfire+ and Crossfire game client	2289	cfplus - A Crossfire+ and Crossfire game client
1965		2290

Diff Legend

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