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.101 by elmex, Sun Jul 23 17:03:44 2006 UTC vs.
Revision 1.129 by root, Sun Nov 19 00:07:51 2006 UTC

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

Diff Legend

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