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.75 by root, Sun Jun 18 17:23:36 2006 UTC vs.
Revision 1.132 by root, Mon Nov 20 16:41:46 2006 UTC

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

Diff Legend

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