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.185 by elmex, Tue Jul 24 18:39:39 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	$MESSAGE_WINDOW->clear_channels;
		498	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
		499
		500	&audio_music_set ([]);
412		501
413	return unless $CONN;	502	return unless $CONN;
414		503
415	status "connection closed";	504	status "connection closed";
416		505
…		…
420		509
421	undef $MAP;	510	undef $MAP;
422	}	511	}
423		512
424	sub graphics_setup {	513	sub graphics_setup {
425	my $vbox = new CFClient::UI::VBox;	514	my $vbox = new CFPlus::UI::VBox;
426		515
427	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	516	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
428		517
		518	my $row = 0;
		519
		520	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
		521	$table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
		522	can_events => 1,
		523	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
		524
		525	my $vidmode_tooltip =
		526	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
		527	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
		528
429	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	529	$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);	530	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
431		531
		532	$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]);	533	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");	534	tooltip => $vidmode_tooltip);
		535	$hbox->add (my $mode_label = new CFPlus::UI::Label
		536	align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
		537	can_events => 1, tooltip => $vidmode_tooltip);
434		538
435	$mode_slider->connect (changed => sub {	539	$mode_slider->connect (changed => sub {
436	my ($self, $value) = @_;	540	my ($self, $value) = @_;
437		541
438	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	542	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
439	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	543	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
440	});	544	});
441	$mode_slider->emit (changed => $mode_slider->{range}[0]);	545	$mode_slider->emit (changed => $mode_slider->{range}[0]);
442		546
443	my $row = 1;
444
445	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	547	$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	548	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
447	state => $CFG->{fullscreen},	549	state => $CFG->{fullscreen},
448	tooltip => "Bring the client into fullscreen mode.",	550	tooltip => "Bring the client into fullscreen mode.",
449	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	551	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
450	);	552	);
451		553
452	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	554	$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	555	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
454	state => $CFG->{fast},	556	state => $CFG->{fast},
455	tooltip => "Lower the visual quality considerably to speed up rendering.",	557	tooltip => "Lower the visual quality considerably to speed up rendering.",
456	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	558	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
457	);	559	);
458		560
		561	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
		562	$table->add_at (1, $row++, new CFPlus::UI::Slider
		563	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
		564	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
		565	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
		566	);
		567
		568	$table->add_at (1, $row++, new CFPlus::UI::Button
		569	expand => 1, align => 0, text => "Apply",
		570	tooltip => "Apply the video settings above.",
		571	on_activate => sub {
		572	video_shutdown ();
		573	video_init ();
		574	0
		575	}
		576	);
		577
459	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	578	$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	579	$table->add_at (1, $row++, new CFPlus::UI::Slider
461	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	580	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
462	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	581	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
463	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	582	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
464	);	583	);
465		584
		585	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
		586	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		587	state => $CFG->{map_smoothing},
		588	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
		589	. "This increases load on the graphics subsystem and works only with 2.x servers. "
		590	. "Changes take effect at next connection only.",
		591	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
		592	);
		593
466	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	594	$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	595	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
468	state => $CFG->{fow_enable},	596	state => $CFG->{fow_enable},
469	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	597	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 }	598	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
471	);	599	);
472		600
473	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	601	$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	602	$table->add_at (1, $row++, new CFPlus::UI::Slider
475	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	603	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.",	604	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 }	605	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
478	);	606	);
479		607
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");	608	$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	609	$table->add_at (1, $row++, new CFPlus::UI::Slider
501	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	610	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.",	611	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 },	612	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
504	);	613	);
505		614
506	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	615	$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	616	$table->add_at (1, $row++, new CFPlus::UI::Slider
508	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	617	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.",	618	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
510	on_changed => sub {	619	on_changed => sub {
511	$CFG->{gauge_fontsize} = $_[1];	620	$CFG->{gauge_fontsize} = $_[1];
512	&set_gauge_window_fontsize;	621	&set_gauge_window_fontsize;
513	0	622	0
514	}	623	}
515	);	624	);
516		625
517	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	626	$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	627	$table->add_at (1, $row++, new CFPlus::UI::Slider
519	range => [$CFG->{gauge_size}, 0.2, 0.8],	628	range => [$CFG->{gauge_size}, 0.2, 0.8],
520	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	629	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
521	on_changed => sub {	630	on_changed => sub {
522	$CFG->{gauge_size} = $_[1];	631	$CFG->{gauge_size} = $_[1];
523	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	632	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
524	0	633	0
525	}	634	}
526	);	635	);
527		636
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	637	$vbox
539	}	638	}
540		639
541	sub audio_setup {	640	sub audio_setup {
542	my $vbox = new CFClient::UI::VBox;	641	my $vbox = new CFPlus::UI::VBox;
543		642
544	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	643	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
545		644
546	my $row = 0;	645	my $row = 0;
547		646
548	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	647	$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	648	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
550	state => $CFG->{audio_enable},	649	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.",	650	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 }	651	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
553	);	652	);
554	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	653	# $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 {	654	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
556	# $CFG->{effects_volume} = $_[1];	655	# $CFG->{effects_volume} = $_[1];
557	# });	656	# });
558	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	657	$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);	658	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
560	$hbox->add (new CFClient::UI::CheckBox	659	$hbox->add (new CFPlus::UI::CheckBox
561	expand => 1, state => $CFG->{bgm_enable},	660	expand => 1, state => $CFG->{bgm_enable},
562	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	661	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 }	662	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
564	);	663	);
565	$hbox->add (new CFClient::UI::Slider	664	$hbox->add (new CFPlus::UI::Slider
566	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	665	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
567	tooltip => "The volume of the background music. Changes are instant.",	666	tooltip => "The volume of the background music. Changes are instant.",
568	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }	667	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
569	);	668	);
570		669
571	$table->add (1, $row++, new CFClient::UI::Button	670	$table->add_at (1, $row++, new CFPlus::UI::Button
572	expand => 1, align => 0, text => "Apply",	671	expand => 1, align => 0, text => "Apply",
573	tooltip => "Apply the audio settings",	672	tooltip => "Apply the audio settings",
574	on_activate => sub {	673	on_activate => sub {
575	audio_shutdown ();	674	audio_shutdown ();
576	audio_init ();	675	audio_init ();
…		…
588	}	687	}
589		688
590	sub make_gauge_window {	689	sub make_gauge_window {
591	my $gh = int $HEIGHT * $CFG->{gauge_size};	690	my $gh = int $HEIGHT * $CFG->{gauge_size};
592		691
593	my $win = new CFClient::UI::Frame (	692	my $win = new CFPlus::UI::Frame (
594	force_x => 0,	693	force_x => 0,
595	force_y => "max",	694	force_y => "max",
596	force_w => $WIDTH,	695	force_w => $WIDTH,
597	force_h => $gh,	696	force_h => $gh,
598	);	697	);
599		698
600	$win->add (my $hbox = new CFClient::UI::HBox	699	$win->add (my $hbox = new CFPlus::UI::HBox
601	children => [	700	children => [
602	(new CFClient::UI::HBox expand => 1),	701	(new CFPlus::UI::HBox expand => 1),
603	(new CFClient::UI::VBox children => [	702	(new CFPlus::UI::VBox children => [
604	(new CFClient::UI::Empty expand => 1),	703	(new CFPlus::UI::Empty expand => 1),
605	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	704	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
606	]),	705	]),
607	(my $vbox = new CFClient::UI::VBox),	706	(my $vbox = new CFPlus::UI::VBox),
608	],	707	],
609	);	708	);
610		709
611	$vbox->add (new CFClient::UI::HBox	710	$vbox->add (new CFPlus::UI::HBox
612	expand => 1,	711	expand => 1,
613	children => [	712	children => [
614	(new CFClient::UI::Empty expand => 1),	713	(new CFPlus::UI::Empty expand => 1),
615	(my $hb = new CFClient::UI::HBox),	714	(my $hb = new CFPlus::UI::HBox),
616	],	715	],
617	);	716	);
618		717
619	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	718	$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',	719	$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',	720	$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',	721	$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		722
628	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	723	$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,	724	$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		725
633	$GAUGES = {	726	$GAUGES = {
634	exp => $exp, win => $win, range => $rng,	727	exp => $exp, win => $win, range => $rng,
635	food => $fg, mana => $mg, hp => $hg, grace => $gg	728	food => $fg, mana => $mg, hp => $hg, grace => $gg
636	};	729	};
…		…
639		732
640	$win	733	$win
641	}	734	}
642		735
643	sub debug_setup {	736	sub debug_setup {
644	my $table = new CFClient::UI::Table;	737	my $table = new CFPlus::UI::Table;
645		738
646	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	739	$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 });	740	$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");	741	$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 });	742	$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");	743	$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 });	744	$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");	745	$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 });	746	$table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		747	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
654		748
655	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	749	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
656		750
657	for my $x (0..2) {	751	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
658	for my $y (0 .. 2) {	752	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
659	$table->add ($x + 3, $y,	753	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
660	new CFClient::UI::Entry	754	$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],	755	$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 },	756	$t->add_at (1,1, new CFPlus::UI::Label text => "e");
663	);	757
664	}	758	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
		759
		760	$c->add_items ({
		761	type => "line_loop",
		762	color => [0, 1, 0],
		763	width => 9,
		764	coord_mode => "abs",
		765	coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
665	}	766	});
666		767
		768	$c->add_items ({
		769	type => "lines",
		770	color => [1, 1, 0],
		771	width => 2,
		772	coord_mode => "rel",
		773	coord => [[0,0], [1,1], [1,0], [0,1]],
		774	});
		775
		776	$c->add_items ({
		777	type => "polygon",
		778	color => [0, 0.43, 0],
		779	width => 2,
		780	coord_mode => "rel",
		781	coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
		782	});
667		783
668	$table	784	$table
669	}	785	}
670		786
671	sub stats_window {	787	sub stats_window {
672	my $r = new CFClient::UI::ScrolledWindow (	788	my $r = new CFPlus::UI::ScrolledWindow (
673	expand => 1,	789	expand => 1,
674	scroll_y => 1	790	scroll_y => 1
675	);	791	);
676	$r->add (my $vb = new CFClient::UI::VBox);	792	$r->add (my $vb = new CFPlus::UI::VBox);
677		793
		794	$vb->add (new CFPlus::UI::FancyFrame
		795	label => "Player",
		796	child => (my $pi = new CFPlus::UI::VBox),
		797	);
		798
678	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	799	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
679	can_hover => 1, can_events => 1,	800	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.");	801	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,	802	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
682	can_hover => 1, can_events => 1,	803	can_hover => 1, can_events => 1,
683	tooltip => "The map you are currently on (if supported by the server).");	804	tooltip => "The map you are currently on (if supported by the server).");
684		805
685	$vb->add (my $hb0 = new CFClient::UI::HBox);	806	$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,	807	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
687	can_hover => 1, can_events => 1,	808	can_hover => 1, can_events => 1,
688	tooltip => "The weight of the player including all inventory items.");	809	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,	810	$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,	811	can_hover => 1, can_events => 1,
691	tooltip => "The weight limit: you cannot carry more than this.");	812	tooltip => "The weight limit: you cannot carry more than this.");
692		813
		814	$vb->add (new CFPlus::UI::FancyFrame
		815	label => "Primary/Secondary Statistics",
693	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	816	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		817	);
694	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	818	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
695		819
696	my $color2 = [1, 1, 0];	820	my $color2 = [1, 1, 0];
697		821
698	for (	822	for (
699	[0, 0, st_str => "Str", 30],	823	[0, 0, st_str => "Str", 30],
…		…
711	[2, 4, st_spd => "Spd", 10.54],	835	[2, 4, st_spd => "Spd", 10.54],
712	[2, 5, st_wspd => "WSp", 10.54],	836	[2, 5, st_wspd => "WSp", 10.54],
713	) {	837	) {
714	my ($col, $row, $id, $label, $template) = @$_;	838	my ($col, $row, $id, $label, $template) = @$_;
715		839
716	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	840	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
717	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	841	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718	align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});	842	align => +1, template => $template, tooltip => "#stat_$label");
719	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	843	$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,	844	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721	align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});	845	align => -1, text => $label, tooltip => "#stat_$label");
722	}	846	}
723		847
		848	$vb->add (new CFPlus::UI::FancyFrame
		849	label => "Resistancies",
724	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	850	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		851	);
725		852
726	my $row = 0;	853	my $row = 0;
727	my $col = 0;	854	my $col = 0;
728		855
729	my %resist_names = (	856	my %resist_names = (
…		…
762	cold => ["Cold",	889	cold => ["Cold",
763	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],	890	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
764	ghit => ["Ghost hit",	891	ghit => ["Ghost hit",
765	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],	892	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
766	);	893	);
		894
767	for (qw/slow holyw conf fire depl magic	895	for (qw/slow holyw conf fire depl magic
768	drain acid pois para deat phys	896	drain acid pois para deat phys
769	blind fear tund elec cold ghit/)	897	blind fear tund elec cold ghit/)
770	{	898	{
771	$tbl2->add ($col, $row,	899	$tbl2->add_at ($col, $row,
772	$STATWIDS->{"res_$_"} =	900	$STATWIDS->{"res_$_"} =
773	new CFClient::UI::Label	901	new CFPlus::UI::Label
774	font => $FONT_FIXED,	902	font => $FONT_FIXED,
775	template => "-100%",	903	template => "-100%",
776	align => +1,	904	align => +1,
777	valign => 0,	905	valign => 0,
778	can_events => 1,	906	can_events => 1,
779	can_hover => 1,	907	can_hover => 1,
780	tooltip => $resist_names{$_}->[1],	908	tooltip => $resist_names{$_}->[1],
781	);	909	);
782	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	910	$tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
783	font => $FONT_FIXED,	911	font => $FONT_FIXED,
784	can_hover => 1,	912	can_hover => 1,
785	can_events => 1,	913	can_events => 1,
786	path => "ui/resist/resist_$_.png",	914	path => "ui/resist/resist_$_.png",
787	tooltip => $resist_names{$_}->[1],	915	tooltip => $resist_names{$_}->[1],
788	);	916	);
789	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	917	$tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
790	text => $resist_names{$_}->[0],	918	text => $resist_names{$_}->[0],
791	font => $FONT_FIXED,	919	font => $FONT_FIXED,
792	can_hover => 1,	920	can_hover => 1,
793	can_events => 1,	921	can_events => 1,
794	tooltip => $resist_names{$_}->[1],	922	tooltip => $resist_names{$_}->[1],
…		…
805		933
806	$r	934	$r
807	}	935	}
808		936
809	sub skill_window {	937	sub skill_window {
810	my $sw = new CFClient::UI::ScrolledWindow (expand => 1);	938	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]);	939	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
812	$sw	940	$sw
813	}	941	}
814		942
815	sub formsep($) {	943	sub formsep($) {
816	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	944	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
…		…
827	return if $METASERVER_ATIME > time;	955	return if $METASERVER_ATIME > time;
828	$METASERVER_ATIME = time + 60;	956	$METASERVER_ATIME = time + 60;
829		957
830	my $table = $METASERVER->{table};	958	my $table = $METASERVER->{table};
831	$table->clear;	959	$table->clear;
832	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	960	$table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
833		961
834	my $buf;	962	my $ok = 0;
835		963
836	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	964	CFPlus::background {
		965	my $ua = CFPlus::lwp_useragent;
837		966
838	unless ($fh) {	967	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
839	$label->set_text ("unable to contact metaserver: $!");	968	} sub {
840	return;	969	my ($msg) = @_;
841	}	970	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;	971	$table->clear;
856		972
857	my @tip = (	973	my @tip = (
858	"The current number of users logged in on the server.",	974	"The current number of users logged in on the server.",
859	"The hostname of the server.",	975	"The hostname of the server.",
860	"The time this server has been running without being restarted.",	976	"The time this server has been running without being restarted.",
861	"The server software version - a '+' indicates a Crossfire+ server.",	977	"The server software version - a '+' indicates a Crossfire+ server.",
862	"Short information about this server provided by its admins.",	978	"Short information about this server provided by its admins.",
863	);	979	);
864	my @col = qw(#Users Host Uptime Version Description);	980	my @col = qw(#Users Host Uptime Version Description);
865	$table->add ($_, 0, new CFClient::UI::Label	981	$table->add_at ($_, 0, new CFPlus::UI::Label
866	can_hover => 1, can_events => 1,	982	can_hover => 1, can_events => 1,
867	align => 0, fg => [1, 1, 0],	983	align => 0, fg => [1, 1, 0],
868	text => $col[$_], tooltip => $tip[$_])	984	text => $col[$_], tooltip => $tip[$_])
869	for 0 .. $#col;	985	for 0 .. $#col;
870		986
871	my @align = qw(1 0 1 1 -1);	987	my @align = qw(1 0 1 1 -1);
872		988
873	my $y = 0;	989	my $y = 0;
874	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	990	for my $m (@{ $msg->{servers} }) {
875	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	991	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
		992	@$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
876		993
877	for ($desc) {	994	for ($desc) {
878	s/<br>/\n/gi;	995	s/<br>/\n/gi;
879	s/<li>/\n· /gi;	996	s/<li>/\n· /gi;
880	s/<.*?>//sgi;	997	s/<.*?>//sgi;
881	s/&/&amp;/g;	998	s/&amp;/&/g;
882	s/</&lt;/g;	999	s/&lt;/</g;
883	s/>/&gt;/g;	1000	s/&gt;/>/g;
884	}	1001	}
885		1002
886	$uptime = sprintf "%dd %02d:%02d:%02d",	1003	$uptime = sprintf "%dd %02d:%02d:%02d",
887	(int $m->[8] / 86400),	1004	(int $uptime / 86400),
888	(int $m->[8] / 3600) % 24,	1005	(int $uptime / 3600) % 24,
889	(int $m->[8] / 60) % 60,	1006	(int $uptime / 60) % 60,
890	$m->[8] % 60;	1007	$uptime % 60;
891		1008
892	$m = [$users, $host, $uptime, $version, $desc];	1009	$m = [$users, $host, $uptime, $version, $desc];
893		1010
894	$y++;	1011	$y++;
895		1012
896	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	1013	$table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
897	(new CFClient::UI::Button	1014	(new CFPlus::UI::Button
898	text => "Use",	1015	text => "Use",
899	tooltip => "Put this server into the <b>Host:Port</b> field",	1016	tooltip => "Put this server into the <b>Host:Port</b> field",
900	on_activate => sub {	1017	on_activate => sub {
901	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1018	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
902	$METASERVER->hide;	1019	$METASERVER->hide;
903	0	1020	0
904	},	1021	},
905	),	1022	),
906	(new CFClient::UI::Empty expand => 1),	1023	(new CFPlus::UI::Empty expand => 1),
907	]);	1024	]);
908		1025
909	$table->add ($_, $y, new CFClient::UI::Label	1026	$table->add_at ($_, $y, new CFPlus::UI::Label
		1027	max_w => $::WIDTH * 0.4,
910	ellipsise => 0,	1028	ellipsise => 0,
911	align => $align[$_],	1029	align => $align[$_],
912	text => $m->[$_],	1030	text => $m->[$_],
913	tooltip => $tip[$_],	1031	tooltip => $tip[$_],
		1032	fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
914	can_hover => 1,	1033	can_hover => 1,
915	can_events => 1,	1034	can_events => 1,
916	fontsize => 0.8)	1035	fontsize => 0.8)
917	for 0 .. $#$m;	1036	for 0 .. $#$m;
918	}	1037	}
		1038	} else {
		1039	$ok or $label->set_text ("error while contacting metaserver");
919	}	1040	}
920	});	1041	};
		1042
921	}	1043	}
922		1044
923	sub metaserver_dialog {	1045	sub metaserver_dialog {
924	my $vbox = new CFClient::UI::VBox;	1046	my $vbox = new CFPlus::UI::VBox;
925	my $table = new CFClient::UI::Table;	1047	my $table = new CFPlus::UI::Table;
926	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	1048	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
927		1049
928	my $dialog = new CFClient::UI::FancyFrame	1050	my $dialog = new CFPlus::UI::Toplevel
929	title => "Server List",	1051	title => "Server List",
930	name => 'metaserver_dialog',	1052	name => 'metaserver_dialog',
931	x => 'center',	1053	x => 'center',
932	y => 'center',	1054	y => 'center',
933	z => 3,	1055	z => 3,
		1056	force_w => $::WIDTH * 0.9,
934	force_h => $::HEIGHT * 0.4,	1057	force_h => $::HEIGHT * 0.7,
935	child => $vbox,	1058	child => $vbox,
936	has_close_button => 1,	1059	has_close_button => 1,
937	table => $table,	1060	table => $table,
938	on_visibility_change => sub {	1061	on_visibility_change => sub {
939	update_metaserver ($_[0]) if $_[1];	1062	update_metaserver ($_[0]) if $_[1];
…		…
943		1066
944	$dialog	1067	$dialog
945	}	1068	}
946		1069
947	sub server_setup {	1070	sub server_setup {
948	my $vbox = new CFClient::UI::VBox;	1071	my $vbox = new CFPlus::UI::VBox;
949		1072
		1073	$vbox->add (new CFPlus::UI::FancyFrame
		1074	label => "Connection Settings",
950	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	1075	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		1076	);
951	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	1077	$table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
952		1078
953	{	1079	{
954	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	1080	$table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
955		1081
956	$vbox->add (	1082	$vbox->add (
957	$HOST_ENTRY = new CFClient::UI::Entry	1083	$HOST_ENTRY = new CFPlus::UI::Entry
958	expand => 1,	1084	expand => 1,
959	text => $CFG->{profile}{default}{host},	1085	text => $CFG->{profile}{default}{host},
960	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	1086	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
961	on_changed => sub {	1087	on_changed => sub {
962	my ($self, $value) = @_;	1088	my ($self, $value) = @_;
963	$CFG->{profile}{default}{host} = $value;	1089	$CFG->{profile}{default}{host} = $value;
964	0	1090	0
965	}	1091	}
966	);	1092	);
967		1093
968	$vbox->add (new CFClient::UI::Button	1094	$vbox->add (new CFPlus::UI::Button
969	expand => 1,	1095	expand => 1,
970	text => "Server List",	1096	text => "Server List",
971	other => $METASERVER,	1097	other => $METASERVER,
972	tooltip => "Show a list of available crossfire servers",	1098	tooltip => "Show a list of available crossfire servers",
973	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1099	on_activate => sub { $METASERVER->toggle_visibility; 0 },
974	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1100	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
975	);	1101	);
976	}	1102	}
977		1103
978	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	1104	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
979	$table->add (1, 4, new CFClient::UI::Entry	1105	$table->add_at (1, 4, new CFPlus::UI::Entry
980	text => $CFG->{profile}{default}{user},	1106	text => $CFG->{profile}{default}{user},
981	tooltip => "The name of your character on the server",	1107	tooltip => "The name of your character on the server",
982	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1108	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
983	);	1109	);
984		1110
985	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1111	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
986	$table->add (1, 5, new CFClient::UI::Entry	1112	$table->add_at (1, 5, new CFPlus::UI::Entry
987	text => $CFG->{profile}{default}{password},	1113	text => $CFG->{profile}{default}{password},
988	hidden => 1,	1114	hidden => 1,
989	tooltip => "The password for your character",	1115	tooltip => "The password for your character",
990	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1116	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
991	);	1117	);
992		1118
993	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1119	$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	1120	$table->add_at (1, 7, new CFPlus::UI::Slider
995	force_w => 100,	1121	force_w => 100,
996	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1122	range => [$CFG->{mapsize}, 10, 100, 0, 1],
997	tooltip => "This is the size of the portion of the map update the server sends you. "	1123	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, "	1124	. "If you set this to a high value you will be able to see further, "
999	. "but you also increase bandwidth requirements and latency. "	1125	. "but you also increase bandwidth requirements and latency. "
1000	. "This option is only used once at log-in.",	1126	. "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 },	1127	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1002	);	1128	);
1003		1129
1004	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1130	$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	1131	$table->add_at (1, 8, new CFPlus::UI::CheckBox
1006	state => $CFG->{face_prefetch},	1132	state => $CFG->{face_prefetch},
1007	tooltip => "<b>Background Image Prefetch</b>\n\n"	1133	tooltip => "<b>Background Image Prefetch</b>\n\n"
1008	. "If enabled, the client automatically pre-fetches images from the server. "	1134	. "If enabled, the client automatically pre-fetches images from the server. "
1009	. "This might increase or create lag, but increases the chances "	1135	. "This might increase or create lag, but increases the chances "
1010	. "of faces being ready for display when you encounter them. "	1136	. "of faces being ready for display when you encounter them. "
…		…
1012	. "so only set it if you really need to prefetch images. "	1138	. "so only set it if you really need to prefetch images. "
1013	. "This option can be set and unset any time.",	1139	. "This option can be set and unset any time.",
1014	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1140	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1015	);	1141	);
1016		1142
		1143	$table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
		1144	$table->add_at (1, 9, new CFPlus::UI::Entry
		1145	text => $CFG->{output_rate},
		1146	tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
		1147	. "when sending images, to ensure interactiveness. When 0 or unset, the server "
		1148	. "default will be used, which is usually around 100kb/s.",
		1149	on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
		1150	);
		1151
1017	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1152	$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	1153	$table->add_at (1, 10, new CFPlus::UI::Entry
1019	text => $CFG->{output_count},	1154	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.",	1155	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 },	1156	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1022	);	1157	);
1023		1158
1024	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1159	$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	1160	$table->add_at (1, 11, new CFPlus::UI::Entry
1026	text => $CFG->{output_sync},	1161	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.",	1162	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 },	1163	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1029	);	1164	);
1030		1165
1031	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1166	$table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1032	expand => 1,	1167	expand => 1,
1033	align => 0,	1168	align => 0,
1034	text => "Login",	1169	text => "Login",
1035	on_activate => sub {	1170	on_activate => sub {
1036	$CONN ? stop_game	1171	$CONN ? stop_game
1037	: start_game;	1172	: start_game;
1038	0	1173	0
1039	},	1174	},
1040	);	1175	);
1041		1176
		1177	$vbox->add (new CFPlus::UI::FancyFrame
		1178	label => "Server Info",
		1179	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1180	);
		1181
		1182	$vbox
		1183	}
		1184
		1185	sub client_setup {
		1186	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
		1187
		1188	my $row = 0;
		1189
1042	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1190	$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	1191	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
1044	text => $CFG->{say_command},	1192	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. "	1193	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 {	1194	on_changed => sub {
1049	my ($self, $value) = @_;	1195	my ($self, $value) = @_;
1050	$CFG->{say_command} = $value;	1196	$CFG->{show_tips} = $value;
1051	0	1197	0
1052	}	1198	}
1053	);	1199	);
1054		1200
1055	$vbox->add (new CFClient::UI::Label	1201	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1056	text => "Server Info",	1202	$table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1057	fontsize => 1.2,	1203	text => $CFG->{logview_max_par},
1058	padding_y => 8,	1204	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1059	fg => [1, 1, 0, 1],	1205	. "sends more messages than this number, older messages get removed to save memory and "
1060	);	1206	. "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 {	1207	on_changed => sub {
1087	my ($input, $prev_focus) = @_;	1208	my ($self, $value) = @_;
1088		1209	$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	1210	0
1097	},	1211	},
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	};	1212	);
1126		1213
1127	$window	1214	$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	}	1215	}
1166		1216
1167	sub autopickup_setup {	1217	sub autopickup_setup {
		1218	my $r = new CFPlus::UI::ScrolledWindow (
		1219	expand => 1,
		1220	scroll_y => 1
		1221	);
1168	my $table = new CFClient::UI::Table;	1222	$r->add (my $table = new CFPlus::UI::Table
		1223	row_expand => [0],
		1224	col_expand => [0, 1, 0, 1],
		1225	);
1169		1226
1170	for (	1227	for (
1171	["General", 0, 0,	1228	["General", 0, 0,
1172	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1229	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1173	["Inhibit autopickup" => PICKUP_INHIBIT],	1230	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1187	["Boots" => PICKUP_BOOTS],	1244	["Boots" => PICKUP_BOOTS],
1188	["Gloves" => PICKUP_GLOVES],	1245	["Gloves" => PICKUP_GLOVES],
1189	["Cloaks" => PICKUP_CLOAK],	1246	["Cloaks" => PICKUP_CLOAK],
1190	],	1247	],
1191		1248
1192	["Readables", 2, 2,	1249	["Readables", 2, 0,
1193	["Spellbooks" => PICKUP_SPELLBOOK],	1250	["Spellbooks" => PICKUP_SPELLBOOK],
1194	["Skillscrolls" => PICKUP_SKILLSCROLL],	1251	["Skillscrolls" => PICKUP_SKILLSCROLL],
1195	["Normal Books/Scrolls" => PICKUP_READABLES],	1252	["Normal Books/Scrolls" => PICKUP_READABLES],
1196	],	1253	],
1197	["Misc", 2, 7,	1254	["Misc", 2, 5,
1198	["Food" => PICKUP_FOOD],	1255	["Food" => PICKUP_FOOD],
1199	["Drinks" => PICKUP_DRINK],	1256	["Drinks" => PICKUP_DRINK],
1200	["Valuables (Money, Gems)" => PICKUP_VALUABLES],	1257	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1201	["Keys" => PICKUP_KEY],	1258	["Keys" => PICKUP_KEY],
1202	["Magical Items" => PICKUP_MAGICAL],	1259	["Magical Items" => PICKUP_MAGICAL],
1203	["Potions" => PICKUP_POTION],	1260	["Potions" => PICKUP_POTION],
1204	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1261	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1205	["Ignore cursed" => PICKUP_NOT_CURSED],	1262	["Ignore cursed" => PICKUP_NOT_CURSED],
1206	["Jewelery" => PICKUP_JEWELS],	1263	["Jewelery" => PICKUP_JEWELS],
		1264	["Flesh" => PICKUP_FLESH],
1207	],	1265	],
1208	["Weight/Value ratio", 2, 17]	1266	["Weight/Value ratio", 2, 17]
1209	)	1267	)
1210	{	1268	{
1211	my ($title, $x, $y, @bits) = @$_;	1269	my ($title, $x, $y, @bits) = @$_;
1212	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1270	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1213		1271
1214	for (@bits) {	1272	for (@bits) {
1215	++$y;	1273	++$y;
1216		1274
1217	my $mask = $_->[1];	1275	my $mask = $_->[1];
1218	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1276	$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	1277	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1220	state => $::CFG->{pickup} & $mask,	1278	state => $::CFG->{pickup} & $mask,
1221	on_changed => sub {	1279	on_changed => sub {
1222	my ($box, $value) = @_;	1280	my ($box, $value) = @_;
1223		1281
1224	if ($value) {	1282	if ($value) {
…		…
1235		1293
1236	${$_->[2]} = $checkbox if $_->[2];	1294	${$_->[2]} = $checkbox if $_->[2];
1237	}	1295	}
1238	}	1296	}
1239		1297
1240	$table->add (2, 18, new CFClient::UI::ValSlider	1298	$table->add_at (2, 18, new CFPlus::UI::ValSlider
1241	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1299	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1242	template => ">= 99",	1300	template => ">= 99",
1243	to_value => sub { ">= " . 5 * $_[0] },	1301	to_value => sub { ">= " . 5 * $_[0] },
1244	on_changed => sub {	1302	on_changed => sub {
1245	my ($slider, $value) = @_;	1303	my ($slider, $value) = @_;
…		…
1248	$::CFG->{pickup} |= int $value	1306	$::CFG->{pickup} |= int $value
1249	if $value;	1307	if $value;
1250	1;	1308	1;
1251	});	1309	});
1252		1310
1253	$table->add (3, 18, new CFClient::UI::Button	1311	$table->add_at (3, 18, new CFPlus::UI::Button
1254	text => "set",	1312	text => "set",
1255	on_activate => sub {	1313	on_activate => sub {
1256	$::CONN->send_command ("pickup $::CFG->{pickup}")	1314	$::CONN->send_command ("pickup $::CFG->{pickup}")
1257	if defined $::CONN;	1315	if defined $::CONN;
1258	0	1316	0
1259	});	1317	});
1260		1318
1261	$table	1319	$r
1262	}	1320	}
1263		1321
1264	my %SORT_ORDER = (	1322	my %SORT_ORDER = (
1265	type => undef,	1323	type => undef,
1266	mtime => sub { sort {	1324	mtime => sub {
		1325	my $NOW = time;
		1326	sort {
		1327	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1328	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1329
1267	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)	1330	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1268	or $b->{mtime} <=> $a->{mtime}	1331	or $btime <=> $atime
1269	or $a->{type} <=> $b->{type}	1332	or $a->{type} <=> $b->{type}
		1333	} @_
1270	} @_ },	1334	},
1271	weight => sub { sort {	1335	weight => sub { sort {
1272	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)	1336	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1273	or $a->{type} <=> $b->{type}	1337	or $a->{type} <=> $b->{type}
1274	} @_ },	1338	} @_ },
1275	);	1339	);
1276		1340
1277	sub inventory_widget {	1341	sub inventory_widget {
1278	my $hb = new CFClient::UI::HBox homogeneous => 1;	1342	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1279		1343
1280	$hb->add (my $vb1 = new CFClient::UI::VBox);	1344	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1281	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1345	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1282		1346
1283	$vb1->add (my $hb1 = new CFClient::UI::HBox);	1347	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
1284		1348
1285	use sort 'stable';	1349	use sort 'stable';
1286		1350
1287	$hb1->add (new CFClient::UI::Selector	1351	$hb1->add (new CFPlus::UI::Selector
1288	value => $::CFG->{inv_sort},	1352	value => $::CFG->{inv_sort},
1289	options => [	1353	options => [
1290	[type => "Type/Name"],	1354	[type => "Type/Name"],
1291	[mtime => "Recent/Normal/Locked"],	1355	[mtime => "Recent/Normal/Locked"],
1292	[weight => "Weight/Type"],	1356	[weight => "Weight/Type"],
…		…
1294	on_changed => sub {	1358	on_changed => sub {
1295	$::CFG->{inv_sort} = $_[1];	1359	$::CFG->{inv_sort} = $_[1];
1296	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1360	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1297	},	1361	},
1298	);	1362	);
1299	$hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);	1363	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1300	#TODO# update to weigh/maxweight	1364	#TODO# update to weigh/maxweight
1301	$hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);	1365	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1302		1366
1303	$vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1367	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1304	$sw1->add ($INV = new CFClient::UI::Inventory);	1368	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1369	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1305		1370
1306	$hb->add (my $vb2 = new CFClient::UI::VBox);	1371	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1307		1372
1308	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1373	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1309		1374
1310	$vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1375	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1311	$sw2->add ($INVR = new CFClient::UI::Inventory);	1376	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1312		1377
1313	# XXX: Call after $INVR = ... because set_opencont sets the items	1378	# XXX: Call after $INVR = ... because set_opencont sets the items
1314	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1379	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1315		1380
1316	$hb	1381	$hb
1317	}	1382	}
1318		1383
1319	sub toggle_player_page {	1384	sub toggle_player_page {
…		…
1326	$PL_WINDOW->show;	1391	$PL_WINDOW->show;
1327	}	1392	}
1328	}	1393	}
1329		1394
1330	sub player_window {	1395	sub player_window {
1331	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1396	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1332	x => "center",	1397	x => "center",
1333	y => "center",	1398	y => "center",
1334	force_w => $WIDTH * 9/10,	1399	force_w => $WIDTH * 9/10,
1335	force_h => $HEIGHT * 9/10,	1400	force_h => $HEIGHT * 9/10,
1336	title => "Player",	1401	title => "Player",
…		…
1338	has_close_button => 1	1403	has_close_button => 1
1339	;	1404	;
1340		1405
1341	my $ntb =	1406	my $ntb =
1342	$PL_NOTEBOOK =	1407	$PL_NOTEBOOK =
1343	new CFClient::UI::Notebook expand => 1, debug => 1;	1408	new CFPlus::UI::Notebook expand => 1;
1344		1409
1345	$ntb->add (	1410	$ntb->add_tab (
1346	"Statistics (F2)" => $STATS_PAGE = stats_window,	1411	"Statistics (F2)" => $STATS_PAGE = stats_window,
1347	"Shows statistics, where all your Stats and Resistances are shown."	1412	"Shows statistics, where all your Stats and Resistances are shown."
1348	);	1413	);
1349	$ntb->add (	1414	$ntb->add_tab (
1350	"Skills (F3)" => $SKILL_PAGE = skill_window,	1415	"Skills (F3)" => $SKILL_PAGE = skill_window,
1351	"Shows all your Skills."	1416	"Shows all your Skills."
1352	);	1417	);
1353		1418
1354	my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1419	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1355	$spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);	1420	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1356	$ntb->add (	1421	$ntb->add_tab (
1357	"Spellbook (F4)" => $spellsw,	1422	"Spellbook (F4)" => $spellsw,
1358	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1423	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1359	);	1424	);
1360	$ntb->add (	1425	$ntb->add_tab (
1361	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1426	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1362	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1427	"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."	1428	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1364	);	1429	);
		1430	$ntb->add_tab (Pickup => autopickup_setup,
		1431	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1365		1432
1366	$ntb->set_current_page ($INVENTORY_PAGE);	1433	$ntb->set_current_page ($INVENTORY_PAGE);
1367		1434
1368	$plwin->add ($ntb);	1435	$plwin->add ($ntb);
1369	$plwin	1436	$plwin
1370	}	1437	}
1371		1438
1372	sub update_bindings {
1373	$BIND_UPD_CB->() if $BIND_UPD_CB;
1374	}
1375
1376	sub keyboard_setup {	1439	sub keyboard_setup {
1377	my $binding_list = new CFClient::UI::VBox;	1440	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	}	1441	}
1560		1442
1561	sub help_window {	1443	sub help_window {
1562	my $win = new CFClient::UI::FancyFrame	1444	my $win = new CFPlus::UI::Toplevel
1563	x => 'center',	1445	x => 'center',
1564	y => 'center',	1446	y => 'center',
1565	z => 2,	1447	z => 4,
1566	name => 'doc_browser',	1448	name => 'doc_browser',
1567	force_w => int $WIDTH * 7/8,	1449	force_w => int $WIDTH * 7/8,
1568	force_h => int $HEIGHT * 7/8,	1450	force_h => int $HEIGHT * 7/8,
1569	title => "Help Browser",	1451	title => "Help Browser",
1570	has_close_button => 1;	1452	has_close_button => 1;
1571		1453
1572	$win->add (my $vbox = new CFClient::UI::VBox);	1454	$win->add (my $vbox = new CFPlus::UI::VBox);
1573		1455
1574	$vbox->add (my $buttons = new CFClient::UI::HBox);	1456	$vbox->add (new CFPlus::UI::FancyFrame
		1457	label => "Navigation",
		1458	child => (my $buttons = new CFPlus::UI::HBox),
		1459	);
1575	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1460	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1576	expand => 1, fontsize => 0.8, padding_x => 4);	1461	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1577		1462
1578	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1463	my @history;
1579	$buttons->add (my $combo = new CFClient::UI::Selector	1464	my @future;
1580	value => undef,	1465	my $curnode;
1581	options => [	1466
1582	[intro => "Introduction"],	1467	my $load_node; $load_node = sub {
1583	[manual => "Main Manual"],	1468	my ($node, $para) = @_;
1584	[skill_help => "Skill Reference"],	1469
1585	[command_help => "Command Reference"],	1470	$buttons->clear;
1586	[dmcommand_help => "DM Commands"],	1471
1587	[COPYING => "License Terms"],	1472	$buttons->add (new CFPlus::UI::Button
1588	[test => "test (do not select)"], #d#TODO	1473	text => "⇤",
1589	],	1474	tooltip => "back to the starting page",
1590	on_changed => sub {	1475	on_activate => sub {
1591	my ($self, $pod) = @_;	1476	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1477	unshift @future, @history;
		1478	@history = ();
		1479	$load_node->(@{shift @future});
		1480	},
		1481	);
1592		1482
1593	if ($pod eq "test") {#d#TODO	1483	if (@history) {
1594	eval {	1484	$buttons->add (new CFPlus::UI::Button
1595	load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";	1485	text => "⋘",
		1486	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1487	on_activate => sub {
		1488	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1489	$load_node->(@{pop @history});
1596	};	1490	},
1597	warn "$@" if $@;	1491	);
1598	return;	1492	}
		1493
		1494	if (@future) {
		1495	$buttons->add (new CFPlus::UI::Button
		1496	text => "⋙",
		1497	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1498	on_activate => sub {
		1499	push @history, [$curnode, $viewer->current_paragraph];
		1500	$load_node->(@{shift @future});
		1501	},
		1502	);
		1503	}
		1504
		1505	$buttons->add (new CFPlus::UI::Label text => " ");
		1506
		1507	my @path = CFPlus::Pod::full_path_of $node;
		1508	pop @path; # drop current node
		1509
		1510	for my $node (@path) {
		1511	$buttons->add (new CFPlus::UI::Button
		1512	text => $node->{kw}[0],
		1513	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1514	on_activate => sub {
		1515	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1516	$load_node->($node);
		1517	},
		1518	);
		1519	$buttons->add (new CFPlus::UI::Label text => "/");
		1520	}
		1521
		1522	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1523
		1524	$curnode = $node;
		1525
		1526	$viewer->clear;
		1527	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1528	$viewer->scroll_to ($para);
		1529	};
		1530
		1531	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1532
		1533	$CFPlus::Pod::goto_document = sub {
		1534	my (@path) = @_;
		1535
		1536	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1537
		1538	$load_node->((CFPlus::Pod::find @path)[0]);
		1539	$win->show;
		1540	};
		1541
		1542	$win
		1543	}
		1544
		1545	sub open_string_query {
		1546	my ($title, $cb, $txt, $tooltip) = @_;
		1547	my $dialog = new CFPlus::UI::Toplevel
		1548	x => "center",
		1549	y => "center",
		1550	z => 50,
		1551	force_w => $WIDTH * 4/5,
		1552	title => $title;
		1553
		1554	$dialog->add (
		1555	my $e = new CFPlus::UI::Entry
		1556	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1557	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1558	tooltip => $tooltip
		1559	);
		1560
		1561	$e->grab_focus;
		1562	$e->set_text ($txt) if $txt;
		1563	$dialog->show;
		1564	}
		1565
		1566	sub open_quit_dialog {
		1567	unless ($QUIT_DIALOG) {
		1568	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1569	x => "center",
		1570	y => "center",
		1571	z => 50,
		1572	title => "Really Quit?",
		1573	on_key_down => sub {
		1574	my ($dialog, $ev) = @_;
		1575	$ev->{sym} == 27 and $dialog->hide;
1599	}	1576	}
		1577	;
1600		1578
1601	my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",	1579	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1602	doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1603		1580
1604	#use Data::Dumper; warn Dumper $pom;#d#	1581	$vb->add (new CFPlus::UI::Label
		1582	text => "You should find a savebed and apply it first!",
		1583	max_w => $WIDTH * 0.25,
		1584	ellipsize => 0,
		1585	);
		1586	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1587	$hb->add (new CFPlus::UI::Button
		1588	text => "Ok",
		1589	expand => 1,
		1590	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1591	);
		1592	$hb->add (new CFPlus::UI::Button
		1593	text => "Quit anyway",
		1594	expand => 1,
		1595	on_activate => sub { exit },
		1596	);
		1597	}
1605		1598
1606	$viewer->clear;	1599	$QUIT_DIALOG->show;
		1600	$QUIT_DIALOG->grab_focus;
		1601	}
1607		1602
1608	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",	1603	sub show_tip_of_the_day {
1609	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),	1604	# find all tips
1610	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),	1605	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1611	# ]);#d#	1606
		1607	CFPlus::DB::get state => "tip_of_the_day", sub {
		1608	my ($todindex) = @_;
		1609	$todindex = 0 if $todindex >= @tod;
		1610	CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
		1611
		1612	# create dialog
		1613	my $dialog;
		1614
		1615	my $close = sub {
		1616	$dialog->destroy;
		1617	};
		1618
		1619	$dialog = new CFPlus::UI::Toplevel
		1620	x => "center",
		1621	y => "center",
		1622	z => 3,
		1623	name => 'tip_of_the_day',
		1624	force_w => int $WIDTH * 4/9,
		1625	force_h => int $WIDTH * 2/9,
		1626	title => "Tip of the day #" . (1 + $todindex),
		1627	child => my $vbox = new CFPlus::UI::VBox,
		1628	has_close_button => 1,
		1629	on_delete => $close,
		1630	;
		1631
		1632	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1633	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1634	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1635
		1636	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
		1637
		1638	$table->add_at (0, 0, new CFPlus::UI::Button
		1639	text => "Close",
		1640	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>.",
		1641	on_activate => $close,
		1642	);
		1643
		1644	$table->add_at (2, 0, new CFPlus::UI::Button
		1645	text => "Next",
		1646	tooltip => "Show the next <b>Tip of the day</b>.",
		1647	on_activate => sub {
		1648	$close->();
		1649	&show_tip_of_the_day;
1612		1650	},
1613	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1614	for @$pom;
1615
1616	$viewer->set_offset (0);
1617
1618	0
1619	},	1651	);
1620	on_visibility_change => sub {	1652
1621	my ($self, $visible) = @_;	1653	$dialog->show;
1622	return unless $visible;
1623	return if $self->{value};
1624	$self->set_value ("intro");
1625	0
1626	},
1627	);	1654	};
1628
1629	$win
1630	}	1655	}
1631		1656
1632	sub sdl_init {	1657	sub sdl_init {
1633	CFClient::SDL_Init	1658	CFPlus::SDL_Init
1634	and die "SDL::Init failed!\n";	1659	and die "SDL::Init failed!\n";
1635	}	1660	}
1636		1661
1637	sub video_init {	1662	sub video_init {
1638	sdl_init;
1639
1640	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	1663	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1641		1664
1642	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	1665	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1643		1666
1644	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1667	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1645	$FULLSCREEN = $CFG->{fullscreen};	1668	$FULLSCREEN = $CFG->{fullscreen};
1646	$FAST = $CFG->{fast};	1669	$FAST = $CFG->{fast};
1647		1670
1648	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1671	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1649	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1672	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1650		1673
1651	$SDL_ACTIVE = 1;	1674	$SDL_ACTIVE = 1;
1652	$LAST_REFRESH = time - 0.01;	1675	$LAST_REFRESH = time - 0.01;
1653		1676
1654	CFClient::OpenGL::init;	1677	CFPlus::OpenGL::init;
1655		1678
1656	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1679	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1657		1680
1658	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1681	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1659		1682
1660	#############################################################################	1683	#############################################################################
1661		1684
1662	if ($DEBUG_STATUS) {	1685	if ($DEBUG_STATUS) {
1663	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1686	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1664	} else {	1687	} else {
1665	# create the widgets	1688	# create the widgets
1666		1689
1667	$DEBUG_STATUS = new CFClient::UI::Label	1690	$DEBUG_STATUS = new CFPlus::UI::Label
1668	padding => 0,	1691	padding => 0,
1669	z => 100,	1692	z => 100,
1670	force_x => "max",	1693	force_x => "max",
1671	force_y => 0;	1694	force_y => 0;
1672	$DEBUG_STATUS->show;	1695	$DEBUG_STATUS->show;
1673		1696
1674	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1675
1676	$STATUSBOX = new CFClient::UI::Statusbox;	1697	$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]);	1698	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1678		1699
1679	(new CFClient::UI::Frame	1700	(new CFPlus::UI::Frame
1680	bg => [0, 0, 0, 0.4],	1701	bg => [0, 0, 0, 0.4],
1681	force_x => 0,	1702	force_x => 0,
1682	force_y => "max",	1703	force_y => "max",
1683	child => $STATUSBOX,	1704	child => $STATUSBOX,
1684	)->show;	1705	)->show;
1685		1706
1686	CFClient::UI::FancyFrame->new (	1707	CFPlus::UI::Toplevel->new (
1687	title => "Map",	1708	title => "Map",
1688	name => "mapmap",	1709	name => "mapmap",
1689	x => 0,	1710	x => 0,
1690	y => $FONTSIZE + 8,	1711	y => $FONTSIZE + 8,
1691	border_bg => [1, 1, 1, 192/255],	1712	border_bg => [1, 1, 1, 192/255],
1692	bg => [1, 1, 1, 0],	1713	bg => [1, 1, 1, 0],
1693	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1714	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.",	1715	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1695	),	1716	),
1696	)->show;	1717	)->show;
1697		1718
1698	$MAPWIDGET = new CFClient::MapWidget;	1719	$MAPWIDGET = new CFPlus::MapWidget;
1699	$MAPWIDGET->connect (activate_console => sub {	1720	$MAPWIDGET->connect (activate_console => sub {
1700	my ($mapwidget, $preset) = @_;	1721	my ($mapwidget, $preset) = @_;
1701		1722
1702	if ($CONSOLE) {	1723	$MESSAGE_WINDOW->activate_console ($preset)
1703	$CONSOLE->{input}->{auto_activated} = 1;	1724	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	});	1725	});
1711	$MAPWIDGET->show;	1726	$MAPWIDGET->show;
1712	$MAPWIDGET->grab_focus;	1727	$MAPWIDGET->grab_focus;
1713		1728
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	1729	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1725	title => "Setup",	1730	title => "Setup",
1726	name => "setup_dialog",	1731	name => "setup_dialog",
1727	x => 'center',	1732	x => 'center',
1728	y => 'center',	1733	y => 'center',
1729	z => 2,	1734	z => 2,
…		…
1731	force_h => $::HEIGHT * 0.6,	1736	force_h => $::HEIGHT * 0.6,
1732	has_close_button => 1,	1737	has_close_button => 1,
1733	;	1738	;
1734		1739
1735	$METASERVER = metaserver_dialog;	1740	$METASERVER = metaserver_dialog;
		1741	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1736		1742
1737	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1743	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1738	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1744	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1739		1745
1740	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1746	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1741	"Configure the server to play on, your username, password and other server-related options.");	1747	"Configure the server to play on, your username, password and other server-related options.");
1742	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1748	$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.");	1749	"Configure various client-specific settings.");
1744	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1750	$SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1745	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1751	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1746	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1752	$SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1747	"Configure the use of audio, sound effects and background music.");	1753	"Configure the use of audio, sound effects and background music.");
1748	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1754	$SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1749	"Lets you define, edit and delete key bindings."	1755	"Lets you define, edit and delete key bindings."
1750	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "	1756	. "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 "	1757	. "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. "	1758	. "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 "	1759	. "After pressing the combo the binding will be saved automatically and the "
1754	. "binding editor closes");	1760	. "binding editor closes");
1755	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1761	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1756	"Some debuggin' options. Do not ask.");	1762	"Some debuggin' options. Do not ask.");
1757		1763
1758	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1764	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1759		1765
1760	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1766	$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.");	1767	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1762		1768
1763	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1769	$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.");	1770	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1765		1771
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	1772	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		1773
1768	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1774	$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.");	1775	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1770		1776
1771	$BUTTONBAR->add (new CFClient::UI::Button	1777	$BUTTONBAR->add (new CFPlus::UI::Button
1772	text => "Save Config",	1778	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.",	1779	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 {	1780	on_activate => sub {
1775	$::CFG->{layout} = CFClient::UI::get_layout;	1781	$::CFG->{layout} = CFPlus::UI::get_layout;
1776	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1782	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1777	status "Configuration Saved";	1783	status "Configuration Saved";
1778	0	1784	0
1779	},	1785	},
1780	);	1786	);
1781		1787
1782	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	1788	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1783	tooltip => "View Documentation");	1789	tooltip => "View Documentation");
1784		1790
		1791
1785	$BUTTONBAR->add (new CFClient::UI::Button	1792	$BUTTONBAR->add (new CFPlus::UI::Button
1786	text => "Quit",	1793	text => "Quit",
1787	tooltip => "Terminates the program",	1794	tooltip => "Terminates the program",
1788	on_activate => sub {	1795	on_activate => sub {
1789	if ($CONN) {	1796	if ($CONN) {
1790	open_quit_dialog;	1797	open_quit_dialog;
…		…
1800	}	1807	}
1801		1808
1802	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1809	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1803	}	1810	}
1804		1811
		1812	sub setup_build_button {
		1813	my ($enabled) = @_;
		1814	if ($enabled) {
		1815	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1816	$BUILD_BUTTON ||= new CFPlus::UI::Button
		1817	text => "Build",
		1818	tooltip => "Opens the ingame builder",
		1819	on_activate => sub {
		1820	if ($CONN) {
		1821	$CONN->send_ext_req (builder_player_items => sub {
		1822	open_ingame_editor ($_[0]) if exists $_[0]->{items};
		1823	});
		1824	}
		1825	0
		1826	};
		1827	$BUTTONBAR->add ($BUILD_BUTTON);
		1828	} else {
		1829	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1830	}
		1831	}
		1832
		1833	sub open_ingame_editor {
		1834	my ($msg) = @_;
		1835
		1836	my $win = new CFPlus::UI::Toplevel
		1837	x => 0,
		1838	y => 'center',
		1839	z => 4,
		1840	name => 'builder_window',
		1841	force_w => int $WIDTH * 1/4,
		1842	force_h => int $HEIGHT * 3/4,
		1843	title => "In game builder",
		1844	has_close_button => 1;
		1845
		1846	my $r = new CFPlus::UI::ScrolledWindow (
		1847	expand => 1,
		1848	scroll_y => 1
		1849	);
		1850	$r->add (my $vb = new CFPlus::UI::VBox);
		1851	$win->add ($r);
		1852
		1853
		1854	$vb->add (
		1855	new CFPlus::UI::Button
		1856	text => "Disable build mode",
		1857	on_activate => sub { $::IN_BUILD_MODE = undef }
		1858	);
		1859	$vb->add (
		1860	new CFPlus::UI::Button
		1861	text => "ERASE",
		1862	on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
		1863	);
		1864
		1865	for my $itemarchname (
		1866	sort {
		1867	$msg->{items}->{$a}->{build_arch_name}
		1868	cmp $msg->{items}->{$b}->{build_arch_name}
		1869	} keys %{$msg->{items}}
		1870	) {
		1871	my $info = $msg->{items}->{$itemarchname};
		1872	$vb->add (
		1873	new CFPlus::UI::Button text => $info->{build_arch_name},
		1874	on_activate => sub {
		1875	$::IN_BUILD_MODE = { item => $itemarchname, info => $info };
		1876
		1877	if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
		1878	build_mode_query_arch_info ();
		1879	}
		1880	}
		1881	);
		1882	}
		1883
		1884	$win->show;
		1885	}
		1886
		1887	sub build_mode_query_arch_info {
		1888	my ($iteminfo) = $::IN_BUILD_MODE;
		1889	my $itemarchname = $iteminfo->{item};
		1890	my $info = $iteminfo->{info};
		1891
		1892	my $dialog = new CFPlus::UI::Toplevel
		1893	x => "center",
		1894	y => "center",
		1895	z => 50,
		1896	force_w => int $WIDTH * 1/2,
		1897	title => "Enter information for placement of '$itemarchname'",
		1898	has_close_button => 1;
		1899
		1900	$dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1901
		1902	$vb->add (my $table = new CFPlus::UI::Table expand => 1);
		1903	my $row = 0;
		1904	if ($info->{has_name}) {
		1905	$table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
		1906	$table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
		1907	}
		1908	if ($info->{has_text}) {
		1909	$table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
		1910	$table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
		1911	}
		1912	if ($info->{has_connection}) {
		1913	$table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
		1914	$table->add_at (1, $row++,
		1915	new CFPlus::UI::Entry
		1916	expand => 1,
		1917	on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
		1918	tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
		1919	);
		1920	}
		1921
		1922	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1923	$hb->add (new CFPlus::UI::Button
		1924	text => "Close",
		1925	expand => 1,
		1926	on_activate => sub { $dialog->hide; 0 },
		1927	);
		1928	$dialog->show;
		1929	}
		1930
1805	sub video_shutdown {	1931	sub video_shutdown {
1806	CFClient::OpenGL::shutdown;	1932	CFPlus::OpenGL::shutdown;
1807		1933
1808	undef $SDL_ACTIVE;	1934	undef $SDL_ACTIVE;
1809	}	1935	}
1810		1936
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 {	1937	sub audio_channel_finished {
1815	my ($channel) = @_;	1938	my ($channel) = @_;
1816		1939
1817	#warn "channel $channel finished\n";#d#	1940	#warn "channel $channel finished\n";#d#
1818	}	1941	}
1819		1942
		1943	sub audio_music_set {
		1944	my ($songs) = @_;
		1945
		1946	my @want =
		1947	grep $_,
		1948	map $CONN->{music_meta}{$_},
		1949	@$songs;
		1950
		1951	if (@want) {
		1952	@MUSIC_WANT = @want;
		1953	&audio_music_changed ();
		1954	}
		1955	}
		1956
		1957	sub audio_music_start {
		1958	my $path = $MUSIC_PLAYING->{path}
		1959	or return;
		1960
		1961	CFPlus::DB::prefetch_file $path, 1024_000, sub {
		1962	return unless $SDL_MIXER;
		1963
		1964	# music might have changed...
		1965	$path eq $MUSIC_PLAYING->{path}
		1966	or return &audio_music_start ();
		1967
		1968	$MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
		1969
		1970	my $NOW = time;
		1971
		1972	if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
		1973	my $pos = $MUSIC_PLAYING->{stop_pos};
		1974	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
		1975	$MUSIC_START = time - $pos;
		1976	} else {
		1977	$MUSIC_PLAYER->play (0);
		1978	$MUSIC_START = time;
		1979	}
		1980
		1981	delete $MUSIC_PLAYING->{stop_time};
		1982	delete $MUSIC_PLAYING->{stop_pos};
		1983	}
		1984	}
		1985
		1986	sub audio_music_changed {
		1987	return unless $CFG->{bgm_enable};
		1988	return unless $SDL_MIXER;
		1989
		1990	# default MUSIC_WANT == MUSIC_DEFAULT
		1991	@MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
		1992
		1993	# if the currently playing song is acceptable, let it continue
		1994	return if $MUSIC_PLAYING
		1995	&& grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
		1996
		1997	my $NOW = time;
		1998
		1999	if ($MUSIC_PLAYING) {
		2000	$MUSIC_PLAYING->{stop_time} = $NOW;
		2001	$MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
		2002	CFPlus::MixMusic::fade_out 1000;
		2003	} else {
		2004	# sort by stop time, oldest first
		2005	@MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
		2006
		2007	# if the most recently-played piece played very recently,
		2008	# resume it, else choose the oldest piece for rotation.
		2009	$MUSIC_PLAYING =
		2010	$MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
		2011	? $MUSIC_WANT[-1]
		2012	: $MUSIC_WANT[0];
		2013
		2014	audio_music_start;
		2015	}
		2016	}
		2017
1820	sub audio_music_finished {	2018	sub audio_music_finished {
1821	return unless $CFG->{bgm_enable};	2019	$MUSIC_PLAYING = undef;
		2020	undef $MUSIC_PLAYER;
1822		2021
1823	# TODO: hack, do play loop and mood music	2022	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	}	2023	}
1829		2024
1830	sub audio_init {	2025	sub audio_init {
1831	if ($CFG->{audio_enable}) {	2026	if ($CFG->{audio_enable}) {
1832	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	2027	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1833	$SDL_MIXER = !CFClient::Mix_OpenAudio;	2028	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1834		2029
1835	unless ($SDL_MIXER) {	2030	unless ($SDL_MIXER) {
1836	status "Unable to open sound device: there will be no sound";	2031	status "Unable to open sound device: there will be no sound";
1837	return;	2032	return;
1838	}	2033	}
1839		2034
1840	CFClient::Mix_AllocateChannels 8;	2035	CFPlus::Mix_AllocateChannels 8;
1841	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	2036	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1842		2037
1843	audio_music_finished;	2038	audio_music_finished;
1844		2039
		2040	local $_;
1845	while (<$fh>) {	2041	while (<$fh>) {
1846	next if /^\s*#/;	2042	next if /^\s*#/;
1847	next if /^\s*$/;	2043	next if /^\s*$/;
1848		2044
1849	my ($file, $volume, $event) = split /\s+/, $_, 3;	2045	my ($file, $volume, $event) = split /\s+/, $_, 3;
1850		2046
1851	push @SOUNDS, "$volume,$file";	2047	push @SOUNDS, "$volume,$file";
1852		2048
1853	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	2049	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1854	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	2050	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1855	$chunk->volume ($volume * 128 / 100);	2051	$chunk->volume ($volume * 128 / 100);
1856	$chunk	2052	$chunk
1857	};	2053	};
1858	}	2054	}
1859	} else {	2055	} else {
1860	status "unable to open sound config: $!";	2056	status "unable to open sound config: $!";
1861	}	2057	}
		2058	} else {
		2059	undef $SDL_MIXER;
1862	}	2060	}
1863	}	2061	}
1864		2062
1865	sub audio_shutdown {	2063	sub audio_shutdown {
1866	CFClient::Mix_CloseAudio if $SDL_MIXER;	2064	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1867	undef $SDL_MIXER;	2065	undef $SDL_MIXER;
1868	@SOUNDS = ();	2066	@SOUNDS = ();
1869	%AUDIO_CHUNKS = ();	2067	%AUDIO_CHUNKS = ();
1870	}	2068	}
1871		2069
…		…
1878		2076
1879	sub force_refresh {	2077	sub force_refresh {
1880	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2078	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1881	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2079	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1882		2080
1883	$CFClient::UI::ROOT->draw;	2081	$CFPlus::UI::ROOT->draw;
1884		2082
1885	$WANT_REFRESH = 0;	2083	$WANT_REFRESH = 0;
1886	$CAN_REFRESH = 0;	2084	$CAN_REFRESH = 0;
1887	$LAST_REFRESH = $NOW;	2085	$LAST_REFRESH = $NOW;
1888		2086
1889	CFClient::SDL_GL_SwapBuffers;	2087	CFPlus::SDL_GL_SwapBuffers;
1890	}	2088	}
1891		2089
1892	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2090	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1893	$NOW = time;	2091	$NOW = time;
1894		2092
1895	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2093	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1896	for CFClient::SDL_PollEvent;	2094	for CFPlus::poll_events;
1897		2095
1898	if (%animate_object) {	2096	if (%animate_object) {
1899	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2097	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1900	$WANT_REFRESH++;	2098	++$WANT_REFRESH;
1901	}	2099	}
1902		2100
1903	if ($WANT_REFRESH) {	2101	if ($WANT_REFRESH) {
1904	force_refresh;	2102	force_refresh;
1905	} else {	2103	} else {
…		…
1925	$CONN->face_prefetch	2123	$CONN->face_prefetch
1926	if $CONN;	2124	if $CONN;
1927	});	2125	});
1928		2126
1929	%SDL_CB = (	2127	%SDL_CB = (
1930	CFClient::SDL_QUIT => sub {	2128	CFPlus::SDL_QUIT => sub {
1931	Event::unloop -1;	2129	exit;
1932	},	2130	},
1933	CFClient::SDL_VIDEORESIZE => sub {	2131	CFPlus::SDL_VIDEORESIZE => sub {
1934	},	2132	},
1935	CFClient::SDL_VIDEOEXPOSE => sub {	2133	CFPlus::SDL_VIDEOEXPOSE => sub {
1936	CFClient::UI::full_refresh;	2134	CFPlus::UI::full_refresh;
1937	},	2135	},
1938	CFClient::SDL_ACTIVEEVENT => sub {	2136	CFPlus::SDL_ACTIVEEVENT => sub {
1939	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2137	# not useful, as APPACTIVE include sonly iconified state, not unmapped
		2138	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
		2139	# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
		2140	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
		2141	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
		2142	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1940	},	2143	},
1941	CFClient::SDL_KEYDOWN => sub {	2144	CFPlus::SDL_KEYDOWN => sub {
1942	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2145	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1943	# alt-enter	2146	# alt-enter
1944	$FULLSCREEN_ENABLE->toggle;	2147	$FULLSCREEN_ENABLE->toggle;
1945	video_shutdown;	2148	video_shutdown;
1946	video_init;	2149	video_init;
1947	} else {	2150	} else {
1948	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2151	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1949	}	2152	}
1950	},	2153	},
1951	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2154	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1952	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2155	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1953	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2156	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1954	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2157	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1955	CFClient::SDL_USEREVENT => sub {	2158	CFPlus::SDL_USEREVENT => sub {
1956	if ($_[0]{code} == 1) {	2159	if ($_[0]{code} == 1) {
1957	audio_channel_finished $_[0]{data1};	2160	audio_channel_finished $_[0]{data1};
1958	} elsif ($_[0]{code} == 0) {	2161	} elsif ($_[0]{code} == 0) {
1959	audio_music_finished;	2162	audio_music_finished;
1960	}	2163	}
…		…
1964	#############################################################################	2167	#############################################################################
1965		2168
1966	$SIG{INT} = $SIG{TERM} = sub { exit };	2169	$SIG{INT} = $SIG{TERM} = sub { exit };
1967		2170
1968	{	2171	{
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";	2172	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
		2173	CFPlus::DB::Server::run;
		2174
1976	CFClient::UI::set_layout ($::CFG->{layout});	2175	CFPlus::UI::set_layout ($::CFG->{layout});
1977		2176
1978	my %DEF_CFG = (	2177	my %DEF_CFG = (
1979	sdl_mode => 0,	2178	sdl_mode => 0,
1980	width => 640,	2179	width => 640,
1981	height => 480,	2180	height => 480,
1982	fullscreen => 0,	2181	fullscreen => 0,
1983	fast => 0,	2182	fast => 0,
1984	map_scale => 1,	2183	map_scale => 1,
1985	fow_enable => 1,	2184	fow_enable => 1,
1986	fow_intensity => 0.45,	2185	fow_intensity => 0,
1987	fow_smooth => 0,	2186	map_smoothing => 1,
1988	gui_fontsize => 1,	2187	gui_fontsize => 1,
1989	log_fontsize => 0.7,	2188	log_fontsize => 0.7,
1990	gauge_fontsize => 1,	2189	gauge_fontsize => 1,
1991	gauge_size => 0.35,	2190	gauge_size => 0.35,
1992	stat_fontsize => 0.7,	2191	stat_fontsize => 0.7,
1993	mapsize => 100,	2192	mapsize => 100,
1994	say_command => 'say',
1995	audio_enable => 1,	2193	audio_enable => 1,
1996	bgm_enable => 1,	2194	bgm_enable => 1,
1997	bgm_volume => 0.25,	2195	bgm_volume => 0.25,
1998	face_prefetch => 0,	2196	face_prefetch => 0,
1999	output_sync => 1,	2197	output_sync => 1,
2000	output_count => 1,	2198	output_count => 1,
		2199	output_rate => "",
2001	pickup => 0,	2200	pickup => 0,
2002	inv_sort => "mtime",	2201	inv_sort => "mtime",
2003	default => "profile", # default profile	2202	default => "profile", # default profile
		2203	show_tips => 1,
		2204	logview_max_par => 1000,
2004	);	2205	);
2005		2206
2006	while (my ($k, $v) = each %DEF_CFG) {	2207	while (my ($k, $v) = each %DEF_CFG) {
2007	$CFG->{$k} = $v unless exists $CFG->{$k};	2208	$CFG->{$k} = $v unless exists $CFG->{$k};
2008	}	2209	}
2009		2210
2010	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";	2211	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		2212	$PROFILE = $CFG->{profile}{default};
		2213
		2214	# convert old bindings (only default profile matters)
		2215	if (my $bindings = delete $PROFILE->{bindings}) {
		2216	while (my ($mod, $syms) = each %$bindings) {
		2217	while (my ($sym, $cmds) = each %$syms) {
		2218	push @{ $PROFILE->{macro} }, {
		2219	accelkey => [$mod*1, $sym*1],
		2220	action => $cmds,
		2221	};
		2222	}
		2223	}
		2224	}
2011		2225
2012	sdl_init;	2226	sdl_init;
2013		2227
2014	@SDL_MODES = reverse	2228	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2015	grep $_->[0] >= 640 && $_->[1] >= 480,	2229	@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)";	2230	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2231
		2232	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2019		2233
2020	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2234	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2021		2235
2022	{	2236	{
2023	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2237	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2024	DejaVuSans.ttf	2238	DejaVuSans.ttf
2025	DejaVuSansMono.ttf	2239	DejaVuSansMono.ttf
2026	DejaVuSans-Bold.ttf	2240	DejaVuSans-Bold.ttf
2027	DejaVuSansMono-Bold.ttf	2241	DejaVuSansMono-Bold.ttf
2028	DejaVuSans-Oblique.ttf	2242	DejaVuSans-Oblique.ttf
2029	DejaVuSansMono-Oblique.ttf	2243	DejaVuSansMono-Oblique.ttf
2030	DejaVuSans-BoldOblique.ttf	2244	DejaVuSans-BoldOblique.ttf
2031	DejaVuSansMono-BoldOblique.ttf	2245	DejaVuSansMono-BoldOblique.ttf
2032	);	2246	);
2033		2247
2034	CFClient::add_font $_ for @fonts;	2248	CFPlus::add_font $_ for @fonts;
2035		2249
2036	CFClient::pango_init;	2250	CFPlus::pango_init;
2037		2251
2038	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2252	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2039	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2253	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2040		2254
2041	$FONT_PROP->make_default;	2255	$FONT_PROP->make_default;
2042	}	2256	}
2043		2257
2044	# compare mono (ft) vs. rgba (cairo)	2258	# compare mono (ft) vs. rgba (cairo)
2045	# ft - 1.8s, cairo 3s, even in alpha-only mode	2259	# ft - 1.8s, cairo 3s, even in alpha-only mode
2046	# for my $rgba (0..1) {	2260	# for my $rgba (0..1) {
2047	# my $t1 = Time::HiRes::time;	2261	# my $t1 = Time::HiRes::time;
2048	# for (1..1000) {	2262	# for (1..1000) {
2049	# my $layout = CFClient::Layout->new ($rgba);	2263	# my $layout = CFPlus::Layout->new ($rgba);
2050	# $layout->set_text ("hallo" x 100);	2264	# $layout->set_text ("hallo" x 100);
2051	# $layout->render;	2265	# $layout->render;
2052	# }	2266	# }
2053	# my $t2 = Time::HiRes::time;	2267	# my $t2 = Time::HiRes::time;
2054	# warn $t2-$t1;	2268	# warn $t2-$t1;
2055	# }	2269	# }
2056		2270
		2271	$startup_done->();
		2272
2057	video_init;	2273	video_init;
2058	audio_init;	2274	audio_init;
2059	}	2275	}
2060		2276
		2277	show_tip_of_the_day if $CFG->{show_tips};
		2278
2061	Event::loop;	2279	Event::loop;
2062	#CFClient::SDL_Quit;	2280	#CFPlus::SDL_Quit;
2063	#CFClient::_exit 0;	2281	#CFPlus::_exit 0;
2064		2282
2065	END { CFClient::SDL_Quit }	2283	END {
		2284	CFPlus::SDL_Quit;
		2285	CFPlus::DB::Server::stop;
		2286	}
2066		2287
2067	=head1 NAME	2288	=head1 NAME
2068		2289
2069	cfplus - A Crossfire+ and Crossfire game client	2290	cfplus - A Crossfire+ and Crossfire game client
2070		2291

Diff Legend

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