ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

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

Diff Legend

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