ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.101 by elmex, Sun Jul 23 17:03:44 2006 UTC vs.
Revision 1.154 by root, Wed May 9 11:46:49 2007 UTC

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

Diff Legend

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