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.98 by root, Sat Jul 22 13:20:33 2006 UTC vs.
Revision 1.147 by root, Fri Apr 6 07:45:35 2007 UTC

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

Diff Legend

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