ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.91 by root, Tue Jul 11 13:51:38 2006 UTC vs.
Revision 1.136 by root, Fri Dec 8 14:59:54 2006 UTC

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

Diff Legend

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