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

Diff Legend

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