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.146 by root, Wed Apr 4 02:43:30 2007 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
		470	my $row = 0;
		471
		472	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
		473	$table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
		474	can_events => 1,
		475	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
		476
406	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	477	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
407	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	478	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
408		479
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]);	480	$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");	481	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
411		482
412	$mode_slider->connect (changed => sub {	483	$mode_slider->connect (changed => sub {
413	my ($self, $value) = @_;	484	my ($self, $value) = @_;
414		485
415	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	486	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
416	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	487	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
417	});	488	});
418	$mode_slider->emit (changed => $mode_slider->{range}[0]);	489	$mode_slider->emit (changed => $mode_slider->{range}[0]);
419		490
420	my $row = 1;
421
422	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	491	$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	492	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
424	state => $CFG->{fullscreen},	493	state => $CFG->{fullscreen},
425	tooltip => "Bring the client into fullscreen mode.",	494	tooltip => "Bring the client into fullscreen mode.",
426	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	495	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
427	);	496	);
428		497
429	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	498	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
430	$table->add (1, $row++, new CFClient::UI::CheckBox	499	$table->add (1, $row++, new CFPlus::UI::CheckBox
431	state => $CFG->{fast},	500	state => $CFG->{fast},
432	tooltip => "Lower the visual quality considerably to speed up rendering.",	501	tooltip => "Lower the visual quality considerably to speed up rendering.",
433	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	502	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
434	);	503	);
435		504
436	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	505	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
437	$table->add (1, $row++, new CFClient::UI::Slider	506	$table->add (1, $row++, new CFPlus::UI::Slider
438	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	507	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
439	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	508	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
440	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	509	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
441	);	510	);
442		511
443	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	512	$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	513	$table->add (1, $row++, new CFPlus::UI::CheckBox
445	state => $CFG->{fow_enable},	514	state => $CFG->{fow_enable},
446	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	515	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 }	516	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
448	);	517	);
449		518
450	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	519	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
451	$table->add (1, $row++, new CFClient::UI::Slider	520	$table->add (1, $row++, new CFPlus::UI::Slider
452	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	521	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.",	522	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 }	523	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
455	);	524	);
456		525
457	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	526	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
458	$table->add (1, $row++, new CFClient::UI::CheckBox	527	$table->add (1, $row++, new CFPlus::UI::CheckBox
459	state => $CFG->{fow_smooth},	528	state => $CFG->{fow_smooth},
460	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	529	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
461	on_changed => sub {	530	on_changed => sub {
462	my ($self, $value) = @_;	531	my ($self, $value) = @_;
463	$CFG->{fow_smooth} = $value;	532	$CFG->{fow_smooth} = $value;
464	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	533	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
465	0	534	0
466	}	535	}
467	);	536	);
468		537
469	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	538	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
470	$table->add (1, $row++, new CFClient::UI::Slider	539	$table->add (1, $row++, new CFPlus::UI::Slider
471	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	540	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.",	541	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 },	542	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
474	);	543	);
475		544
476	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	545	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
477	$table->add (1, $row++, new CFClient::UI::Slider	546	$table->add (1, $row++, new CFPlus::UI::Slider
478	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	547	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.",	548	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 },	549	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
481	);	550	);
482		551
483	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	552	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
484	$table->add (1, $row++, new CFClient::UI::Slider	553	$table->add (1, $row++, new CFPlus::UI::Slider
485	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	554	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.",	555	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
487	on_changed => sub {	556	on_changed => sub {
488	$CFG->{gauge_fontsize} = $_[1];	557	$CFG->{gauge_fontsize} = $_[1];
489	&set_gauge_window_fontsize;	558	&set_gauge_window_fontsize;
490	0	559	0
491	}	560	}
492	);	561	);
493		562
494	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	563	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
495	$table->add (1, $row++, new CFClient::UI::Slider	564	$table->add (1, $row++, new CFPlus::UI::Slider
496	range => [$CFG->{gauge_size}, 0.2, 0.8],	565	range => [$CFG->{gauge_size}, 0.2, 0.8],
497	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	566	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
498	on_changed => sub {	567	on_changed => sub {
499	$CFG->{gauge_size} = $_[1];	568	$CFG->{gauge_size} = $_[1];
500	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	569	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
501	0	570	0
502	}	571	}
503	);	572	);
504		573
505	$table->add (1, $row++, new CFClient::UI::Button	574	$table->add (1, $row++, new CFPlus::UI::Button
506	expand => 1, align => 0, text => "Apply",	575	expand => 1, align => 0, text => "Apply",
507	tooltip => "Apply the video settings",	576	tooltip => "Apply the video settings",
508	on_activate => sub {	577	on_activate => sub {
509	video_shutdown ();	578	video_shutdown ();
510	video_init ();	579	video_init ();
…		…
514		583
515	$vbox	584	$vbox
516	}	585	}
517		586
518	sub audio_setup {	587	sub audio_setup {
519	my $vbox = new CFClient::UI::VBox;	588	my $vbox = new CFPlus::UI::VBox;
520		589
521	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	590	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
522		591
523	my $row = 0;	592	my $row = 0;
524		593
525	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	594	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
526	$table->add (1, $row++, new CFClient::UI::CheckBox	595	$table->add (1, $row++, new CFPlus::UI::CheckBox
527	state => $CFG->{audio_enable},	596	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.",	597	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 }	598	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
530	);	599	);
531	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	600	# $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 {	601	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
533	# $CFG->{effects_volume} = $_[1];	602	# $CFG->{effects_volume} = $_[1];
534	# });	603	# });
535	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	604	$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);	605	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
537	$hbox->add (new CFClient::UI::CheckBox	606	$hbox->add (new CFPlus::UI::CheckBox
538	expand => 1, state => $CFG->{bgm_enable},	607	expand => 1, state => $CFG->{bgm_enable},
539	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	608	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 }	609	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
541	);	610	);
542	$hbox->add (new CFClient::UI::Slider	611	$hbox->add (new CFPlus::UI::Slider
543	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	612	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
544	tooltip => "The volume of the background music. Changes are instant.",	613	tooltip => "The volume of the background music. Changes are instant.",
545	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }	614	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
546	);	615	);
547		616
548	$table->add (1, $row++, new CFClient::UI::Button	617	$table->add (1, $row++, new CFPlus::UI::Button
549	expand => 1, align => 0, text => "Apply",	618	expand => 1, align => 0, text => "Apply",
550	tooltip => "Apply the audio settings",	619	tooltip => "Apply the audio settings",
551	on_activate => sub {	620	on_activate => sub {
552	audio_shutdown ();	621	audio_shutdown ();
553	audio_init ();	622	audio_init ();
…		…
565	}	634	}
566		635
567	sub make_gauge_window {	636	sub make_gauge_window {
568	my $gh = int $HEIGHT * $CFG->{gauge_size};	637	my $gh = int $HEIGHT * $CFG->{gauge_size};
569		638
570	my $win = new CFClient::UI::Frame (	639	my $win = new CFPlus::UI::Frame (
571	force_x => 0,	640	force_x => 0,
572	force_y => "max",	641	force_y => "max",
573	force_w => $WIDTH,	642	force_w => $WIDTH,
574	force_h => $gh,	643	force_h => $gh,
575	);	644	);
576		645
577	$win->add (my $hbox = new CFClient::UI::HBox	646	$win->add (my $hbox = new CFPlus::UI::HBox
578	children => [	647	children => [
579	(new CFClient::UI::HBox expand => 1),	648	(new CFPlus::UI::HBox expand => 1),
580	(new CFClient::UI::VBox children => [	649	(new CFPlus::UI::VBox children => [
581	(new CFClient::UI::Empty expand => 1),	650	(new CFPlus::UI::Empty expand => 1),
582	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	651	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
583	]),	652	]),
584	(my $vbox = new CFClient::UI::VBox),	653	(my $vbox = new CFPlus::UI::VBox),
585	],	654	],
586	);	655	);
587		656
588	$vbox->add (new CFClient::UI::HBox	657	$vbox->add (new CFPlus::UI::HBox
589	expand => 1,	658	expand => 1,
590	children => [	659	children => [
591	(new CFClient::UI::Empty expand => 1),	660	(new CFPlus::UI::Empty expand => 1),
592	(my $hb = new CFClient::UI::HBox),	661	(my $hb = new CFPlus::UI::HBox),
593	],	662	],
594	);	663	);
595		664
596	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	665	$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',	666	$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',	667	$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',	668	$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		669
605	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	670	$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,	671	$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		672
610	$GAUGES = {	673	$GAUGES = {
611	exp => $exp, win => $win, range => $rng,	674	exp => $exp, win => $win, range => $rng,
612	food => $fg, mana => $mg, hp => $hg, grace => $gg	675	food => $fg, mana => $mg, hp => $hg, grace => $gg
613	};	676	};
…		…
616		679
617	$win	680	$win
618	}	681	}
619		682
620	sub debug_setup {	683	sub debug_setup {
621	my $table = new CFClient::UI::Table;	684	my $table = new CFPlus::UI::Table;
622		685
623	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	686	$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 });	687	$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");	688	$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 });	689	$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");	690	$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 });	691	$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");	692	$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 });	693	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		694	$table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
631		695
632	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	696	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
633		697
634	for my $x (0..2) {	698	for my $x (0..2) {
635	for my $y (0 .. 2) {	699	for my $y (0 .. 2) {
636	$table->add ($x + 3, $y,	700	$table->add ($x + 3, $y,
637	new CFClient::UI::Entry	701	new CFPlus::UI::Entry
638	text => $default_smooth[$x * 3 + $y],	702	text => $default_smooth[$x * 3 + $y],
639	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },	703	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
640	);	704	);
641	}	705	}
642	}	706	}
643		707
		708	$table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
644		709
645	$table	710	$table
646	}	711	}
647		712
648	sub stats_window {	713	sub stats_window {
		714	my $r = new CFPlus::UI::ScrolledWindow (
		715	expand => 1,
		716	scroll_y => 1
		717	);
649	my $vb = new CFClient::UI::VBox;	718	$r->add (my $vb = new CFPlus::UI::VBox);
650		719
		720	$vb->add (new CFPlus::UI::FancyFrame
		721	label => "Player",
		722	child => (my $pi = new CFPlus::UI::VBox),
		723	);
		724
651	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	725	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
652	can_hover => 1, can_events => 1,	726	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.");	727	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,	728	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
655	can_hover => 1, can_events => 1,	729	can_hover => 1, can_events => 1,
656	tooltip => "The map you are currently on (if supported by the server).");	730	tooltip => "The map you are currently on (if supported by the server).");
657		731
658	$vb->add (my $hb0 = new CFClient::UI::HBox);	732	$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,	733	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
660	can_hover => 1, can_events => 1,	734	can_hover => 1, can_events => 1,
661	tooltip => "The weight of the player including all inventory items.");	735	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,	736	$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,	737	can_hover => 1, can_events => 1,
664	tooltip => "The weight limit: you cannot carry more than this.");	738	tooltip => "The weight limit: you cannot carry more than this.");
665		739
666		740	$vb->add (new CFPlus::UI::FancyFrame
		741	label => "Primary/Secondary Statistics",
667	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	742	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		743	);
668	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	744	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
669		745
670	my $color2 = [1, 1, 0];	746	my $color2 = [1, 1, 0];
671		747
672	for (	748	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"],	749	[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"],	750	[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"],	751	[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"],	752	[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"],	753	[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"],	754	[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."],	755	[0, 6, st_cha => "Cha", 30],
680		756
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."],	757	[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."],	758	[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."],	759	[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."],	760	[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."],	761	[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."],	762	[2, 5, st_wspd => "WSp", 10.54],
687	) {	763	) {
688	my ($col, $row, $id, $label, $template, $tooltip) = @$_;	764	my ($col, $row, $id, $label, $template) = @$_;
689		765
690	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	766	$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);	767	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
		768	align => +1, template => $template, tooltip => "#stat_$label");
692	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	769	$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);	770	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
		771	align => -1, text => $label, tooltip => "#stat_$label");
694	}	772	}
695		773
		774	$vb->add (new CFPlus::UI::FancyFrame
		775	label => "Resistancies",
696	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	776	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		777	);
697		778
698	my $row = 0;	779	my $row = 0;
699	my $col = 0;	780	my $col = 0;
700		781
701	my %resist_names = (	782	my %resist_names = (
…		…
740	drain acid pois para deat phys	821	drain acid pois para deat phys
741	blind fear tund elec cold ghit/)	822	blind fear tund elec cold ghit/)
742	{	823	{
743	$tbl2->add ($col, $row,	824	$tbl2->add ($col, $row,
744	$STATWIDS->{"res_$_"} =	825	$STATWIDS->{"res_$_"} =
745	new CFClient::UI::Label	826	new CFPlus::UI::Label
746	font => $FONT_FIXED,	827	font => $FONT_FIXED,
747	template => "-100%",	828	template => "-100%",
748	align => +1,	829	align => +1,
749	valign => 0,	830	valign => 0,
750	can_events => 1,	831	can_events => 1,
751	can_hover => 1,	832	can_hover => 1,
752	tooltip => $resist_names{$_}->[1],	833	tooltip => $resist_names{$_}->[1],
753	);	834	);
754	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	835	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
755	font => $FONT_FIXED,	836	font => $FONT_FIXED,
756	can_hover => 1,	837	can_hover => 1,
757	can_events => 1,	838	can_events => 1,
758	path => "ui/resist/resist_$_.png",	839	path => "ui/resist/resist_$_.png",
759	tooltip => $resist_names{$_}->[1],	840	tooltip => $resist_names{$_}->[1],
760	);	841	);
761	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	842	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
762	text => $resist_names{$_}->[0],	843	text => $resist_names{$_}->[0],
763	font => $FONT_FIXED,	844	font => $FONT_FIXED,
764	can_hover => 1,	845	can_hover => 1,
765	can_events => 1,	846	can_events => 1,
766	tooltip => $resist_names{$_}->[1],	847	tooltip => $resist_names{$_}->[1],
…		…
773	}	854	}
774	}	855	}
775		856
776	#update_stats_window ({});	857	#update_stats_window ({});
777		858
778	$vb	859	$r
779	}	860	}
780		861
781	sub skill_window {	862	sub skill_window {
		863	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]	864	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
		865	$sw
783	}	866	}
784		867
785	sub formsep($) {	868	sub formsep($) {
786	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	869	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
787	}	870	}
…		…
797	return if $METASERVER_ATIME > time;	880	return if $METASERVER_ATIME > time;
798	$METASERVER_ATIME = time + 60;	881	$METASERVER_ATIME = time + 60;
799		882
800	my $table = $METASERVER->{table};	883	my $table = $METASERVER->{table};
801	$table->clear;	884	$table->clear;
802	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	885	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
803		886
804	my $buf;	887	my $ok = 0;
805		888
806	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	889	CFPlus::background {
		890	my $ua = CFPlus::lwp_useragent;
807		891
808	unless ($fh) {	892	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
809	$label->set_text ("unable to contact metaserver: $!");	893	} sub {
810	return;	894	my ($msg) = @_;
811	}	895	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;	896	$table->clear;
826		897
827	my @tip = (	898	my @tip = (
828	"The current number of users logged in on the server.",	899	"The current number of users logged in on the server.",
829	"The hostname of the server.",	900	"The hostname of the server.",
830	"The time this server has been running without being restarted.",	901	"The time this server has been running without being restarted.",
831	"The server software version - a '+' indicates a Crossfire+ server.",	902	"The server software version - a '+' indicates a Crossfire+ server.",
832	"Short information about this server provided by its admins.",	903	"Short information about this server provided by its admins.",
833	);	904	);
834	my @col = qw(#Users Host Uptime Version Description);	905	my @col = qw(#Users Host Uptime Version Description);
835	$table->add ($_, 0, new CFClient::UI::Label	906	$table->add ($_, 0, new CFPlus::UI::Label
836	can_hover => 1, can_events => 1,	907	can_hover => 1, can_events => 1,
837	align => 0, fg => [1, 1, 0],	908	align => 0, fg => [1, 1, 0],
838	text => $col[$_], tooltip => $tip[$_])	909	text => $col[$_], tooltip => $tip[$_])
839	for 0 .. $#col;	910	for 0 .. $#col;
840		911
841	my @align = qw(1 0 1 1 -1);	912	my @align = qw(1 0 1 1 -1);
842		913
843	my $y = 0;	914	my $y = 0;
844	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	915	for my $m (@{ $msg->{servers} }) {
845	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	916	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
		917	@$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
846		918
847	for ($desc) {	919	for ($desc) {
848	s/<br>/\n/gi;	920	s/<br>/\n/gi;
849	s/<li>/\n· /gi;	921	s/<li>/\n· /gi;
850	s/<.*?>//sgi;	922	s/<.*?>//sgi;
851	s/&/&amp;/g;	923	s/&amp;/&/g;
852	s/</&lt;/g;	924	s/&lt;/</g;
853	s/>/&gt;/g;	925	s/&gt;/>/g;
854	}	926	}
855		927
856	$uptime = sprintf "%dd %02d:%02d:%02d",	928	$uptime = sprintf "%dd %02d:%02d:%02d",
857	(int $m->[8] / 86400),	929	(int $uptime / 86400),
858	(int $m->[8] / 3600) % 24,	930	(int $uptime / 3600) % 24,
859	(int $m->[8] / 60) % 60,	931	(int $uptime / 60) % 60,
860	$m->[8] % 60;	932	$uptime % 60;
861		933
862	$m = [$users, $host, $uptime, $version, $desc];	934	$m = [$users, $host, $uptime, $version, $desc];
863		935
864	$y++;	936	$y++;
865		937
866	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	938	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
867	(new CFClient::UI::Button	939	(new CFPlus::UI::Button
868	text => "Use",	940	text => "Use",
869	tooltip => "Put this server into the <b>Host:Port</b> field",	941	tooltip => "Put this server into the <b>Host:Port</b> field",
870	on_activate => sub {	942	on_activate => sub {
871	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	943	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
872	$METASERVER->hide;	944	$METASERVER->hide;
873	0	945	0
874	},	946	},
875	),	947	),
876	(new CFClient::UI::Empty expand => 1),	948	(new CFPlus::UI::Empty expand => 1),
877	]);	949	]);
878		950
879	$table->add ($_, $y, new CFClient::UI::Label	951	$table->add ($_, $y, new CFPlus::UI::Label
		952	max_w => $::WIDTH * 0.4,
880	ellipsise => 0,	953	ellipsise => 0,
881	align => $align[$_],	954	align => $align[$_],
882	text => $m->[$_],	955	text => $m->[$_],
883	tooltip => $tip[$_],	956	tooltip => $tip[$_],
		957	fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
884	can_hover => 1,	958	can_hover => 1,
885	can_events => 1,	959	can_events => 1,
886	fontsize => 0.8)	960	fontsize => 0.8)
887	for 0 .. $#$m;	961	for 0 .. $#$m;
888	}	962	}
		963	} else {
		964	$ok or $label->set_text ("error while contacting metaserver");
889	}	965	}
890	});	966	};
		967
891	}	968	}
892		969
893	sub metaserver_dialog {	970	sub metaserver_dialog {
894	my $vbox = new CFClient::UI::VBox;	971	my $vbox = new CFPlus::UI::VBox;
895	my $table = new CFClient::UI::Table;	972	my $table = new CFPlus::UI::Table;
896	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	973	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
897		974
898	my $dialog = new CFClient::UI::FancyFrame	975	my $dialog = new CFPlus::UI::Toplevel
899	title => "Server List",	976	title => "Server List",
900	name => 'metaserver_dialog',	977	name => 'metaserver_dialog',
901	x => 'center',	978	x => 'center',
902	y => 'center',	979	y => 'center',
903	z => 3,	980	z => 3,
		981	force_w => $::WIDTH * 0.9,
904	force_h => $::HEIGHT * 0.4,	982	force_h => $::HEIGHT * 0.7,
905	child => $vbox,	983	child => $vbox,
906	has_close_button => 1,	984	has_close_button => 1,
907	table => $table,	985	table => $table,
908	on_visibility_change => sub {	986	on_visibility_change => sub {
909	update_metaserver ($_[0]) if $_[1];	987	update_metaserver ($_[0]) if $_[1];
…		…
913		991
914	$dialog	992	$dialog
915	}	993	}
916		994
917	sub server_setup {	995	sub server_setup {
918	my $vbox = new CFClient::UI::VBox;	996	my $vbox = new CFPlus::UI::VBox;
919		997
		998	$vbox->add (new CFPlus::UI::FancyFrame
		999	label => "Connection Settings",
920	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	1000	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		1001	);
921	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	1002	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
922		1003
923	{	1004	{
924	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	1005	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
925		1006
926	$vbox->add (	1007	$vbox->add (
927	$HOST_ENTRY = new CFClient::UI::Entry	1008	$HOST_ENTRY = new CFPlus::UI::Entry
928	expand => 1,	1009	expand => 1,
929	text => $CFG->{profile}{default}{host},	1010	text => $CFG->{profile}{default}{host},
930	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	1011	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
931	on_changed => sub {	1012	on_changed => sub {
932	my ($self, $value) = @_;	1013	my ($self, $value) = @_;
933	$CFG->{profile}{default}{host} = $value;	1014	$CFG->{profile}{default}{host} = $value;
934	0	1015	0
935	}	1016	}
936	);	1017	);
937		1018
938	$vbox->add (new CFClient::UI::Button	1019	$vbox->add (new CFPlus::UI::Button
939	expand => 1,	1020	expand => 1,
940	text => "Server List",	1021	text => "Server List",
941	other => $METASERVER,	1022	other => $METASERVER,
942	tooltip => "Show a list of available crossfire servers",	1023	tooltip => "Show a list of available crossfire servers",
943	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1024	on_activate => sub { $METASERVER->toggle_visibility; 0 },
944	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1025	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
945	);	1026	);
946	}	1027	}
947		1028
948	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	1029	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
949	$table->add (1, 4, new CFClient::UI::Entry	1030	$table->add (1, 4, new CFPlus::UI::Entry
950	text => $CFG->{profile}{default}{user},	1031	text => $CFG->{profile}{default}{user},
951	tooltip => "The name of your character on the server",	1032	tooltip => "The name of your character on the server",
952	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1033	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
953	);	1034	);
954		1035
955	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1036	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
956	$table->add (1, 5, new CFClient::UI::Entry	1037	$table->add (1, 5, new CFPlus::UI::Entry
957	text => $CFG->{profile}{default}{password},	1038	text => $CFG->{profile}{default}{password},
958	hidden => 1,	1039	hidden => 1,
959	tooltip => "The password for your character",	1040	tooltip => "The password for your character",
960	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1041	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
961	);	1042	);
962		1043
963	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1044	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
964	$table->add (1, 7, new CFClient::UI::Slider	1045	$table->add (1, 7, new CFPlus::UI::Slider
965	force_w => 100,	1046	force_w => 100,
966	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1047	range => [$CFG->{mapsize}, 10, 100, 0, 1],
967	tooltip => "This is the size of the portion of the map update the server sends you. "	1048	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, "	1049	. "If you set this to a high value you will be able to see further, "
969	. "but you also increase bandwidth requirements and latency. "	1050	. "but you also increase bandwidth requirements and latency. "
970	. "This option is only used once at log-in.",	1051	. "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 },	1052	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
972	);	1053	);
973		1054
974	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1055	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
975	$table->add (1, 8, new CFClient::UI::CheckBox	1056	$table->add (1, 8, new CFPlus::UI::CheckBox
976	state => $CFG->{face_prefetch},	1057	state => $CFG->{face_prefetch},
977	tooltip => "<b>Background Image Prefetch</b>\n\n"	1058	tooltip => "<b>Background Image Prefetch</b>\n\n"
978	. "If enabled, the client automatically pre-fetches images from the server. "	1059	. "If enabled, the client automatically pre-fetches images from the server. "
979	. "This might increase or create lag, but increases the chances "	1060	. "This might increase or create lag, but increases the chances "
980	. "of faces being ready for display when you encounter them. "	1061	. "of faces being ready for display when you encounter them. "
…		…
982	. "so only set it if you really need to prefetch images. "	1063	. "so only set it if you really need to prefetch images. "
983	. "This option can be set and unset any time.",	1064	. "This option can be set and unset any time.",
984	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1065	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
985	);	1066	);
986		1067
		1068	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
		1069	$table->add (1, 9, new CFPlus::UI::Entry
		1070	text => $CFG->{output_rate},
		1071	tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
		1072	. "when sending images, to ensure interactiveness. When 0 or unset, the server "
		1073	. "default will be used, which is usually around 100kb/s.",
		1074	on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
		1075	);
		1076
987	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1077	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
988	$table->add (1, 9, new CFClient::UI::Entry	1078	$table->add (1, 10, new CFPlus::UI::Entry
989	text => $CFG->{output_count},	1079	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.",	1080	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 },	1081	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
992	);	1082	);
993		1083
994	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1084	$table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
995	$table->add (1, 10, new CFClient::UI::Entry	1085	$table->add (1, 11, new CFPlus::UI::Entry
996	text => $CFG->{output_sync},	1086	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.",	1087	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 },	1088	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
999	);	1089	);
1000		1090
1001	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1091	$table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1002	expand => 1,	1092	expand => 1,
1003	align => 0,	1093	align => 0,
1004	text => "Login",	1094	text => "Login",
1005	on_activate => sub {	1095	on_activate => sub {
1006	$CONN ? stop_game	1096	$CONN ? stop_game
1007	: start_game;	1097	: start_game;
1008	0	1098	0
1009	},	1099	},
1010	);	1100	);
1011		1101
1012	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1102	$table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1013	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1103	$table->add (1, 13, my $saycmd = new CFPlus::UI::Entry
1014	text => $CFG->{say_command},	1104	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. "	1105	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. "	1106	. "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.",	1107	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1018	on_changed => sub {	1108	on_changed => sub {
1019	my ($self, $value) = @_;	1109	my ($self, $value) = @_;
1020	$CFG->{say_command} = $value;	1110	$CFG->{say_command} = $value;
1021	0	1111	0
1022	}	1112	}
1023	);	1113	);
1024		1114
		1115	$table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
		1116	$table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox
		1117	state => $CFG->{show_tips},
		1118	tooltip => "Show the <b>Tip of the day</b> window at startup?",
		1119	on_changed => sub {
		1120	my ($self, $value) = @_;
		1121	$CFG->{show_tips} = $value;
		1122	0
		1123	}
		1124	);
		1125
1025	$vbox->add (new CFClient::UI::Label	1126	$vbox->add (new CFPlus::UI::FancyFrame
1026	text => "Server Info",	1127	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);	1128	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1129	);
1033		1130
1034	$vbox	1131	$vbox
1035	}	1132	}
1036		1133
1037	sub message_window {	1134	sub message_window {
1038	my $window = new CFClient::UI::FancyFrame	1135	my $window = new CFPlus::UI::Toplevel
1039	name => "message_window",	1136	name => "message_window",
1040	title => "Messages",	1137	title => "Messages",
1041	border_bg => [1, 1, 1, 1],	1138	border_bg => [1, 1, 1, 1],
1042	x => "max",	1139	x => "max",
1043	y => 0,	1140	y => 0,
1044	force_w => $::WIDTH * 0.4,	1141	force_w => $::WIDTH * 0.4,
1045	force_h => $::HEIGHT * 0.5,	1142	force_h => $::HEIGHT * 0.5,
1046	child => (my $vbox = new CFClient::UI::VBox),	1143	child => (my $vbox = new CFPlus::UI::VBox),
1047	has_close_button => 1;	1144	has_close_button => 1;
1048		1145
1049	$vbox->add ($LOGVIEW);	1146	$vbox->add ($LOGVIEW);
1050		1147
1051	$vbox->add (my $input = new CFClient::UI::Entry	1148	$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> "	1149	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>...). "	1150	. "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). "	1151	. "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.",	1152	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1056	on_focus_in => sub {	1153	on_focus_in => sub {
…		…
1095	};	1192	};
1096		1193
1097	$window	1194	$window
1098	}	1195	}
1099		1196
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 {	1197	sub autopickup_setup {
1133	my $table = new CFClient::UI::Table;	1198	my $table = new CFPlus::UI::Table;
1134		1199
1135	for (	1200	for (
1136	["General", 0, 0,	1201	["General", 0, 0,
1137	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1202	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1138	["Inhibit autopickup" => PICKUP_INHIBIT],	1203	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1152	["Boots" => PICKUP_BOOTS],	1217	["Boots" => PICKUP_BOOTS],
1153	["Gloves" => PICKUP_GLOVES],	1218	["Gloves" => PICKUP_GLOVES],
1154	["Cloaks" => PICKUP_CLOAK],	1219	["Cloaks" => PICKUP_CLOAK],
1155	],	1220	],
1156		1221
1157	["Readables", 2, 2,	1222	["Readables", 2, 0,
1158	["Spellbooks" => PICKUP_SPELLBOOK],	1223	["Spellbooks" => PICKUP_SPELLBOOK],
1159	["Skillscrolls" => PICKUP_SKILLSCROLL],	1224	["Skillscrolls" => PICKUP_SKILLSCROLL],
1160	["Normal Books/Scrolls" => PICKUP_READABLES],	1225	["Normal Books/Scrolls" => PICKUP_READABLES],
1161	],	1226	],
1162	["Misc", 2, 7,	1227	["Misc", 2, 5,
1163	["Food" => PICKUP_FOOD],	1228	["Food" => PICKUP_FOOD],
1164	["Drinks" => PICKUP_DRINK],	1229	["Drinks" => PICKUP_DRINK],
1165	["Valuables (Money, Gems)" => PICKUP_VALUABLES],	1230	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1166	["Keys" => PICKUP_KEY],	1231	["Keys" => PICKUP_KEY],
1167	["Magical Items" => PICKUP_MAGICAL],	1232	["Magical Items" => PICKUP_MAGICAL],
1168	["Potions" => PICKUP_POTION],	1233	["Potions" => PICKUP_POTION],
1169	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1234	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1170	["Ignore cursed" => PICKUP_NOT_CURSED],	1235	["Ignore cursed" => PICKUP_NOT_CURSED],
1171	["Jewelery" => PICKUP_JEWELS],	1236	["Jewelery" => PICKUP_JEWELS],
		1237	["Flesh" => PICKUP_FLESH],
1172	],	1238	],
1173	["Weight/Value ratio", 2, 17]	1239	["Weight/Value ratio", 2, 17]
1174	)	1240	)
1175	{	1241	{
1176	my ($title, $x, $y, @bits) = @$_;	1242	my ($title, $x, $y, @bits) = @$_;
1177	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1243	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1178		1244
1179	for (@bits) {	1245	for (@bits) {
1180	++$y;	1246	++$y;
1181		1247
1182	my $mask = $_->[1];	1248	my $mask = $_->[1];
1183	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1249	$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	1250	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1185	state => $::CFG->{pickup} & $mask,	1251	state => $::CFG->{pickup} & $mask,
1186	on_changed => sub {	1252	on_changed => sub {
1187	my ($box, $value) = @_;	1253	my ($box, $value) = @_;
1188		1254
1189	if ($value) {	1255	if ($value) {
…		…
1200		1266
1201	${$_->[2]} = $checkbox if $_->[2];	1267	${$_->[2]} = $checkbox if $_->[2];
1202	}	1268	}
1203	}	1269	}
1204		1270
1205	$table->add (2, 18, new CFClient::UI::ValSlider	1271	$table->add (2, 18, new CFPlus::UI::ValSlider
1206	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1272	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1207	template => ">= 99",	1273	template => ">= 99",
1208	to_value => sub { ">= " . 5 * $_[0] },	1274	to_value => sub { ">= " . 5 * $_[0] },
1209	on_changed => sub {	1275	on_changed => sub {
1210	my ($slider, $value) = @_;	1276	my ($slider, $value) = @_;
…		…
1213	$::CFG->{pickup} |= int $value	1279	$::CFG->{pickup} |= int $value
1214	if $value;	1280	if $value;
1215	1;	1281	1;
1216	});	1282	});
1217		1283
1218	$table->add (3, 18, new CFClient::UI::Button	1284	$table->add (3, 18, new CFPlus::UI::Button
1219	text => "set",	1285	text => "set",
1220	on_activate => sub {	1286	on_activate => sub {
1221	$::CONN->send_command ("pickup $::CFG->{pickup}")	1287	$::CONN->send_command ("pickup $::CFG->{pickup}")
1222	if defined $::CONN;	1288	if defined $::CONN;
1223	0	1289	0
1224	});	1290	});
1225		1291
1226	$table	1292	$table
1227	}	1293	}
1228		1294
		1295	my %SORT_ORDER = (
		1296	type => undef,
		1297	mtime => sub {
		1298	my $NOW = time;
		1299	sort {
		1300	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1301	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1302
		1303	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1304	or $btime <=> $atime
		1305	or $a->{type} <=> $b->{type}
		1306	} @_
		1307	},
		1308	weight => sub { sort {
		1309	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1310	or $a->{type} <=> $b->{type}
		1311	} @_ },
		1312	);
		1313
1229	sub inventory_widget {	1314	sub inventory_widget {
1230	my $hb = new CFClient::UI::HBox homogeneous => 1;	1315	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1231		1316
1232	$hb->add (my $vb1 = new CFClient::UI::VBox);	1317	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1233	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1318	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
		1319
		1320	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
		1321
		1322	use sort 'stable';
		1323
		1324	$hb1->add (new CFPlus::UI::Selector
		1325	value => $::CFG->{inv_sort},
		1326	options => [
		1327	[type => "Type/Name"],
		1328	[mtime => "Recent/Normal/Locked"],
		1329	[weight => "Weight/Type"],
		1330	],
		1331	on_changed => sub {
		1332	$::CFG->{inv_sort} = $_[1];
		1333	$INV->set_sort_order ($SORT_ORDER{$_[1]});
		1334	},
		1335	);
		1336	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
		1337	#TODO# update to weigh/maxweight
		1338	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
		1339
		1340	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1234	$vb1->add ($INV = new CFClient::UI::Inventory);	1341	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1342	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1235		1343
1236	$hb->add (my $vb2 = new CFClient::UI::VBox);	1344	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1237		1345
1238	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1346	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1239		1347
		1348	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1240	$vb2->add ($INVR = new CFClient::UI::Inventory);	1349	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1241		1350
1242	# XXX: Call after $INVR = ... because set_opencont sets the items	1351	# XXX: Call after $INVR = ... because set_opencont sets the items
1243	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1352	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1244		1353
1245	$hb	1354	$hb
1246	}	1355	}
1247		1356
1248	sub toggle_player_page {	1357	sub toggle_player_page {
…		…
1255	$PL_WINDOW->show;	1364	$PL_WINDOW->show;
1256	}	1365	}
1257	}	1366	}
1258		1367
1259	sub player_window {	1368	sub player_window {
1260	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1369	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1261	x => "center",	1370	x => "center",
1262	y => "center",	1371	y => "center",
1263	force_w => $WIDTH * 9/10,	1372	force_w => $WIDTH * 9/10,
1264	force_h => $HEIGHT * 9/10,	1373	force_h => $HEIGHT * 9/10,
1265	title => "Player",	1374	title => "Player",
…		…
1267	has_close_button => 1	1376	has_close_button => 1
1268	;	1377	;
1269		1378
1270	my $ntb =	1379	my $ntb =
1271	$PL_NOTEBOOK =	1380	$PL_NOTEBOOK =
1272	new CFClient::UI::Notebook	1381	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		1382
1278	$ntb->add (	1383	$ntb->add (
1279	"Statistics (F2)" => $STATS_PAGE = stats_window,	1384	"Statistics (F2)" => $STATS_PAGE = stats_window,
1280	"Shows statistics, where all your Stats and Resistances are shown."	1385	"Shows statistics, where all your Stats and Resistances are shown."
1281	);	1386	);
1282	$ntb->add (	1387	$ntb->add (
1283	"Skills (F3)" => $SKILL_PAGE = skill_window,	1388	"Skills (F3)" => $SKILL_PAGE = skill_window,
1284	"Shows all your Skills."	1389	"Shows all your Skills."
1285	);	1390	);
		1391
		1392	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
		1393	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1286	$ntb->add (	1394	$ntb->add (
1287	"Spellbook (F4)" => $SPELL_PAGE = new CFClient::UI::SpellList,	1395	"Spellbook (F4)" => $spellsw,
1288	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1396	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1289	);	1397	);
1290	$ntb->add (	1398	$ntb->add (
1291	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1399	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1292	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1400	"Toggles the inventory window, where you can manage your loot (or treasures :). "
…		…
1297		1405
1298	$plwin->add ($ntb);	1406	$plwin->add ($ntb);
1299	$plwin	1407	$plwin
1300	}	1408	}
1301		1409
1302	sub update_bindings {
1303	$BIND_UPD_CB->() if $BIND_UPD_CB;
1304	}
1305
1306	sub keyboard_setup {	1410	sub keyboard_setup {
1307	my $binding_list = new CFClient::UI::VBox;	1411	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	}	1412	}
1413		1413
1414	sub help_window {	1414	sub help_window {
1415	my $win = new CFClient::UI::FancyFrame	1415	my $win = new CFPlus::UI::Toplevel
1416	x => 'center',	1416	x => 'center',
1417	y => 'center',	1417	y => 'center',
1418	z => 2,	1418	z => 4,
1419	name => 'doc_browser',	1419	name => 'doc_browser',
1420	force_w => int $WIDTH * 7/8,	1420	force_w => int $WIDTH * 7/8,
1421	force_h => int $HEIGHT * 7/8,	1421	force_h => int $HEIGHT * 7/8,
1422	title => "Help Browser",	1422	title => "Help Browser",
1423	has_close_button => 1;	1423	has_close_button => 1;
1424		1424
1425	$win->add (my $vbox = new CFClient::UI::VBox);	1425	$win->add (my $vbox = new CFPlus::UI::VBox);
1426		1426
1427	$vbox->add (my $buttons = new CFClient::UI::HBox);	1427	$vbox->add (new CFPlus::UI::FancyFrame
		1428	label => "Navigation",
		1429	child => (my $buttons = new CFPlus::UI::HBox),
		1430	);
1428	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1431	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1429	expand => 1, fontsize => 0.8, padding_x => 4);	1432	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1430		1433
1431	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1434	my @history;
1432	$buttons->add (my $combo = new CFClient::UI::Combobox	1435	my @future;
1433	value => undef,	1436	my $curnode;
1434	options => [	1437
1435	[intro => "Introduction"],	1438	my $load_node; $load_node = sub {
1436	[manual => "Main Manual"],	1439	my ($node, $para) = @_;
1437	[skill_help => "Skill Reference"],	1440
1438	[command_help => "Command Reference"],	1441	$buttons->clear;
1439	[dmcommand_help => "DM Commands"],	1442
1440	[COPYING => "License Terms"],	1443	$buttons->add (new CFPlus::UI::Button
		1444	text => "⇤",
		1445	tooltip => "back to the starting page",
		1446	on_activate => sub {
		1447	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1448	unshift @future, @history;
		1449	@history = ();
		1450	$load_node->(@{shift @future});
		1451	},
		1452	);
		1453
		1454	if (@history) {
		1455	$buttons->add (new CFPlus::UI::Button
		1456	text => "⋘",
		1457	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1458	on_activate => sub {
		1459	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1460	$load_node->(@{pop @history});
		1461	},
		1462	);
1441	],	1463	}
1442	on_changed => sub {
1443	my ($self, $pod) = @_;
1444		1464
1445	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",	1465	if (@future) {
1446	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };	1466	$buttons->add (new CFPlus::UI::Button
		1467	text => "⋙",
		1468	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1469	on_activate => sub {
		1470	push @history, [$curnode, $viewer->current_paragraph];
		1471	$load_node->(@{shift @future});
		1472	},
		1473	);
		1474	}
1447		1475
		1476	$buttons->add (new CFPlus::UI::Label text => " ");
		1477
		1478	my @path = CFPlus::Pod::full_path_of $node;
		1479	pop @path; # drop current node
		1480
		1481	for my $node (@path) {
		1482	$buttons->add (new CFPlus::UI::Button
		1483	text => $node->{kw}[0],
		1484	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1485	on_activate => sub {
		1486	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1487	$load_node->($node);
		1488	},
		1489	);
		1490	$buttons->add (new CFPlus::UI::Label text => "/");
		1491	}
		1492
		1493	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1494
		1495	$curnode = $node;
		1496
1448	$viewer->clear;	1497	$viewer->clear;
		1498	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1499	$viewer->scroll_to ($para);
		1500	};
1449		1501
1450	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",	1502	$load_node->(CFPlus::Pod::find pod => "mainpage");
1451	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),	1503
1452	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),	1504	$CFPlus::Pod::goto_document = sub {
1453	# ]);#d#	1505	my (@path) = @_;
		1506
		1507	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1508
		1509	$load_node->((CFPlus::Pod::find @path)[0]);
		1510	$win->show;
		1511	};
		1512
		1513	$win
		1514	}
		1515
		1516	sub open_string_query {
		1517	my ($title, $cb, $txt, $tooltip) = @_;
		1518	my $dialog = new CFPlus::UI::Toplevel
		1519	x => "center",
		1520	y => "center",
		1521	z => 50,
		1522	force_w => $WIDTH * 4/5,
		1523	title => $title;
		1524
		1525	$dialog->add (
		1526	my $e = new CFPlus::UI::Entry
		1527	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1528	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1529	tooltip => $tooltip
		1530	);
		1531
		1532	$e->grab_focus;
		1533	$e->set_text ($txt) if $txt;
		1534	$dialog->show;
		1535	}
		1536
		1537	sub open_quit_dialog {
		1538	unless ($QUIT_DIALOG) {
		1539	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1540	x => "center",
		1541	y => "center",
		1542	z => 50,
		1543	title => "Really Quit?",
		1544	on_key_down => sub {
		1545	my ($dialog, $ev) = @_;
		1546	$ev->{sym} == 27 and $dialog->hide;
1454		1547	}
1455	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1548	;
1456	for @$pom;
1457		1549
1458	$viewer->set_offset (0);	1550	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1459		1551
1460	0	1552	$vb->add (new CFPlus::UI::Label
		1553	text => "You should find a savebed and apply it first!",
		1554	max_w => $WIDTH * 0.25,
		1555	ellipsize => 0,
		1556	);
		1557	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1558	$hb->add (new CFPlus::UI::Button
		1559	text => "Ok",
		1560	expand => 1,
		1561	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1562	);
		1563	$hb->add (new CFPlus::UI::Button
		1564	text => "Quit anyway",
		1565	expand => 1,
		1566	on_activate => sub { exit },
		1567	);
		1568	}
		1569
		1570	$QUIT_DIALOG->show;
		1571	$QUIT_DIALOG->grab_focus;
		1572	}
		1573
		1574	sub show_tip_of_the_day {
		1575	# find all tips
		1576	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
		1577
		1578	my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
		1579	$todindex = 0 if $todindex >= @tod;
		1580	$CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
		1581
		1582	# create dialog
		1583	my $dialog;
		1584
		1585	my $close = sub {
		1586	$dialog->destroy;
		1587	};
		1588
		1589	$dialog = new CFPlus::UI::Toplevel
		1590	x => "center",
		1591	y => "center",
		1592	z => 3,
		1593	name => 'tip_of_the_day',
		1594	force_w => int $WIDTH * 4/9,
		1595	force_h => int $WIDTH * 2/9,
		1596	title => "Tip of the day #" . (1 + $todindex),
		1597	child => my $vbox = new CFPlus::UI::VBox,
		1598	has_close_button => 1,
		1599	on_delete => $close,
		1600	;
		1601
		1602	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1603	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1604	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1605
		1606	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
		1607
		1608	$table->add (0, 0, new CFPlus::UI::Button
		1609	text => "Close",
		1610	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>.",
		1611	on_activate => $close,
		1612	);
		1613
		1614	$table->add (2, 0, new CFPlus::UI::Button
		1615	text => "Next",
		1616	tooltip => "Show the next <b>Tip of the day</b>.",
		1617	on_activate => sub {
		1618	$close->();
		1619	&show_tip_of_the_day;
1461	},	1620	},
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	);	1621	);
1470		1622
1471	$win	1623	$dialog->show;
1472	}	1624	}
1473		1625
1474	sub sdl_init {	1626	sub sdl_init {
1475	CFClient::SDL_Init	1627	CFPlus::SDL_Init
1476	and die "SDL::Init failed!\n";	1628	and die "SDL::Init failed!\n";
1477	}	1629	}
1478		1630
1479	sub video_init {	1631	sub video_init {
1480	sdl_init;	1632	sdl_init;
…		…
1485		1637
1486	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1638	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1487	$FULLSCREEN = $CFG->{fullscreen};	1639	$FULLSCREEN = $CFG->{fullscreen};
1488	$FAST = $CFG->{fast};	1640	$FAST = $CFG->{fast};
1489		1641
1490	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1642	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1491	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1643	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1492		1644
1493	$SDL_ACTIVE = 1;	1645	$SDL_ACTIVE = 1;
1494	$LAST_REFRESH = time - 0.01;	1646	$LAST_REFRESH = time - 0.01;
1495		1647
1496	CFClient::OpenGL::init;	1648	CFPlus::OpenGL::init;
1497		1649
1498	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1650	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1499		1651
1500	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1652	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1501		1653
1502	#############################################################################	1654	#############################################################################
1503		1655
1504	if ($DEBUG_STATUS) {	1656	if ($DEBUG_STATUS) {
1505	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1657	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1506	} else {	1658	} else {
1507	# create the widgets	1659	# create the widgets
1508		1660
1509	$DEBUG_STATUS = new CFClient::UI::Label	1661	$DEBUG_STATUS = new CFPlus::UI::Label
1510	padding => 0,	1662	padding => 0,
1511	z => 100,	1663	z => 100,
1512	force_x => "max",	1664	force_x => "max",
1513	force_y => 0;	1665	force_y => 0;
1514	$DEBUG_STATUS->show;	1666	$DEBUG_STATUS->show;
1515		1667
1516	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1517
1518	$STATUSBOX = new CFClient::UI::Statusbox;	1668	$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]);	1669	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1520		1670
1521	(new CFClient::UI::Frame	1671	(new CFPlus::UI::Frame
1522	bg => [0, 0, 0, 0.4],	1672	bg => [0, 0, 0, 0.4],
1523	force_x => 0,	1673	force_x => 0,
1524	force_y => "max",	1674	force_y => "max",
1525	child => $STATUSBOX,	1675	child => $STATUSBOX,
1526	)->show;	1676	)->show;
1527		1677
1528	CFClient::UI::FancyFrame->new (	1678	CFPlus::UI::Toplevel->new (
1529	title => "Map",	1679	title => "Map",
1530	name => "mapmap",	1680	name => "mapmap",
1531	x => 0,	1681	x => 0,
1532	y => $FONTSIZE + 8,	1682	y => $FONTSIZE + 8,
1533	border_bg => [1, 1, 1, 192/255],	1683	border_bg => [1, 1, 1, 192/255],
1534	bg => [1, 1, 1, 0],	1684	bg => [1, 1, 1, 0],
1535	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1685	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.",	1686	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1537	),	1687	),
1538	)->show;	1688	)->show;
1539		1689
1540	$MAPWIDGET = new CFClient::MapWidget;	1690	$MAPWIDGET = new CFPlus::MapWidget;
1541	$MAPWIDGET->connect (activate_console => sub {	1691	$MAPWIDGET->connect (activate_console => sub {
1542	my ($mapwidget, $preset) = @_;	1692	my ($mapwidget, $preset) = @_;
1543		1693
1544	if ($CONSOLE) {	1694	if ($CONSOLE) {
1545	$CONSOLE->{input}->{auto_activated} = 1;	1695	$CONSOLE->{input}->{auto_activated} = 1;
…		…
1551	}	1701	}
1552	});	1702	});
1553	$MAPWIDGET->show;	1703	$MAPWIDGET->show;
1554	$MAPWIDGET->grab_focus;	1704	$MAPWIDGET->grab_focus;
1555		1705
1556	$LOGVIEW = new CFClient::UI::TextScroller	1706	$LOGVIEW = new CFPlus::UI::TextScroller
1557	expand => 1,	1707	expand => 1,
1558	font => $FONT_FIXED,	1708	font => $FONT_FIXED,
1559	fontsize => $::CFG->{log_fontsize},	1709	fontsize => $::CFG->{log_fontsize},
1560	indent => -4,	1710	indent => -4,
1561	can_hover => 1,	1711	can_hover => 1,
1562	can_events => 1,	1712	can_events => 1,
1563	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1713	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1564	;	1714	;
1565		1715
1566	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1716	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1567	title => "Setup",	1717	title => "Setup",
1568	name => "setup_dialog",	1718	name => "setup_dialog",
1569	x => 'center',	1719	x => 'center',
1570	y => 'center',	1720	y => 'center',
1571	z => 2,	1721	z => 2,
…		…
1574	has_close_button => 1,	1724	has_close_button => 1,
1575	;	1725	;
1576		1726
1577	$METASERVER = metaserver_dialog;	1727	$METASERVER = metaserver_dialog;
1578		1728
1579	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1729	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1580	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1730	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1581		1731
1582	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1732	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1583	"Configure the server to play on, your username, password and other server-related options.");	1733	"Configure the server to play on, your username, password and other server-related options.");
1584	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1734	$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.");	1735	"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 "	1745	. "After pressing the combo the binding will be saved automatically and the "
1596	. "binding editor closes");	1746	. "binding editor closes");
1597	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1747	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1598	"Some debuggin' options. Do not ask.");	1748	"Some debuggin' options. Do not ask.");
1599		1749
1600	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1750	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1601		1751
1602	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1752	$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.");	1753	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1604		1754
1605	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1755	$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.");	1756	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1607		1757
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	1758	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		1759
1610	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1760	$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.");	1761	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1612		1762
1613	$BUTTONBAR->add (new CFClient::UI::Button	1763	$BUTTONBAR->add (new CFPlus::UI::Button
1614	text => "Save Config",	1764	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.",	1765	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 {	1766	on_activate => sub {
1617	$::CFG->{layout} = CFClient::UI::get_layout;	1767	$::CFG->{layout} = CFPlus::UI::get_layout;
1618	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1768	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1619	status "Configuration Saved";	1769	status "Configuration Saved";
1620	0	1770	0
1621	},	1771	},
1622	);	1772	);
1623		1773
1624	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	1774	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1625	tooltip => "View Documentation");	1775	tooltip => "View Documentation");
1626		1776
		1777
1627	$BUTTONBAR->add (new CFClient::UI::Button	1778	$BUTTONBAR->add (new CFPlus::UI::Button
1628	text => "Quit",	1779	text => "Quit",
1629	tooltip => "Terminates the program",	1780	tooltip => "Terminates the program",
1630	on_activate => sub {	1781	on_activate => sub {
1631	if ($CONN) {	1782	if ($CONN) {
1632	open_quit_dialog;	1783	open_quit_dialog;
…		…
1642	}	1793	}
1643		1794
1644	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1795	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1645	}	1796	}
1646		1797
		1798	sub setup_build_button {
		1799	my ($enabled) = @_;
		1800	if ($enabled) {
		1801	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1802	$BUILD_BUTTON ||= new CFPlus::UI::Button
		1803	text => "Build",
		1804	tooltip => "Opens the ingame builder",
		1805	on_activate => sub {
		1806	if ($CONN) {
		1807	$CONN->send_ext_req (builder_player_items => sub {
		1808	open_ingame_editor ($_[0]) if exists $_[0]->{items};
		1809	});
		1810	}
		1811	0
		1812	};
		1813	$BUTTONBAR->add ($BUILD_BUTTON);
		1814	} else {
		1815	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1816	}
		1817	}
		1818
		1819	sub open_ingame_editor {
		1820	my ($msg) = @_;
		1821
		1822	my $win = new CFPlus::UI::Toplevel
		1823	x => 0,
		1824	y => 'center',
		1825	z => 4,
		1826	name => 'builder_window',
		1827	force_w => int $WIDTH * 1/4,
		1828	force_h => int $HEIGHT * 3/4,
		1829	title => "In game builder",
		1830	has_close_button => 1;
		1831
		1832	my $r = new CFPlus::UI::ScrolledWindow (
		1833	expand => 1,
		1834	scroll_y => 1
		1835	);
		1836	$r->add (my $vb = new CFPlus::UI::VBox);
		1837	$win->add ($r);
		1838
		1839
		1840	$vb->add (
		1841	new CFPlus::UI::Button
		1842	text => "Disable build mode",
		1843	on_activate => sub { $::IN_BUILD_MODE = undef }
		1844	);
		1845	$vb->add (
		1846	new CFPlus::UI::Button
		1847	text => "ERASE",
		1848	on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
		1849	);
		1850
		1851	for my $itemarchname (
		1852	sort {
		1853	$msg->{items}->{$a}->{build_arch_name}
		1854	cmp $msg->{items}->{$b}->{build_arch_name}
		1855	} keys %{$msg->{items}}
		1856	) {
		1857	my $info = $msg->{items}->{$itemarchname};
		1858	$vb->add (
		1859	new CFPlus::UI::Button text => $info->{build_arch_name},
		1860	on_activate => sub {
		1861	$::IN_BUILD_MODE = { item => $itemarchname, info => $info };
		1862
		1863	if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
		1864	build_mode_query_arch_info ();
		1865	}
		1866	}
		1867	);
		1868	}
		1869
		1870	$win->show;
		1871	}
		1872
		1873	sub build_mode_query_arch_info {
		1874	my ($iteminfo) = $::IN_BUILD_MODE;
		1875	my $itemarchname = $iteminfo->{item};
		1876	my $info = $iteminfo->{info};
		1877
		1878	my $dialog = new CFPlus::UI::Toplevel
		1879	x => "center",
		1880	y => "center",
		1881	z => 50,
		1882	force_w => int $WIDTH * 1/2,
		1883	title => "Enter information for placement of '$itemarchname'",
		1884	has_close_button => 1;
		1885
		1886	$dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1887
		1888	$vb->add (my $table = new CFPlus::UI::Table expand => 1);
		1889	my $row = 0;
		1890	if ($info->{has_name}) {
		1891	$table->add (0, $row, new CFPlus::UI::Label text => "Name:");
		1892	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
		1893	}
		1894	if ($info->{has_text}) {
		1895	$table->add (0, $row, new CFPlus::UI::Label text => "Text:");
		1896	$table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
		1897	}
		1898	if ($info->{has_connection}) {
		1899	$table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
		1900	$table->add (1, $row++,
		1901	new CFPlus::UI::Entry
		1902	expand => 1,
		1903	on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
		1904	tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
		1905	);
		1906	}
		1907
		1908	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1909	$hb->add (new CFPlus::UI::Button
		1910	text => "Close",
		1911	expand => 1,
		1912	on_activate => sub { $dialog->hide; 0 },
		1913	);
		1914	$dialog->show;
		1915	}
		1916
1647	sub video_shutdown {	1917	sub video_shutdown {
1648	CFClient::OpenGL::shutdown;	1918	CFPlus::OpenGL::shutdown;
1649		1919
1650	undef $SDL_ACTIVE;	1920	undef $SDL_ACTIVE;
1651	}	1921	}
1652		1922
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#	1923	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		1931
1662	sub audio_music_finished {	1932	sub audio_music_finished {
1663	return unless $CFG->{bgm_enable};	1933	return unless $CFG->{bgm_enable};
1664		1934
1665	# TODO: hack, do play loop and mood music	1935	# TODO: hack, do play loop and mood music
1666	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	1936	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1667	$bgmusic->play (0);	1937	$bgmusic->play (0);
1668		1938
1669	push @bgmusic, shift @bgmusic;	1939	push @bgmusic, shift @bgmusic;
1670	}	1940	}
1671		1941
1672	sub audio_init {	1942	sub audio_init {
1673	if ($CFG->{audio_enable}) {	1943	if ($CFG->{audio_enable}) {
1674	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	1944	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1675	$SDL_MIXER = !CFClient::Mix_OpenAudio;	1945	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1676		1946
1677	unless ($SDL_MIXER) {	1947	unless ($SDL_MIXER) {
1678	status "Unable to open sound device: there will be no sound";	1948	status "Unable to open sound device: there will be no sound";
1679	return;	1949	return;
1680	}	1950	}
1681		1951
1682	CFClient::Mix_AllocateChannels 8;	1952	CFPlus::Mix_AllocateChannels 8;
1683	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	1953	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1684		1954
1685	audio_music_finished;	1955	audio_music_finished;
1686		1956
		1957	local $_;
1687	while (<$fh>) {	1958	while (<$fh>) {
1688	next if /^\s*#/;	1959	next if /^\s*#/;
1689	next if /^\s*$/;	1960	next if /^\s*$/;
1690		1961
1691	my ($file, $volume, $event) = split /\s+/, $_, 3;	1962	my ($file, $volume, $event) = split /\s+/, $_, 3;
1692		1963
1693	push @SOUNDS, "$volume,$file";	1964	push @SOUNDS, "$volume,$file";
1694		1965
1695	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	1966	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1696	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	1967	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1697	$chunk->volume ($volume * 128 / 100);	1968	$chunk->volume ($volume * 128 / 100);
1698	$chunk	1969	$chunk
1699	};	1970	};
1700	}	1971	}
1701	} else {	1972	} else {
…		…
1703	}	1974	}
1704	}	1975	}
1705	}	1976	}
1706		1977
1707	sub audio_shutdown {	1978	sub audio_shutdown {
1708	CFClient::Mix_CloseAudio if $SDL_MIXER;	1979	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1709	undef $SDL_MIXER;	1980	undef $SDL_MIXER;
1710	@SOUNDS = ();	1981	@SOUNDS = ();
1711	%AUDIO_CHUNKS = ();	1982	%AUDIO_CHUNKS = ();
1712	}	1983	}
1713		1984
…		…
1720		1991
1721	sub force_refresh {	1992	sub force_refresh {
1722	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	1993	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1723	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	1994	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1724		1995
1725	$CFClient::UI::ROOT->draw;	1996	$CFPlus::UI::ROOT->draw;
1726		1997
1727	$WANT_REFRESH = 0;	1998	$WANT_REFRESH = 0;
1728	$CAN_REFRESH = 0;	1999	$CAN_REFRESH = 0;
1729	$LAST_REFRESH = $NOW;	2000	$LAST_REFRESH = $NOW;
1730		2001
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;	2002	CFPlus::SDL_GL_SwapBuffers;
1786	}	2003	}
1787		2004
1788	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2005	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1789	$NOW = time;	2006	$NOW = time;
1790		2007
1791	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2008	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1792	for CFClient::SDL_PollEvent;	2009	for CFPlus::SDL_PollEvent;
1793		2010
1794	if (%animate_object) {	2011	if (%animate_object) {
1795	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2012	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1796	$WANT_REFRESH++;	2013	$WANT_REFRESH++;
1797	}	2014	}
…		…
1821	$CONN->face_prefetch	2038	$CONN->face_prefetch
1822	if $CONN;	2039	if $CONN;
1823	});	2040	});
1824		2041
1825	%SDL_CB = (	2042	%SDL_CB = (
1826	CFClient::SDL_QUIT => sub {	2043	CFPlus::SDL_QUIT => sub {
1827	Event::unloop -1;	2044	Event::unloop -1;
1828	},	2045	},
1829	CFClient::SDL_VIDEORESIZE => sub {	2046	CFPlus::SDL_VIDEORESIZE => sub {
1830	},	2047	},
1831	CFClient::SDL_VIDEOEXPOSE => sub {	2048	CFPlus::SDL_VIDEOEXPOSE => sub {
1832	CFClient::UI::full_refresh;	2049	CFPlus::UI::full_refresh;
1833	},	2050	},
1834	CFClient::SDL_ACTIVEEVENT => sub {	2051	CFPlus::SDL_ACTIVEEVENT => sub {
1835	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2052	# not useful, as APPACTIVE include sonly iconified state, not unmapped
		2053	# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
		2054	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
		2055	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
		2056	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1836	},	2057	},
1837	CFClient::SDL_KEYDOWN => sub {	2058	CFPlus::SDL_KEYDOWN => sub {
1838	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2059	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1839	# alt-enter	2060	# alt-enter
1840	$FULLSCREEN_ENABLE->toggle;	2061	$FULLSCREEN_ENABLE->toggle;
1841	video_shutdown;	2062	video_shutdown;
1842	video_init;	2063	video_init;
1843	} else {	2064	} else {
1844	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2065	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1845	}	2066	}
1846	},	2067	},
1847	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2068	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1848	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2069	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1849	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2070	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1850	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2071	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1851	CFClient::SDL_USEREVENT => sub {	2072	CFPlus::SDL_USEREVENT => sub {
1852	if ($_[0]{code} == 1) {	2073	if ($_[0]{code} == 1) {
1853	audio_channel_finished $_[0]{data1};	2074	audio_channel_finished $_[0]{data1};
1854	} elsif ($_[0]{code} == 0) {	2075	} elsif ($_[0]{code} == 0) {
1855	audio_music_finished;	2076	audio_music_finished;
1856	}	2077	}
…		…
1860	#############################################################################	2081	#############################################################################
1861		2082
1862	$SIG{INT} = $SIG{TERM} = sub { exit };	2083	$SIG{INT} = $SIG{TERM} = sub { exit };
1863		2084
1864	{	2085	{
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";	2086	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1872	CFClient::UI::set_layout ($::CFG->{layout});	2087	CFPlus::UI::set_layout ($::CFG->{layout});
1873		2088
1874	my %DEF_CFG = (	2089	my %DEF_CFG = (
1875	sdl_mode => 0,	2090	sdl_mode => 0,
1876	width => 640,	2091	width => 640,
1877	height => 480,	2092	height => 480,
…		…
1885	log_fontsize => 0.7,	2100	log_fontsize => 0.7,
1886	gauge_fontsize => 1,	2101	gauge_fontsize => 1,
1887	gauge_size => 0.35,	2102	gauge_size => 0.35,
1888	stat_fontsize => 0.7,	2103	stat_fontsize => 0.7,
1889	mapsize => 100,	2104	mapsize => 100,
1890	say_command => 'say',	2105	say_command => 'chat',
1891	audio_enable => 1,	2106	audio_enable => 1,
1892	bgm_enable => 1,	2107	bgm_enable => 1,
1893	bgm_volume => 0.25,	2108	bgm_volume => 0.25,
1894	face_prefetch => 0,	2109	face_prefetch => 0,
1895	output_sync => 1,	2110	output_sync => 1,
1896	output_count => 1,	2111	output_count => 1,
		2112	output_rate => "",
1897	pickup => 0,	2113	pickup => 0,
		2114	inv_sort => "mtime",
1898	default => "profile", # default profile	2115	default => "profile", # default profile
		2116	show_tips => 1,
1899	);	2117	);
1900		2118
1901	while (my ($k, $v) = each %DEF_CFG) {	2119	while (my ($k, $v) = each %DEF_CFG) {
1902	$CFG->{$k} = $v unless exists $CFG->{$k};	2120	$CFG->{$k} = $v unless exists $CFG->{$k};
1903	}	2121	}
1904		2122
1905	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";	2123	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		2124	$PROFILE = $CFG->{profile}{default};
		2125
		2126	# convert old bindings (only default profile matters)
		2127	if (my $bindings = delete $PROFILE->{bindings}) {
		2128	while (my ($mod, $syms) = each %$bindings) {
		2129	while (my ($sym, $cmds) = each %$syms) {
		2130	push @{ $PROFILE->{macro} }, {
		2131	accelkey => [$mod*1, $sym*1],
		2132	action => $cmds,
		2133	};
		2134	}
		2135	}
		2136	}
1906		2137
1907	sdl_init;	2138	sdl_init;
1908		2139
1909	@SDL_MODES = reverse	2140	@SDL_MODES = reverse
1910	grep $_->[0] >= 640 && $_->[1] >= 480,	2141	grep $_->[0] >= 640 && $_->[1] >= 480,
1911	CFClient::SDL_ListModes;	2142	CFPlus::SDL_ListModes;
1912		2143
1913	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2144	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1914		2145
1915	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2146	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1916		2147
1917	{	2148	{
1918	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2149	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1919	DejaVuSans.ttf	2150	DejaVuSans.ttf
1920	DejaVuSansMono.ttf	2151	DejaVuSansMono.ttf
1921	DejaVuSans-Bold.ttf	2152	DejaVuSans-Bold.ttf
1922	DejaVuSansMono-Bold.ttf	2153	DejaVuSansMono-Bold.ttf
1923	DejaVuSans-Oblique.ttf	2154	DejaVuSans-Oblique.ttf
1924	DejaVuSansMono-Oblique.ttf	2155	DejaVuSansMono-Oblique.ttf
1925	DejaVuSans-BoldOblique.ttf	2156	DejaVuSans-BoldOblique.ttf
1926	DejaVuSansMono-BoldOblique.ttf	2157	DejaVuSansMono-BoldOblique.ttf
1927	);	2158	);
1928		2159
1929	CFClient::add_font $_ for @fonts;	2160	CFPlus::add_font $_ for @fonts;
1930		2161
1931	CFClient::pango_init;	2162	CFPlus::pango_init;
1932		2163
1933	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2164	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1934	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2165	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1935		2166
1936	$FONT_PROP->make_default;	2167	$FONT_PROP->make_default;
1937	}	2168	}
1938		2169
1939	# compare mono (ft) vs. rgba (cairo)	2170	# compare mono (ft) vs. rgba (cairo)
1940	# ft - 1.8s, cairo 3s, even in alpha-only mode	2171	# ft - 1.8s, cairo 3s, even in alpha-only mode
1941	# for my $rgba (0..1) {	2172	# for my $rgba (0..1) {
1942	# my $t1 = Time::HiRes::time;	2173	# my $t1 = Time::HiRes::time;
1943	# for (1..1000) {	2174	# for (1..1000) {
1944	# my $layout = CFClient::Layout->new ($rgba);	2175	# my $layout = CFPlus::Layout->new ($rgba);
1945	# $layout->set_text ("hallo" x 100);	2176	# $layout->set_text ("hallo" x 100);
1946	# $layout->render;	2177	# $layout->render;
1947	# }	2178	# }
1948	# my $t2 = Time::HiRes::time;	2179	# my $t2 = Time::HiRes::time;
1949	# warn $t2-$t1;	2180	# warn $t2-$t1;
1950	# }	2181	# }
1951		2182
		2183	$startup_done->();
		2184
1952	video_init;	2185	video_init;
1953	audio_init;	2186	audio_init;
1954	}	2187	}
1955		2188
		2189	show_tip_of_the_day if $CFG->{show_tips};
		2190
1956	Event::loop;	2191	Event::loop;
1957	#CFClient::SDL_Quit;	2192	#CFPlus::SDL_Quit;
1958	#CFClient::_exit 0;	2193	#CFPlus::_exit 0;
1959		2194
1960	END { CFClient::SDL_Quit }	2195	END { CFPlus::SDL_Quit }
1961		2196
1962	=head1 NAME	2197	=head1 NAME
1963		2198
1964	cfplus - A Crossfire+ and Crossfire game client	2199	cfplus - A Crossfire+ and Crossfire game client
1965		2200

Diff Legend

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