ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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