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

Diff Legend

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