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.172 by root, Tue Jul 17 16:02:14 2007 UTC

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

Diff Legend

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