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

Diff Legend

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