ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.99 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.131 by root, Sun Nov 19 20:31:29 2006 UTC

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

Diff Legend

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