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

Diff Legend

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