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.100 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.184 by root, Mon Jul 23 15:30:46 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	;
1139
1140	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1141
1142	$vb->add (new CFClient::UI::Label
1143	text => "You should find a savebed and apply it first!",
1144	max_w => $WIDTH * 0.25,
1145	ellipsize => 0,
1146	);
1147	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1148	$hb->add (new CFClient::UI::Button
1149	text => "Ok",
1150	expand => 1,
1151	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1152	);
1153	$hb->add (new CFClient::UI::Button
1154	text => "Quit anyway",
1155	expand => 1,
1156	on_activate => sub { exit },
1157	);
1158	}
1159
1160	$QUIT_DIALOG->show;
1161	}	1227	}
1162		1228
1163	sub autopickup_setup {	1229	sub autopickup_setup {
		1230	my $r = new CFPlus::UI::ScrolledWindow (
		1231	expand => 1,
		1232	scroll_y => 1
		1233	);
1164	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	);
1165		1238
1166	for (	1239	for (
1167	["General", 0, 0,	1240	["General", 0, 0,
1168	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1241	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1169	["Inhibit autopickup" => PICKUP_INHIBIT],	1242	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1183	["Boots" => PICKUP_BOOTS],	1256	["Boots" => PICKUP_BOOTS],
1184	["Gloves" => PICKUP_GLOVES],	1257	["Gloves" => PICKUP_GLOVES],
1185	["Cloaks" => PICKUP_CLOAK],	1258	["Cloaks" => PICKUP_CLOAK],
1186	],	1259	],
1187		1260
1188	["Readables", 2, 2,	1261	["Readables", 2, 0,
1189	["Spellbooks" => PICKUP_SPELLBOOK],	1262	["Spellbooks" => PICKUP_SPELLBOOK],
1190	["Skillscrolls" => PICKUP_SKILLSCROLL],	1263	["Skillscrolls" => PICKUP_SKILLSCROLL],
1191	["Normal Books/Scrolls" => PICKUP_READABLES],	1264	["Normal Books/Scrolls" => PICKUP_READABLES],
1192	],	1265	],
1193	["Misc", 2, 7,	1266	["Misc", 2, 5,
1194	["Food" => PICKUP_FOOD],	1267	["Food" => PICKUP_FOOD],
1195	["Drinks" => PICKUP_DRINK],	1268	["Drinks" => PICKUP_DRINK],
1196	["Valuables (Money, Gems)" => PICKUP_VALUABLES],	1269	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1197	["Keys" => PICKUP_KEY],	1270	["Keys" => PICKUP_KEY],
1198	["Magical Items" => PICKUP_MAGICAL],	1271	["Magical Items" => PICKUP_MAGICAL],
1199	["Potions" => PICKUP_POTION],	1272	["Potions" => PICKUP_POTION],
1200	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1273	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1201	["Ignore cursed" => PICKUP_NOT_CURSED],	1274	["Ignore cursed" => PICKUP_NOT_CURSED],
1202	["Jewelery" => PICKUP_JEWELS],	1275	["Jewelery" => PICKUP_JEWELS],
		1276	["Flesh" => PICKUP_FLESH],
1203	],	1277	],
1204	["Weight/Value ratio", 2, 17]	1278	["Weight/Value ratio", 2, 17]
1205	)	1279	)
1206	{	1280	{
1207	my ($title, $x, $y, @bits) = @$_;	1281	my ($title, $x, $y, @bits) = @$_;
1208	$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]);
1209		1283
1210	for (@bits) {	1284	for (@bits) {
1211	++$y;	1285	++$y;
1212		1286
1213	my $mask = $_->[1];	1287	my $mask = $_->[1];
1214	$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);
1215	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1289	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1216	state => $::CFG->{pickup} & $mask,	1290	state => $::CFG->{pickup} & $mask,
1217	on_changed => sub {	1291	on_changed => sub {
1218	my ($box, $value) = @_;	1292	my ($box, $value) = @_;
1219		1293
1220	if ($value) {	1294	if ($value) {
…		…
1231		1305
1232	${$_->[2]} = $checkbox if $_->[2];	1306	${$_->[2]} = $checkbox if $_->[2];
1233	}	1307	}
1234	}	1308	}
1235		1309
1236	$table->add (2, 18, new CFClient::UI::ValSlider	1310	$table->add_at (2, 18, new CFPlus::UI::ValSlider
1237	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1311	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1238	template => ">= 99",	1312	template => ">= 99",
1239	to_value => sub { ">= " . 5 * $_[0] },	1313	to_value => sub { ">= " . 5 * $_[0] },
1240	on_changed => sub {	1314	on_changed => sub {
1241	my ($slider, $value) = @_;	1315	my ($slider, $value) = @_;
…		…
1244	$::CFG->{pickup} |= int $value	1318	$::CFG->{pickup} |= int $value
1245	if $value;	1319	if $value;
1246	1;	1320	1;
1247	});	1321	});
1248		1322
1249	$table->add (3, 18, new CFClient::UI::Button	1323	$table->add_at (3, 18, new CFPlus::UI::Button
1250	text => "set",	1324	text => "set",
1251	on_activate => sub {	1325	on_activate => sub {
1252	$::CONN->send_command ("pickup $::CFG->{pickup}")	1326	$::CONN->send_command ("pickup $::CFG->{pickup}")
1253	if defined $::CONN;	1327	if defined $::CONN;
1254	0	1328	0
1255	});	1329	});
1256		1330
1257	$table	1331	$r
1258	}	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	);
1259		1352
1260	sub inventory_widget {	1353	sub inventory_widget {
1261	my $hb = new CFClient::UI::HBox homogeneous => 1;	1354	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1262		1355
1263	$hb->add (my $vb1 = new CFClient::UI::VBox);	1356	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1264	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1357	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1265		1358
1266	$vb1->add (my $hb1 = new CFClient::UI::HBox);	1359	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
1267		1360
1268	use sort 'stable';	1361	use sort 'stable';
1269		1362
1270	$hb1->add (new CFClient::UI::Combobox	1363	$hb1->add (new CFPlus::UI::Selector
1271	value => undef,	1364	value => $::CFG->{inv_sort},
1272	options => [	1365	options => [
1273	[undef, "Type/Name"],	1366	[type => "Type/Name"],
1274	[	1367	[mtime => "Recent/Normal/Locked"],
1275	sub { sort {
1276	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1277	or $a->{type} <=> $b->{type}
1278	} @_ },
1279	"Weight/Type",	1368	[weight => "Weight/Type"],
1280	],
1281	[sub { } => "#TODO#"],
1282	],	1369	],
1283	on_changed => sub {	1370	on_changed => sub {
		1371	$::CFG->{inv_sort} = $_[1];
1284	$INV->set_sort_order ($_[1]);	1372	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1285	},	1373	},
1286	);	1374	);
1287	$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);
1288	#TODO# update to weigh/maxweight	1376	#TODO# update to weigh/maxweight
1289	$hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);	1377	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1290		1378
1291	$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);
1292	$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}});
1293		1382
1294	$hb->add (my $vb2 = new CFClient::UI::VBox);	1383	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1295		1384
1296	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1385	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1297		1386
1298	$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);
1299	$sw2->add ($INVR = new CFClient::UI::Inventory);	1388	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1300		1389
1301	# XXX: Call after $INVR = ... because set_opencont sets the items	1390	# XXX: Call after $INVR = ... because set_opencont sets the items
1302	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1391	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1303		1392
1304	$hb	1393	$hb
1305	}	1394	}
1306		1395
1307	sub toggle_player_page {	1396	sub toggle_player_page {
…		…
1314	$PL_WINDOW->show;	1403	$PL_WINDOW->show;
1315	}	1404	}
1316	}	1405	}
1317		1406
1318	sub player_window {	1407	sub player_window {
1319	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1408	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1320	x => "center",	1409	x => "center",
1321	y => "center",	1410	y => "center",
1322	force_w => $WIDTH * 9/10,	1411	force_w => $WIDTH * 9/10,
1323	force_h => $HEIGHT * 9/10,	1412	force_h => $HEIGHT * 9/10,
1324	title => "Player",	1413	title => "Player",
…		…
1326	has_close_button => 1	1415	has_close_button => 1
1327	;	1416	;
1328		1417
1329	my $ntb =	1418	my $ntb =
1330	$PL_NOTEBOOK =	1419	$PL_NOTEBOOK =
1331	new CFClient::UI::Notebook expand => 1, debug => 1;	1420	new CFPlus::UI::Notebook expand => 1;
1332		1421
1333	$ntb->add (	1422	$ntb->add_tab (
1334	"Statistics (F2)" => $STATS_PAGE = stats_window,	1423	"Statistics (F2)" => $STATS_PAGE = stats_window,
1335	"Shows statistics, where all your Stats and Resistances are shown."	1424	"Shows statistics, where all your Stats and Resistances are shown."
1336	);	1425	);
1337	$ntb->add (	1426	$ntb->add_tab (
1338	"Skills (F3)" => $SKILL_PAGE = skill_window,	1427	"Skills (F3)" => $SKILL_PAGE = skill_window,
1339	"Shows all your Skills."	1428	"Shows all your Skills."
1340	);	1429	);
1341		1430
1342	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);
1343	$spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);	1432	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1344	$ntb->add (	1433	$ntb->add_tab (
1345	"Spellbook (F4)" => $spellsw,	1434	"Spellbook (F4)" => $spellsw,
1346	"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."
1347	);	1436	);
1348	$ntb->add (	1437	$ntb->add_tab (
1349	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1438	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1350	"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 :). "
1351	. "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."
1352	);	1441	);
		1442	$ntb->add_tab (Pickup => autopickup_setup,
		1443	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1353		1444
1354	$ntb->set_current_page ($INVENTORY_PAGE);	1445	$ntb->set_current_page ($INVENTORY_PAGE);
1355		1446
1356	$plwin->add ($ntb);	1447	$plwin->add ($ntb);
1357	$plwin	1448	$plwin
1358	}	1449	}
1359		1450
1360	sub update_bindings {
1361	$BIND_UPD_CB->() if $BIND_UPD_CB;
1362	}
1363
1364	sub keyboard_setup {	1451	sub keyboard_setup {
1365	my $binding_list = new CFClient::UI::VBox;	1452	CFPlus::Macro::keyboard_setup
1366
1367	my $refresh;
1368	$refresh = $BIND_UPD_CB = sub {
1369	$binding_list->clear ();
1370
1371	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1372	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1373	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1374	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1375
1376	my $lbl = join "; ", @$cmds;
1377	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1378	$binding_list->add (my $hb = new CFClient::UI::HBox);
1379	$hb->add (new CFClient::UI::Button
1380	text => "delete",
1381	tooltip => "Deletes the binding",
1382	on_activate => sub {
1383	$binding_list->remove ($hb);
1384	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1385	0
1386	});
1387
1388	$hb->add (new CFClient::UI::Button
1389	text => "edit",
1390	tooltip => "Edits the binding",
1391	on_activate => sub {
1392	$::BIND_EDITOR->set_binding (
1393	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1394	sub {
1395	my ($nmod, $nsym, $ncmds) = @_;
1396	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1397	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1398	$refresh->();
1399	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1400	$SETUP_DIALOG->show;
1401	},
1402	sub {
1403	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1404	$SETUP_DIALOG->show;
1405	});
1406	$::BIND_EDITOR->show;
1407	$SETUP_DIALOG->hide;
1408	0
1409	});
1410
1411	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1412	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1413	}
1414	}
1415	};
1416
1417	my $vb = new CFClient::UI::VBox;
1418	$vb->add (my $hb = new CFClient::UI::HBox);
1419	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1420	$hb->add (new CFClient::UI::CheckBox
1421	expand => 1,
1422	state => $CFG->{shift_fire_stop},
1423	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1424	on_changed => sub {
1425	my ($cbox, $value) = @_;
1426	$CFG->{shift_fire_stop} = $value;
1427	0
1428	});
1429
1430	$vb->add ($binding_list);
1431	$vb->add (my $hb = new CFClient::UI::HBox);
1432
1433	$hb->add (new CFClient::UI::Button
1434	text => "record new",
1435	expand => 1,
1436	tooltip => "This button opens the binding editor with an empty binding.",
1437	on_activate => sub {
1438	$::BIND_EDITOR->set_binding (undef, undef, [],
1439	sub {
1440	my ($mod, $sym, $cmds) = @_;
1441	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1442	$refresh->();
1443	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1444	$SETUP_DIALOG->show;
1445	},
1446	sub {
1447	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1448	$SETUP_DIALOG->show;
1449	},
1450	);
1451	$SETUP_DIALOG->hide;
1452	$::BIND_EDITOR->show;
1453	0
1454	},
1455	);
1456
1457	$hb->add (new CFClient::UI::Button
1458	text => "close",
1459	tooltip => "Closes the binding window",
1460	expand => 1,
1461	on_activate => sub {
1462	$SETUP_DIALOG->hide;
1463	0
1464	}
1465	);
1466
1467	$refresh->();
1468
1469	$vb
1470	}
1471
1472	# just weirdness, pls. ignore
1473	sub load_html_page {
1474	my ($viewer, $base) = @_;
1475
1476	$viewer->clear;
1477
1478	require LWP::Simple;
1479	require HTML::Parser;
1480	require URI;
1481
1482	my $page = LWP::Simple::get ($base)
1483	or return;
1484
1485	my @s = { };
1486	my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1487
1488	my $parser = HTML::Parser->new (
1489	text_h => [sub {
1490	my ($text) = @_;
1491	$text =~ s/\s+/ /g;
1492	$s[-1]{text} .= CFClient::asxml $text;
1493	}, "dtext"],
1494	start_h => [sub {
1495	my ($tag, $attr) = @_;
1496	if ($passthrough{$tag}) {
1497	$s[-1]{text} .= "<$tag>";
1498	} elsif ($tag eq "h1") {
1499	push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1500	} elsif ($tag eq "h2") {
1501	push @s, { text => "<span foreground='#ccccff' size='large'>" };
1502	} elsif ($tag eq "h3") {
1503	push @s, { text => "<span size='large'>" };
1504	} elsif ($tag eq "a") {
1505	push @s, { text => "", url => $attr->{href} };
1506	} elsif ($tag eq "p") {
1507	push @s, { };
1508	} elsif ($tag eq "img") {
1509	eval {
1510	push @{$s[-1]{obj}}, new CFClient::UI::Image
1511	tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1512	$s[-1]{text} .= "\x{fffc}";
1513	};
1514	}
1515	}, "tagname, attr"],
1516	end_h => [sub {
1517	my ($tag) = @_;
1518	if ($passthrough{$tag}) {
1519	$s[-1]{text} .= "</$tag>";
1520	} elsif ($tag =~ /^h\d$/) {
1521	$s[-1]{text} .= "</span>";
1522	push @s, { };
1523	} elsif ($tag eq "a") {
1524	my $S = pop @s;
1525	$s[-1]{text} .= "\x{fffc}";
1526	push @{$s[-1]{obj}}, new CFClient::UI::Label
1527	fg => [0.8, 0.8, 1],
1528	markup => "<u>$S->{text}</u>",
1529	fontsize => 0.8,
1530	can_events => 1,
1531	can_focus => 1,
1532	on_button_up => sub {
1533	load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1534	},
1535	;
1536	}
1537	}, "tagname"],
1538	);
1539
1540	$parser->parse ($page);
1541	$parser->eof;
1542
1543	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1544	for @s;
1545
1546	$viewer->set_offset (0);
1547	}	1453	}
1548		1454
1549	sub help_window {	1455	sub help_window {
1550	my $win = new CFClient::UI::FancyFrame	1456	my $win = new CFPlus::UI::Toplevel
1551	x => 'center',	1457	x => 'center',
1552	y => 'center',	1458	y => 'center',
1553	z => 2,	1459	z => 4,
1554	name => 'doc_browser',	1460	name => 'doc_browser',
1555	force_w => int $WIDTH * 7/8,	1461	force_w => int $WIDTH * 7/8,
1556	force_h => int $HEIGHT * 7/8,	1462	force_h => int $HEIGHT * 7/8,
1557	title => "Help Browser",	1463	title => "Help Browser",
1558	has_close_button => 1;	1464	has_close_button => 1;
1559		1465
1560	$win->add (my $vbox = new CFClient::UI::VBox);	1466	$win->add (my $vbox = new CFPlus::UI::VBox);
1561		1467
1562	$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	);
1563	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1472	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1564	expand => 1, fontsize => 0.8, padding_x => 4);	1473	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1565		1474
1566	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1475	my @history;
1567	$buttons->add (my $combo = new CFClient::UI::Combobox	1476	my @future;
1568	value => undef,	1477	my $curnode;
1569	options => [	1478
1570	[intro => "Introduction"],	1479	my $load_node; $load_node = sub {
1571	[manual => "Main Manual"],	1480	my ($node, $para) = @_;
1572	[skill_help => "Skill Reference"],	1481
1573	[command_help => "Command Reference"],	1482	$buttons->clear;
1574	[dmcommand_help => "DM Commands"],	1483
1575	[COPYING => "License Terms"],	1484	$buttons->add (new CFPlus::UI::Button
1576	[test => "test (do not select)"], #d#TODO	1485	text => "⇤",
1577	],	1486	tooltip => "back to the starting page",
1578	on_changed => sub {	1487	on_activate => sub {
1579	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	);
1580		1494
1581	if ($pod eq "test") {#d#TODO	1495	if (@history) {
1582	eval {	1496	$buttons->add (new CFPlus::UI::Button
1583	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});
1584	};	1502	},
1585	warn "$@" if $@;	1503	);
1586	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;
1587	}	1588	}
		1589	;
1588		1590
1589	my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",	1591	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1590	doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1591		1592
1592	#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	}
1593		1610
1594	$viewer->clear;	1611	$QUIT_DIALOG->show;
		1612	$QUIT_DIALOG->grab_focus;
		1613	}
1595		1614
1596	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",	1615	sub show_tip_of_the_day {
1597	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),	1616	# find all tips
1598	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),	1617	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1599	# ]);#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;
1600		1662	},
1601	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1602	for @$pom;
1603
1604	$viewer->set_offset (0);
1605
1606	0
1607	},	1663	);
1608	on_visibility_change => sub {	1664
1609	my ($self, $visible) = @_;	1665	$dialog->show;
1610	return unless $visible;
1611	return if $self->{value};
1612	$self->set_value ("intro");
1613	0
1614	},
1615	);	1666	};
1616
1617	$win
1618	}	1667	}
1619		1668
1620	sub sdl_init {	1669	sub sdl_init {
1621	CFClient::SDL_Init	1670	CFPlus::SDL_Init
1622	and die "SDL::Init failed!\n";	1671	and die "SDL::Init failed!\n";
1623	}	1672	}
1624		1673
1625	sub video_init {	1674	sub video_init {
1626	sdl_init;
1627
1628	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	1675	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1629		1676
1630	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	1677	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1631		1678
1632	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1679	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1633	$FULLSCREEN = $CFG->{fullscreen};	1680	$FULLSCREEN = $CFG->{fullscreen};
1634	$FAST = $CFG->{fast};	1681	$FAST = $CFG->{fast};
1635		1682
1636	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1683	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1637	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1684	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1638		1685
1639	$SDL_ACTIVE = 1;	1686	$SDL_ACTIVE = 1;
1640	$LAST_REFRESH = time - 0.01;	1687	$LAST_REFRESH = time - 0.01;
1641		1688
1642	CFClient::OpenGL::init;	1689	CFPlus::OpenGL::init;
1643		1690
1644	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1691	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1645		1692
1646	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1693	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1647		1694
1648	#############################################################################	1695	#############################################################################
1649		1696
1650	if ($DEBUG_STATUS) {	1697	if ($DEBUG_STATUS) {
1651	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1698	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1652	} else {	1699	} else {
1653	# create the widgets	1700	# create the widgets
1654		1701
1655	$DEBUG_STATUS = new CFClient::UI::Label	1702	$DEBUG_STATUS = new CFPlus::UI::Label
1656	padding => 0,	1703	padding => 0,
1657	z => 100,	1704	z => 100,
1658	force_x => "max",	1705	force_x => "max",
1659	force_y => 0;	1706	force_y => 0;
1660	$DEBUG_STATUS->show;	1707	$DEBUG_STATUS->show;
1661		1708
1662	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1663
1664	$STATUSBOX = new CFClient::UI::Statusbox;	1709	$STATUSBOX = new CFPlus::UI::Statusbox;
1665	$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]);
1666		1711
1667	(new CFClient::UI::Frame	1712	(new CFPlus::UI::Frame
1668	bg => [0, 0, 0, 0.4],	1713	bg => [0, 0, 0, 0.4],
1669	force_x => 0,	1714	force_x => 0,
1670	force_y => "max",	1715	force_y => "max",
1671	child => $STATUSBOX,	1716	child => $STATUSBOX,
1672	)->show;	1717	)->show;
1673		1718
1674	CFClient::UI::FancyFrame->new (	1719	CFPlus::UI::Toplevel->new (
1675	title => "Map",	1720	title => "Map",
1676	name => "mapmap",	1721	name => "mapmap",
1677	x => 0,	1722	x => 0,
1678	y => $FONTSIZE + 8,	1723	y => $FONTSIZE + 8,
1679	border_bg => [1, 1, 1, 192/255],	1724	border_bg => [1, 1, 1, 192/255],
1680	bg => [1, 1, 1, 0],	1725	bg => [1, 1, 1, 0],
1681	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1726	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1682	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.",
1683	),	1728	),
1684	)->show;	1729	)->show;
1685		1730
1686	$MAPWIDGET = new CFClient::MapWidget;	1731	$MAPWIDGET = new CFPlus::MapWidget;
1687	$MAPWIDGET->connect (activate_console => sub {	1732	$MAPWIDGET->connect (activate_console => sub {
1688	my ($mapwidget, $preset) = @_;	1733	my ($mapwidget, $preset) = @_;
1689		1734
1690	if ($CONSOLE) {	1735	$MESSAGE_WINDOW->activate_console ($preset)
1691	$CONSOLE->{input}->{auto_activated} = 1;	1736	if $MESSAGE_WINDOW;
1692	$CONSOLE->{input}->grab_focus;
1693
1694	if ($preset && $CONSOLE->{input}->get_text eq '') {
1695	$CONSOLE->{input}->set_text ($preset);
1696	}
1697	}
1698	});	1737	});
1699	$MAPWIDGET->show;	1738	$MAPWIDGET->show;
1700	$MAPWIDGET->grab_focus;	1739	$MAPWIDGET->grab_focus;
1701		1740
1702	$LOGVIEW = new CFClient::UI::TextScroller
1703	expand => 1,
1704	font => $FONT_FIXED,
1705	fontsize => $::CFG->{log_fontsize},
1706	indent => -4,
1707	can_hover => 1,
1708	can_events => 1,
1709	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1710	;
1711
1712	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1741	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1713	title => "Setup",	1742	title => "Setup",
1714	name => "setup_dialog",	1743	name => "setup_dialog",
1715	x => 'center',	1744	x => 'center',
1716	y => 'center',	1745	y => 'center',
1717	z => 2,	1746	z => 2,
…		…
1719	force_h => $::HEIGHT * 0.6,	1748	force_h => $::HEIGHT * 0.6,
1720	has_close_button => 1,	1749	has_close_button => 1,
1721	;	1750	;
1722		1751
1723	$METASERVER = metaserver_dialog;	1752	$METASERVER = metaserver_dialog;
		1753	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1724		1754
1725	$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,
1726	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1756	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1727		1757
1728	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1758	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1729	"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.");
1730	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1760	$SETUP_NOTEBOOK->add_tab (Client => client_setup,
1731	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1761	"Configure various client-specific settings.");
1732	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1762	$SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1733	"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.");
1734	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1764	$SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1735	"Configure the use of audio, sound effects and background music.");	1765	"Configure the use of audio, sound effects and background music.");
1736	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1766	$SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1737	"Lets you define, edit and delete key bindings."	1767	"Lets you define, edit and delete key bindings."
1738	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "	1768	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1739	. "with nothing set and the recording started. After doing the actions you "	1769	. "with nothing set and the recording started. After doing the actions you "
1740	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1770	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1741	. "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 "
1742	. "binding editor closes");	1772	. "binding editor closes");
1743	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1773	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1744	"Some debuggin' options. Do not ask.");	1774	"Some debuggin' options. Do not ask.");
1745		1775
1746	$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
1747		1777
1748	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1778	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1749	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.");
1750		1780
1751	$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,
1752	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.");
1753		1783
1754	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
1755		1785
1756	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1786	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1757	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.");
1758		1788
1759	$BUTTONBAR->add (new CFClient::UI::Button	1789	$BUTTONBAR->add (new CFPlus::UI::Button
1760	text => "Save Config",	1790	text => "Save Config",
1761	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.",
1762	on_activate => sub {	1792	on_activate => sub {
1763	$::CFG->{layout} = CFClient::UI::get_layout;	1793	$::CFG->{layout} = CFPlus::UI::get_layout;
1764	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1794	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1765	status "Configuration Saved";	1795	status "Configuration Saved";
1766	0	1796	0
1767	},	1797	},
1768	);	1798	);
1769		1799
1770	$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,
1771	tooltip => "View Documentation");	1801	tooltip => "View Documentation");
1772		1802
		1803
1773	$BUTTONBAR->add (new CFClient::UI::Button	1804	$BUTTONBAR->add (new CFPlus::UI::Button
1774	text => "Quit",	1805	text => "Quit",
1775	tooltip => "Terminates the program",	1806	tooltip => "Terminates the program",
1776	on_activate => sub {	1807	on_activate => sub {
1777	if ($CONN) {	1808	if ($CONN) {
1778	open_quit_dialog;	1809	open_quit_dialog;
…		…
1788	}	1819	}
1789		1820
1790	$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]);
1791	}	1822	}
1792		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
1793	sub video_shutdown {	1943	sub video_shutdown {
1794	CFClient::OpenGL::shutdown;	1944	CFPlus::OpenGL::shutdown;
1795		1945
1796	undef $SDL_ACTIVE;	1946	undef $SDL_ACTIVE;
1797	}	1947	}
1798		1948
1799	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1800	my $bgmusic;#TODO#hack#d#
1801
1802	sub audio_channel_finished {	1949	sub audio_channel_finished {
1803	my ($channel) = @_;	1950	my ($channel) = @_;
1804		1951
1805	#warn "channel $channel finished\n";#d#	1952	#warn "channel $channel finished\n";#d#
1806	}	1953	}
1807		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	return unless $SDL_MIXER;
		1975
		1976	# music might have changed...
		1977	$path eq $MUSIC_PLAYING->{path}
		1978	or return &audio_music_start ();
		1979
		1980	$MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
		1981
		1982	my $NOW = time;
		1983
		1984	if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
		1985	my $pos = $MUSIC_PLAYING->{stop_pos};
		1986	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
		1987	$MUSIC_START = time - $pos;
		1988	} else {
		1989	$MUSIC_PLAYER->play (0);
		1990	$MUSIC_START = time;
		1991	}
		1992
		1993	delete $MUSIC_PLAYING->{stop_time};
		1994	delete $MUSIC_PLAYING->{stop_pos};
		1995	}
		1996	}
		1997
		1998	sub audio_music_changed {
		1999	return unless $CFG->{bgm_enable};
		2000	return unless $SDL_MIXER;
		2001
		2002	# default MUSIC_WANT == MUSIC_DEFAULT
		2003	@MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
		2004
		2005	# if the currently playing song is acceptable, let it continue
		2006	return if $MUSIC_PLAYING
		2007	&& grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
		2008
		2009	my $NOW = time;
		2010
		2011	if ($MUSIC_PLAYING) {
		2012	$MUSIC_PLAYING->{stop_time} = $NOW;
		2013	$MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
		2014	CFPlus::MixMusic::fade_out 1000;
		2015	} else {
		2016	# sort by stop time, oldest first
		2017	@MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
		2018
		2019	# if the most recently-played piece played very recently,
		2020	# resume it, else choose the oldest piece for rotation.
		2021	$MUSIC_PLAYING =
		2022	$MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
		2023	? $MUSIC_WANT[-1]
		2024	: $MUSIC_WANT[0];
		2025
		2026	audio_music_start;
		2027	}
		2028	}
		2029
1808	sub audio_music_finished {	2030	sub audio_music_finished {
1809	return unless $CFG->{bgm_enable};	2031	$MUSIC_PLAYING = undef;
		2032	undef $MUSIC_PLAYER;
1810		2033
1811	# TODO: hack, do play loop and mood music	2034	audio_music_changed;
1812	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1813	$bgmusic->play (0);
1814
1815	push @bgmusic, shift @bgmusic;
1816	}	2035	}
1817		2036
1818	sub audio_init {	2037	sub audio_init {
1819	if ($CFG->{audio_enable}) {	2038	if ($CFG->{audio_enable}) {
1820	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	2039	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1821	$SDL_MIXER = !CFClient::Mix_OpenAudio;	2040	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1822		2041
1823	unless ($SDL_MIXER) {	2042	unless ($SDL_MIXER) {
1824	status "Unable to open sound device: there will be no sound";	2043	status "Unable to open sound device: there will be no sound";
1825	return;	2044	return;
1826	}	2045	}
1827		2046
1828	CFClient::Mix_AllocateChannels 8;	2047	CFPlus::Mix_AllocateChannels 8;
1829	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	2048	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1830		2049
1831	audio_music_finished;	2050	audio_music_finished;
1832		2051
		2052	local $_;
1833	while (<$fh>) {	2053	while (<$fh>) {
1834	next if /^\s*#/;	2054	next if /^\s*#/;
1835	next if /^\s*$/;	2055	next if /^\s*$/;
1836		2056
1837	my ($file, $volume, $event) = split /\s+/, $_, 3;	2057	my ($file, $volume, $event) = split /\s+/, $_, 3;
1838		2058
1839	push @SOUNDS, "$volume,$file";	2059	push @SOUNDS, "$volume,$file";
1840		2060
1841	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	2061	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1842	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	2062	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1843	$chunk->volume ($volume * 128 / 100);	2063	$chunk->volume ($volume * 128 / 100);
1844	$chunk	2064	$chunk
1845	};	2065	};
1846	}	2066	}
1847	} else {	2067	} else {
1848	status "unable to open sound config: $!";	2068	status "unable to open sound config: $!";
1849	}	2069	}
		2070	} else {
		2071	undef $SDL_MIXER;
1850	}	2072	}
1851	}	2073	}
1852		2074
1853	sub audio_shutdown {	2075	sub audio_shutdown {
1854	CFClient::Mix_CloseAudio if $SDL_MIXER;	2076	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1855	undef $SDL_MIXER;	2077	undef $SDL_MIXER;
1856	@SOUNDS = ();	2078	@SOUNDS = ();
1857	%AUDIO_CHUNKS = ();	2079	%AUDIO_CHUNKS = ();
1858	}	2080	}
1859		2081
…		…
1866		2088
1867	sub force_refresh {	2089	sub force_refresh {
1868	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2090	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1869	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2091	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1870		2092
1871	$CFClient::UI::ROOT->draw;	2093	$CFPlus::UI::ROOT->draw;
1872		2094
1873	$WANT_REFRESH = 0;	2095	$WANT_REFRESH = 0;
1874	$CAN_REFRESH = 0;	2096	$CAN_REFRESH = 0;
1875	$LAST_REFRESH = $NOW;	2097	$LAST_REFRESH = $NOW;
1876		2098
1877	CFClient::SDL_GL_SwapBuffers;	2099	CFPlus::SDL_GL_SwapBuffers;
1878	}	2100	}
1879		2101
1880	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2102	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1881	$NOW = time;	2103	$NOW = time;
1882		2104
1883	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2105	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1884	for CFClient::SDL_PollEvent;	2106	for CFPlus::poll_events;
1885		2107
1886	if (%animate_object) {	2108	if (%animate_object) {
1887	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2109	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1888	$WANT_REFRESH++;	2110	++$WANT_REFRESH;
1889	}	2111	}
1890		2112
1891	if ($WANT_REFRESH) {	2113	if ($WANT_REFRESH) {
1892	force_refresh;	2114	force_refresh;
1893	} else {	2115	} else {
…		…
1913	$CONN->face_prefetch	2135	$CONN->face_prefetch
1914	if $CONN;	2136	if $CONN;
1915	});	2137	});
1916		2138
1917	%SDL_CB = (	2139	%SDL_CB = (
1918	CFClient::SDL_QUIT => sub {	2140	CFPlus::SDL_QUIT => sub {
1919	Event::unloop -1;	2141	exit;
1920	},	2142	},
1921	CFClient::SDL_VIDEORESIZE => sub {	2143	CFPlus::SDL_VIDEORESIZE => sub {
1922	},	2144	},
1923	CFClient::SDL_VIDEOEXPOSE => sub {	2145	CFPlus::SDL_VIDEOEXPOSE => sub {
1924	CFClient::UI::full_refresh;	2146	CFPlus::UI::full_refresh;
1925	},	2147	},
1926	CFClient::SDL_ACTIVEEVENT => sub {	2148	CFPlus::SDL_ACTIVEEVENT => sub {
1927	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2149	# not useful, as APPACTIVE include sonly iconified state, not unmapped
		2150	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
		2151	# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
		2152	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
		2153	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
		2154	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1928	},	2155	},
1929	CFClient::SDL_KEYDOWN => sub {	2156	CFPlus::SDL_KEYDOWN => sub {
1930	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2157	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1931	# alt-enter	2158	# alt-enter
1932	$FULLSCREEN_ENABLE->toggle;	2159	$FULLSCREEN_ENABLE->toggle;
1933	video_shutdown;	2160	video_shutdown;
1934	video_init;	2161	video_init;
1935	} else {	2162	} else {
1936	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2163	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1937	}	2164	}
1938	},	2165	},
1939	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2166	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1940	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2167	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1941	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2168	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1942	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2169	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1943	CFClient::SDL_USEREVENT => sub {	2170	CFPlus::SDL_USEREVENT => sub {
1944	if ($_[0]{code} == 1) {	2171	if ($_[0]{code} == 1) {
1945	audio_channel_finished $_[0]{data1};	2172	audio_channel_finished $_[0]{data1};
1946	} elsif ($_[0]{code} == 0) {	2173	} elsif ($_[0]{code} == 0) {
1947	audio_music_finished;	2174	audio_music_finished;
1948	}	2175	}
…		…
1952	#############################################################################	2179	#############################################################################
1953		2180
1954	$SIG{INT} = $SIG{TERM} = sub { exit };	2181	$SIG{INT} = $SIG{TERM} = sub { exit };
1955		2182
1956	{	2183	{
1957	local $SIG{__DIE__} = sub {
1958	return unless defined $^S && !$^S;
1959	Carp::confess $_[0];#d#TODO: remove when stable
1960	CFClient::fatal $_[0];
1961	};
1962
1963	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	2184	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
		2185	CFPlus::DB::Server::run;
		2186
1964	CFClient::UI::set_layout ($::CFG->{layout});	2187	CFPlus::UI::set_layout ($::CFG->{layout});
1965		2188
1966	my %DEF_CFG = (	2189	my %DEF_CFG = (
1967	sdl_mode => 0,	2190	sdl_mode => 0,
1968	width => 640,	2191	width => 640,
1969	height => 480,	2192	height => 480,
1970	fullscreen => 0,	2193	fullscreen => 0,
1971	fast => 0,	2194	fast => 0,
1972	map_scale => 1,	2195	map_scale => 1,
1973	fow_enable => 1,	2196	fow_enable => 1,
1974	fow_intensity => 0.45,	2197	fow_intensity => 0,
1975	fow_smooth => 0,	2198	map_smoothing => 1,
1976	gui_fontsize => 1,	2199	gui_fontsize => 1,
1977	log_fontsize => 0.7,	2200	log_fontsize => 0.7,
1978	gauge_fontsize => 1,	2201	gauge_fontsize => 1,
1979	gauge_size => 0.35,	2202	gauge_size => 0.35,
1980	stat_fontsize => 0.7,	2203	stat_fontsize => 0.7,
1981	mapsize => 100,	2204	mapsize => 100,
1982	say_command => 'say',	2205	say_command => 'chat',
1983	audio_enable => 1,	2206	audio_enable => 1,
1984	bgm_enable => 1,	2207	bgm_enable => 1,
1985	bgm_volume => 0.25,	2208	bgm_volume => 0.25,
1986	face_prefetch => 0,	2209	face_prefetch => 0,
1987	output_sync => 1,	2210	output_sync => 1,
1988	output_count => 1,	2211	output_count => 1,
		2212	output_rate => "",
1989	pickup => 0,	2213	pickup => 0,
		2214	inv_sort => "mtime",
1990	default => "profile", # default profile	2215	default => "profile", # default profile
		2216	show_tips => 1,
		2217	logview_max_par => 1000,
1991	);	2218	);
1992		2219
1993	while (my ($k, $v) = each %DEF_CFG) {	2220	while (my ($k, $v) = each %DEF_CFG) {
1994	$CFG->{$k} = $v unless exists $CFG->{$k};	2221	$CFG->{$k} = $v unless exists $CFG->{$k};
1995	}	2222	}
1996		2223
1997	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";	2224	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		2225	$PROFILE = $CFG->{profile}{default};
		2226
		2227	# convert old bindings (only default profile matters)
		2228	if (my $bindings = delete $PROFILE->{bindings}) {
		2229	while (my ($mod, $syms) = each %$bindings) {
		2230	while (my ($sym, $cmds) = each %$syms) {
		2231	push @{ $PROFILE->{macro} }, {
		2232	accelkey => [$mod*1, $sym*1],
		2233	action => $cmds,
		2234	};
		2235	}
		2236	}
		2237	}
1998		2238
1999	sdl_init;	2239	sdl_init;
2000		2240
2001	@SDL_MODES = reverse	2241	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2002	grep $_->[0] >= 640 && $_->[1] >= 480,	2242	@SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2003	CFClient::SDL_ListModes;
2004
2005	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2243	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2244
		2245	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2006		2246
2007	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2247	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2008		2248
2009	{	2249	{
2010	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2250	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2011	DejaVuSans.ttf	2251	DejaVuSans.ttf
2012	DejaVuSansMono.ttf	2252	DejaVuSansMono.ttf
2013	DejaVuSans-Bold.ttf	2253	DejaVuSans-Bold.ttf
2014	DejaVuSansMono-Bold.ttf	2254	DejaVuSansMono-Bold.ttf
2015	DejaVuSans-Oblique.ttf	2255	DejaVuSans-Oblique.ttf
2016	DejaVuSansMono-Oblique.ttf	2256	DejaVuSansMono-Oblique.ttf
2017	DejaVuSans-BoldOblique.ttf	2257	DejaVuSans-BoldOblique.ttf
2018	DejaVuSansMono-BoldOblique.ttf	2258	DejaVuSansMono-BoldOblique.ttf
2019	);	2259	);
2020		2260
2021	CFClient::add_font $_ for @fonts;	2261	CFPlus::add_font $_ for @fonts;
2022		2262
2023	CFClient::pango_init;	2263	CFPlus::pango_init;
2024		2264
2025	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2265	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2026	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2266	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2027		2267
2028	$FONT_PROP->make_default;	2268	$FONT_PROP->make_default;
2029	}	2269	}
2030		2270
2031	# compare mono (ft) vs. rgba (cairo)	2271	# compare mono (ft) vs. rgba (cairo)
2032	# ft - 1.8s, cairo 3s, even in alpha-only mode	2272	# ft - 1.8s, cairo 3s, even in alpha-only mode
2033	# for my $rgba (0..1) {	2273	# for my $rgba (0..1) {
2034	# my $t1 = Time::HiRes::time;	2274	# my $t1 = Time::HiRes::time;
2035	# for (1..1000) {	2275	# for (1..1000) {
2036	# my $layout = CFClient::Layout->new ($rgba);	2276	# my $layout = CFPlus::Layout->new ($rgba);
2037	# $layout->set_text ("hallo" x 100);	2277	# $layout->set_text ("hallo" x 100);
2038	# $layout->render;	2278	# $layout->render;
2039	# }	2279	# }
2040	# my $t2 = Time::HiRes::time;	2280	# my $t2 = Time::HiRes::time;
2041	# warn $t2-$t1;	2281	# warn $t2-$t1;
2042	# }	2282	# }
2043		2283
		2284	$startup_done->();
		2285
2044	video_init;	2286	video_init;
2045	audio_init;	2287	audio_init;
2046	}	2288	}
2047		2289
		2290	show_tip_of_the_day if $CFG->{show_tips};
		2291
2048	Event::loop;	2292	Event::loop;
2049	#CFClient::SDL_Quit;	2293	#CFPlus::SDL_Quit;
2050	#CFClient::_exit 0;	2294	#CFPlus::_exit 0;
2051		2295
2052	END { CFClient::SDL_Quit }	2296	END {
		2297	CFPlus::SDL_Quit;
		2298	CFPlus::DB::Server::stop;
		2299	}
2053		2300
2054	=head1 NAME	2301	=head1 NAME
2055		2302
2056	cfplus - A Crossfire+ and Crossfire game client	2303	cfplus - A Crossfire+ and Crossfire game client
2057		2304

Diff Legend

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