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.99 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.126 by root, Sat Nov 18 18:19:05 2006 UTC

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

Diff Legend

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