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

Diff Legend

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