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.89 by elmex, Sun Jul 9 21:11:48 2006 UTC vs.
Revision 1.131 by root, Sun Nov 19 20:31:29 2006 UTC

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

Diff Legend

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