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.93 by root, Sat Jul 15 01:19:55 2006 UTC vs.
Revision 1.168 by root, Sat Jul 14 12:05:53 2007 UTC

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

Diff Legend

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