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

Diff Legend

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