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

Diff Legend

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