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.102 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.186 by elmex, Wed Jul 25 15:06:21 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::Selector	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
		813	$vb->add (new CFPlus::UI::FancyFrame
		814	label => "Primary/Secondary Statistics",
693	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	815	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		816	);
694	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	817	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
695		818
696	my $color2 = [1, 1, 0];	819	my $color2 = [1, 1, 0];
697		820
698	for (	821	for (
699	[0, 0, st_str => "Str", 30],	822	[0, 0, st_str => "Str", 30],
…		…
711	[2, 4, st_spd => "Spd", 10.54],	834	[2, 4, st_spd => "Spd", 10.54],
712	[2, 5, st_wspd => "WSp", 10.54],	835	[2, 5, st_wspd => "WSp", 10.54],
713	) {	836	) {
714	my ($col, $row, $id, $label, $template) = @$_;	837	my ($col, $row, $id, $label, $template) = @$_;
715		838
716	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	839	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
717	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	840	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718	align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});	841	align => +1, template => $template, tooltip => "#stat_$label");
719	$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
720	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,
721	align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});	844	align => -1, text => $label, tooltip => "#stat_$label");
722	}	845	}
723		846
		847	$vb->add (new CFPlus::UI::FancyFrame
		848	label => "Resistancies",
724	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	849	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		850	);
725		851
726	my $row = 0;	852	my $row = 0;
727	my $col = 0;	853	my $col = 0;
728		854
729	my %resist_names = (	855	my %resist_names = (
…		…
762	cold => ["Cold",	888	cold => ["Cold",
763	"<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, ...)"],
764	ghit => ["Ghost hit",	890	ghit => ["Ghost hit",
765	"<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)"],
766	);	892	);
		893
767	for (qw/slow holyw conf fire depl magic	894	for (qw/slow holyw conf fire depl magic
768	drain acid pois para deat phys	895	drain acid pois para deat phys
769	blind fear tund elec cold ghit/)	896	blind fear tund elec cold ghit/)
770	{	897	{
771	$tbl2->add ($col, $row,	898	$tbl2->add_at ($col, $row,
772	$STATWIDS->{"res_$_"} =	899	$STATWIDS->{"res_$_"} =
773	new CFClient::UI::Label	900	new CFPlus::UI::Label
774	font => $FONT_FIXED,	901	font => $FONT_FIXED,
775	template => "-100%",	902	template => "-100%",
776	align => +1,	903	align => +1,
777	valign => 0,	904	valign => 0,
778	can_events => 1,	905	can_events => 1,
779	can_hover => 1,	906	can_hover => 1,
780	tooltip => $resist_names{$_}->[1],	907	tooltip => $resist_names{$_}->[1],
781	);	908	);
782	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	909	$tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
783	font => $FONT_FIXED,	910	font => $FONT_FIXED,
784	can_hover => 1,	911	can_hover => 1,
785	can_events => 1,	912	can_events => 1,
786	path => "ui/resist/resist_$_.png",	913	path => "ui/resist/resist_$_.png",
787	tooltip => $resist_names{$_}->[1],	914	tooltip => $resist_names{$_}->[1],
788	);	915	);
789	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	916	$tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
790	text => $resist_names{$_}->[0],	917	text => $resist_names{$_}->[0],
791	font => $FONT_FIXED,	918	font => $FONT_FIXED,
792	can_hover => 1,	919	can_hover => 1,
793	can_events => 1,	920	can_events => 1,
794	tooltip => $resist_names{$_}->[1],	921	tooltip => $resist_names{$_}->[1],
…		…
805		932
806	$r	933	$r
807	}	934	}
808		935
809	sub skill_window {	936	sub skill_window {
810	my $sw = new CFClient::UI::ScrolledWindow (expand => 1);	937	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
811	$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]);
812	$sw	939	$sw
813	}	940	}
814		941
815	sub formsep($) {	942	sub formsep($) {
816	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	943	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
…		…
827	return if $METASERVER_ATIME > time;	954	return if $METASERVER_ATIME > time;
828	$METASERVER_ATIME = time + 60;	955	$METASERVER_ATIME = time + 60;
829		956
830	my $table = $METASERVER->{table};	957	my $table = $METASERVER->{table};
831	$table->clear;	958	$table->clear;
832	$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...");
833		960
834	my $buf;	961	my $ok = 0;
835		962
836	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	963	CFPlus::background {
		964	my $ua = CFPlus::lwp_useragent;
837		965
838	unless ($fh) {	966	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
839	$label->set_text ("unable to contact metaserver: $!");	967	} sub {
840	return;	968	my ($msg) = @_;
841	}	969	if ($msg) {
842
843	Event->io (fd => $fh, poll => 'r', cb => sub {
844	my $res = sysread $fh, $buf, 8192, length $buf;
845
846	if (!defined $res) {
847	$_[0]->w->cancel;
848	$label->set_text ("error while retrieving server list: $!");
849	} elsif ($res == 0) {
850	$_[0]->w->cancel;
851	status "server list retrieved";
852
853	utf8::decode $buf if utf8::valid $buf;
854
855	$table->clear;	970	$table->clear;
856		971
857	my @tip = (	972	my @tip = (
858	"The current number of users logged in on the server.",	973	"The current number of users logged in on the server.",
859	"The hostname of the server.",	974	"The hostname of the server.",
860	"The time this server has been running without being restarted.",	975	"The time this server has been running without being restarted.",
861	"The server software version - a '+' indicates a Crossfire+ server.",	976	"The server software version - a '+' indicates a Crossfire+ server.",
862	"Short information about this server provided by its admins.",	977	"Short information about this server provided by its admins.",
863	);	978	);
864	my @col = qw(#Users Host Uptime Version Description);	979	my @col = qw(#Users Host Uptime Version Description);
865	$table->add ($_, 0, new CFClient::UI::Label	980	$table->add_at ($_, 0, new CFPlus::UI::Label
866	can_hover => 1, can_events => 1,	981	can_hover => 1, can_events => 1,
867	align => 0, fg => [1, 1, 0],	982	align => 0, fg => [1, 1, 0],
868	text => $col[$_], tooltip => $tip[$_])	983	text => $col[$_], tooltip => $tip[$_])
869	for 0 .. $#col;	984	for 0 .. $#col;
870		985
871	my @align = qw(1 0 1 1 -1);	986	my @align = qw(1 0 1 1 -1);
872		987
873	my $y = 0;	988	my $y = 0;
874	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	989	for my $m (@{ $msg->{servers} }) {
875	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)};
876		992
877	for ($desc) {	993	for ($desc) {
878	s/<br>/\n/gi;	994	s/<br>/\n/gi;
879	s/<li>/\n· /gi;	995	s/<li>/\n· /gi;
880	s/<.*?>//sgi;	996	s/<.*?>//sgi;
881	s/&/&amp;/g;	997	s/&amp;/&/g;
882	s/</&lt;/g;	998	s/&lt;/</g;
883	s/>/&gt;/g;	999	s/&gt;/>/g;
884	}	1000	}
885		1001
886	$uptime = sprintf "%dd %02d:%02d:%02d",	1002	$uptime = sprintf "%dd %02d:%02d:%02d",
887	(int $m->[8] / 86400),	1003	(int $uptime / 86400),
888	(int $m->[8] / 3600) % 24,	1004	(int $uptime / 3600) % 24,
889	(int $m->[8] / 60) % 60,	1005	(int $uptime / 60) % 60,
890	$m->[8] % 60;	1006	$uptime % 60;
891		1007
892	$m = [$users, $host, $uptime, $version, $desc];	1008	$m = [$users, $host, $uptime, $version, $desc];
893		1009
894	$y++;	1010	$y++;
895		1011
896	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	1012	$table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
897	(new CFClient::UI::Button	1013	(new CFPlus::UI::Button
898	text => "Use",	1014	text => "Use",
899	tooltip => "Put this server into the <b>Host:Port</b> field",	1015	tooltip => "Put this server into the <b>Host:Port</b> field",
900	on_activate => sub {	1016	on_activate => sub {
901	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1017	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
902	$METASERVER->hide;	1018	$METASERVER->hide;
903	0	1019	0
904	},	1020	},
905	),	1021	),
906	(new CFClient::UI::Empty expand => 1),	1022	(new CFPlus::UI::Empty expand => 1),
907	]);	1023	]);
908		1024
909	$table->add ($_, $y, new CFClient::UI::Label	1025	$table->add_at ($_, $y, new CFPlus::UI::Label
		1026	max_w => $::WIDTH * 0.4,
910	ellipsise => 0,	1027	ellipsise => 0,
911	align => $align[$_],	1028	align => $align[$_],
912	text => $m->[$_],	1029	text => $m->[$_],
913	tooltip => $tip[$_],	1030	tooltip => $tip[$_],
		1031	fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
914	can_hover => 1,	1032	can_hover => 1,
915	can_events => 1,	1033	can_events => 1,
916	fontsize => 0.8)	1034	fontsize => 0.8)
917	for 0 .. $#$m;	1035	for 0 .. $#$m;
918	}	1036	}
		1037	} else {
		1038	$ok or $label->set_text ("error while contacting metaserver");
919	}	1039	}
920	});	1040	};
		1041
921	}	1042	}
922		1043
923	sub metaserver_dialog {	1044	sub metaserver_dialog {
924	my $vbox = new CFClient::UI::VBox;	1045	my $vbox = new CFPlus::UI::VBox;
925	my $table = new CFClient::UI::Table;	1046	my $table = new CFPlus::UI::Table;
926	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	1047	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
927		1048
928	my $dialog = new CFClient::UI::FancyFrame	1049	my $dialog = new CFPlus::UI::Toplevel
929	title => "Server List",	1050	title => "Server List",
930	name => 'metaserver_dialog',	1051	name => 'metaserver_dialog',
931	x => 'center',	1052	x => 'center',
932	y => 'center',	1053	y => 'center',
933	z => 3,	1054	z => 3,
		1055	force_w => $::WIDTH * 0.9,
934	force_h => $::HEIGHT * 0.4,	1056	force_h => $::HEIGHT * 0.7,
935	child => $vbox,	1057	child => $vbox,
936	has_close_button => 1,	1058	has_close_button => 1,
937	table => $table,	1059	table => $table,
938	on_visibility_change => sub {	1060	on_visibility_change => sub {
939	update_metaserver ($_[0]) if $_[1];	1061	update_metaserver ($_[0]) if $_[1];
…		…
943		1065
944	$dialog	1066	$dialog
945	}	1067	}
946		1068
947	sub server_setup {	1069	sub server_setup {
948	my $vbox = new CFClient::UI::VBox;	1070	my $vbox = new CFPlus::UI::VBox;
949		1071
		1072	$vbox->add (new CFPlus::UI::FancyFrame
		1073	label => "Connection Settings",
950	$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	);
951	$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");
952		1077
953	{	1078	{
954	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	1079	$table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
955		1080
956	$vbox->add (	1081	$vbox->add (
957	$HOST_ENTRY = new CFClient::UI::Entry	1082	$HOST_ENTRY = new CFPlus::UI::Entry
958	expand => 1,	1083	expand => 1,
959	text => $CFG->{profile}{default}{host},	1084	text => $CFG->{profile}{default}{host},
960	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",
961	on_changed => sub {	1086	on_changed => sub {
962	my ($self, $value) = @_;	1087	my ($self, $value) = @_;
963	$CFG->{profile}{default}{host} = $value;	1088	$CFG->{profile}{default}{host} = $value;
964	0	1089	0
965	}	1090	}
966	);	1091	);
967		1092
968	$vbox->add (new CFClient::UI::Button	1093	$vbox->add (new CFPlus::UI::Button
969	expand => 1,	1094	expand => 1,
970	text => "Server List",	1095	text => "Server List",
971	other => $METASERVER,	1096	other => $METASERVER,
972	tooltip => "Show a list of available crossfire servers",	1097	tooltip => "Show a list of available crossfire servers",
973	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1098	on_activate => sub { $METASERVER->toggle_visibility; 0 },
974	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1099	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
975	);	1100	);
976	}	1101	}
977		1102
978	$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");
979	$table->add (1, 4, new CFClient::UI::Entry	1104	$table->add_at (1, 4, new CFPlus::UI::Entry
980	text => $CFG->{profile}{default}{user},	1105	text => $CFG->{profile}{default}{user},
981	tooltip => "The name of your character on the server",	1106	tooltip => "The name of your character on the server",
982	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1107	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
983	);	1108	);
984		1109
985	$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");
986	$table->add (1, 5, new CFClient::UI::Entry	1111	$table->add_at (1, 5, new CFPlus::UI::Entry
987	text => $CFG->{profile}{default}{password},	1112	text => $CFG->{profile}{default}{password},
988	hidden => 1,	1113	hidden => 1,
989	tooltip => "The password for your character",	1114	tooltip => "The password for your character",
990	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1115	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
991	);	1116	);
992		1117
993	$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");
994	$table->add (1, 7, new CFClient::UI::Slider	1119	$table->add_at (1, 7, new CFPlus::UI::Slider
995	force_w => 100,	1120	force_w => 100,
996	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1121	range => [$CFG->{mapsize}, 10, 100, 0, 1],
997	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. "
998	. "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, "
999	. "but you also increase bandwidth requirements and latency. "	1124	. "but you also increase bandwidth requirements and latency. "
1000	. "This option is only used once at log-in.",	1125	. "This option is only used once at log-in.",
1001	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 },
1002	);	1127	);
1003		1128
1004	$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");
1005	$table->add (1, 8, new CFClient::UI::CheckBox	1130	$table->add_at (1, 8, new CFPlus::UI::CheckBox
1006	state => $CFG->{face_prefetch},	1131	state => $CFG->{face_prefetch},
1007	tooltip => "<b>Background Image Prefetch</b>\n\n"	1132	tooltip => "<b>Background Image Prefetch</b>\n\n"
1008	. "If enabled, the client automatically pre-fetches images from the server. "	1133	. "If enabled, the client automatically pre-fetches images from the server. "
1009	. "This might increase or create lag, but increases the chances "	1134	. "This might increase or create lag, but increases the chances "
1010	. "of faces being ready for display when you encounter them. "	1135	. "of faces being ready for display when you encounter them. "
…		…
1012	. "so only set it if you really need to prefetch images. "	1137	. "so only set it if you really need to prefetch images. "
1013	. "This option can be set and unset any time.",	1138	. "This option can be set and unset any time.",
1014	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1139	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1015	);	1140	);
1016		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
1017	$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");
1018	$table->add (1, 9, new CFClient::UI::Entry	1152	$table->add_at (1, 10, new CFPlus::UI::Entry
1019	text => $CFG->{output_count},	1153	text => $CFG->{output_count},
1020	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.",
1021	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1155	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1022	);	1156	);
1023		1157
1024	$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");
1025	$table->add (1, 10, new CFClient::UI::Entry	1159	$table->add_at (1, 11, new CFPlus::UI::Entry
1026	text => $CFG->{output_sync},	1160	text => $CFG->{output_sync},
1027	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.",
1028	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1162	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1029	);	1163	);
1030		1164
1031	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1165	$table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1032	expand => 1,	1166	expand => 1,
1033	align => 0,	1167	align => 0,
1034	text => "Login",	1168	text => "Login",
1035	on_activate => sub {	1169	on_activate => sub {
1036	$CONN ? stop_game	1170	$CONN ? stop_game
1037	: start_game;	1171	: start_game;
1038	0	1172	0
1039	},	1173	},
1040	);	1174	);
1041		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
1042	$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 => "Tip of the day");
1043	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1190	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
1044	text => $CFG->{say_command},	1191	state => $CFG->{show_tips},
1045	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 => "Show the <b>Tip of the day</b> window at startup?",
1046	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1047	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1048	on_changed => sub {	1193	on_changed => sub {
1049	my ($self, $value) = @_;	1194	my ($self, $value) = @_;
1050	$CFG->{say_command} = $value;	1195	$CFG->{show_tips} = $value;
1051	0	1196	0
1052	}	1197	}
1053	);	1198	);
1054		1199
1055	$vbox->add (new CFClient::UI::Label	1200	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1056	text => "Server Info",	1201	$table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1057	fontsize => 1.2,	1202	text => $CFG->{logview_max_par},
1058	padding_y => 8,	1203	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1059	fg => [1, 1, 0, 1],	1204	. "sends more messages than this number, older messages get removed to save memory and "
1060	);	1205	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1061
1062	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1063
1064	$vbox
1065	}
1066
1067	sub message_window {
1068	my $window = new CFClient::UI::FancyFrame
1069	name => "message_window",
1070	title => "Messages",
1071	border_bg => [1, 1, 1, 1],
1072	x => "max",
1073	y => 0,
1074	force_w => $::WIDTH * 0.4,
1075	force_h => $::HEIGHT * 0.5,
1076	child => (my $vbox = new CFClient::UI::VBox),
1077	has_close_button => 1;
1078
1079	$vbox->add ($LOGVIEW);
1080
1081	$vbox->add (my $input = new CFClient::UI::Entry
1082	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1083	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1084	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1085	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1086	on_focus_in => sub {	1206	on_changed => sub {
1087	my ($input, $prev_focus) = @_;	1207	my ($self, $value) = @_;
1088		1208	$MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1089	delete $input->{refocus_map};
1090
1091	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1092	$input->{refocus_map} = 1;
1093	}
1094	delete $input->{auto_activated};
1095
1096	0	1209	0
1097	},	1210	},
1098	on_activate => sub {
1099	my ($input, $text) = @_;
1100	$input->set_text ('');
1101
1102	if ($text =~ /^\/(.*)/) {
1103	$::CONN->user_send ($1);
1104	} else {
1105	my $say_cmd = $::CFG->{say_command} || 'say';
1106	$::CONN->user_send ("$say_cmd $text");
1107	}
1108	if ($input->{refocus_map}) {
1109	delete $input->{refocus_map};
1110	$MAPWIDGET->focus_in
1111	}
1112
1113	0
1114	},
1115	on_escape => sub {
1116	$MAPWIDGET->grab_focus;
1117
1118	0
1119	},
1120	);
1121
1122	$CONSOLE = {
1123	window => $window,
1124	input => $input,
1125	};	1211	);
1126		1212
1127	$window	1213	$table
1128	}
1129
1130	sub open_quit_dialog {
1131	unless ($QUIT_DIALOG) {
1132	$QUIT_DIALOG = new CFClient::UI::FancyFrame
1133	x => "center",
1134	y => "center",
1135	z => 50,
1136	title => "Really Quit?",
1137	on_key_down => sub {
1138	my ($dialog, $ev) = @_;
1139	$ev->{sym} == 27 and $dialog->hide;
1140	}
1141	;
1142
1143	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1144
1145	$vb->add (new CFClient::UI::Label
1146	text => "You should find a savebed and apply it first!",
1147	max_w => $WIDTH * 0.25,
1148	ellipsize => 0,
1149	);
1150	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1151	$hb->add (new CFClient::UI::Button
1152	text => "Ok",
1153	expand => 1,
1154	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1155	);
1156	$hb->add (new CFClient::UI::Button
1157	text => "Quit anyway",
1158	expand => 1,
1159	on_activate => sub { exit },
1160	);
1161	}
1162
1163	$QUIT_DIALOG->show;
1164	$QUIT_DIALOG->grab_focus;
1165	}	1214	}
1166		1215
1167	sub autopickup_setup {	1216	sub autopickup_setup {
		1217	my $r = new CFPlus::UI::ScrolledWindow (
		1218	expand => 1,
		1219	scroll_y => 1
		1220	);
1168	my $table = new CFClient::UI::Table;	1221	$r->add (my $table = new CFPlus::UI::Table
		1222	row_expand => [0],
		1223	col_expand => [0, 1, 0, 1],
		1224	);
1169		1225
1170	for (	1226	for (
1171	["General", 0, 0,	1227	["General", 0, 0,
1172	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1228	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1173	["Inhibit autopickup" => PICKUP_INHIBIT],	1229	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1187	["Boots" => PICKUP_BOOTS],	1243	["Boots" => PICKUP_BOOTS],
1188	["Gloves" => PICKUP_GLOVES],	1244	["Gloves" => PICKUP_GLOVES],
1189	["Cloaks" => PICKUP_CLOAK],	1245	["Cloaks" => PICKUP_CLOAK],
1190	],	1246	],
1191		1247
1192	["Readables", 2, 2,	1248	["Readables", 2, 0,
1193	["Spellbooks" => PICKUP_SPELLBOOK],	1249	["Spellbooks" => PICKUP_SPELLBOOK],
1194	["Skillscrolls" => PICKUP_SKILLSCROLL],	1250	["Skillscrolls" => PICKUP_SKILLSCROLL],
1195	["Normal Books/Scrolls" => PICKUP_READABLES],	1251	["Normal Books/Scrolls" => PICKUP_READABLES],
1196	],	1252	],
1197	["Misc", 2, 7,	1253	["Misc", 2, 5,
1198	["Food" => PICKUP_FOOD],	1254	["Food" => PICKUP_FOOD],
1199	["Drinks" => PICKUP_DRINK],	1255	["Drinks" => PICKUP_DRINK],
1200	["Valuables (Money, Gems)" => PICKUP_VALUABLES],	1256	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1201	["Keys" => PICKUP_KEY],	1257	["Keys" => PICKUP_KEY],
1202	["Magical Items" => PICKUP_MAGICAL],	1258	["Magical Items" => PICKUP_MAGICAL],
1203	["Potions" => PICKUP_POTION],	1259	["Potions" => PICKUP_POTION],
1204	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1260	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1205	["Ignore cursed" => PICKUP_NOT_CURSED],	1261	["Ignore cursed" => PICKUP_NOT_CURSED],
1206	["Jewelery" => PICKUP_JEWELS],	1262	["Jewelery" => PICKUP_JEWELS],
		1263	["Flesh" => PICKUP_FLESH],
1207	],	1264	],
1208	["Weight/Value ratio", 2, 17]	1265	["Weight/Value ratio", 2, 17]
1209	)	1266	)
1210	{	1267	{
1211	my ($title, $x, $y, @bits) = @$_;	1268	my ($title, $x, $y, @bits) = @$_;
1212	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1269	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1213		1270
1214	for (@bits) {	1271	for (@bits) {
1215	++$y;	1272	++$y;
1216		1273
1217	my $mask = $_->[1];	1274	my $mask = $_->[1];
1218	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1275	$table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1219	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1276	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1220	state => $::CFG->{pickup} & $mask,	1277	state => $::CFG->{pickup} & $mask,
1221	on_changed => sub {	1278	on_changed => sub {
1222	my ($box, $value) = @_;	1279	my ($box, $value) = @_;
1223		1280
1224	if ($value) {	1281	if ($value) {
…		…
1235		1292
1236	${$_->[2]} = $checkbox if $_->[2];	1293	${$_->[2]} = $checkbox if $_->[2];
1237	}	1294	}
1238	}	1295	}
1239		1296
1240	$table->add (2, 18, new CFClient::UI::ValSlider	1297	$table->add_at (2, 18, new CFPlus::UI::ValSlider
1241	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1298	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1242	template => ">= 99",	1299	template => ">= 99",
1243	to_value => sub { ">= " . 5 * $_[0] },	1300	to_value => sub { ">= " . 5 * $_[0] },
1244	on_changed => sub {	1301	on_changed => sub {
1245	my ($slider, $value) = @_;	1302	my ($slider, $value) = @_;
…		…
1248	$::CFG->{pickup} |= int $value	1305	$::CFG->{pickup} |= int $value
1249	if $value;	1306	if $value;
1250	1;	1307	1;
1251	});	1308	});
1252		1309
1253	$table->add (3, 18, new CFClient::UI::Button	1310	$table->add_at (3, 18, new CFPlus::UI::Button
1254	text => "set",	1311	text => "set",
1255	on_activate => sub {	1312	on_activate => sub {
1256	$::CONN->send_command ("pickup $::CFG->{pickup}")	1313	$::CONN->send_command ("pickup $::CFG->{pickup}")
1257	if defined $::CONN;	1314	if defined $::CONN;
1258	0	1315	0
1259	});	1316	});
1260		1317
1261	$table	1318	$r
1262	}	1319	}
1263		1320
1264	my %SORT_ORDER = (	1321	my %SORT_ORDER = (
1265	type => undef,	1322	type => undef,
1266	mtime => sub { sort {	1323	mtime => sub {
		1324	my $NOW = time;
		1325	sort {
		1326	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1327	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1328
1267	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)	1329	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1268	or $b->{mtime} <=> $a->{mtime}	1330	or $btime <=> $atime
1269	or $a->{type} <=> $b->{type}	1331	or $a->{type} <=> $b->{type}
		1332	} @_
1270	} @_ },	1333	},
1271	weight => sub { sort {	1334	weight => sub { sort {
1272	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)	1335	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1273	or $a->{type} <=> $b->{type}	1336	or $a->{type} <=> $b->{type}
1274	} @_ },	1337	} @_ },
1275	);	1338	);
1276		1339
1277	sub inventory_widget {	1340	sub inventory_widget {
1278	my $hb = new CFClient::UI::HBox homogeneous => 1;	1341	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1279		1342
1280	$hb->add (my $vb1 = new CFClient::UI::VBox);	1343	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1281	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1344	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1282		1345
1283	$vb1->add (my $hb1 = new CFClient::UI::HBox);	1346	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
1284		1347
1285	use sort 'stable';	1348	use sort 'stable';
1286		1349
1287	$hb1->add (new CFClient::UI::Selector	1350	$hb1->add (new CFPlus::UI::Selector
1288	value => $::CFG->{inv_sort},	1351	value => $::CFG->{inv_sort},
1289	options => [	1352	options => [
1290	[type => "Type/Name"],	1353	[type => "Type/Name"],
1291	[mtime => "Recent/Normal/Locked"],	1354	[mtime => "Recent/Normal/Locked"],
1292	[weight => "Weight/Type"],	1355	[weight => "Weight/Type"],
…		…
1294	on_changed => sub {	1357	on_changed => sub {
1295	$::CFG->{inv_sort} = $_[1];	1358	$::CFG->{inv_sort} = $_[1];
1296	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1359	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1297	},	1360	},
1298	);	1361	);
1299	$hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);	1362	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1300	#TODO# update to weigh/maxweight	1363	#TODO# update to weigh/maxweight
1301	$hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);	1364	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1302		1365
1303	$vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1366	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1304	$sw1->add ($INV = new CFClient::UI::Inventory);	1367	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1368	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1305		1369
1306	$hb->add (my $vb2 = new CFClient::UI::VBox);	1370	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1307		1371
1308	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1372	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1309		1373
1310	$vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1374	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1311	$sw2->add ($INVR = new CFClient::UI::Inventory);	1375	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1312		1376
1313	# XXX: Call after $INVR = ... because set_opencont sets the items	1377	# XXX: Call after $INVR = ... because set_opencont sets the items
1314	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1378	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1315		1379
1316	$hb	1380	$hb
1317	}	1381	}
1318		1382
1319	sub toggle_player_page {	1383	sub toggle_player_page {
…		…
1326	$PL_WINDOW->show;	1390	$PL_WINDOW->show;
1327	}	1391	}
1328	}	1392	}
1329		1393
1330	sub player_window {	1394	sub player_window {
1331	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1395	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1332	x => "center",	1396	x => "center",
1333	y => "center",	1397	y => "center",
1334	force_w => $WIDTH * 9/10,	1398	force_w => $WIDTH * 9/10,
1335	force_h => $HEIGHT * 9/10,	1399	force_h => $HEIGHT * 9/10,
1336	title => "Player",	1400	title => "Player",
…		…
1338	has_close_button => 1	1402	has_close_button => 1
1339	;	1403	;
1340		1404
1341	my $ntb =	1405	my $ntb =
1342	$PL_NOTEBOOK =	1406	$PL_NOTEBOOK =
1343	new CFClient::UI::Notebook expand => 1, debug => 1;	1407	new CFPlus::UI::Notebook expand => 1;
1344		1408
1345	$ntb->add (	1409	$ntb->add_tab (
1346	"Statistics (F2)" => $STATS_PAGE = stats_window,	1410	"Statistics (F2)" => $STATS_PAGE = stats_window,
1347	"Shows statistics, where all your Stats and Resistances are shown."	1411	"Shows statistics, where all your Stats and Resistances are shown."
1348	);	1412	);
1349	$ntb->add (	1413	$ntb->add_tab (
1350	"Skills (F3)" => $SKILL_PAGE = skill_window,	1414	"Skills (F3)" => $SKILL_PAGE = skill_window,
1351	"Shows all your Skills."	1415	"Shows all your Skills."
1352	);	1416	);
1353		1417
1354	my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1418	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1355	$spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);	1419	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1356	$ntb->add (	1420	$ntb->add_tab (
1357	"Spellbook (F4)" => $spellsw,	1421	"Spellbook (F4)" => $spellsw,
1358	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1422	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1359	);	1423	);
1360	$ntb->add (	1424	$ntb->add_tab (
1361	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1425	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1362	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1426	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1363	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1427	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1364	);	1428	);
		1429	$ntb->add_tab (Pickup => autopickup_setup,
		1430	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1365		1431
1366	$ntb->set_current_page ($INVENTORY_PAGE);	1432	$ntb->set_current_page ($INVENTORY_PAGE);
1367		1433
1368	$plwin->add ($ntb);	1434	$plwin->add ($ntb);
1369	$plwin	1435	$plwin
1370	}	1436	}
1371		1437
1372	sub update_bindings {
1373	$BIND_UPD_CB->() if $BIND_UPD_CB;
1374	}
1375
1376	sub keyboard_setup {	1438	sub keyboard_setup {
1377	my $binding_list = new CFClient::UI::VBox;	1439	CFPlus::Macro::keyboard_setup
1378
1379	my $refresh;
1380	$refresh = $BIND_UPD_CB = sub {
1381	$binding_list->clear ();
1382
1383	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1384	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1385	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1386	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1387
1388	my $lbl = join "; ", @$cmds;
1389	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1390	$binding_list->add (my $hb = new CFClient::UI::HBox);
1391	$hb->add (new CFClient::UI::Button
1392	text => "delete",
1393	tooltip => "Deletes the binding",
1394	on_activate => sub {
1395	$binding_list->remove ($hb);
1396	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1397	0
1398	});
1399
1400	$hb->add (new CFClient::UI::Button
1401	text => "edit",
1402	tooltip => "Edits the binding",
1403	on_activate => sub {
1404	$::BIND_EDITOR->set_binding (
1405	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1406	sub {
1407	my ($nmod, $nsym, $ncmds) = @_;
1408	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1409	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1410	$refresh->();
1411	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1412	$SETUP_DIALOG->show;
1413	},
1414	sub {
1415	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1416	$SETUP_DIALOG->show;
1417	});
1418	$::BIND_EDITOR->show;
1419	$SETUP_DIALOG->hide;
1420	0
1421	});
1422
1423	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1424	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1425	}
1426	}
1427	};
1428
1429	my $vb = new CFClient::UI::VBox;
1430	$vb->add (my $hb = new CFClient::UI::HBox);
1431	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1432	$hb->add (new CFClient::UI::CheckBox
1433	expand => 1,
1434	state => $CFG->{shift_fire_stop},
1435	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1436	on_changed => sub {
1437	my ($cbox, $value) = @_;
1438	$CFG->{shift_fire_stop} = $value;
1439	0
1440	});
1441
1442	$vb->add ($binding_list);
1443	$vb->add (my $hb = new CFClient::UI::HBox);
1444
1445	$hb->add (new CFClient::UI::Button
1446	text => "record new",
1447	expand => 1,
1448	tooltip => "This button opens the binding editor with an empty binding.",
1449	on_activate => sub {
1450	$::BIND_EDITOR->set_binding (undef, undef, [],
1451	sub {
1452	my ($mod, $sym, $cmds) = @_;
1453	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1454	$refresh->();
1455	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1456	$SETUP_DIALOG->show;
1457	},
1458	sub {
1459	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1460	$SETUP_DIALOG->show;
1461	},
1462	);
1463	$SETUP_DIALOG->hide;
1464	$::BIND_EDITOR->show;
1465	0
1466	},
1467	);
1468
1469	$hb->add (new CFClient::UI::Button
1470	text => "close",
1471	tooltip => "Closes the binding window",
1472	expand => 1,
1473	on_activate => sub {
1474	$SETUP_DIALOG->hide;
1475	0
1476	}
1477	);
1478
1479	$refresh->();
1480
1481	$vb
1482	}
1483
1484	# just weirdness, pls. ignore
1485	sub load_html_page {
1486	my ($viewer, $base) = @_;
1487
1488	$viewer->clear;
1489
1490	require LWP::Simple;
1491	require HTML::Parser;
1492	require URI;
1493
1494	my $page = LWP::Simple::get ($base)
1495	or return;
1496
1497	my @s = { };
1498	my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1499
1500	my $parser = HTML::Parser->new (
1501	text_h => [sub {
1502	my ($text) = @_;
1503	$text =~ s/\s+/ /g;
1504	$s[-1]{text} .= CFClient::asxml $text;
1505	}, "dtext"],
1506	start_h => [sub {
1507	my ($tag, $attr) = @_;
1508	if ($passthrough{$tag}) {
1509	$s[-1]{text} .= "<$tag>";
1510	} elsif ($tag eq "h1") {
1511	push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1512	} elsif ($tag eq "h2") {
1513	push @s, { text => "<span foreground='#ccccff' size='large'>" };
1514	} elsif ($tag eq "h3") {
1515	push @s, { text => "<span size='large'>" };
1516	} elsif ($tag eq "a") {
1517	push @s, { text => "", url => $attr->{href} };
1518	} elsif ($tag eq "p") {
1519	push @s, { };
1520	} elsif ($tag eq "img") {
1521	eval {
1522	push @{$s[-1]{obj}}, new CFClient::UI::Image
1523	tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1524	$s[-1]{text} .= "\x{fffc}";
1525	};
1526	}
1527	}, "tagname, attr"],
1528	end_h => [sub {
1529	my ($tag) = @_;
1530	if ($passthrough{$tag}) {
1531	$s[-1]{text} .= "</$tag>";
1532	} elsif ($tag =~ /^h\d$/) {
1533	$s[-1]{text} .= "</span>";
1534	push @s, { };
1535	} elsif ($tag eq "a") {
1536	my $S = pop @s;
1537	$s[-1]{text} .= "\x{fffc}";
1538	push @{$s[-1]{obj}}, new CFClient::UI::Label
1539	fg => [0.8, 0.8, 1],
1540	markup => "<u>$S->{text}</u>",
1541	fontsize => 0.8,
1542	can_events => 1,
1543	can_focus => 1,
1544	on_button_up => sub {
1545	load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1546	},
1547	;
1548	}
1549	}, "tagname"],
1550	);
1551
1552	$parser->parse ($page);
1553	$parser->eof;
1554
1555	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1556	for @s;
1557
1558	$viewer->set_offset (0);
1559	}	1440	}
1560		1441
1561	sub help_window {	1442	sub help_window {
1562	my $win = new CFClient::UI::FancyFrame	1443	my $win = new CFPlus::UI::Toplevel
1563	x => 'center',	1444	x => 'center',
1564	y => 'center',	1445	y => 'center',
1565	z => 2,	1446	z => 4,
1566	name => 'doc_browser',	1447	name => 'doc_browser',
1567	force_w => int $WIDTH * 7/8,	1448	force_w => int $WIDTH * 7/8,
1568	force_h => int $HEIGHT * 7/8,	1449	force_h => int $HEIGHT * 7/8,
1569	title => "Help Browser",	1450	title => "Help Browser",
1570	has_close_button => 1;	1451	has_close_button => 1;
1571		1452
1572	$win->add (my $vbox = new CFClient::UI::VBox);	1453	$win->add (my $vbox = new CFPlus::UI::VBox);
1573		1454
1574	$vbox->add (my $buttons = new CFClient::UI::HBox);	1455	$vbox->add (new CFPlus::UI::FancyFrame
		1456	label => "Navigation",
		1457	child => (my $buttons = new CFPlus::UI::HBox),
		1458	);
1575	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1459	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1576	expand => 1, fontsize => 0.8, padding_x => 4);	1460	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1577		1461
1578	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1462	my @history;
1579	$buttons->add (my $combo = new CFClient::UI::Selector	1463	my @future;
1580	value => undef,	1464	my $curnode;
1581	options => [	1465
1582	[intro => "Introduction"],	1466	my $load_node; $load_node = sub {
1583	[manual => "Main Manual"],	1467	my ($node, $para) = @_;
1584	[skill_help => "Skill Reference"],	1468
1585	[command_help => "Command Reference"],	1469	$buttons->clear;
1586	[dmcommand_help => "DM Commands"],	1470
1587	[COPYING => "License Terms"],	1471	$buttons->add (new CFPlus::UI::Button
1588	[test => "test (do not select)"], #d#TODO	1472	text => "⇤",
1589	],	1473	tooltip => "back to the starting page",
1590	on_changed => sub {	1474	on_activate => sub {
1591	my ($self, $pod) = @_;	1475	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1476	unshift @future, @history;
		1477	@history = ();
		1478	$load_node->(@{shift @future});
		1479	},
		1480	);
1592		1481
1593	if ($pod eq "test") {#d#TODO	1482	if (@history) {
1594	eval {	1483	$buttons->add (new CFPlus::UI::Button
1595	load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";	1484	text => "⋘",
		1485	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1486	on_activate => sub {
		1487	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1488	$load_node->(@{pop @history});
1596	};	1489	},
1597	warn "$@" if $@;	1490	);
1598	return;	1491	}
		1492
		1493	if (@future) {
		1494	$buttons->add (new CFPlus::UI::Button
		1495	text => "⋙",
		1496	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1497	on_activate => sub {
		1498	push @history, [$curnode, $viewer->current_paragraph];
		1499	$load_node->(@{shift @future});
		1500	},
		1501	);
		1502	}
		1503
		1504	$buttons->add (new CFPlus::UI::Label text => " ");
		1505
		1506	my @path = CFPlus::Pod::full_path_of $node;
		1507	pop @path; # drop current node
		1508
		1509	for my $node (@path) {
		1510	$buttons->add (new CFPlus::UI::Button
		1511	text => $node->{kw}[0],
		1512	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1513	on_activate => sub {
		1514	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1515	$load_node->($node);
		1516	},
		1517	);
		1518	$buttons->add (new CFPlus::UI::Label text => "/");
		1519	}
		1520
		1521	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1522
		1523	$curnode = $node;
		1524
		1525	$viewer->clear;
		1526	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1527	$viewer->scroll_to ($para);
		1528	};
		1529
		1530	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1531
		1532	$CFPlus::Pod::goto_document = sub {
		1533	my (@path) = @_;
		1534
		1535	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1536
		1537	$load_node->((CFPlus::Pod::find @path)[0]);
		1538	$win->show;
		1539	};
		1540
		1541	$win
		1542	}
		1543
		1544	sub open_string_query {
		1545	my ($title, $cb, $txt, $tooltip) = @_;
		1546	my $dialog = new CFPlus::UI::Toplevel
		1547	x => "center",
		1548	y => "center",
		1549	z => 50,
		1550	force_w => $WIDTH * 4/5,
		1551	title => $title;
		1552
		1553	$dialog->add (
		1554	my $e = new CFPlus::UI::Entry
		1555	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1556	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1557	tooltip => $tooltip
		1558	);
		1559
		1560	$e->grab_focus;
		1561	$e->set_text ($txt) if $txt;
		1562	$dialog->show;
		1563	}
		1564
		1565	sub open_quit_dialog {
		1566	unless ($QUIT_DIALOG) {
		1567	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1568	x => "center",
		1569	y => "center",
		1570	z => 50,
		1571	title => "Really Quit?",
		1572	on_key_down => sub {
		1573	my ($dialog, $ev) = @_;
		1574	$ev->{sym} == 27 and $dialog->hide;
1599	}	1575	}
		1576	;
1600		1577
1601	my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",	1578	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1602	doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1603		1579
1604	#use Data::Dumper; warn Dumper $pom;#d#	1580	$vb->add (new CFPlus::UI::Label
		1581	text => "You should find a savebed and apply it first!",
		1582	max_w => $WIDTH * 0.25,
		1583	ellipsize => 0,
		1584	);
		1585	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1586	$hb->add (new CFPlus::UI::Button
		1587	text => "Ok",
		1588	expand => 1,
		1589	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1590	);
		1591	$hb->add (new CFPlus::UI::Button
		1592	text => "Quit anyway",
		1593	expand => 1,
		1594	on_activate => sub { exit },
		1595	);
		1596	}
1605		1597
1606	$viewer->clear;	1598	$QUIT_DIALOG->show;
		1599	$QUIT_DIALOG->grab_focus;
		1600	}
1607		1601
1608	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",	1602	sub show_tip_of_the_day {
1609	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),	1603	# find all tips
1610	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),	1604	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1611	# ]);#d#	1605
		1606	CFPlus::DB::get state => "tip_of_the_day", sub {
		1607	my ($todindex) = @_;
		1608	$todindex = 0 if $todindex >= @tod;
		1609	CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
		1610
		1611	# create dialog
		1612	my $dialog;
		1613
		1614	my $close = sub {
		1615	$dialog->destroy;
		1616	};
		1617
		1618	$dialog = new CFPlus::UI::Toplevel
		1619	x => "center",
		1620	y => "center",
		1621	z => 3,
		1622	name => 'tip_of_the_day',
		1623	force_w => int $WIDTH * 4/9,
		1624	force_h => int $WIDTH * 2/9,
		1625	title => "Tip of the day #" . (1 + $todindex),
		1626	child => my $vbox = new CFPlus::UI::VBox,
		1627	has_close_button => 1,
		1628	on_delete => $close,
		1629	;
		1630
		1631	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1632	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1633	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1634
		1635	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
		1636
		1637	$table->add_at (0, 0, new CFPlus::UI::Button
		1638	text => "Close",
		1639	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>.",
		1640	on_activate => $close,
		1641	);
		1642
		1643	$table->add_at (2, 0, new CFPlus::UI::Button
		1644	text => "Next",
		1645	tooltip => "Show the next <b>Tip of the day</b>.",
		1646	on_activate => sub {
		1647	$close->();
		1648	&show_tip_of_the_day;
1612		1649	},
1613	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1614	for @$pom;
1615
1616	$viewer->set_offset (0);
1617
1618	0
1619	},	1650	);
1620	on_visibility_change => sub {	1651
1621	my ($self, $visible) = @_;	1652	$dialog->show;
1622	return unless $visible;
1623	return if $self->{value};
1624	$self->set_value ("intro");
1625	0
1626	},
1627	);	1653	};
1628
1629	$win
1630	}	1654	}
1631		1655
1632	sub sdl_init {	1656	sub sdl_init {
1633	CFClient::SDL_Init	1657	CFPlus::SDL_Init
1634	and die "SDL::Init failed!\n";	1658	and die "SDL::Init failed!\n";
1635	}	1659	}
1636		1660
1637	sub video_init {	1661	sub video_init {
1638	sdl_init;
1639
1640	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	1662	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1641		1663
1642	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	1664	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1643		1665
1644	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1666	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1645	$FULLSCREEN = $CFG->{fullscreen};	1667	$FULLSCREEN = $CFG->{fullscreen};
1646	$FAST = $CFG->{fast};	1668	$FAST = $CFG->{fast};
1647		1669
1648	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1670	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1649	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1671	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1650		1672
1651	$SDL_ACTIVE = 1;	1673	$SDL_ACTIVE = 1;
1652	$LAST_REFRESH = time - 0.01;	1674	$LAST_REFRESH = time - 0.01;
1653		1675
1654	CFClient::OpenGL::init;	1676	CFPlus::OpenGL::init;
1655		1677
1656	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1678	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1657		1679
1658	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1680	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1659		1681
1660	#############################################################################	1682	#############################################################################
1661		1683
1662	if ($DEBUG_STATUS) {	1684	if ($DEBUG_STATUS) {
1663	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1685	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1664	} else {	1686	} else {
1665	# create the widgets	1687	# create the widgets
1666		1688
1667	$DEBUG_STATUS = new CFClient::UI::Label	1689	$DEBUG_STATUS = new CFPlus::UI::Label
1668	padding => 0,	1690	padding => 0,
1669	z => 100,	1691	z => 100,
1670	force_x => "max",	1692	force_x => "max",
1671	force_y => 0;	1693	force_y => 0;
1672	$DEBUG_STATUS->show;	1694	$DEBUG_STATUS->show;
1673		1695
1674	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1675
1676	$STATUSBOX = new CFClient::UI::Statusbox;	1696	$STATUSBOX = new CFPlus::UI::Statusbox;
1677	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1697	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1678		1698
1679	(new CFClient::UI::Frame	1699	(new CFPlus::UI::Frame
1680	bg => [0, 0, 0, 0.4],	1700	bg => [0, 0, 0, 0.4],
1681	force_x => 0,	1701	force_x => 0,
1682	force_y => "max",	1702	force_y => "max",
1683	child => $STATUSBOX,	1703	child => $STATUSBOX,
1684	)->show;	1704	)->show;
1685		1705
1686	CFClient::UI::FancyFrame->new (	1706	CFPlus::UI::Toplevel->new (
1687	title => "Map",	1707	title => "Map",
1688	name => "mapmap",	1708	name => "mapmap",
1689	x => 0,	1709	x => 0,
1690	y => $FONTSIZE + 8,	1710	y => $FONTSIZE + 8,
1691	border_bg => [1, 1, 1, 192/255],	1711	border_bg => [1, 1, 1, 192/255],
1692	bg => [1, 1, 1, 0],	1712	bg => [1, 1, 1, 0],
1693	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1713	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1694	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1714	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1695	),	1715	),
1696	)->show;	1716	)->show;
1697		1717
1698	$MAPWIDGET = new CFClient::MapWidget;	1718	$MAPWIDGET = new CFPlus::MapWidget;
1699	$MAPWIDGET->connect (activate_console => sub {	1719	$MAPWIDGET->connect (activate_console => sub {
1700	my ($mapwidget, $preset) = @_;	1720	my ($mapwidget, $preset) = @_;
1701		1721
1702	if ($CONSOLE) {	1722	$MESSAGE_WINDOW->activate_console ($preset)
1703	$CONSOLE->{input}->{auto_activated} = 1;	1723	if $MESSAGE_WINDOW;
1704	$CONSOLE->{input}->grab_focus;
1705
1706	if ($preset && $CONSOLE->{input}->get_text eq '') {
1707	$CONSOLE->{input}->set_text ($preset);
1708	}
1709	}
1710	});	1724	});
1711	$MAPWIDGET->show;	1725	$MAPWIDGET->show;
1712	$MAPWIDGET->grab_focus;	1726	$MAPWIDGET->grab_focus;
1713		1727
1714	$LOGVIEW = new CFClient::UI::TextScroller
1715	expand => 1,
1716	font => $FONT_FIXED,
1717	fontsize => $::CFG->{log_fontsize},
1718	indent => -4,
1719	can_hover => 1,
1720	can_events => 1,
1721	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1722	;
1723
1724	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1728	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1725	title => "Setup",	1729	title => "Setup",
1726	name => "setup_dialog",	1730	name => "setup_dialog",
1727	x => 'center',	1731	x => 'center',
1728	y => 'center',	1732	y => 'center',
1729	z => 2,	1733	z => 2,
…		…
1731	force_h => $::HEIGHT * 0.6,	1735	force_h => $::HEIGHT * 0.6,
1732	has_close_button => 1,	1736	has_close_button => 1,
1733	;	1737	;
1734		1738
1735	$METASERVER = metaserver_dialog;	1739	$METASERVER = metaserver_dialog;
		1740	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1736		1741
1737	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1742	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1738	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1743	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1739		1744
1740	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1745	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1741	"Configure the server to play on, your username, password and other server-related options.");	1746	"Configure the server to play on, your username, password and other server-related options.");
1742	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1747	$SETUP_NOTEBOOK->add_tab (Client => client_setup,
1743	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1748	"Configure various client-specific settings.");
1744	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1749	$SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1745	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1750	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1746	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1751	$SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1747	"Configure the use of audio, sound effects and background music.");	1752	"Configure the use of audio, sound effects and background music.");
1748	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1753	$SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1749	"Lets you define, edit and delete key bindings."	1754	"Lets you define, edit and delete key bindings."
1750	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "	1755	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1751	. "with nothing set and the recording started. After doing the actions you "	1756	. "with nothing set and the recording started. After doing the actions you "
1752	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1757	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1753	. "After pressing the combo the binding will be saved automatically and the "	1758	. "After pressing the combo the binding will be saved automatically and the "
1754	. "binding editor closes");	1759	. "binding editor closes");
1755	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1760	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1756	"Some debuggin' options. Do not ask.");	1761	"Some debuggin' options. Do not ask.");
1757		1762
1758	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1763	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1759		1764
1760	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1765	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1761	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1766	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1762		1767
1763	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1768	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1764	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1769	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1765		1770
1766	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	1771	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
1767		1772
1768	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1773	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1769	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");	1774	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1770		1775
1771	$BUTTONBAR->add (new CFClient::UI::Button	1776	$BUTTONBAR->add (new CFPlus::UI::Button
1772	text => "Save Config",	1777	text => "Save Config",
1773	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1778	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1774	on_activate => sub {	1779	on_activate => sub {
1775	$::CFG->{layout} = CFClient::UI::get_layout;	1780	$::CFG->{layout} = CFPlus::UI::get_layout;
1776	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1781	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1777	status "Configuration Saved";	1782	status "Configuration Saved";
1778	0	1783	0
1779	},	1784	},
1780	);	1785	);
1781		1786
1782	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	1787	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1783	tooltip => "View Documentation");	1788	tooltip => "View Documentation");
1784		1789
		1790
1785	$BUTTONBAR->add (new CFClient::UI::Button	1791	$BUTTONBAR->add (new CFPlus::UI::Button
1786	text => "Quit",	1792	text => "Quit",
1787	tooltip => "Terminates the program",	1793	tooltip => "Terminates the program",
1788	on_activate => sub {	1794	on_activate => sub {
1789	if ($CONN) {	1795	if ($CONN) {
1790	open_quit_dialog;	1796	open_quit_dialog;
…		…
1800	}	1806	}
1801		1807
1802	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1808	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1803	}	1809	}
1804		1810
		1811	sub setup_build_button {
		1812	my ($enabled) = @_;
		1813	if ($enabled) {
		1814	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1815	$BUILD_BUTTON ||= new CFPlus::UI::Button
		1816	text => "Build",
		1817	tooltip => "Opens the ingame builder",
		1818	on_activate => sub {
		1819	if ($CONN) {
		1820	$CONN->send_ext_req (builder_player_items => sub {
		1821	open_ingame_editor ($_[0]) if exists $_[0]->{items};
		1822	});
		1823	}
		1824	0
		1825	};
		1826	$BUTTONBAR->add ($BUILD_BUTTON);
		1827	} else {
		1828	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1829	}
		1830	}
		1831
		1832	sub open_ingame_editor {
		1833	my ($msg) = @_;
		1834
		1835	my $win = new CFPlus::UI::Toplevel
		1836	x => 0,
		1837	y => 'center',
		1838	z => 4,
		1839	name => 'builder_window',
		1840	force_w => int $WIDTH * 1/4,
		1841	force_h => int $HEIGHT * 3/4,
		1842	title => "In game builder",
		1843	has_close_button => 1;
		1844
		1845	my $r = new CFPlus::UI::ScrolledWindow (
		1846	expand => 1,
		1847	scroll_y => 1
		1848	);
		1849	$r->add (my $vb = new CFPlus::UI::VBox);
		1850	$win->add ($r);
		1851
		1852
		1853	$vb->add (
		1854	new CFPlus::UI::Button
		1855	text => "Disable build mode",
		1856	on_activate => sub { $::IN_BUILD_MODE = undef }
		1857	);
		1858	$vb->add (
		1859	new CFPlus::UI::Button
		1860	text => "ERASE",
		1861	on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
		1862	);
		1863
		1864	for my $itemarchname (
		1865	sort {
		1866	$msg->{items}->{$a}->{build_arch_name}
		1867	cmp $msg->{items}->{$b}->{build_arch_name}
		1868	} keys %{$msg->{items}}
		1869	) {
		1870	my $info = $msg->{items}->{$itemarchname};
		1871	$vb->add (
		1872	new CFPlus::UI::Button text => $info->{build_arch_name},
		1873	on_activate => sub {
		1874	$::IN_BUILD_MODE = { item => $itemarchname, info => $info };
		1875
		1876	if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
		1877	build_mode_query_arch_info ();
		1878	}
		1879	}
		1880	);
		1881	}
		1882
		1883	$win->show;
		1884	}
		1885
		1886	sub build_mode_query_arch_info {
		1887	my ($iteminfo) = $::IN_BUILD_MODE;
		1888	my $itemarchname = $iteminfo->{item};
		1889	my $info = $iteminfo->{info};
		1890
		1891	my $dialog = new CFPlus::UI::Toplevel
		1892	x => "center",
		1893	y => "center",
		1894	z => 50,
		1895	force_w => int $WIDTH * 1/2,
		1896	title => "Enter information for placement of '$itemarchname'",
		1897	has_close_button => 1;
		1898
		1899	$dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1900
		1901	$vb->add (my $table = new CFPlus::UI::Table expand => 1);
		1902	my $row = 0;
		1903	if ($info->{has_name}) {
		1904	$table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
		1905	$table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
		1906	}
		1907	if ($info->{has_text}) {
		1908	$table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
		1909	$table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
		1910	}
		1911	if ($info->{has_connection}) {
		1912	$table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
		1913	$table->add_at (1, $row++,
		1914	new CFPlus::UI::Entry
		1915	expand => 1,
		1916	on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
		1917	tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
		1918	);
		1919	}
		1920
		1921	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1922	$hb->add (new CFPlus::UI::Button
		1923	text => "Close",
		1924	expand => 1,
		1925	on_activate => sub { $dialog->hide; 0 },
		1926	);
		1927	$dialog->show;
		1928	}
		1929
1805	sub video_shutdown {	1930	sub video_shutdown {
1806	CFClient::OpenGL::shutdown;	1931	CFPlus::OpenGL::shutdown;
1807		1932
1808	undef $SDL_ACTIVE;	1933	undef $SDL_ACTIVE;
1809	}	1934	}
1810		1935
1811	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1812	my $bgmusic;#TODO#hack#d#
1813
1814	sub audio_channel_finished {	1936	sub audio_channel_finished {
1815	my ($channel) = @_;	1937	my ($channel) = @_;
1816		1938
1817	#warn "channel $channel finished\n";#d#	1939	#warn "channel $channel finished\n";#d#
1818	}	1940	}
1819		1941
		1942	sub audio_music_set {
		1943	my ($songs) = @_;
		1944
		1945	my @want =
		1946	grep $_,
		1947	map $CONN->{music_meta}{$_},
		1948	@$songs;
		1949
		1950	if (@want) {
		1951	@MUSIC_WANT = @want;
		1952	&audio_music_changed ();
		1953	}
		1954	}
		1955
		1956	sub audio_music_start {
		1957	my $path = $MUSIC_PLAYING->{path}
		1958	or return;
		1959
		1960	CFPlus::DB::prefetch_file $path, 1024_000, sub {
		1961	return unless $SDL_MIXER;
		1962
		1963	# music might have changed...
		1964	$path eq $MUSIC_PLAYING->{path}
		1965	or return &audio_music_start ();
		1966
		1967	$MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
		1968
		1969	my $NOW = time;
		1970
		1971	if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
		1972	my $pos = $MUSIC_PLAYING->{stop_pos};
		1973	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
		1974	$MUSIC_START = time - $pos;
		1975	} else {
		1976	$MUSIC_PLAYER->play (0);
		1977	$MUSIC_START = time;
		1978	}
		1979
		1980	delete $MUSIC_PLAYING->{stop_time};
		1981	delete $MUSIC_PLAYING->{stop_pos};
		1982	}
		1983	}
		1984
		1985	sub audio_music_changed {
		1986	return unless $CFG->{bgm_enable};
		1987	return unless $SDL_MIXER;
		1988
		1989	# default MUSIC_WANT == MUSIC_DEFAULT
		1990	@MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
		1991
		1992	# if the currently playing song is acceptable, let it continue
		1993	return if $MUSIC_PLAYING
		1994	&& grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
		1995
		1996	my $NOW = time;
		1997
		1998	if ($MUSIC_PLAYING) {
		1999	$MUSIC_PLAYING->{stop_time} = $NOW;
		2000	$MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
		2001	CFPlus::MixMusic::fade_out 1000;
		2002	} else {
		2003	# sort by stop time, oldest first
		2004	@MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
		2005
		2006	# if the most recently-played piece played very recently,
		2007	# resume it, else choose the oldest piece for rotation.
		2008	$MUSIC_PLAYING =
		2009	$MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
		2010	? $MUSIC_WANT[-1]
		2011	: $MUSIC_WANT[0];
		2012
		2013	audio_music_start;
		2014	}
		2015	}
		2016
1820	sub audio_music_finished {	2017	sub audio_music_finished {
1821	return unless $CFG->{bgm_enable};	2018	$MUSIC_PLAYING = undef;
		2019	undef $MUSIC_PLAYER;
1822		2020
1823	# TODO: hack, do play loop and mood music	2021	audio_music_changed;
1824	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1825	$bgmusic->play (0);
1826
1827	push @bgmusic, shift @bgmusic;
1828	}	2022	}
1829		2023
1830	sub audio_init {	2024	sub audio_init {
1831	if ($CFG->{audio_enable}) {	2025	if ($CFG->{audio_enable}) {
1832	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	2026	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1833	$SDL_MIXER = !CFClient::Mix_OpenAudio;	2027	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1834		2028
1835	unless ($SDL_MIXER) {	2029	unless ($SDL_MIXER) {
1836	status "Unable to open sound device: there will be no sound";	2030	status "Unable to open sound device: there will be no sound";
1837	return;	2031	return;
1838	}	2032	}
1839		2033
1840	CFClient::Mix_AllocateChannels 8;	2034	CFPlus::Mix_AllocateChannels 8;
1841	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	2035	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1842		2036
1843	audio_music_finished;	2037	audio_music_finished;
1844		2038
		2039	local $_;
1845	while (<$fh>) {	2040	while (<$fh>) {
1846	next if /^\s*#/;	2041	next if /^\s*#/;
1847	next if /^\s*$/;	2042	next if /^\s*$/;
1848		2043
1849	my ($file, $volume, $event) = split /\s+/, $_, 3;	2044	my ($file, $volume, $event) = split /\s+/, $_, 3;
1850		2045
1851	push @SOUNDS, "$volume,$file";	2046	push @SOUNDS, "$volume,$file";
1852		2047
1853	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	2048	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1854	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	2049	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1855	$chunk->volume ($volume * 128 / 100);	2050	$chunk->volume ($volume * 128 / 100);
1856	$chunk	2051	$chunk
1857	};	2052	};
1858	}	2053	}
1859	} else {	2054	} else {
1860	status "unable to open sound config: $!";	2055	status "unable to open sound config: $!";
1861	}	2056	}
		2057	} else {
		2058	undef $SDL_MIXER;
1862	}	2059	}
1863	}	2060	}
1864		2061
1865	sub audio_shutdown {	2062	sub audio_shutdown {
1866	CFClient::Mix_CloseAudio if $SDL_MIXER;	2063	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1867	undef $SDL_MIXER;	2064	undef $SDL_MIXER;
1868	@SOUNDS = ();	2065	@SOUNDS = ();
1869	%AUDIO_CHUNKS = ();	2066	%AUDIO_CHUNKS = ();
1870	}	2067	}
1871		2068
…		…
1878		2075
1879	sub force_refresh {	2076	sub force_refresh {
1880	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2077	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1881	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2078	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1882		2079
1883	$CFClient::UI::ROOT->draw;	2080	$CFPlus::UI::ROOT->draw;
1884		2081
1885	$WANT_REFRESH = 0;	2082	$WANT_REFRESH = 0;
1886	$CAN_REFRESH = 0;	2083	$CAN_REFRESH = 0;
1887	$LAST_REFRESH = $NOW;	2084	$LAST_REFRESH = $NOW;
1888		2085
1889	CFClient::SDL_GL_SwapBuffers;	2086	CFPlus::SDL_GL_SwapBuffers;
1890	}	2087	}
1891		2088
1892	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2089	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1893	$NOW = time;	2090	$NOW = time;
1894		2091
1895	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2092	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1896	for CFClient::SDL_PollEvent;	2093	for CFPlus::poll_events;
1897		2094
1898	if (%animate_object) {	2095	if (%animate_object) {
1899	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2096	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1900	$WANT_REFRESH++;	2097	++$WANT_REFRESH;
1901	}	2098	}
1902		2099
1903	if ($WANT_REFRESH) {	2100	if ($WANT_REFRESH) {
1904	force_refresh;	2101	force_refresh;
1905	} else {	2102	} else {
…		…
1925	$CONN->face_prefetch	2122	$CONN->face_prefetch
1926	if $CONN;	2123	if $CONN;
1927	});	2124	});
1928		2125
1929	%SDL_CB = (	2126	%SDL_CB = (
1930	CFClient::SDL_QUIT => sub {	2127	CFPlus::SDL_QUIT => sub {
1931	Event::unloop -1;	2128	exit;
1932	},	2129	},
1933	CFClient::SDL_VIDEORESIZE => sub {	2130	CFPlus::SDL_VIDEORESIZE => sub {
1934	},	2131	},
1935	CFClient::SDL_VIDEOEXPOSE => sub {	2132	CFPlus::SDL_VIDEOEXPOSE => sub {
1936	CFClient::UI::full_refresh;	2133	CFPlus::UI::full_refresh;
1937	},	2134	},
1938	CFClient::SDL_ACTIVEEVENT => sub {	2135	CFPlus::SDL_ACTIVEEVENT => sub {
1939	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2136	# not useful, as APPACTIVE include sonly iconified state, not unmapped
		2137	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
		2138	# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
		2139	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
		2140	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
		2141	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1940	},	2142	},
1941	CFClient::SDL_KEYDOWN => sub {	2143	CFPlus::SDL_KEYDOWN => sub {
1942	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2144	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1943	# alt-enter	2145	# alt-enter
1944	$FULLSCREEN_ENABLE->toggle;	2146	$FULLSCREEN_ENABLE->toggle;
1945	video_shutdown;	2147	video_shutdown;
1946	video_init;	2148	video_init;
1947	} else {	2149	} else {
1948	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2150	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1949	}	2151	}
1950	},	2152	},
1951	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2153	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1952	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2154	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1953	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2155	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1954	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2156	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1955	CFClient::SDL_USEREVENT => sub {	2157	CFPlus::SDL_USEREVENT => sub {
1956	if ($_[0]{code} == 1) {	2158	if ($_[0]{code} == 1) {
1957	audio_channel_finished $_[0]{data1};	2159	audio_channel_finished $_[0]{data1};
1958	} elsif ($_[0]{code} == 0) {	2160	} elsif ($_[0]{code} == 0) {
1959	audio_music_finished;	2161	audio_music_finished;
1960	}	2162	}
…		…
1964	#############################################################################	2166	#############################################################################
1965		2167
1966	$SIG{INT} = $SIG{TERM} = sub { exit };	2168	$SIG{INT} = $SIG{TERM} = sub { exit };
1967		2169
1968	{	2170	{
1969	local $SIG{__DIE__} = sub {
1970	return unless defined $^S && !$^S;
1971	Carp::confess $_[0];#d#TODO: remove when stable
1972	CFClient::fatal $_[0];
1973	};
1974
1975	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	2171	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
		2172	CFPlus::DB::Server::run;
		2173
1976	CFClient::UI::set_layout ($::CFG->{layout});	2174	CFPlus::UI::set_layout ($::CFG->{layout});
1977		2175
1978	my %DEF_CFG = (	2176	my %DEF_CFG = (
1979	sdl_mode => 0,	2177	sdl_mode => 0,
1980	width => 640,	2178	width => 640,
1981	height => 480,	2179	height => 480,
1982	fullscreen => 0,	2180	fullscreen => 0,
1983	fast => 0,	2181	fast => 0,
1984	map_scale => 1,	2182	map_scale => 1,
1985	fow_enable => 1,	2183	fow_enable => 1,
1986	fow_intensity => 0.45,	2184	fow_intensity => 0,
1987	fow_smooth => 0,	2185	map_smoothing => 1,
1988	gui_fontsize => 1,	2186	gui_fontsize => 1,
1989	log_fontsize => 0.7,	2187	log_fontsize => 0.7,
1990	gauge_fontsize => 1,	2188	gauge_fontsize => 1,
1991	gauge_size => 0.35,	2189	gauge_size => 0.35,
1992	stat_fontsize => 0.7,	2190	stat_fontsize => 0.7,
1993	mapsize => 100,	2191	mapsize => 100,
1994	say_command => 'say',
1995	audio_enable => 1,	2192	audio_enable => 1,
1996	bgm_enable => 1,	2193	bgm_enable => 1,
1997	bgm_volume => 0.25,	2194	bgm_volume => 0.25,
1998	face_prefetch => 0,	2195	face_prefetch => 0,
1999	output_sync => 1,	2196	output_sync => 1,
2000	output_count => 1,	2197	output_count => 1,
		2198	output_rate => "",
2001	pickup => 0,	2199	pickup => 0,
2002	inv_sort => "mtime",	2200	inv_sort => "mtime",
2003	default => "profile", # default profile	2201	default => "profile", # default profile
		2202	show_tips => 1,
		2203	logview_max_par => 1000,
2004	);	2204	);
2005		2205
2006	while (my ($k, $v) = each %DEF_CFG) {	2206	while (my ($k, $v) = each %DEF_CFG) {
2007	$CFG->{$k} = $v unless exists $CFG->{$k};	2207	$CFG->{$k} = $v unless exists $CFG->{$k};
2008	}	2208	}
2009		2209
2010	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";	2210	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		2211	$PROFILE = $CFG->{profile}{default};
		2212
		2213	# convert old bindings (only default profile matters)
		2214	if (my $bindings = delete $PROFILE->{bindings}) {
		2215	while (my ($mod, $syms) = each %$bindings) {
		2216	while (my ($sym, $cmds) = each %$syms) {
		2217	push @{ $PROFILE->{macro} }, {
		2218	accelkey => [$mod*1, $sym*1],
		2219	action => $cmds,
		2220	};
		2221	}
		2222	}
		2223	}
2011		2224
2012	sdl_init;	2225	sdl_init;
2013		2226
2014	@SDL_MODES = reverse	2227	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2015	grep $_->[0] >= 640 && $_->[1] >= 480,	2228	@SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2016	CFClient::SDL_ListModes;
2017
2018	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2229	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2230
		2231	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2019		2232
2020	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2233	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2021		2234
2022	{	2235	{
2023	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2236	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2024	DejaVuSans.ttf	2237	DejaVuSans.ttf
2025	DejaVuSansMono.ttf	2238	DejaVuSansMono.ttf
2026	DejaVuSans-Bold.ttf	2239	DejaVuSans-Bold.ttf
2027	DejaVuSansMono-Bold.ttf	2240	DejaVuSansMono-Bold.ttf
2028	DejaVuSans-Oblique.ttf	2241	DejaVuSans-Oblique.ttf
2029	DejaVuSansMono-Oblique.ttf	2242	DejaVuSansMono-Oblique.ttf
2030	DejaVuSans-BoldOblique.ttf	2243	DejaVuSans-BoldOblique.ttf
2031	DejaVuSansMono-BoldOblique.ttf	2244	DejaVuSansMono-BoldOblique.ttf
2032	);	2245	);
2033		2246
2034	CFClient::add_font $_ for @fonts;	2247	CFPlus::add_font $_ for @fonts;
2035		2248
2036	CFClient::pango_init;	2249	CFPlus::pango_init;
2037		2250
2038	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2251	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2039	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2252	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2040		2253
2041	$FONT_PROP->make_default;	2254	$FONT_PROP->make_default;
2042	}	2255	}
2043		2256
2044	# compare mono (ft) vs. rgba (cairo)	2257	# compare mono (ft) vs. rgba (cairo)
2045	# ft - 1.8s, cairo 3s, even in alpha-only mode	2258	# ft - 1.8s, cairo 3s, even in alpha-only mode
2046	# for my $rgba (0..1) {	2259	# for my $rgba (0..1) {
2047	# my $t1 = Time::HiRes::time;	2260	# my $t1 = Time::HiRes::time;
2048	# for (1..1000) {	2261	# for (1..1000) {
2049	# my $layout = CFClient::Layout->new ($rgba);	2262	# my $layout = CFPlus::Layout->new ($rgba);
2050	# $layout->set_text ("hallo" x 100);	2263	# $layout->set_text ("hallo" x 100);
2051	# $layout->render;	2264	# $layout->render;
2052	# }	2265	# }
2053	# my $t2 = Time::HiRes::time;	2266	# my $t2 = Time::HiRes::time;
2054	# warn $t2-$t1;	2267	# warn $t2-$t1;
2055	# }	2268	# }
2056		2269
		2270	$startup_done->();
		2271
2057	video_init;	2272	video_init;
2058	audio_init;	2273	audio_init;
2059	}	2274	}
2060		2275
		2276	show_tip_of_the_day if $CFG->{show_tips};
		2277
2061	Event::loop;	2278	Event::loop;
2062	#CFClient::SDL_Quit;	2279	#CFPlus::SDL_Quit;
2063	#CFClient::_exit 0;	2280	#CFPlus::_exit 0;
2064		2281
2065	END { CFClient::SDL_Quit }	2282	END {
		2283	CFPlus::SDL_Quit;
		2284	CFPlus::DB::Server::stop;
		2285	}
2066		2286
2067	=head1 NAME	2287	=head1 NAME
2068		2288
2069	cfplus - A Crossfire+ and Crossfire game client	2289	cfplus - A Crossfire+ and Crossfire game client
2070		2290

Diff Legend

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