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

Diff Legend

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