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

Diff Legend

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