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

Diff Legend

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