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

Diff Legend

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