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

Diff Legend

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