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

Diff Legend

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