ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

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

Diff Legend

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