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

Diff Legend

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