ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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