ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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