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

Diff Legend

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