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

Diff Legend

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