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

Diff Legend

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