ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.87 by root, Sun Jul 2 21:41:34 2006 UTC vs.
Revision 1.134 by elmex, Mon Dec 4 15:17:14 2006 UTC

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

Diff Legend

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