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

Diff Legend

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