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

Diff Legend

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