ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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