ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

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

Diff Legend

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