ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.99 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.155 by root, Sat May 12 08:13:34 2007 UTC

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

Diff Legend

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