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

Diff Legend

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