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.94 by root, Sun Jul 16 20:04:08 2006 UTC vs.
Revision 1.165 by root, Thu Jul 12 18:57:45 2007 UTC

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

Diff Legend

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