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

Diff Legend

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