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

Diff Legend

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