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.99 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.174 by root, Tue Jul 17 18:34:24 2007 UTC

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

Diff Legend

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