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

Diff Legend

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