ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

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

Diff Legend

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