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.98 by root, Sat Jul 22 13:20:33 2006 UTC vs.
Revision 1.165 by root, Thu Jul 12 18:57:45 2007 UTC

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

Diff Legend

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