ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.102 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.162 by root, Thu Jul 5 07:06:05 2007 UTC

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

Diff Legend

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