ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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