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

Diff Legend

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