ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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