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

Diff Legend

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