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.99 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.167 by root, Fri Jul 13 05:31:32 2007 UTC

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

Diff Legend

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