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.94 by root, Sun Jul 16 20:04:08 2006 UTC vs.
Revision 1.176 by root, Thu Jul 19 14:54:51 2007 UTC

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

Diff Legend

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