ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.93 by root, Sat Jul 15 01:19:55 2006 UTC vs.
Revision 1.136 by root, Fri Dec 8 14:59:54 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	}
641		687
		688	$table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
642		689
643	$table	690	$table
644	}	691	}
645		692
646	sub stats_window {	693	sub stats_window {
		694	my $r = new CFPlus::UI::ScrolledWindow (
		695	expand => 1,
		696	scroll_y => 1
		697	);
647	my $vb = new CFClient::UI::VBox;	698	$r->add (my $vb = new CFPlus::UI::VBox);
648		699
		700	$vb->add (new CFPlus::UI::FancyFrame
		701	label => "Player",
		702	child => (my $pi = new CFPlus::UI::VBox),
		703	);
		704
649	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	705	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
650	can_hover => 1, can_events => 1,	706	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.");	707	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,	708	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
653	can_hover => 1, can_events => 1,	709	can_hover => 1, can_events => 1,
654	tooltip => "The map you are currently on (if supported by the server).");	710	tooltip => "The map you are currently on (if supported by the server).");
655		711
656	$vb->add (my $hb0 = new CFClient::UI::HBox);	712	$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,	713	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
658	can_hover => 1, can_events => 1,	714	can_hover => 1, can_events => 1,
659	tooltip => "The weight of the player including all inventory items.");	715	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,	716	$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,	717	can_hover => 1, can_events => 1,
662	tooltip => "The weight limit: you cannot carry more than this.");	718	tooltip => "The weight limit: you cannot carry more than this.");
663		719
664		720	$vb->add (new CFPlus::UI::FancyFrame
		721	label => "Primary/Secondary Statistics",
665	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	722	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		723	);
666	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	724	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
667		725
668	my $color2 = [1, 1, 0];	726	my $color2 = [1, 1, 0];
669		727
670	for (	728	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"],	729	[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"],	730	[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"],	731	[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"],	732	[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"],	733	[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"],	734	[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."],	735	[0, 6, st_cha => "Cha", 30],
678		736
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."],	737	[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."],	738	[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."],	739	[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."],	740	[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."],	741	[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."],	742	[2, 5, st_wspd => "WSp", 10.54],
685	) {	743	) {
686	my ($col, $row, $id, $label, $template, $tooltip) = @$_;	744	my ($col, $row, $id, $label, $template) = @$_;
687		745
688	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	746	$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);	747	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
		748	align => +1, template => $template, tooltip => "#stat_$label");
690	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	749	$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);	750	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
		751	align => -1, text => $label, tooltip => "#stat_$label");
692	}	752	}
693		753
		754	$vb->add (new CFPlus::UI::FancyFrame
		755	label => "Resistancies",
694	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	756	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		757	);
695		758
696	my $row = 0;	759	my $row = 0;
697	my $col = 0;	760	my $col = 0;
698		761
699	my %resist_names = (	762	my %resist_names = (
…		…
738	drain acid pois para deat phys	801	drain acid pois para deat phys
739	blind fear tund elec cold ghit/)	802	blind fear tund elec cold ghit/)
740	{	803	{
741	$tbl2->add ($col, $row,	804	$tbl2->add ($col, $row,
742	$STATWIDS->{"res_$_"} =	805	$STATWIDS->{"res_$_"} =
743	new CFClient::UI::Label	806	new CFPlus::UI::Label
744	font => $FONT_FIXED,	807	font => $FONT_FIXED,
745	template => "-100%",	808	template => "-100%",
746	align => +1,	809	align => +1,
747	valign => 0,	810	valign => 0,
748	can_events => 1,	811	can_events => 1,
749	can_hover => 1,	812	can_hover => 1,
750	tooltip => $resist_names{$_}->[1],	813	tooltip => $resist_names{$_}->[1],
751	);	814	);
752	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	815	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
753	font => $FONT_FIXED,	816	font => $FONT_FIXED,
754	can_hover => 1,	817	can_hover => 1,
755	can_events => 1,	818	can_events => 1,
756	path => "ui/resist/resist_$_.png",	819	path => "ui/resist/resist_$_.png",
757	tooltip => $resist_names{$_}->[1],	820	tooltip => $resist_names{$_}->[1],
758	);	821	);
759	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	822	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
760	text => $resist_names{$_}->[0],	823	text => $resist_names{$_}->[0],
761	font => $FONT_FIXED,	824	font => $FONT_FIXED,
762	can_hover => 1,	825	can_hover => 1,
763	can_events => 1,	826	can_events => 1,
764	tooltip => $resist_names{$_}->[1],	827	tooltip => $resist_names{$_}->[1],
…		…
769	$col += 3;	832	$col += 3;
770	$row = 0;	833	$row = 0;
771	}	834	}
772	}	835	}
773		836
774	update_stats_window ({});	837	#update_stats_window ({});
775		838
776	$vb	839	$r
777	}	840	}
778		841
779	sub skill_window {	842	sub skill_window {
780	my ($self) = @_;	843	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
781	$STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1;	844	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
		845	$sw
782	}	846	}
783		847
784	sub formsep($) {	848	sub formsep($) {
785	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	849	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
786	}	850	}
787		851
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;	852	my $METASERVER_ATIME;
894		853
895	sub update_metaserver {	854	sub update_metaserver {
896	my ($metaserver_dialog) = @_;	855	my ($metaserver_dialog) = @_;
897		856
…		…
901	return if $METASERVER_ATIME > time;	860	return if $METASERVER_ATIME > time;
902	$METASERVER_ATIME = time + 60;	861	$METASERVER_ATIME = time + 60;
903		862
904	my $table = $METASERVER->{table};	863	my $table = $METASERVER->{table};
905	$table->clear;	864	$table->clear;
906	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	865	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
907		866
908	my $buf;	867	my $ok = 0;
909		868
910	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	869	CFPlus::background {
		870	my $ua = CFPlus::lwp_useragent;
911		871
912	unless ($fh) {	872	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
913	$label->set_text ("unable to contact metaserver: $!");	873	} sub {
914	return;	874	my ($msg) = @_;
915	}	875	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;	876	$table->clear;
930		877
931	my @tip = (	878	my @tip = (
932	"The current number of users logged in on the server.",	879	"The current number of users logged in on the server.",
933	"The hostname of the server.",	880	"The hostname of the server.",
934	"The time this server has been running without being restarted.",	881	"The time this server has been running without being restarted.",
935	"The server software version - a '+' indicates a Crossfire+ server.",	882	"The server software version - a '+' indicates a Crossfire+ server.",
936	"Short information about this server provided by its admins.",	883	"Short information about this server provided by its admins.",
937	);	884	);
938	my @col = qw(#Users Host Uptime Version Description);	885	my @col = qw(#Users Host Uptime Version Description);
939	$table->add ($_, 0, new CFClient::UI::Label	886	$table->add ($_, 0, new CFPlus::UI::Label
940	can_hover => 1, can_events => 1,	887	can_hover => 1, can_events => 1,
941	align => 0, fg => [1, 1, 0],	888	align => 0, fg => [1, 1, 0],
942	text => $col[$_], tooltip => $tip[$_])	889	text => $col[$_], tooltip => $tip[$_])
943	for 0 .. $#col;	890	for 0 .. $#col;
944		891
945	my @align = qw(1 0 1 1 -1);	892	my @align = qw(1 0 1 1 -1);
946		893
947	my $y = 0;	894	my $y = 0;
948	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	895	for my $m (
		896	sort {
		897	$b->{version} <=> $a->{version}
		898	or $b->{users} <=> $a->{users}
		899	}
		900	@{ $msg->{servers} }
		901	) {
949	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	902	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
		903	@$m{qw(ip age hostname users version description ibytes obytes uptime)};
950		904
951	for ($desc) {	905	for ($desc) {
952	s/<br>/\n/gi;	906	s/<br>/\n/gi;
953	s/<li>/\n· /gi;	907	s/<li>/\n· /gi;
954	s/<.*?>//sgi;	908	s/<.*?>//sgi;
955	s/&/&amp;/g;	909	s/&amp;/&/g;
956	s/</&lt;/g;	910	s/&lt;/</g;
957	s/>/&gt;/g;	911	s/&gt;/>/g;
958	}	912	}
959		913
960	$uptime = sprintf "%dd %02d:%02d:%02d",	914	$uptime = sprintf "%dd %02d:%02d:%02d",
961	(int $m->[8] / 86400),	915	(int $uptime / 86400),
962	(int $m->[8] / 3600) % 24,	916	(int $uptime / 3600) % 24,
963	(int $m->[8] / 60) % 60,	917	(int $uptime / 60) % 60,
964	$m->[8] % 60;	918	$uptime % 60;
965		919
966	$m = [$users, $host, $uptime, $version, $desc];	920	$m = [$users, $host, $uptime, $version, $desc];
967		921
968	$y++;	922	$y++;
969		923
970	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	924	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
971	(new CFClient::UI::Button	925	(new CFPlus::UI::Button
972	text => "Use",	926	text => "Use",
973	tooltip => "Put this server into the <b>Host:Port</b> field",	927	tooltip => "Put this server into the <b>Host:Port</b> field",
974	on_activate => sub {	928	on_activate => sub {
975	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	929	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
976	$METASERVER->hide;	930	$METASERVER->hide;
977	0	931	0
978	},	932	},
979	),	933	),
980	(new CFClient::UI::Empty expand => 1),	934	(new CFPlus::UI::Empty expand => 1),
981	]);	935	]);
982		936
983	$table->add ($_, $y, new CFClient::UI::Label	937	$table->add ($_, $y, new CFPlus::UI::Label
		938	max_w => $::WIDTH * 0.4,
984	ellipsise => 0,	939	ellipsise => 0,
985	align => $align[$_],	940	align => $align[$_],
986	text => $m->[$_],	941	text => $m->[$_],
987	tooltip => $tip[$_],	942	tooltip => $tip[$_],
		943	fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
988	can_hover => 1,	944	can_hover => 1,
989	can_events => 1,	945	can_events => 1,
990	fontsize => 0.8)	946	fontsize => 0.8)
991	for 0 .. $#$m;	947	for 0 .. $#$m;
992	}	948	}
		949	} else {
		950	$ok or $label->set_text ("error while contacting metaserver");
993	}	951	}
994	});	952	};
		953
995	}	954	}
996		955
997	sub metaserver_dialog {	956	sub metaserver_dialog {
998	my $vbox = new CFClient::UI::VBox;	957	my $vbox = new CFPlus::UI::VBox;
999	my $table = new CFClient::UI::Table;	958	my $table = new CFPlus::UI::Table;
1000	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	959	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
1001		960
1002	my $dialog = new CFClient::UI::FancyFrame	961	my $dialog = new CFPlus::UI::Toplevel
1003	title => "Server List",	962	title => "Server List",
1004	name => 'metaserver_dialog',	963	name => 'metaserver_dialog',
1005	x => 'center',	964	x => 'center',
1006	y => 'center',	965	y => 'center',
1007	z => 3,	966	z => 3,
		967	force_w => $::WIDTH * 0.9,
1008	force_h => $::HEIGHT * 0.4,	968	force_h => $::HEIGHT * 0.7,
1009	child => $vbox,	969	child => $vbox,
1010	has_close_button => 1,	970	has_close_button => 1,
1011	table => $table,	971	table => $table,
1012	on_visibility_change => sub {	972	on_visibility_change => sub {
1013	update_metaserver ($_[0]) if $_[1];	973	update_metaserver ($_[0]) if $_[1];
…		…
1017		977
1018	$dialog	978	$dialog
1019	}	979	}
1020		980
1021	sub server_setup {	981	sub server_setup {
1022	my $vbox = new CFClient::UI::VBox;	982	my $vbox = new CFPlus::UI::VBox;
1023		983
		984	$vbox->add (new CFPlus::UI::FancyFrame
		985	label => "Connection Settings",
1024	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	986	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		987	);
1025	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	988	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1026		989
1027	{	990	{
1028	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	991	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
1029		992
1030	$vbox->add (	993	$vbox->add (
1031	$HOST_ENTRY = new CFClient::UI::Entry	994	$HOST_ENTRY = new CFPlus::UI::Entry
1032	expand => 1,	995	expand => 1,
1033	text => $CFG->{profile}{default}{host},	996	text => $CFG->{profile}{default}{host},
1034	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	997	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1035	on_changed => sub {	998	on_changed => sub {
1036	my ($self, $value) = @_;	999	my ($self, $value) = @_;
1037	$CFG->{profile}{default}{host} = $value;	1000	$CFG->{profile}{default}{host} = $value;
1038	0	1001	0
1039	}	1002	}
1040	);	1003	);
1041		1004
1042	$vbox->add (new CFClient::UI::Button	1005	$vbox->add (new CFPlus::UI::Button
1043	expand => 1,	1006	expand => 1,
1044	text => "Server List",	1007	text => "Server List",
1045	other => $METASERVER,	1008	other => $METASERVER,
1046	tooltip => "Show a list of available crossfire servers",	1009	tooltip => "Show a list of available crossfire servers",
1047	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1010	on_activate => sub { $METASERVER->toggle_visibility; 0 },
1048	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1011	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1049	);	1012	);
1050	}	1013	}
1051		1014
1052	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	1015	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1053	$table->add (1, 4, new CFClient::UI::Entry	1016	$table->add (1, 4, new CFPlus::UI::Entry
1054	text => $CFG->{profile}{default}{user},	1017	text => $CFG->{profile}{default}{user},
1055	tooltip => "The name of your character on the server",	1018	tooltip => "The name of your character on the server",
1056	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1019	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1057	);	1020	);
1058		1021
1059	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1022	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1060	$table->add (1, 5, new CFClient::UI::Entry	1023	$table->add (1, 5, new CFPlus::UI::Entry
1061	text => $CFG->{profile}{default}{password},	1024	text => $CFG->{profile}{default}{password},
1062	hidden => 1,	1025	hidden => 1,
1063	tooltip => "The password for your character",	1026	tooltip => "The password for your character",
1064	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1027	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1065	);	1028	);
1066		1029
1067	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1030	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1068	$table->add (1, 7, new CFClient::UI::Slider	1031	$table->add (1, 7, new CFPlus::UI::Slider
1069	force_w => 100,	1032	force_w => 100,
1070	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1033	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1071	tooltip => "This is the size of the portion of the map update the server sends you. "	1034	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, "	1035	. "If you set this to a high value you will be able to see further, "
1073	. "but you also increase bandwidth requirements and latency. "	1036	. "but you also increase bandwidth requirements and latency. "
1074	. "This option is only used once at log-in.",	1037	. "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 },	1038	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1076	);	1039	);
1077		1040
1078	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1041	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1079	$table->add (1, 8, new CFClient::UI::CheckBox	1042	$table->add (1, 8, new CFPlus::UI::CheckBox
1080	state => $CFG->{face_prefetch},	1043	state => $CFG->{face_prefetch},
1081	tooltip => "<b>Background Image Prefetch</b>\n\n"	1044	tooltip => "<b>Background Image Prefetch</b>\n\n"
1082	. "If enabled, the client automatically pre-fetches images from the server. "	1045	. "If enabled, the client automatically pre-fetches images from the server. "
1083	. "This might increase or create lag, but increases the chances "	1046	. "This might increase or create lag, but increases the chances "
1084	. "of faces being ready for display when you encounter them. "	1047	. "of faces being ready for display when you encounter them. "
…		…
1086	. "so only set it if you really need to prefetch images. "	1049	. "so only set it if you really need to prefetch images. "
1087	. "This option can be set and unset any time.",	1050	. "This option can be set and unset any time.",
1088	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1051	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1089	);	1052	);
1090		1053
1091	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1054	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1092	$table->add (1, 9, new CFClient::UI::Entry	1055	$table->add (1, 9, new CFPlus::UI::Entry
1093	text => $CFG->{output_count},	1056	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.",	1057	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 },	1058	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1096	);	1059	);
1097		1060
1098	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1061	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1099	$table->add (1, 10, new CFClient::UI::Entry	1062	$table->add (1, 10, new CFPlus::UI::Entry
1100	text => $CFG->{output_sync},	1063	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.",	1064	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 },	1065	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1103	);	1066	);
1104		1067
1105	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1068	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1106	expand => 1,	1069	expand => 1,
1107	align => 0,	1070	align => 0,
1108	text => "Login",	1071	text => "Login",
1109	on_activate => sub {	1072	on_activate => sub {
1110	$CONN ? stop_game	1073	$CONN ? stop_game
1111	: start_game;	1074	: start_game;
1112	0	1075	0
1113	},	1076	},
1114	);	1077	);
1115		1078
1116	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1079	$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	1080	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1118	text => $CFG->{say_command},	1081	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. "	1082	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. "	1083	. "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.",	1084	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1122	on_changed => sub {	1085	on_changed => sub {
1123	my ($self, $value) = @_;	1086	my ($self, $value) = @_;
1124	$CFG->{say_command} = $value;	1087	$CFG->{say_command} = $value;
1125	0	1088	0
1126	}	1089	}
1127	);	1090	);
1128		1091
		1092	$table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
		1093	$table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
		1094	state => $CFG->{show_tips},
		1095	tooltip => "Show the <b>Tip of the day</b> window at startup?",
		1096	on_changed => sub {
		1097	my ($self, $value) = @_;
		1098	$CFG->{show_tips} = $value;
		1099	0
		1100	}
		1101	);
		1102
1129	$vbox->add (new CFClient::UI::Label	1103	$vbox->add (new CFPlus::UI::FancyFrame
1130	text => "Server Info",	1104	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);	1105	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1106	);
1137		1107
1138	$vbox	1108	$vbox
1139	}	1109	}
1140		1110
1141	sub message_window {	1111	sub message_window {
1142	my $window = new CFClient::UI::FancyFrame	1112	my $window = new CFPlus::UI::Toplevel
1143	name => "message_window",	1113	name => "message_window",
1144	title => "Messages",	1114	title => "Messages",
1145	border_bg => [1, 1, 1, 1],	1115	border_bg => [1, 1, 1, 1],
1146	x => "max",	1116	x => "max",
1147	y => 0,	1117	y => 0,
1148	force_w => $::WIDTH * 0.4,	1118	force_w => $::WIDTH * 0.4,
1149	force_h => $::HEIGHT * 0.5,	1119	force_h => $::HEIGHT * 0.5,
1150	child => (my $vbox = new CFClient::UI::VBox),	1120	child => (my $vbox = new CFPlus::UI::VBox),
1151	has_close_button => 1;	1121	has_close_button => 1;
1152		1122
1153	$vbox->add ($LOGVIEW);	1123	$vbox->add ($LOGVIEW);
1154		1124
1155	$vbox->add (my $input = new CFClient::UI::Entry	1125	$vbox->add (my $input = new CFPlus::UI::Entry
1156	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1126	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1157	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1127	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1158	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1128	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1159	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	1129	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1160	on_focus_in => sub {	1130	on_focus_in => sub {
…		…
1199	};	1169	};
1200		1170
1201	$window	1171	$window
1202	}	1172	}
1203		1173
1204	sub open_quit_dialog {
1205	unless ($QUIT_DIALOG) {
1206	$QUIT_DIALOG = new CFClient::UI::FancyFrame
1207	x => "center",
1208	y => "center",
1209	z => 50,
1210	title => "Really Quit?",
1211	;
1212
1213	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1214
1215	$vb->add (new CFClient::UI::Label
1216	text => "You should find a savebed and apply it first!",
1217	max_w => $WIDTH * 0.25,
1218	ellipsize => 0,
1219	);
1220	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1221	$hb->add (new CFClient::UI::Button
1222	text => "Ok",
1223	expand => 1,
1224	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1225	);
1226	$hb->add (new CFClient::UI::Button
1227	text => "Quit anyway",
1228	expand => 1,
1229	on_activate => sub { exit },
1230	);
1231	}
1232
1233	$QUIT_DIALOG->show;
1234	}
1235
1236	sub autopickup_setup {	1174	sub autopickup_setup {
1237	my $table = new CFClient::UI::Table;	1175	my $table = new CFPlus::UI::Table;
1238		1176
1239	for (	1177	for (
1240	["General", 0, 0,	1178	["General", 0, 0,
1241	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1179	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1242	["Inhibit autopickup" => PICKUP_INHIBIT],	1180	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1256	["Boots" => PICKUP_BOOTS],	1194	["Boots" => PICKUP_BOOTS],
1257	["Gloves" => PICKUP_GLOVES],	1195	["Gloves" => PICKUP_GLOVES],
1258	["Cloaks" => PICKUP_CLOAK],	1196	["Cloaks" => PICKUP_CLOAK],
1259	],	1197	],
1260		1198
1261	["Readables", 2, 2,	1199	["Readables", 2, 0,
1262	["Spellbooks" => PICKUP_SPELLBOOK],	1200	["Spellbooks" => PICKUP_SPELLBOOK],
1263	["Skillscrolls" => PICKUP_SKILLSCROLL],	1201	["Skillscrolls" => PICKUP_SKILLSCROLL],
1264	["Normal Books/Scrolls" => PICKUP_READABLES],	1202	["Normal Books/Scrolls" => PICKUP_READABLES],
1265	],	1203	],
1266	["Misc", 2, 7,	1204	["Misc", 2, 5,
1267	["Food" => PICKUP_FOOD],	1205	["Food" => PICKUP_FOOD],
1268	["Drinks" => PICKUP_DRINK],	1206	["Drinks" => PICKUP_DRINK],
1269	["Valuables (Money, Gems)" => PICKUP_VALUABLES],	1207	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1270	["Keys" => PICKUP_KEY],	1208	["Keys" => PICKUP_KEY],
1271	["Magical Items" => PICKUP_MAGICAL],	1209	["Magical Items" => PICKUP_MAGICAL],
1272	["Potions" => PICKUP_POTION],	1210	["Potions" => PICKUP_POTION],
1273	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1211	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1274	["Ignore cursed" => PICKUP_NOT_CURSED],	1212	["Ignore cursed" => PICKUP_NOT_CURSED],
1275	["Jewelery" => PICKUP_JEWELS],	1213	["Jewelery" => PICKUP_JEWELS],
		1214	["Flesh" => PICKUP_FLESH],
1276	],	1215	],
1277	["Weight/Value ratio", 2, 17]	1216	["Weight/Value ratio", 2, 17]
1278	)	1217	)
1279	{	1218	{
1280	my ($title, $x, $y, @bits) = @$_;	1219	my ($title, $x, $y, @bits) = @$_;
1281	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1220	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1282		1221
1283	for (@bits) {	1222	for (@bits) {
1284	++$y;	1223	++$y;
1285		1224
1286	my $mask = $_->[1];	1225	my $mask = $_->[1];
1287	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1226	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1288	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1227	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1289	state => $::CFG->{pickup} & $mask,	1228	state => $::CFG->{pickup} & $mask,
1290	on_changed => sub {	1229	on_changed => sub {
1291	my ($box, $value) = @_;	1230	my ($box, $value) = @_;
1292		1231
1293	if ($value) {	1232	if ($value) {
…		…
1304		1243
1305	${$_->[2]} = $checkbox if $_->[2];	1244	${$_->[2]} = $checkbox if $_->[2];
1306	}	1245	}
1307	}	1246	}
1308		1247
1309	$table->add (2, 18, new CFClient::UI::ValSlider	1248	$table->add (2, 18, new CFPlus::UI::ValSlider
1310	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1249	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1311	template => ">= 99",	1250	template => ">= 99",
1312	to_value => sub { ">= " . 5 * $_[0] },	1251	to_value => sub { ">= " . 5 * $_[0] },
1313	on_changed => sub {	1252	on_changed => sub {
1314	my ($slider, $value) = @_;	1253	my ($slider, $value) = @_;
…		…
1317	$::CFG->{pickup} |= int $value	1256	$::CFG->{pickup} |= int $value
1318	if $value;	1257	if $value;
1319	1;	1258	1;
1320	});	1259	});
1321		1260
1322	$table->add (3, 18, new CFClient::UI::Button	1261	$table->add (3, 18, new CFPlus::UI::Button
1323	text => "set",	1262	text => "set",
1324	on_activate => sub {	1263	on_activate => sub {
1325	$::CONN->send_command ("pickup $::CFG->{pickup}")	1264	$::CONN->send_command ("pickup $::CFG->{pickup}")
1326	if defined $::CONN;	1265	if defined $::CONN;
1327	0	1266	0
1328	});	1267	});
1329		1268
1330	$table	1269	$table
1331	}	1270	}
1332		1271
		1272	my %SORT_ORDER = (
		1273	type => undef,
		1274	mtime => sub {
		1275	my $NOW = time;
		1276	sort {
		1277	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1278	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1279
		1280	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1281	or $btime <=> $atime
		1282	or $a->{type} <=> $b->{type}
		1283	} @_
		1284	},
		1285	weight => sub { sort {
		1286	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1287	or $a->{type} <=> $b->{type}
		1288	} @_ },
		1289	);
		1290
1333	sub inventory_widget {	1291	sub inventory_widget {
1334	my $hb = new CFClient::UI::HBox homogeneous => 1;	1292	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1335		1293
1336	$hb->add (my $vb1 = new CFClient::UI::VBox);	1294	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1337	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1295	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
		1296
		1297	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
		1298
		1299	use sort 'stable';
		1300
		1301	$hb1->add (new CFPlus::UI::Selector
		1302	value => $::CFG->{inv_sort},
		1303	options => [
		1304	[type => "Type/Name"],
		1305	[mtime => "Recent/Normal/Locked"],
		1306	[weight => "Weight/Type"],
		1307	],
		1308	on_changed => sub {
		1309	$::CFG->{inv_sort} = $_[1];
		1310	$INV->set_sort_order ($SORT_ORDER{$_[1]});
		1311	},
		1312	);
		1313	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
		1314	#TODO# update to weigh/maxweight
		1315	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
		1316
		1317	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1338	$vb1->add ($INV = new CFClient::UI::Inventory);	1318	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1319	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1339		1320
1340	$hb->add (my $vb2 = new CFClient::UI::VBox);	1321	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1341		1322
1342	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1323	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1343		1324
		1325	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1344	$vb2->add ($INVR = new CFClient::UI::Inventory);	1326	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1345		1327
1346	# XXX: Call after $INVR = ... because set_opencont sets the items	1328	# XXX: Call after $INVR = ... because set_opencont sets the items
1347	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1329	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1348		1330
1349	$hb	1331	$hb
1350	}	1332	}
1351		1333
1352	sub toggle_player_page {	1334	sub toggle_player_page {
…		…
1359	$PL_WINDOW->show;	1341	$PL_WINDOW->show;
1360	}	1342	}
1361	}	1343	}
1362		1344
1363	sub player_window {	1345	sub player_window {
1364	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1346	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1365	x => "center",	1347	x => "center",
1366	y => "center",	1348	y => "center",
1367	force_w => $WIDTH * 9/10,	1349	force_w => $WIDTH * 9/10,
1368	force_h => $HEIGHT * 9/10,	1350	force_h => $HEIGHT * 9/10,
1369	title => "Player",	1351	title => "Player",
…		…
1371	has_close_button => 1	1353	has_close_button => 1
1372	;	1354	;
1373		1355
1374	my $ntb =	1356	my $ntb =
1375	$PL_NOTEBOOK =	1357	$PL_NOTEBOOK =
1376	new CFClient::UI::Notebook	1358	new CFPlus::UI::Notebook expand => 1, debug => 1;
1377	expand => 1,
1378	debug => 1,
1379	filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1380	;
1381		1359
1382	$ntb->add (	1360	$ntb->add (
1383	"Stats" => $STATS_PAGE = stats_window,	1361	"Statistics (F2)" => $STATS_PAGE = stats_window,
1384	"Shows statistics, where all your Stats and Resistances are shown."	1362	"Shows statistics, where all your Stats and Resistances are shown."
1385	);	1363	);
1386	$ntb->add (	1364	$ntb->add (
1387	"Skills" => $STATS_PAGE = skill_window,	1365	"Skills (F3)" => $SKILL_PAGE = skill_window,
1388	"Shows all your Skills."	1366	"Shows all your Skills."
1389	);	1367	);
		1368
		1369	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
		1370	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1390	$ntb->add (	1371	$ntb->add (
1391	Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,	1372	"Spellbook (F4)" => $spellsw,
1392	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1373	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1393	);	1374	);
1394	$ntb->add (	1375	$ntb->add (
1395	Inventory => $INVENTORY_PAGE = inventory_widget,	1376	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1396	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1377	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1397	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1378	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1398	);	1379	);
1399		1380
1400	$ntb->set_current_page ($INVENTORY_PAGE);	1381	$ntb->set_current_page ($INVENTORY_PAGE);
…		…
1406	sub update_bindings {	1387	sub update_bindings {
1407	$BIND_UPD_CB->() if $BIND_UPD_CB;	1388	$BIND_UPD_CB->() if $BIND_UPD_CB;
1408	}	1389	}
1409		1390
1410	sub keyboard_setup {	1391	sub keyboard_setup {
1411	my $binding_list = new CFClient::UI::VBox;	1392	my $binding_list = new CFPlus::UI::VBox;
1412		1393
1413	my $refresh;	1394	my $refresh;
1414	$refresh = $BIND_UPD_CB = sub {	1395	$refresh = $BIND_UPD_CB = sub {
1415	$binding_list->clear ();	1396	$binding_list->clear ();
1416		1397
		1398	return unless $PROFILE;
		1399
1417	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {	1400	for my $mod (keys %{$PROFILE->{bindings}}) {
1418	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {	1401	for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1419	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1402	my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1420	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1403	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1421		1404
1422	my $lbl = join "; ", @$cmds;	1405	my $lbl = join "; ", @$cmds;
1423	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);	1406	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1424	$binding_list->add (my $hb = new CFClient::UI::HBox);	1407	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1425	$hb->add (new CFClient::UI::Button	1408	$hb->add (new CFPlus::UI::Button
1426	text => "delete",	1409	text => "delete",
1427	tooltip => "Deletes the binding",	1410	tooltip => "Deletes the binding",
1428	on_activate => sub {	1411	on_activate => sub {
1429	$binding_list->remove ($hb);	1412	$binding_list->remove ($hb);
1430	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1413	delete $PROFILE->{bindings}{$mod}{$sym};
1431	0	1414	0
1432	});	1415	});
1433		1416
1434	$hb->add (new CFClient::UI::Button	1417	$hb->add (new CFPlus::UI::Button
1435	text => "edit",	1418	text => "edit",
1436	tooltip => "Edits the binding",	1419	tooltip => "Edits the binding",
1437	on_activate => sub {	1420	on_activate => sub {
1438	$::BIND_EDITOR->set_binding (	1421	$::BIND_EDITOR->set_binding (
1439	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},	1422	$mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1440	sub {	1423	sub {
1441	my ($nmod, $nsym, $ncmds) = @_;	1424	my ($nmod, $nsym, $ncmds) = @_;
1442	$::BIND_EDITOR->cfg_unbind ($mod, $sym);	1425	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1443	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);	1426	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1444	$refresh->();	1427	$refresh->();
…		…
1452	$::BIND_EDITOR->show;	1435	$::BIND_EDITOR->show;
1453	$SETUP_DIALOG->hide;	1436	$SETUP_DIALOG->hide;
1454	0	1437	0
1455	});	1438	});
1456		1439
1457	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1440	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1458	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1441	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1459	}	1442	}
1460	}	1443	}
1461	};	1444	};
1462		1445
1463	my $vb = new CFClient::UI::VBox;	1446	my $vb = new CFPlus::UI::VBox;
1464	$vb->add (my $hb = new CFClient::UI::HBox);	1447	$vb->add (new CFPlus::UI::FancyFrame
		1448	label => "Options",
		1449	child => (my $hb = new CFPlus::UI::HBox),
		1450	);
1465	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");	1451	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1466	$hb->add (new CFClient::UI::CheckBox	1452	$hb->add (new CFPlus::UI::CheckBox
1467	expand => 1,	1453	expand => 1,
1468	state => $CFG->{shift_fire_stop},	1454	state => $CFG->{shift_fire_stop},
1469	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",	1455	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1470	on_changed => sub {	1456	on_changed => sub {
1471	my ($cbox, $value) = @_;	1457	my ($cbox, $value) = @_;
1472	$CFG->{shift_fire_stop} = $value;	1458	$CFG->{shift_fire_stop} = $value;
1473	0	1459	0
1474	});	1460	});
1475		1461
1476	$vb->add ($binding_list);	1462	$vb->add (new CFPlus::UI::FancyFrame
		1463	label => "Bindings",
		1464	child => $binding_list);
1477	$vb->add (my $hb = new CFClient::UI::HBox);	1465	$vb->add (my $hb = new CFPlus::UI::HBox);
1478		1466
1479	$hb->add (new CFClient::UI::Button	1467	$hb->add (new CFPlus::UI::Button
1480	text => "record new",	1468	text => "record new",
1481	expand => 1,	1469	expand => 1,
1482	tooltip => "This button opens the binding editor with an empty binding.",	1470	tooltip => "This button opens the binding editor with an empty binding.",
1483	on_activate => sub {	1471	on_activate => sub {
1484	$::BIND_EDITOR->set_binding (undef, undef, [],	1472	$::BIND_EDITOR->set_binding (undef, undef, [],
…		…
1498	$::BIND_EDITOR->show;	1486	$::BIND_EDITOR->show;
1499	0	1487	0
1500	},	1488	},
1501	);	1489	);
1502		1490
1503	$hb->add (new CFClient::UI::Button	1491	$hb->add (new CFPlus::UI::Button
1504	text => "close",	1492	text => "close",
1505	tooltip => "Closes the binding window",	1493	tooltip => "Closes the binding window",
1506	expand => 1,	1494	expand => 1,
1507	on_activate => sub {	1495	on_activate => sub {
1508	$SETUP_DIALOG->hide;	1496	$SETUP_DIALOG->hide;
…		…
1514		1502
1515	$vb	1503	$vb
1516	}	1504	}
1517		1505
1518	sub help_window {	1506	sub help_window {
1519	my $win = new CFClient::UI::FancyFrame	1507	my $win = new CFPlus::UI::Toplevel
1520	x => 'center',	1508	x => 'center',
1521	y => 'center',	1509	y => 'center',
1522	z => 2,	1510	z => 4,
1523	name => 'doc_browser',	1511	name => 'doc_browser',
1524	force_w => int $WIDTH * 7/8,	1512	force_w => int $WIDTH * 7/8,
1525	force_h => int $HEIGHT * 7/8,	1513	force_h => int $HEIGHT * 7/8,
1526	title => "Help Browser",	1514	title => "Help Browser",
1527	has_close_button => 1;	1515	has_close_button => 1;
1528		1516
1529	$win->add (my $vbox = new CFClient::UI::VBox);	1517	$win->add (my $vbox = new CFPlus::UI::VBox);
1530		1518
1531	$vbox->add (my $buttons = new CFClient::UI::HBox);	1519	$vbox->add (new CFPlus::UI::FancyFrame
		1520	label => "Navigation",
		1521	child => (my $buttons = new CFPlus::UI::HBox),
		1522	);
1532	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1523	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1533	expand => 1, fontsize => 0.8, padding_x => 4);	1524	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1534		1525
1535	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1526	my @history;
1536	$buttons->add (my $combo = new CFClient::UI::Combobox	1527	my @future;
1537	value => undef,	1528	my $curnode;
1538	options => [	1529
1539	[intro => "Introduction"],	1530	my $load_node; $load_node = sub {
1540	[manual => "Main Manual"],	1531	my ($node, $para) = @_;
1541	[skill_help => "Skill Reference"],	1532
1542	[command_help => "Command Reference"],	1533	$buttons->clear;
1543	[dmcommand_help => "DM Commands"],	1534
1544	[COPYING => "License Terms"],	1535	$buttons->add (new CFPlus::UI::Button
		1536	text => "⇤",
		1537	tooltip => "back to the starting page",
		1538	on_activate => sub {
		1539	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1540	unshift @future, @history;
		1541	@history = ();
		1542	$load_node->(@{shift @future});
		1543	},
		1544	);
		1545
		1546	if (@history) {
		1547	$buttons->add (new CFPlus::UI::Button
		1548	text => "⋘",
		1549	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1550	on_activate => sub {
		1551	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1552	$load_node->(@{pop @history});
		1553	},
		1554	);
1545	],	1555	}
1546	on_changed => sub {
1547	my ($self, $pod) = @_;
1548		1556
1549	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",	1557	if (@future) {
1550	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };	1558	$buttons->add (new CFPlus::UI::Button
		1559	text => "⋙",
		1560	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1561	on_activate => sub {
		1562	push @history, [$curnode, $viewer->current_paragraph];
		1563	$load_node->(@{shift @future});
		1564	},
		1565	);
		1566	}
1551		1567
		1568	$buttons->add (new CFPlus::UI::Label text => " ");
		1569
		1570	my @path = CFPlus::Pod::full_path_of $node;
		1571	pop @path; # drop current node
		1572
		1573	for my $node (@path) {
		1574	$buttons->add (new CFPlus::UI::Button
		1575	text => $node->{kw}[0],
		1576	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1577	on_activate => sub {
		1578	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1579	$load_node->($node);
		1580	},
		1581	);
		1582	$buttons->add (new CFPlus::UI::Label text => "/");
		1583	}
		1584
		1585	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1586
		1587	$curnode = $node;
		1588
1552	$viewer->clear;	1589	$viewer->clear;
		1590	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1591	$viewer->scroll_to ($para);
		1592	};
1553		1593
1554	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",	1594	$load_node->(CFPlus::Pod::find pod => "mainpage");
1555	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),	1595
1556	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),	1596	$CFPlus::Pod::goto_document = sub {
1557	# ]);#d#	1597	my (@path) = @_;
		1598
		1599	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1600
		1601	$load_node->((CFPlus::Pod::find @path)[0]);
		1602	$win->show;
		1603	};
		1604
		1605	$win
		1606	}
		1607
		1608	sub open_string_query {
		1609	my ($title, $cb, $txt, $tooltip) = @_;
		1610	my $dialog = new CFPlus::UI::Toplevel
		1611	x => "center",
		1612	y => "center",
		1613	z => 50,
		1614	force_w => $WIDTH * 4/5,
		1615	title => $title;
		1616
		1617	$dialog->add (
		1618	my $e = new CFPlus::UI::Entry
		1619	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1620	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1621	tooltip => $tooltip
		1622	);
		1623
		1624	$e->grab_focus;
		1625	$e->set_text ($txt) if $txt;
		1626	$dialog->show;
		1627	}
		1628
		1629	sub open_quit_dialog {
		1630	unless ($QUIT_DIALOG) {
		1631	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1632	x => "center",
		1633	y => "center",
		1634	z => 50,
		1635	title => "Really Quit?",
		1636	on_key_down => sub {
		1637	my ($dialog, $ev) = @_;
		1638	$ev->{sym} == 27 and $dialog->hide;
1558		1639	}
1559	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1640	;
1560	for @$pom;
1561		1641
1562	$viewer->set_offset (0);	1642	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1563		1643
1564	0	1644	$vb->add (new CFPlus::UI::Label
		1645	text => "You should find a savebed and apply it first!",
		1646	max_w => $WIDTH * 0.25,
		1647	ellipsize => 0,
		1648	);
		1649	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1650	$hb->add (new CFPlus::UI::Button
		1651	text => "Ok",
		1652	expand => 1,
		1653	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1654	);
		1655	$hb->add (new CFPlus::UI::Button
		1656	text => "Quit anyway",
		1657	expand => 1,
		1658	on_activate => sub { exit },
		1659	);
		1660	}
		1661
		1662	$QUIT_DIALOG->show;
		1663	$QUIT_DIALOG->grab_focus;
		1664	}
		1665
		1666	sub show_tip_of_the_day {
		1667	# find all tips
		1668	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
		1669
		1670	my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
		1671	$todindex = 0 if $todindex >= @tod;
		1672	$CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
		1673
		1674	# create dialog
		1675	my $dialog;
		1676
		1677	my $close = sub {
		1678	$dialog->destroy;
		1679	};
		1680
		1681	$dialog = new CFPlus::UI::Toplevel
		1682	x => "center",
		1683	y => "center",
		1684	z => 3,
		1685	name => 'tip_of_the_day',
		1686	force_w => int $WIDTH * 4/9,
		1687	force_h => int $WIDTH * 2/9,
		1688	title => "Tip of the day #" . (1 + $todindex),
		1689	child => my $vbox = new CFPlus::UI::VBox,
		1690	has_close_button => 1,
		1691	on_delete => $close,
		1692	;
		1693
		1694	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1695	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1696	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1697
		1698	$vbox->add (my $table = new CFPlus::UI::Table);
		1699
		1700	$table->add (0, 0, new CFPlus::UI::Button
		1701	text => "Close",
		1702	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>.",
		1703	on_activate => $close,
		1704	);
		1705
		1706	$table->add (2, 0, new CFPlus::UI::Button
		1707	text => "Next",
		1708	tooltip => "Show the next <b>Tip of the day</b>.",
		1709	on_activate => sub {
		1710	$close->();
		1711	&show_tip_of_the_day;
1565	},	1712	},
1566	on_visibility_change => sub {
1567	my ($self, $visible) = @_;
1568	return unless $visible;
1569	return if $self->{value};
1570	$self->set_value ("intro");
1571	0
1572	},
1573	);	1713	);
1574		1714
1575	$win	1715	$dialog->show;
1576	}	1716	}
1577		1717
1578	sub sdl_init {	1718	sub sdl_init {
1579	CFClient::SDL_Init	1719	CFPlus::SDL_Init
1580	and die "SDL::Init failed!\n";	1720	and die "SDL::Init failed!\n";
1581	}	1721	}
1582		1722
1583	sub video_init {	1723	sub video_init {
1584	sdl_init;	1724	sdl_init;
…		…
1589		1729
1590	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1730	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1591	$FULLSCREEN = $CFG->{fullscreen};	1731	$FULLSCREEN = $CFG->{fullscreen};
1592	$FAST = $CFG->{fast};	1732	$FAST = $CFG->{fast};
1593		1733
1594	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1734	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1595	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1735	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1596		1736
1597	$SDL_ACTIVE = 1;	1737	$SDL_ACTIVE = 1;
1598	$LAST_REFRESH = time - 0.01;	1738	$LAST_REFRESH = time - 0.01;
1599		1739
1600	CFClient::OpenGL::init;	1740	CFPlus::OpenGL::init;
1601		1741
1602	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1742	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1603		1743
1604	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1744	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1605		1745
1606	#############################################################################	1746	#############################################################################
1607		1747
1608	if ($DEBUG_STATUS) {	1748	if ($DEBUG_STATUS) {
1609	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1749	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1610	} else {	1750	} else {
1611	# create the widgets	1751	# create the widgets
1612		1752
1613	$DEBUG_STATUS = new CFClient::UI::Label	1753	$DEBUG_STATUS = new CFPlus::UI::Label
1614	padding => 0,	1754	padding => 0,
1615	z => 100,	1755	z => 100,
1616	force_x => "max",	1756	force_x => "max",
1617	force_y => 0;	1757	force_y => 0;
1618	$DEBUG_STATUS->show;	1758	$DEBUG_STATUS->show;
1619		1759
1620	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);	1760	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1621		1761
1622	$STATUSBOX = new CFClient::UI::Statusbox;	1762	$STATUSBOX = new CFPlus::UI::Statusbox;
1623	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1763	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1624		1764
1625	(new CFClient::UI::Frame	1765	(new CFPlus::UI::Frame
1626	bg => [0, 0, 0, 0.4],	1766	bg => [0, 0, 0, 0.4],
1627	force_x => 0,	1767	force_x => 0,
1628	force_y => "max",	1768	force_y => "max",
1629	child => $STATUSBOX,	1769	child => $STATUSBOX,
1630	)->show;	1770	)->show;
1631		1771
1632	CFClient::UI::FancyFrame->new (	1772	CFPlus::UI::Toplevel->new (
1633	title => "Map",	1773	title => "Map",
1634	name => "mapmap",	1774	name => "mapmap",
1635	x => 0,	1775	x => 0,
1636	y => $FONTSIZE + 8,	1776	y => $FONTSIZE + 8,
1637	border_bg => [1, 1, 1, 192/255],	1777	border_bg => [1, 1, 1, 192/255],
1638	bg => [1, 1, 1, 0],	1778	bg => [1, 1, 1, 0],
1639	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1779	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1640	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1780	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1641	),	1781	),
1642	)->show;	1782	)->show;
1643		1783
1644	$MAPWIDGET = new CFClient::MapWidget;	1784	$MAPWIDGET = new CFPlus::MapWidget;
1645	$MAPWIDGET->connect (activate_console => sub {	1785	$MAPWIDGET->connect (activate_console => sub {
1646	my ($mapwidget, $preset) = @_;	1786	my ($mapwidget, $preset) = @_;
1647		1787
1648	if ($CONSOLE) {	1788	if ($CONSOLE) {
1649	$CONSOLE->{input}->{auto_activated} = 1;	1789	$CONSOLE->{input}->{auto_activated} = 1;
…		…
1655	}	1795	}
1656	});	1796	});
1657	$MAPWIDGET->show;	1797	$MAPWIDGET->show;
1658	$MAPWIDGET->grab_focus;	1798	$MAPWIDGET->grab_focus;
1659		1799
1660	$LOGVIEW = new CFClient::UI::TextScroller	1800	$LOGVIEW = new CFPlus::UI::TextScroller
1661	expand => 1,	1801	expand => 1,
1662	font => $FONT_FIXED,	1802	font => $FONT_FIXED,
1663	fontsize => $::CFG->{log_fontsize},	1803	fontsize => $::CFG->{log_fontsize},
1664	indent => -4,	1804	indent => -4,
1665	can_hover => 1,	1805	can_hover => 1,
1666	can_events => 1,	1806	can_events => 1,
1667	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1807	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1668	;	1808	;
1669		1809
1670	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1810	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1671	title => "Setup",	1811	title => "Setup",
1672	name => "setup_dialog",	1812	name => "setup_dialog",
1673	x => 'center',	1813	x => 'center',
1674	y => 'center',	1814	y => 'center',
1675	z => 2,	1815	z => 2,
…		…
1678	has_close_button => 1,	1818	has_close_button => 1,
1679	;	1819	;
1680		1820
1681	$METASERVER = metaserver_dialog;	1821	$METASERVER = metaserver_dialog;
1682		1822
1683	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1823	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1684	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1824	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1685		1825
1686	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1826	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1687	"Configure the server to play on, your username, password and other server-related options.");	1827	"Configure the server to play on, your username, password and other server-related options.");
1688	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1828	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1689	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1829	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
…		…
1699	. "After pressing the combo the binding will be saved automatically and the "	1839	. "After pressing the combo the binding will be saved automatically and the "
1700	. "binding editor closes");	1840	. "binding editor closes");
1701	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1841	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1702	"Some debuggin' options. Do not ask.");	1842	"Some debuggin' options. Do not ask.");
1703		1843
1704	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1844	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1705		1845
1706	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1846	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1707	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1847	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1708		1848
1709	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1849	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1710	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1850	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1711		1851
1712	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	1852	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1713		1853
1714	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1854	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1715	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");	1855	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1716		1856
1717	$BUTTONBAR->add (new CFClient::UI::Button	1857	$BUTTONBAR->add (new CFPlus::UI::Button
1718	text => "Save Config",	1858	text => "Save Config",
1719	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1859	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1720	on_activate => sub {	1860	on_activate => sub {
1721	$::CFG->{layout} = CFClient::UI::get_layout;	1861	$::CFG->{layout} = CFPlus::UI::get_layout;
1722	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1862	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1723	status "Configuration Saved";	1863	status "Configuration Saved";
1724	0	1864	0
1725	},	1865	},
1726	);	1866	);
1727		1867
1728	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	1868	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1729	tooltip => "View Documentation");	1869	tooltip => "View Documentation");
1730		1870
		1871
1731	$BUTTONBAR->add (new CFClient::UI::Button	1872	$BUTTONBAR->add (new CFPlus::UI::Button
1732	text => "Quit",	1873	text => "Quit",
1733	tooltip => "Terminates the program",	1874	tooltip => "Terminates the program",
1734	on_activate => sub {	1875	on_activate => sub {
1735	if ($CONN) {	1876	if ($CONN) {
1736	open_quit_dialog;	1877	open_quit_dialog;
…		…
1746	}	1887	}
1747		1888
1748	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1889	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1749	}	1890	}
1750		1891
		1892	sub setup_build_button {
		1893	my ($enabled) = @_;
		1894	if ($enabled) {
		1895	$BUILD_BUTTON ||= new CFPlus::UI::Button
		1896	text => "Build",
		1897	tooltip => "Opens the ingame builder",
		1898	on_activate => sub {
		1899	if ($CONN) {
		1900	$CONN->send_ext_req (builder_player_items => sub {
		1901	open_ingame_editor ($_[0]) if exists $_[0]->{items};
		1902	});
		1903	}
		1904	0
		1905	};
		1906	$BUTTONBAR->add ($BUILD_BUTTON);
		1907	} else {
		1908	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1909	}
		1910	}
		1911
		1912	sub open_ingame_editor {
		1913	my ($msg) = @_;
		1914
		1915	my $win = new CFPlus::UI::Toplevel
		1916	x => 0,
		1917	y => 'center',
		1918	z => 4,
		1919	name => 'builder_window',
		1920	force_w => int $WIDTH * 1/4,
		1921	force_h => int $HEIGHT * 3/4,
		1922	title => "In game builder",
		1923	has_close_button => 1;
		1924
		1925	my $r = new CFPlus::UI::ScrolledWindow (
		1926	expand => 1,
		1927	scroll_y => 1
		1928	);
		1929	$r->add (my $vb = new CFPlus::UI::VBox);
		1930	$win->add ($r);
		1931
		1932
		1933	$vb->add (
		1934	new CFPlus::UI::Button
		1935	text => "Disable build mode",
		1936	on_activate => sub { $::IN_BUILD_MODE = undef }
		1937	);
		1938	$vb->add (
		1939	new CFPlus::UI::Button
		1940	text => "ERASE",
		1941	on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
		1942	);
		1943
		1944	for my $itemarchname (
		1945	sort {
		1946	$msg->{items}->{$a}->{build_arch_name}
		1947	cmp $msg->{items}->{$b}->{build_arch_name}
		1948	} keys %{$msg->{items}}
		1949	) {
		1950	my $info = $msg->{items}->{$itemarchname};
		1951	$vb->add (
		1952	new CFPlus::UI::Button text => $info->{build_arch_name},
		1953	on_activate => sub {
		1954	$::IN_BUILD_MODE = { item => $itemarchname, info => $info };
		1955
		1956	if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
		1957	build_mode_query_arch_info ();
		1958	}
		1959	}
		1960	);
		1961	}
		1962
		1963	$win->show;
		1964	}
		1965
		1966	sub build_mode_query_arch_info {
		1967	my ($iteminfo) = $::IN_BUILD_MODE;
		1968	my $itemarchname = $iteminfo->{item};
		1969	my $info = $iteminfo->{info};
		1970
		1971	my $dialog = new CFPlus::UI::Toplevel
		1972	x => "center",
		1973	y => "center",
		1974	z => 50,
		1975	force_w => int $WIDTH * 1/2,
		1976	title => "Enter information for placement of '$itemarchname'",
		1977	has_close_button => 1;
		1978
		1979	$dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1980
		1981	$vb->add (my $table = new CFPlus::UI::Table expand => 1);
		1982	my $row = 0;
		1983	if ($info->{has_name}) {
		1984	$table->add (0, $row, new CFPlus::UI::Label text => "Name:");
		1985	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
		1986	}
		1987	if ($info->{has_text}) {
		1988	$table->add (0, $row, new CFPlus::UI::Label text => "Text:");
		1989	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
		1990	}
		1991	if ($info->{has_connection}) {
		1992	$table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
		1993	$table->add (1, $row++,
		1994	new CFPlus::UI::Entry
		1995	expand => 1,
		1996	on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
		1997	tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
		1998	);
		1999	}
		2000
		2001	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		2002	$hb->add (new CFPlus::UI::Button
		2003	text => "Close",
		2004	expand => 1,
		2005	on_activate => sub { $dialog->hide; 0 },
		2006	);
		2007	$dialog->show;
		2008	}
		2009
1751	sub video_shutdown {	2010	sub video_shutdown {
1752	CFClient::OpenGL::shutdown;	2011	CFPlus::OpenGL::shutdown;
1753		2012
1754	undef $SDL_ACTIVE;	2013	undef $SDL_ACTIVE;
1755	}	2014	}
1756		2015
1757	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	2016	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
…		…
1765		2024
1766	sub audio_music_finished {	2025	sub audio_music_finished {
1767	return unless $CFG->{bgm_enable};	2026	return unless $CFG->{bgm_enable};
1768		2027
1769	# TODO: hack, do play loop and mood music	2028	# TODO: hack, do play loop and mood music
1770	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	2029	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1771	$bgmusic->play (0);	2030	$bgmusic->play (0);
1772		2031
1773	push @bgmusic, shift @bgmusic;	2032	push @bgmusic, shift @bgmusic;
1774	}	2033	}
1775		2034
1776	sub audio_init {	2035	sub audio_init {
1777	if ($CFG->{audio_enable}) {	2036	if ($CFG->{audio_enable}) {
1778	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	2037	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1779	$SDL_MIXER = !CFClient::Mix_OpenAudio;	2038	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1780		2039
1781	unless ($SDL_MIXER) {	2040	unless ($SDL_MIXER) {
1782	status "Unable to open sound device: there will be no sound";	2041	status "Unable to open sound device: there will be no sound";
1783	return;	2042	return;
1784	}	2043	}
1785		2044
1786	CFClient::Mix_AllocateChannels 8;	2045	CFPlus::Mix_AllocateChannels 8;
1787	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	2046	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1788		2047
1789	audio_music_finished;	2048	audio_music_finished;
1790		2049
		2050	local $_;
1791	while (<$fh>) {	2051	while (<$fh>) {
1792	next if /^\s*#/;	2052	next if /^\s*#/;
1793	next if /^\s*$/;	2053	next if /^\s*$/;
1794		2054
1795	my ($file, $volume, $event) = split /\s+/, $_, 3;	2055	my ($file, $volume, $event) = split /\s+/, $_, 3;
1796		2056
1797	push @SOUNDS, "$volume,$file";	2057	push @SOUNDS, "$volume,$file";
1798		2058
1799	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	2059	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1800	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	2060	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1801	$chunk->volume ($volume * 128 / 100);	2061	$chunk->volume ($volume * 128 / 100);
1802	$chunk	2062	$chunk
1803	};	2063	};
1804	}	2064	}
1805	} else {	2065	} else {
…		…
1807	}	2067	}
1808	}	2068	}
1809	}	2069	}
1810		2070
1811	sub audio_shutdown {	2071	sub audio_shutdown {
1812	CFClient::Mix_CloseAudio if $SDL_MIXER;	2072	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1813	undef $SDL_MIXER;	2073	undef $SDL_MIXER;
1814	@SOUNDS = ();	2074	@SOUNDS = ();
1815	%AUDIO_CHUNKS = ();	2075	%AUDIO_CHUNKS = ();
1816	}	2076	}
1817		2077
…		…
1824		2084
1825	sub force_refresh {	2085	sub force_refresh {
1826	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2086	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1827	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2087	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1828		2088
1829	$CFClient::UI::ROOT->draw;	2089	$CFPlus::UI::ROOT->draw;
1830		2090
1831	$WANT_REFRESH = 0;	2091	$WANT_REFRESH = 0;
1832	$CAN_REFRESH = 0;	2092	$CAN_REFRESH = 0;
1833	$LAST_REFRESH = $NOW;	2093	$LAST_REFRESH = $NOW;
1834		2094
1835	0 && do {
1836	# some weird model-drawing code, just a joke right now
1837	use CFClient::OpenGL;
1838
1839	$demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1840	$demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1841	$demo{r} ||= do {
1842	my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1843	$mod->{v} = pack "f*", @{$mod->{v}};
1844	$_ = [scalar @$_, pack "S!*", @$_]
1845	for values %{$mod->{g}};
1846	$mod
1847	};
1848
1849	my $r = $demo{r} or die;
1850
1851	glDepthMask 1;
1852	glClear GL_DEPTH_BUFFER_BIT;
1853	glEnable GL_TEXTURE_2D;
1854	glEnable GL_DEPTH_TEST;
1855	glEnable GL_CULL_FACE;
1856	glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1857
1858	glMatrixMode GL_PROJECTION;
1859	glLoadIdentity;
1860	glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1861	#glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1862	glMatrixMode GL_MODELVIEW;
1863	glLoadIdentity;
1864
1865	glPushMatrix;
1866	glTranslate 0, 0, -800;
1867	glScale 1, -1, 1;
1868	glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1869	glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1870	glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1871	glScale 50, 50, 50;
1872
1873	glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1874	while (my ($k, $v) = each %{$r->{g}}) {
1875	glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1876	glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1877	}
1878
1879	glPopMatrix;
1880
1881	glShadeModel GL_FLAT;
1882	glDisable GL_DEPTH_TEST;
1883	glDisable GL_TEXTURE_2D;
1884	glDepthMask 0;
1885
1886	$WANT_REFRESH++;
1887	};
1888
1889	CFClient::SDL_GL_SwapBuffers;	2095	CFPlus::SDL_GL_SwapBuffers;
1890	}	2096	}
1891		2097
1892	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2098	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1893	$NOW = time;	2099	$NOW = time;
1894		2100
1895	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2101	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1896	for CFClient::SDL_PollEvent;	2102	for CFPlus::SDL_PollEvent;
1897		2103
1898	if (%animate_object) {	2104	if (%animate_object) {
1899	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2105	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1900	$WANT_REFRESH++;	2106	$WANT_REFRESH++;
1901	}	2107	}
…		…
1925	$CONN->face_prefetch	2131	$CONN->face_prefetch
1926	if $CONN;	2132	if $CONN;
1927	});	2133	});
1928		2134
1929	%SDL_CB = (	2135	%SDL_CB = (
1930	CFClient::SDL_QUIT => sub {	2136	CFPlus::SDL_QUIT => sub {
1931	Event::unloop -1;	2137	Event::unloop -1;
1932	},	2138	},
1933	CFClient::SDL_VIDEORESIZE => sub {	2139	CFPlus::SDL_VIDEORESIZE => sub {
1934	},	2140	},
1935	CFClient::SDL_VIDEOEXPOSE => sub {	2141	CFPlus::SDL_VIDEOEXPOSE => sub {
1936	CFClient::UI::full_refresh;	2142	CFPlus::UI::full_refresh;
1937	},	2143	},
1938	CFClient::SDL_ACTIVEEVENT => sub {	2144	CFPlus::SDL_ACTIVEEVENT => sub {
1939	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2145	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1940	},	2146	},
1941	CFClient::SDL_KEYDOWN => sub {	2147	CFPlus::SDL_KEYDOWN => sub {
1942	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2148	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1943	# alt-enter	2149	# alt-enter
		2150	$FULLSCREEN_ENABLE->toggle;
1944	video_shutdown;	2151	video_shutdown;
1945	$CFG->{fullscreen} = !$CFG->{fullscreen};
1946	video_init;	2152	video_init;
1947	} else {	2153	} else {
1948	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2154	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1949	}	2155	}
1950	},	2156	},
1951	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2157	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1952	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2158	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1953	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2159	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1954	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2160	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1955	CFClient::SDL_USEREVENT => sub {	2161	CFPlus::SDL_USEREVENT => sub {
1956	if ($_[0]{code} == 1) {	2162	if ($_[0]{code} == 1) {
1957	audio_channel_finished $_[0]{data1};	2163	audio_channel_finished $_[0]{data1};
1958	} elsif ($_[0]{code} == 0) {	2164	} elsif ($_[0]{code} == 0) {
1959	audio_music_finished;	2165	audio_music_finished;
1960	}	2166	}
…		…
1964	#############################################################################	2170	#############################################################################
1965		2171
1966	$SIG{INT} = $SIG{TERM} = sub { exit };	2172	$SIG{INT} = $SIG{TERM} = sub { exit };
1967		2173
1968	{	2174	{
1969	local $SIG{__DIE__} = sub {
1970	return unless defined $^S && !$^S;
1971	Carp::confess $_[1];#d#TODO: remove when stable
1972	CFClient::fatal $_[0];
1973	};
1974
1975	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	2175	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1976	CFClient::UI::set_layout ($::CFG->{layout});	2176	CFPlus::UI::set_layout ($::CFG->{layout});
1977		2177
1978	my %DEF_CFG = (	2178	my %DEF_CFG = (
1979	sdl_mode => 0,	2179	sdl_mode => 0,
1980	width => 640,	2180	width => 640,
1981	height => 480,	2181	height => 480,
…		…
1989	log_fontsize => 0.7,	2189	log_fontsize => 0.7,
1990	gauge_fontsize => 1,	2190	gauge_fontsize => 1,
1991	gauge_size => 0.35,	2191	gauge_size => 0.35,
1992	stat_fontsize => 0.7,	2192	stat_fontsize => 0.7,
1993	mapsize => 100,	2193	mapsize => 100,
1994	say_command => 'say',	2194	say_command => 'chat',
1995	audio_enable => 1,	2195	audio_enable => 1,
1996	bgm_enable => 1,	2196	bgm_enable => 1,
1997	bgm_volume => 0.25,	2197	bgm_volume => 0.25,
1998	face_prefetch => 0,	2198	face_prefetch => 0,
1999	output_sync => 1,	2199	output_sync => 1,
2000	output_count => 1,	2200	output_count => 1,
2001	pickup => 0,	2201	pickup => 0,
		2202	inv_sort => "mtime",
2002	default => "profile", # default profile	2203	default => "profile", # default profile
		2204	show_tips => 1,
2003	);	2205	);
2004		2206
2005	while (my ($k, $v) = each %DEF_CFG) {	2207	while (my ($k, $v) = each %DEF_CFG) {
2006	$CFG->{$k} = $v unless exists $CFG->{$k};	2208	$CFG->{$k} = $v unless exists $CFG->{$k};
2007	}	2209	}
…		…
2010		2212
2011	sdl_init;	2213	sdl_init;
2012		2214
2013	@SDL_MODES = reverse	2215	@SDL_MODES = reverse
2014	grep $_->[0] >= 640 && $_->[1] >= 480,	2216	grep $_->[0] >= 640 && $_->[1] >= 480,
2015	CFClient::SDL_ListModes;	2217	CFPlus::SDL_ListModes;
2016		2218
2017	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2219	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2018		2220
2019	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2221	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2020		2222
2021	{	2223	{
2022	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2224	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2023	DejaVuSans.ttf	2225	DejaVuSans.ttf
2024	DejaVuSansMono.ttf	2226	DejaVuSansMono.ttf
2025	DejaVuSans-Bold.ttf	2227	DejaVuSans-Bold.ttf
2026	DejaVuSansMono-Bold.ttf	2228	DejaVuSansMono-Bold.ttf
2027	DejaVuSans-Oblique.ttf	2229	DejaVuSans-Oblique.ttf
2028	DejaVuSansMono-Oblique.ttf	2230	DejaVuSansMono-Oblique.ttf
2029	DejaVuSans-BoldOblique.ttf	2231	DejaVuSans-BoldOblique.ttf
2030	DejaVuSansMono-BoldOblique.ttf	2232	DejaVuSansMono-BoldOblique.ttf
2031	);	2233	);
2032		2234
2033	CFClient::add_font $_ for @fonts;	2235	CFPlus::add_font $_ for @fonts;
2034		2236
2035	CFClient::pango_init;	2237	CFPlus::pango_init;
2036		2238
2037	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2239	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2038	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2240	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2039		2241
2040	$FONT_PROP->make_default;	2242	$FONT_PROP->make_default;
2041	}	2243	}
2042		2244
2043	# compare mono (ft) vs. rgba (cairo)	2245	# compare mono (ft) vs. rgba (cairo)
2044	# ft - 1.8s, cairo 3s, even in alpha-only mode	2246	# ft - 1.8s, cairo 3s, even in alpha-only mode
2045	# for my $rgba (0..1) {	2247	# for my $rgba (0..1) {
2046	# my $t1 = Time::HiRes::time;	2248	# my $t1 = Time::HiRes::time;
2047	# for (1..1000) {	2249	# for (1..1000) {
2048	# my $layout = CFClient::Layout->new ($rgba);	2250	# my $layout = CFPlus::Layout->new ($rgba);
2049	# $layout->set_text ("hallo" x 100);	2251	# $layout->set_text ("hallo" x 100);
2050	# $layout->render;	2252	# $layout->render;
2051	# }	2253	# }
2052	# my $t2 = Time::HiRes::time;	2254	# my $t2 = Time::HiRes::time;
2053	# warn $t2-$t1;	2255	# warn $t2-$t1;
2054	# }	2256	# }
2055		2257
		2258	$startup_done->();
		2259
2056	video_init;	2260	video_init;
2057	audio_init;	2261	audio_init;
2058	}	2262	}
2059		2263
		2264	show_tip_of_the_day if $CFG->{show_tips};
		2265
2060	Event::loop;	2266	Event::loop;
2061	#CFClient::SDL_Quit;	2267	#CFPlus::SDL_Quit;
2062	#CFClient::_exit 0;	2268	#CFPlus::_exit 0;
2063		2269
2064	END { CFClient::SDL_Quit }	2270	END { CFPlus::SDL_Quit }
2065		2271
2066	=head1 NAME	2272	=head1 NAME
2067		2273
2068	cfplus - A Crossfire+ and Crossfire game client	2274	cfplus - A Crossfire+ and Crossfire game client
2069		2275

Diff Legend

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