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.76 by root, Tue Jun 20 08:49:40 2006 UTC vs.
Revision 1.129 by root, Sun Nov 19 00:07:51 2006 UTC

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

Diff Legend

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