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

Diff Legend

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