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.103 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.128 by root, Sat Nov 18 23:31:24 2006 UTC

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

Diff Legend

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