ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.102 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.180 by root, Sat Jul 21 13:37:09 2007 UTC

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

Diff Legend

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