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.97 by elmex, Wed Jul 19 16:41:51 2006 UTC vs.
Revision 1.165 by root, Thu Jul 12 18:57:45 2007 UTC

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

Diff Legend

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