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.92 by elmex, Fri Jul 14 17:35:35 2006 UTC vs.
Revision 1.134 by elmex, Mon Dec 4 15:17:14 2006 UTC

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

Diff Legend

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