ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.103 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.192 by root, Mon Jul 30 02:16:16 2007 UTC

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

Diff Legend

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