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

Diff Legend

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