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.183 by root, Sun Jul 22 17:17:17 2007 UTC

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

Diff Legend

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