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.85 by elmex, Sun Jul 2 19:32:56 2006 UTC vs.
Revision 1.160 by root, Thu Jul 5 06:51:04 2007 UTC

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

Diff Legend

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