ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.96 by root, Mon Jul 17 01:41:54 2006 UTC vs.
Revision 1.188 by root, Sun Jul 29 03:58:26 2007 UTC

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

Diff Legend

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