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.172 by root, Tue Jul 17 16:02:14 2007 UTC

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

Diff Legend

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