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

Diff Legend

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