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

Diff Legend

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