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.101 by elmex, Sun Jul 23 17:03:44 2006 UTC vs.
Revision 1.182 by elmex, Sat Jul 21 20:30:41 2007 UTC

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

Diff Legend

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