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

Diff Legend

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