ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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