ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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