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

Diff Legend

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