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

Diff Legend

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