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

Diff Legend

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