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.99 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.178 by root, Fri Jul 20 16:32:04 2007 UTC

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

Diff Legend

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