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

Diff Legend

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