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.93 by root, Sat Jul 15 01:19:55 2006 UTC vs.
Revision 1.178 by root, Fri Jul 20 16:32:04 2007 UTC

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

Diff Legend

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