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

Diff Legend

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