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.154 by root, Wed May 9 11:46:49 2007 UTC

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

Diff Legend

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