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

Diff Legend

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