[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.116 by root, Mon Aug 14 04:15:04 2006 UTC vs.
Revision 1.195 by root, Tue Jul 31 01:03:52 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}
27	if %PAR::LibCache;	72	if %PAR::LibCache;
28		73
29	use Time::HiRes 'time';	74	use Time::HiRes 'time';
30	use Event;	75	use Event;
		76	use List::Util qw(max min);
31		77
32	use Crossfire;	78	use Crossfire;
33	use Crossfire::Protocol::Constants;	79	use Crossfire::Protocol::Constants;
34		80
35	use Compress::LZF;	81	use Compress::LZF;
36		82
37	use CFPlus;	83	use CFPlus;
38	use CFPlus::OpenGL ();	84	use CFPlus::OpenGL ();
39	use CFPlus::Protocol;	85	use CFPlus::Protocol;
		86	use CFPlus::DB;
40	use CFPlus::UI;	87	use CFPlus::UI;
		88	use CFPlus::UI::Canvas;
		89	use CFPlus::UI::Inventory;
		90	use CFPlus::UI::SpellList;
		91	use CFPlus::UI::MessageWindow;
41	use CFPlus::Pod;	92	use CFPlus::Pod;
42	use CFPlus::BindingEditor;
43	use CFPlus::MapWidget;	93	use CFPlus::MapWidget;
		94	use CFPlus::Macro;
44		95
45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	96	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46	$SIG{PIPE} = 'IGNORE';	97	$SIG{PIPE} = 'IGNORE';
47		98
48	$Event::Eval = 0;	99	$Event::Eval = 1;
49	$Event::DIED = sub {	100	$Event::DIED = sub {
50	# TODO: display dialog box or so	101	CFPlus::fatal Carp::longmess $_[1]
51	Carp::cluck $_[1];#d#TODO: remove when stable
52	CFPlus::error $_[1];
53	};	102	};
54
55	$SIG{__DIE__} = sub {
56	return if CFPlus::in_destruct;
57	Carp::cluck $_[0];
58	CFPlus::error $_[0];
59	return;#d#
60	#return unless defined $^S && !$^S;
61	$Event::DIED->(undef, $_[0]);
62	};
63
64	our $VERSION = '0.1';
65		103
66	my $MAX_FPS = 60;	104	my $MAX_FPS = 60;
67	my $MIN_FPS = 5; # unused as of yet	105	my $MIN_FPS = 5; # unused as of yet
68		106
69	our $META_SERVER = "crossfire.real-time.com:13326";	107	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70		108
71	our $LAST_REFRESH;	109	our $LAST_REFRESH;
72	our $NOW;	110	our $NOW;
73		111
74	our $CFG;	112	our $CFG;
75	our $CONN;	113	our $CONN;
		114	our $PROFILE; # current profile
76	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	115	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77		116
78	our $WANT_REFRESH;	117	our $WANT_REFRESH;
79	our $CAN_REFRESH;	118	our $CAN_REFRESH;
80		119
89		128
90	our $MAP;	129	our $MAP;
91	our $MAPMAP;	130	our $MAPMAP;
92	our $MAPWIDGET;	131	our $MAPWIDGET;
93	our $BUTTONBAR;	132	our $BUTTONBAR;
94	our $LOGVIEW;
95	our $CONSOLE;
96	our $METASERVER;	133	our $METASERVER;
97	our $LOGIN_BUTTON;	134	our $LOGIN_BUTTON;
98	our $QUIT_DIALOG;	135	our $QUIT_DIALOG;
99	our $HOST_ENTRY;	136	our $HOST_ENTRY;
100	our $FULLSCREEN_ENABLE;	137	our $FULLSCREEN_ENABLE;
…		…
111		148
112	our $INVENTORY_PAGE;	149	our $INVENTORY_PAGE;
113	our $STATS_PAGE;	150	our $STATS_PAGE;
114	our $SKILL_PAGE;	151	our $SKILL_PAGE;
115	our $SPELL_PAGE;	152	our $SPELL_PAGE;
		153	our $SPELL_LIST;
116		154
117	our $HELP_WINDOW;	155	our $HELP_WINDOW;
118	our $MESSAGE_WINDOW;	156	our $MESSAGE_WINDOW;
119	our $FLOORBOX;	157	our $FLOORBOX;
120	our $GAUGES;	158	our $GAUGES;
…		…
122		160
123	our $SDL_ACTIVE;	161	our $SDL_ACTIVE;
124	our %SDL_CB;	162	our %SDL_CB;
125		163
126	our $SDL_MIXER;	164	our $SDL_MIXER;
		165	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
		166	our @MUSIC_WANT;
		167	our $MUSIC_START;
		168	our $MUSIC_PLAYING_DATA;
		169	our $MUSIC_PLAYING_META;
		170	our $MUSIC_PLAYER;
		171	our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
127	our @SOUNDS; # event => file mapping	172	our @SOUNDS; # event => file mapping
128	our %AUDIO_CHUNKS; # audio files	173	our %AUDIO_CHUNK; # audio files
129		174
130	our $ALT_ENTER_MESSAGE;	175	our $ALT_ENTER_MESSAGE;
131	our $STATUSBOX;	176	our $STATUSBOX;
132	our $DEBUG_STATUS;	177	our $DEBUG_STATUS;
133		178
134	our $INV;	179	our $INV;
135	our $INVR;	180	our $INVR;
136	our $INV_RIGHT_HB;	181	our $INV_RIGHT_HB;
137		182
138	our $BIND_EDITOR;
139	our $BIND_UPD_CB;
140
141	our $PICKUP_CFG;	183	our $PICKUP_CFG;
		184
		185	#############################################################################
		186	#TODO: maybe move into own audio module...
		187
		188	sub audio_channel_finished {
		189	my ($channel) = @_;
		190
		191	# warn "channel $channel finished\n";#d#
		192	}
		193
		194	our %AUDIO_PLAY;
		195	our %AUDIO_CHUNK;
		196
		197	sub audio_sound_push($) {
		198	my ($face) = @_;
		199
		200	if (my $chunk = $AUDIO_CHUNK{$face}) {
		201	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) \|\| []}) {
		202	my (undef, $dx, $dy, $vol) = @$_;
		203
		204	my $channel = CFPlus::Channel::find;
		205	$channel->volume (128 + $vol);
		206	$dx = $dx / 10 * 255;
		207	$channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
		208
		209	# my $angle = $dx ? : $dx < 0 ?
		210	# my $distance = -$vol;
		211	# $channel->set_position ($angle, $distance);
		212
		213	$chunk->play ($channel);
		214	}
		215	} else {
		216	# sound_meta not set means data is in flight either way
		217	my $meta = $CONN->{sound_meta}{$face}
		218	or return;
		219
		220	# fetch from database
		221	CFPlus::DB::get res_data => $meta->{name}, sub {
		222	my $vol = $meta->{meta}{volume} \|\| 1;
		223	my $rwops = new CFPlus::RW $_[0];
		224	my $chunk = new CFPlus::MixChunk $rwops;
		225	$chunk->volume ($vol * 128);
		226	$AUDIO_CHUNK{$face} = $chunk;
		227
		228	audio_sound_push ($face);
		229	};
		230	}
		231	}
		232
		233	sub audio_sound_play {
		234	my ($face, $dx, $dy, $vol) = @_;
		235
		236	$SDL_MIXER
		237	or return;
		238
		239	my $queue = $AUDIO_PLAY{$face} \|\|= [];
		240	push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
		241	audio_sound_push $face
		242	unless @$queue > 1;
		243	}
		244
		245	sub audio_music_update_volume {
		246	return unless $MUSIC_PLAYING_META;
		247	my $volume = $MUSIC_PLAYING_META->{meta}{volume} \|\| 1;
		248	my $base = $CFG->{bgm_volume};
		249	CFPlus::MixMusic::volume $base * $volume * 128;
		250	}
		251
		252	sub audio_music_set_ambient {
		253	my ($songs) = @_;
		254
		255	my @want =
		256	grep $_,
		257	map $CONN->{music_meta}{$_},
		258	@$songs;
		259
		260	if (@want) {
		261	@MUSIC_WANT = @want;
		262	&audio_music_changed ();
		263	}
		264	}
		265
		266	sub audio_music_start {
		267	my $meta = $MUSIC_PLAYING_META;
		268
		269	CFPlus::DB::get res_data => $meta->{name}, sub {
		270	return unless $SDL_MIXER;
		271
		272	# music might have changed...
		273	$meta eq $MUSIC_PLAYING_META
		274	or return &audio_music_start ();
		275
		276	audio_music_update_volume;
		277
		278	$MUSIC_PLAYING_DATA = \$_[0];
		279
		280	my $rwops = $meta->{path}
		281	? new_from_file CFPlus::RW $meta->{path}
		282	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
		283
		284	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
		285	or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
		286
		287	my $NOW = time;
		288
		289	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
		290	my $pos = $MUSIC_PLAYING_META->{stop_pos};
		291	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
		292	$MUSIC_START = time - $pos;
		293	} else {
		294	$MUSIC_PLAYER->play (0);
		295	$MUSIC_START = time;
		296	}
		297
		298	delete $MUSIC_PLAYING_META->{stop_time};
		299	delete $MUSIC_PLAYING_META->{stop_pos};
		300	}
		301	}
		302
		303	sub audio_music_changed {
		304	return unless $CFG->{bgm_enable};
		305	return unless $SDL_MIXER;
		306
		307	# default MUSIC_WANT == MUSIC_DEFAULT
		308	@MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
		309
		310	# if the currently playing song is acceptable, let it continue
		311	return if $MUSIC_PLAYING_META
		312	&& grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
		313
		314	my $NOW = time;
		315
		316	if ($MUSIC_PLAYING_META) {
		317	$MUSIC_PLAYING_META->{stop_time} = $NOW;
		318	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
		319	CFPlus::MixMusic::fade_out 1000;
		320	} else {
		321	# sort by stop time, oldest first
		322	@MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
		323
		324	# if the most recently-played piece played very recently,
		325	# resume it, else choose the oldest piece for rotation.
		326	$MUSIC_PLAYING_META =
		327	$MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
		328	? $MUSIC_WANT[-1]
		329	: $MUSIC_WANT[0];
		330
		331	audio_music_start;
		332	}
		333	}
		334
		335	sub audio_music_finished {
		336	undef $MUSIC_PLAYER;
		337	undef $MUSIC_PLAYING_META;
		338	undef $MUSIC_PLAYING_DATA;
		339
		340	audio_music_changed;
		341	}
		342
		343	#############################################################################
142		344
143	sub status {	345	sub status {
144	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	346	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145	}	347	}
146		348
147	sub debug {	349	sub debug {
148	$DEBUG_STATUS->set_text ($_[0]);	350	$DEBUG_STATUS->set_text ($_[0]);
		351	}
		352
		353	sub message {
		354	my ($para) = @_;
		355	$MESSAGE_WINDOW->message ($para);
149	}	356	}
150		357
151	sub destroy_query_dialog {	358	sub destroy_query_dialog {
152	(delete $_[0]{query_dialog})->destroy	359	(delete $_[0]{query_dialog})->destroy
153	if $_[0]{query_dialog};	360	if $_[0]{query_dialog};
154	}	361	}
155		362
		363	# FIXME: a very ugly hack to wait for stat update look below! #d#
		364	our $QUERY_TIMER; #d#
		365
156	# server query dialog	366	# server query dialog
157	sub server_query {	367	sub server_query {
158	my ($conn, $flags, $prompt) = @_;	368	my ($conn, $flags, $prompt) = @_;
		369
		370	# FIXME: a very ugly hack to wait for stat update #d#
		371	if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
		372	unless ($QUERY_TIMER) {
		373	$QUERY_TIMER =
		374	Event->timer (
		375	after => 1,
		376	cb => sub {
		377	server_query ($conn, $flags, $prompt, 1);
		378	$QUERY_TIMER = undef
		379	}
		380	);
		381	return;
		382	}
		383	}
159		384
160	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel	385	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161	x => "center",	386	x => "center",
162	y => "center",	387	y => "center",
163	title => "Server Query",	388	title => "Server Query",
164	child => my $vbox = new CFPlus::UI::VBox,	389	child => my $vbox = new CFPlus::UI::VBox,
165	;	390	;
166		391
167	my @dialog = my $label = new CFPlus::UI::Label	392	my @dialog = my $label = new CFPlus::UI::Label
168	max_w => $::WIDTH * 0.4,	393	max_w => $::WIDTH * 0.8,
169	ellipsise => 0,	394	ellipsise => 0,
170	text => $prompt;	395	text => $prompt;
171		396
172	if ($flags & CS_QUERY_YESNO) {	397	if ($flags & CS_QUERY_YESNO) {
173	push @dialog, my $hbox = new CFPlus::UI::HBox;	398	push @dialog, my $hbox = new CFPlus::UI::HBox;
…		…
190	);	415	);
191		416
192	$dialog->grab_focus;	417	$dialog->grab_focus;
193		418
194	} elsif ($flags & CS_QUERY_SINGLECHAR) {	419	} elsif ($flags & CS_QUERY_SINGLECHAR) {
195	$dialog->{tooltip} = "#charcreation_focus";
196
197	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {	420	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {
198	$MESSAGE_WINDOW->show;	421	$dialog->{tooltip} = "#charcreation_focus";
199		422
200	unshift @dialog, new CFPlus::UI::Label	423	unshift @dialog, new CFPlus::UI::Label
201	max_w => $::WIDTH * 0.4,	424	max_w => $::WIDTH * 0.8,
202	ellipsise => 0,	425	ellipsise => 0,
203	markup => "\nOr use your keyboard and the text entry below:\n";	426	markup => "\nOr use your keyboard and the text entry below:\n";
204		427
205	unshift @dialog, my $table = new CFPlus::UI::Table;	428	unshift @dialog, my $table = new CFPlus::UI::Table;
206		429
207	$table->add (0, 0, new CFPlus::UI::Button	430	$table->add_at (0, 0, new CFPlus::UI::Button
208	text => "Next Race",	431	text => "Next Race",
209	on_activate => sub {	432	on_activate => sub {
210	$conn->send ("reply n");	433	$conn->send ("reply n");
211	destroy_query_dialog $conn;	434	destroy_query_dialog $conn;
212	0	435	0
213	},	436	},
214	);	437	);
215	$table->add (2, 0, new CFPlus::UI::Button	438	$table->add_at (2, 0, new CFPlus::UI::Button
216	text => "Accept",	439	text => "Accept",
217	on_activate => sub {	440	on_activate => sub {
218	$conn->send ("reply d");	441	$conn->send ("reply d");
219	destroy_query_dialog $conn;	442	destroy_query_dialog $conn;
220	0	443	0
221	},	444	},
222	);	445	);
223		446
		447	if ($conn->{chargen_race_description}) {
		448	unshift @dialog, new CFPlus::UI::Label
		449	max_w => $::WIDTH * 0.8,
		450	ellipsise => 0,
		451	markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
		452	;
		453	}
		454
		455	unshift @dialog, new CFPlus::UI::Face
		456	face => $conn->{player}{face},
		457	bg => [.2, .2, .2, 1],
		458	min_w => 64,
		459	min_h => 64,
		460	;
		461
		462	if ($conn->{chargen_race_title}) {
		463	unshift @dialog, new CFPlus::UI::Label
		464	allign => 1,
		465	ellipsise => 0,
		466	markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
		467	;
		468	}
		469
224	unshift @dialog, new CFPlus::UI::Label	470	unshift @dialog, new CFPlus::UI::Label
225	max_w => $::WIDTH * 0.4,	471	max_w => $::WIDTH * 0.4,
226	ellipsise => 0,	472	ellipsise => 0,
227	markup => (CFPlus::Pod::section_label ui => "chargen_race"),	473	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228	;	474	;
…		…
232	$conn->send ("reply $stat");	478	$conn->send ("reply $stat");
233	destroy_query_dialog $conn;	479	destroy_query_dialog $conn;
234	return;	480	return;
235	}	481	}
236		482
237	$STATS_PAGE->show;
238	$MESSAGE_WINDOW->hide;
239
240	unshift @dialog, new CFPlus::UI::Label	483	unshift @dialog, new CFPlus::UI::Label
241	max_w => $::WIDTH * 0.4,	484	max_w => $::WIDTH * 0.4,
242	ellipsise => 0,	485	ellipsise => 0,
243	markup => "\nOr use your keyboard and the text entry below:\n";	486	markup => "\nOr use your keyboard and the text entry below:\n";
244		487
245	unshift @dialog, my $table = new CFPlus::UI::Table;	488	unshift @dialog, my $table = new CFPlus::UI::Table;
246		489
247	# left: re-roll	490	# left: re-roll
248	$table->add (0, 0, new CFPlus::UI::Button	491	$table->add_at (0, 0, new CFPlus::UI::Button
249	text => "Roll Again",	492	text => "Roll Again",
250	on_activate => sub {	493	on_activate => sub {
251	$conn->send ("reply y");	494	$conn->send ("reply y");
252	destroy_query_dialog $conn;	495	destroy_query_dialog $conn;
253	0	496	0
…		…
267	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	510	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
268	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	511	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
269	],	512	],
270	), 1 .. 2;	513	), 1 .. 2;
271		514
272	$table->add (2, 0, new CFPlus::UI::Button	515	$table->add_at (2, 0, new CFPlus::UI::Button
273	text => "Swap Stats",	516	text => "Swap Stats",
274	on_activate => sub {	517	on_activate => sub {
275	$conn->{stat_change_with} = $sw2->{value};	518	$conn->{stat_change_with} = $sw2->{value};
276	$conn->send ("reply $sw1->{value}");	519	$conn->send ("reply $sw1->{value}");
277	destroy_query_dialog $conn;	520	destroy_query_dialog $conn;
278	0	521	0
279	},	522	},
280	);	523	);
281	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);	524	$table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
282		525
283	# right: accept	526	# right: accept
284	$table->add (4, 0, new CFPlus::UI::Button	527	$table->add_at (4, 0, new CFPlus::UI::Button
285	text => "Accept",	528	text => "Accept",
286	on_activate => sub {	529	on_activate => sub {
287	$conn->send ("reply n");	530	$conn->send ("reply n");
288	$STATS_PAGE->hide;	531	$STATS_PAGE->hide;
289	destroy_query_dialog $conn;	532	destroy_query_dialog $conn;
…		…
354	$LOGIN_BUTTON->set_text ("Logout");	597	$LOGIN_BUTTON->set_text ("Logout");
355	$SETUP_DIALOG->hide;	598	$SETUP_DIALOG->hide;
356		599
357	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	600	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358		601
359	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};	602	my ($host, $port) = split /:/, $PROFILE->{host};
360		603
361	$MAP = new CFPlus::Map $mapsize, $mapsize;	604	$MAP = new CFPlus::Map;
362		605
363	$CONN = eval {	606	$CONN = eval {
364	new CFPlus::Protocol	607	new CFPlus::Protocol
365	host => $host,	608	host => $host,
366	port => $port \|\| 13327,	609	port => $port \|\| 13327,
367	user => $CFG->{profile}{default}{user},	610	user => $PROFILE->{user},
368	pass => $CFG->{profile}{default}{password},	611	pass => $PROFILE->{password},
369	mapw => $mapsize,	612	mapw => $mapsize,
370	maph => $mapsize,	613	maph => $mapsize,
371		614
		615	client => "cfplus $CFPlus::VERSION $] $^O",
		616
372	map_widget => $MAPWIDGET,	617	map_widget => $MAPWIDGET,
373	logview => $LOGVIEW,
374	statusbox => $STATUSBOX,	618	statusbox => $STATUSBOX,
375	map => $MAP,	619	map => $MAP,
376	mapmap => $MAPMAP,	620	mapmap => $MAPMAP,
377	query => \&server_query,	621	query => \&server_query,
378		622
379	sound_play => sub {	623	setup_req => {
380	my ($x, $y, $soundnum, $type) = @_;	624	smoothing => $CFG->{map_smoothing}*1,
381
382	$SDL_MIXER
383	or return;
384
385	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
386	or return;
387
388	$chunk->play;
389	},	625	},
390	};	626	};
391		627
392	if ($CONN) {	628	if ($CONN) {
393	CFPlus::lowdelay fileno $CONN->{fh};	629	CFPlus::lowdelay fileno $CONN->{fh};
…		…
402	sub stop_game {	638	sub stop_game {
403	$LOGIN_BUTTON->set_text ("Login");	639	$LOGIN_BUTTON->set_text ("Login");
404	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	640	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405	$SETUP_DIALOG->show;	641	$SETUP_DIALOG->show;
406	$PL_WINDOW->hide;	642	$PL_WINDOW->hide;
407	$SPELL_PAGE->clear_spells;	643	$SPELL_LIST->clear_spells;
		644	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
		645
		646	&audio_music_set_ambient ([]);
408		647
409	return unless $CONN;	648	return unless $CONN;
410		649
411	status "connection closed";	650	status "connection closed";
412		651
…		…
420	sub graphics_setup {	659	sub graphics_setup {
421	my $vbox = new CFPlus::UI::VBox;	660	my $vbox = new CFPlus::UI::VBox;
422		661
423	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	662	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
424		663
		664	my $row = 0;
		665
		666	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
		667	$table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
		668	can_events => 1,
		669	tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
		670
		671	my $vidmode_tooltip =
		672	"<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
		673	. "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
		674
425	$table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");	675	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
426	$table->add (1, 0, my $hbox = new CFPlus::UI::HBox);	676	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
427		677
		678	$hbox->add (my $mode_slider = new CFPlus::UI::Slider
428	$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]);	679	force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
429	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	680	tooltip => $vidmode_tooltip);
		681	$hbox->add (my $mode_label = new CFPlus::UI::Label
		682	align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
		683	can_events => 1, tooltip => $vidmode_tooltip);
430		684
431	$mode_slider->connect (changed => sub {	685	$mode_slider->connect (changed => sub {
432	my ($self, $value) = @_;	686	my ($self, $value) = @_;
433		687
434	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	688	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	689	$mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
436	});	690	});
437	$mode_slider->emit (changed => $mode_slider->{range}[0]);	691	$mode_slider->emit (changed => $mode_slider->{range}[0]);
438		692
439	my $row = 1;
440
441	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");	693	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
442	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox	694	$table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443	state => $CFG->{fullscreen},	695	state => $CFG->{fullscreen},
444	tooltip => "Bring the client into fullscreen mode.",	696	tooltip => "Bring the client into fullscreen mode.",
445	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	697	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
446	);	698	);
447		699
448	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	700	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
449	$table->add (1, $row++, new CFPlus::UI::CheckBox	701	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
450	state => $CFG->{fast},	702	state => $CFG->{fast},
451	tooltip => "Lower the visual quality considerably to speed up rendering.",	703	tooltip => "Lower the visual quality considerably to speed up rendering.",
452	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	704	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453	);	705	);
454		706
		707	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
		708	$table->add_at (1, $row++, new CFPlus::UI::Slider
		709	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
		710	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
		711	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
		712	);
		713
		714	$table->add_at (1, $row++, new CFPlus::UI::Button
		715	expand => 1, align => 0, text => "Apply",
		716	tooltip => "Apply the video settings above.",
		717	on_activate => sub {
		718	video_shutdown ();
		719	video_init ();
		720	0
		721	}
		722	);
		723
455	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");	724	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
456	$table->add (1, $row++, new CFPlus::UI::Slider	725	$table->add_at (1, $row++, new CFPlus::UI::Slider
457	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	726	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	727	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	728	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
460	);	729	);
461		730
		731	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
		732	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
		733	state => $CFG->{map_smoothing},
		734	tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
		735	. "This increases load on the graphics subsystem and works only with 2.x servers. "
		736	. "Changes take effect at next connection only.",
		737	on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
		738	);
		739
462	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");	740	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
463	$table->add (1, $row++, new CFPlus::UI::CheckBox	741	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
464	state => $CFG->{fow_enable},	742	state => $CFG->{fow_enable},
465	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	743	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
466	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	744	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
467	);	745	);
468		746
469	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");	747	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
470	$table->add (1, $row++, new CFPlus::UI::Slider	748	$table->add_at (1, $row++, new CFPlus::UI::Slider
471	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	749	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
472	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	750	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
473	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	751	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
474	);	752	);
475		753
476	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
477	$table->add (1, $row++, new CFPlus::UI::CheckBox
478	state => $CFG->{fow_smooth},
479	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
480	on_changed => sub {
481	my ($self, $value) = @_;
482	$CFG->{fow_smooth} = $value;
483	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
484	0
485	}
486	);
487
488	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
489	$table->add (1, $row++, new CFPlus::UI::Slider
490	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
491	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
492	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
493	);
494
495	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");	754	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
496	$table->add (1, $row++, new CFPlus::UI::Slider	755	$table->add_at (1, $row++, new CFPlus::UI::Slider
497	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	756	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
498	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	757	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
499	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	758	on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
500	);	759	);
501		760
502	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	761	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
503	$table->add (1, $row++, new CFPlus::UI::Slider	762	$table->add_at (1, $row++, new CFPlus::UI::Slider
504	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	763	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
505	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	764	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
506	on_changed => sub {	765	on_changed => sub {
507	$CFG->{gauge_fontsize} = $_[1];	766	$CFG->{gauge_fontsize} = $_[1];
508	&set_gauge_window_fontsize;	767	&set_gauge_window_fontsize;
509	0	768	0
510	}	769	}
511	);	770	);
512		771
513	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");	772	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
514	$table->add (1, $row++, new CFPlus::UI::Slider	773	$table->add_at (1, $row++, new CFPlus::UI::Slider
515	range => [$CFG->{gauge_size}, 0.2, 0.8],	774	range => [$CFG->{gauge_size}, 0.2, 0.8],
516	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	775	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
517	on_changed => sub {	776	on_changed => sub {
518	$CFG->{gauge_size} = $_[1];	777	$CFG->{gauge_size} = $_[1];
519	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	778	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520	0	779	0
521	}	780	}
522	);	781	);
523		782
524	$table->add (1, $row++, new CFPlus::UI::Button
525	expand => 1, align => 0, text => "Apply",
526	tooltip => "Apply the video settings",
527	on_activate => sub {
528	video_shutdown ();
529	video_init ();
530	0
531	}
532	);
533
534	$vbox	783	$vbox
535	}	784	}
536		785
537	sub audio_setup {	786	sub audio_setup {
538	my $vbox = new CFPlus::UI::VBox;	787	my $vbox = new CFPlus::UI::VBox;
539		788
540	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	789	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
541		790
542	my $row = 0;	791	my $row = 0;
543		792
544	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");	793	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
545	$table->add (1, $row++, new CFPlus::UI::CheckBox	794	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
546	state => $CFG->{audio_enable},	795	state => $CFG->{audio_enable},
547	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.",	796	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.",
548	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	797	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
549	);	798	);
550	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");	799	# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
551	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	800	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
552	# $CFG->{effects_volume} = $_[1];	801	# $CFG->{effects_volume} = $_[1];
553	# });	802	# });
554	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");	803	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
555	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);	804	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
556	$hbox->add (new CFPlus::UI::CheckBox	805	$hbox->add (new CFPlus::UI::CheckBox
557	expand => 1, state => $CFG->{bgm_enable},	806	expand => 1, state => $CFG->{bgm_enable},
558	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	807	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
559	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	808	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
560	);	809	);
561	$hbox->add (new CFPlus::UI::Slider	810	$hbox->add (new CFPlus::UI::Slider
562	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	811	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
563	tooltip => "The volume of the background music. Changes are instant.",	812	tooltip => "The volume of the background music. Changes are instant.",
564	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }	813	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
565	);	814	);
566		815
567	$table->add (1, $row++, new CFPlus::UI::Button	816	$table->add_at (1, $row++, new CFPlus::UI::Button
568	expand => 1, align => 0, text => "Apply",	817	expand => 1, align => 0, text => "Apply",
569	tooltip => "Apply the audio settings",	818	tooltip => "Apply the audio settings",
570	on_activate => sub {	819	on_activate => sub {
571	audio_shutdown ();	820	audio_shutdown ();
572	audio_init ();	821	audio_init ();
…		…
631	}	880	}
632		881
633	sub debug_setup {	882	sub debug_setup {
634	my $table = new CFPlus::UI::Table;	883	my $table = new CFPlus::UI::Table;
635		884
636	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");	885	$table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
637	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	886	$table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
638	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");	887	$table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
639	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	888	$table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
640	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");	889	$table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
641	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	890	$table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
642	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");	891	$table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	892	$table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		893	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
644		894
645	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	895	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
646		896
647	for my $x (0..2) {	897	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
648	for my $y (0 .. 2) {	898	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
649	$table->add ($x + 3, $y,	899	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
650	new CFPlus::UI::Entry	900	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
651	text => $default_smooth[$x * 3 + $y],	901	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
652	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },	902	$t->add_at (1,1, new CFPlus::UI::Label text => "e");
653	);	903
654	}	904	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
		905
		906	$c->add_items ({
		907	type => "line_loop",
		908	color => [0, 1, 0],
		909	width => 9,
		910	coord_mode => "abs",
		911	coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
655	}	912	});
656		913
		914	$c->add_items ({
		915	type => "lines",
		916	color => [1, 1, 0],
		917	width => 2,
		918	coord_mode => "rel",
		919	coord => [[0,0], [1,1], [1,0], [0,1]],
		920	});
		921
		922	$c->add_items ({
		923	type => "polygon",
		924	color => [0, 0.43, 0],
		925	width => 2,
		926	coord_mode => "rel",
		927	coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
		928	});
657		929
658	$table	930	$table
659	}	931	}
660		932
661	sub stats_window {	933	sub stats_window {
…		…
709	[2, 4, st_spd => "Spd", 10.54],	981	[2, 4, st_spd => "Spd", 10.54],
710	[2, 5, st_wspd => "WSp", 10.54],	982	[2, 5, st_wspd => "WSp", 10.54],
711	) {	983	) {
712	my ($col, $row, $id, $label, $template) = @$_;	984	my ($col, $row, $id, $label, $template) = @$_;
713		985
714	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label	986	$tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
715	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	987	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
716	align => +1, template => $template, tooltip => "#stat_$label");	988	align => +1, template => $template, tooltip => "#stat_$label");
717	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label	989	$tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
718	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	990	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
719	align => -1, text => $label, tooltip => "#stat_$label");	991	align => -1, text => $label, tooltip => "#stat_$label");
720	}	992	}
721		993
722	$vb->add (new CFPlus::UI::FancyFrame	994	$vb->add (new CFPlus::UI::FancyFrame
…		…
763	cold => ["Cold",	1035	cold => ["Cold",
764	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],	1036	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
765	ghit => ["Ghost hit",	1037	ghit => ["Ghost hit",
766	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],	1038	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
767	);	1039	);
		1040
768	for (qw/slow holyw conf fire depl magic	1041	for (qw/slow holyw conf fire depl magic
769	drain acid pois para deat phys	1042	drain acid pois para deat phys
770	blind fear tund elec cold ghit/)	1043	blind fear tund elec cold ghit/)
771	{	1044	{
772	$tbl2->add ($col, $row,	1045	$tbl2->add_at ($col, $row,
773	$STATWIDS->{"res_$_"} =	1046	$STATWIDS->{"res_$_"} =
774	new CFPlus::UI::Label	1047	new CFPlus::UI::Label
775	font => $FONT_FIXED,	1048	font => $FONT_FIXED,
776	template => "-100%",	1049	template => "-100%",
777	align => +1,	1050	align => +1,
778	valign => 0,	1051	valign => 0,
779	can_events => 1,	1052	can_events => 1,
780	can_hover => 1,	1053	can_hover => 1,
781	tooltip => $resist_names{$_}->[1],	1054	tooltip => $resist_names{$_}->[1],
782	);	1055	);
783	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image	1056	$tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
784	font => $FONT_FIXED,	1057	font => $FONT_FIXED,
785	can_hover => 1,	1058	can_hover => 1,
786	can_events => 1,	1059	can_events => 1,
787	path => "ui/resist/resist_$_.png",	1060	path => "ui/resist/resist_$_.png",
788	tooltip => $resist_names{$_}->[1],	1061	tooltip => $resist_names{$_}->[1],
789	);	1062	);
790	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label	1063	$tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
791	text => $resist_names{$_}->[0],	1064	text => $resist_names{$_}->[0],
792	font => $FONT_FIXED,	1065	font => $FONT_FIXED,
793	can_hover => 1,	1066	can_hover => 1,
794	can_events => 1,	1067	can_events => 1,
795	tooltip => $resist_names{$_}->[1],	1068	tooltip => $resist_names{$_}->[1],
…		…
828	return if $METASERVER_ATIME > time;	1101	return if $METASERVER_ATIME > time;
829	$METASERVER_ATIME = time + 60;	1102	$METASERVER_ATIME = time + 60;
830		1103
831	my $table = $METASERVER->{table};	1104	my $table = $METASERVER->{table};
832	$table->clear;	1105	$table->clear;
833	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	1106	$table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834		1107
835	my $buf;	1108	my $ok = 0;
836		1109
837	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	1110	CFPlus::background {
		1111	my $ua = CFPlus::lwp_useragent;
838		1112
839	unless ($fh) {	1113	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840	$label->set_text ("unable to contact metaserver: $!");	1114	} sub {
841	return;	1115	my ($msg) = @_;
842	}	1116	if ($msg) {
843
844	Event->io (fd => $fh, poll => 'r', cb => sub {
845	my $res = sysread $fh, $buf, 8192, length $buf;
846
847	if (!defined $res) {
848	$_[0]->w->cancel;
849	$label->set_text ("error while retrieving server list: $!");
850	} elsif ($res == 0) {
851	$_[0]->w->cancel;
852	status "server list retrieved";
853
854	utf8::decode $buf if utf8::valid $buf;
855
856	$table->clear;	1117	$table->clear;
857		1118
858	my @tip = (	1119	my @tip = (
859	"The current number of users logged in on the server.",	1120	"The current number of users logged in on the server.",
860	"The hostname of the server.",	1121	"The hostname of the server.",
861	"The time this server has been running without being restarted.",	1122	"The time this server has been running without being restarted.",
862	"The server software version - a '+' indicates a Crossfire+ server.",	1123	"The server software version - a '+' indicates a Crossfire+ server.",
863	"Short information about this server provided by its admins.",	1124	"Short information about this server provided by its admins.",
864	);	1125	);
865	my @col = qw(#Users Host Uptime Version Description);	1126	my @col = qw(#Users Host Uptime Version Description);
866	$table->add ($_, 0, new CFPlus::UI::Label	1127	$table->add_at ($_, 0, new CFPlus::UI::Label
867	can_hover => 1, can_events => 1,	1128	can_hover => 1, can_events => 1,
868	align => 0, fg => [1, 1, 0],	1129	align => 0, fg => [1, 1, 0],
869	text => $col[$_], tooltip => $tip[$_])	1130	text => $col[$_], tooltip => $tip[$_])
870	for 0 .. $#col;	1131	for 0 .. $#col;
871		1132
872	my @align = qw(1 0 1 1 -1);	1133	my @align = qw(1 0 1 1 -1);
873		1134
874	my $y = 0;	1135	my $y = 0;
875	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {	1136	for my $m (@{ $msg->{servers} }) {
876	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	1137	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
		1138	@$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
877		1139
878	for ($desc) {	1140	for ($desc) {
879	s/<br>/\n/gi;	1141	s/<br>/\n/gi;
880	s/<li>/\n· /gi;	1142	s/<li>/\n· /gi;
881	s/<.*?>//sgi;	1143	s/<.*?>//sgi;
882	s/&/&/g;	1144	s/&/&/g;
883	s/</</g;	1145	s/</</g;
884	s/>/>/g;	1146	s/>/>/g;
885	}	1147	}
886		1148
887	$uptime = sprintf "%dd %02d:%02d:%02d",	1149	$uptime = sprintf "%dd %02d:%02d:%02d",
888	(int $m->[8] / 86400),	1150	(int $uptime / 86400),
889	(int $m->[8] / 3600) % 24,	1151	(int $uptime / 3600) % 24,
890	(int $m->[8] / 60) % 60,	1152	(int $uptime / 60) % 60,
891	$m->[8] % 60;	1153	$uptime % 60;
892		1154
893	$m = [$users, $host, $uptime, $version, $desc];	1155	$m = [$users, $host, $uptime, $version, $desc];
894		1156
895	$y++;	1157	$y++;
896		1158
897	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [	1159	$table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
898	(new CFPlus::UI::Button	1160	(new CFPlus::UI::Button
899	text => "Use",	1161	text => "Use",
900	tooltip => "Put this server into the <b>Host:Port</b> field",	1162	tooltip => "Put this server into the <b>Host:Port</b> field",
901	on_activate => sub {	1163	on_activate => sub {
902	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	1164	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
…		…
905	},	1167	},
906	),	1168	),
907	(new CFPlus::UI::Empty expand => 1),	1169	(new CFPlus::UI::Empty expand => 1),
908	]);	1170	]);
909		1171
910	$table->add ($_, $y, new CFPlus::UI::Label	1172	$table->add_at ($_, $y, new CFPlus::UI::Label
		1173	max_w => $::WIDTH * 0.4,
911	ellipsise => 0,	1174	ellipsise => 0,
912	align => $align[$_],	1175	align => $align[$_],
913	text => $m->[$_],	1176	text => $m->[$_],
914	tooltip => $tip[$_],	1177	tooltip => $tip[$_],
		1178	fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
915	can_hover => 1,	1179	can_hover => 1,
916	can_events => 1,	1180	can_events => 1,
917	fontsize => 0.8)	1181	fontsize => 0.8)
918	for 0 .. $#$m;	1182	for 0 .. $#$m;
919	}	1183	}
		1184	} else {
		1185	$ok or $label->set_text ("error while contacting metaserver");
920	}	1186	}
921	});	1187	};
		1188
922	}	1189	}
923		1190
924	sub metaserver_dialog {	1191	sub metaserver_dialog {
925	my $vbox = new CFPlus::UI::VBox;	1192	my $vbox = new CFPlus::UI::VBox;
926	my $table = new CFPlus::UI::Table;	1193	my $table = new CFPlus::UI::Table;
…		…
930	title => "Server List",	1197	title => "Server List",
931	name => 'metaserver_dialog',	1198	name => 'metaserver_dialog',
932	x => 'center',	1199	x => 'center',
933	y => 'center',	1200	y => 'center',
934	z => 3,	1201	z => 3,
		1202	force_w => $::WIDTH * 0.9,
935	force_h => $::HEIGHT * 0.4,	1203	force_h => $::HEIGHT * 0.7,
936	child => $vbox,	1204	child => $vbox,
937	has_close_button => 1,	1205	has_close_button => 1,
938	table => $table,	1206	table => $table,
939	on_visibility_change => sub {	1207	on_visibility_change => sub {
940	update_metaserver ($_[0]) if $_[1];	1208	update_metaserver ($_[0]) if $_[1];
…		…
950		1218
951	$vbox->add (new CFPlus::UI::FancyFrame	1219	$vbox->add (new CFPlus::UI::FancyFrame
952	label => "Connection Settings",	1220	label => "Connection Settings",
953	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),	1221	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
954	);	1222	);
955	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");	1223	$table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
956		1224
957	{	1225	{
958	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);	1226	$table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
959		1227
960	$vbox->add (	1228	$vbox->add (
961	$HOST_ENTRY = new CFPlus::UI::Entry	1229	$HOST_ENTRY = new CFPlus::UI::Entry
962	expand => 1,	1230	expand => 1,
963	text => $CFG->{profile}{default}{host},	1231	text => $CFG->{profile}{default}{host},
964	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	1232	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
965	on_changed => sub {	1233	on_changed => sub {
966	my ($self, $value) = @_;	1234	my ($self, $value) = @_;
967	$CFG->{profile}{default}{host} = $value;	1235	$CFG->{profile}{default}{host} = $value;
968	0	1236	1
969	}	1237	}
970	);	1238	);
971		1239
972	$vbox->add (new CFPlus::UI::Button	1240	$vbox->add (new CFPlus::UI::Button
973	expand => 1,	1241	expand => 1,
974	text => "Server List",	1242	text => "Server List",
975	other => $METASERVER,	1243	other => $METASERVER,
976	tooltip => "Show a list of available crossfire servers",	1244	tooltip => "Show a list of available crossfire servers",
977	on_activate => sub { $METASERVER->toggle_visibility; 0 },	1245	on_activate => sub { $METASERVER->toggle_visibility; 0 },
978	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	1246	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
979	);	1247	);
980	}	1248	}
981		1249
982	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");	1250	$table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
983	$table->add (1, 4, new CFPlus::UI::Entry	1251	$table->add_at (1, 4, new CFPlus::UI::Entry
984	text => $CFG->{profile}{default}{user},	1252	text => $CFG->{profile}{default}{user},
985	tooltip => "The name of your character on the server",	1253	tooltip => "The name of your character on the server",
986	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	1254	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
987	);	1255	);
988		1256
989	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");	1257	$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
990	$table->add (1, 5, new CFPlus::UI::Entry	1258	$table->add_at (1, 5, new CFPlus::UI::Entry
991	text => $CFG->{profile}{default}{password},	1259	text => $CFG->{profile}{default}{password},
992	hidden => 1,	1260	hidden => 1,
993	tooltip => "The password for your character",	1261	tooltip => "The password for your character",
994	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	1262	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
995	);	1263	);
996		1264
997	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");	1265	$table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
998	$table->add (1, 7, new CFPlus::UI::Slider	1266	$table->add_at (1, 7, new CFPlus::UI::Slider
999	force_w => 100,	1267	force_w => 100,
1000	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1268	range => [$CFG->{mapsize}, 10, 100, 0, 1],
1001	tooltip => "This is the size of the portion of the map update the server sends you. "	1269	tooltip => "This is the size of the portion of the map update the server sends you. "
1002	. "If you set this to a high value you will be able to see further, "	1270	. "If you set this to a high value you will be able to see further, "
1003	. "but you also increase bandwidth requirements and latency. "	1271	. "but you also increase bandwidth requirements and latency. "
1004	. "This option is only used once at log-in.",	1272	. "This option is only used once at log-in.",
1005	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1273	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1006	);	1274	);
1007		1275
1008	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1276	$table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1009	$table->add (1, 8, new CFPlus::UI::CheckBox	1277	$table->add_at (1, 8, new CFPlus::UI::Entry
1010	state => $CFG->{face_prefetch},	1278	text => $CFG->{output_rate},
1011	tooltip => "<b>Background Image Prefetch</b>\n\n"	1279	tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1012	. "If enabled, the client automatically pre-fetches images from the server. "	1280	. "when sending data. When 0 or unset, the server "
1013	. "This might increase or create lag, but increases the chances "	1281	. "default will be used, which is usually around 100kb/s. Most servers will "
1014	. "of faces being ready for display when you encounter them. "	1282	. "dynamically find an optimal rate, so adjust this only when necessary.",
1015	. "It also uses up server bandwidth on every connect, "
1016	. "so only set it if you really need to prefetch images. "
1017	. "This option can be set and unset any time.",
1018	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1283	on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1019	);	1284	);
1020		1285
1021	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");	1286	$table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1022	$table->add (1, 9, new CFPlus::UI::Entry	1287	$table->add_at (1, 9, new CFPlus::UI::Entry
1023	text => $CFG->{output_count},	1288	text => $CFG->{output_count},
1024	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1289	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1025	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1290	on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1026	);	1291	);
1027		1292
1028	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");	1293	$table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1029	$table->add (1, 10, new CFPlus::UI::Entry	1294	$table->add_at (1, 10, new CFPlus::UI::Entry
1030	text => $CFG->{output_sync},	1295	text => $CFG->{output_sync},
1031	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1296	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1032	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1297	on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1033	);	1298	);
1034		1299
1035	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button	1300	$table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1036	expand => 1,	1301	expand => 1,
1037	align => 0,	1302	align => 0,
1038	text => "Login",	1303	text => "Login",
1039	on_activate => sub {	1304	on_activate => sub {
1040	$CONN ? stop_game	1305	$CONN ? stop_game
1041	: start_game;	1306	: start_game;
1042	0	1307	1
1043	},	1308	},
1044	);
1045
1046	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1047	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1048	text => $CFG->{say_command},
1049	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. "
1050	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1051	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1052	on_changed => sub {
1053	my ($self, $value) = @_;
1054	$CFG->{say_command} = $value;
1055	0
1056	}
1057	);	1309	);
1058		1310
1059	$vbox->add (new CFPlus::UI::FancyFrame	1311	$vbox->add (new CFPlus::UI::FancyFrame
1060	label => "Server Info",	1312	label => "Server Info",
1061	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),	1313	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1062	);	1314	);
1063		1315
1064	$vbox	1316	$vbox
1065	}	1317	}
1066		1318
1067	sub message_window {	1319	sub client_setup {
1068	my $window = new CFPlus::UI::Toplevel	1320	my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1069	name => "message_window",
1070	title => "Messages",
1071	border_bg => [1, 1, 1, 1],
1072	x => "max",
1073	y => 0,
1074	force_w => $::WIDTH * 0.4,
1075	force_h => $::HEIGHT * 0.5,
1076	child => (my $vbox = new CFPlus::UI::VBox),
1077	has_close_button => 1;
1078		1321
1079	$vbox->add ($LOGVIEW);	1322	my $row = 0;
1080		1323
1081	$vbox->add (my $input = new CFPlus::UI::Entry	1324	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1082	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1325	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
1083	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1326	state => $CFG->{show_tips},
1084	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1327	tooltip => "Show the <b>Tip of the day</b> window at startup?",
1085	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1086	on_focus_in => sub {	1328	on_changed => sub {
1087	my ($input, $prev_focus) = @_;	1329	my ($self, $value) = @_;
1088		1330	$CFG->{show_tips} = $value;
1089	delete $input->{refocus_map};
1090
1091	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1092	$input->{refocus_map} = 1;
1093	}	1331	0
1094	delete $input->{auto_activated};	1332	}
		1333	);
1095		1334
		1335	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
		1336	$table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
		1337	text => $CFG->{logview_max_par},
		1338	tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
		1339	. "sends more messages than this number, older messages get removed to save memory and "
		1340	. "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
		1341	on_changed => sub {
		1342	my ($self, $value) = @_;
		1343	$MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1096	0	1344	0
1097	},	1345	},
1098	on_activate => sub {
1099	my ($input, $text) = @_;
1100	$input->set_text ('');
1101
1102	if ($text =~ /^\/(.*)/) {
1103	$::CONN->user_send ($1);
1104	} else {
1105	my $say_cmd = $::CFG->{say_command} \|\| 'say';
1106	$::CONN->user_send ("$say_cmd $text");
1107	}
1108	if ($input->{refocus_map}) {
1109	delete $input->{refocus_map};
1110	$MAPWIDGET->focus_in
1111	}
1112
1113	0
1114	},
1115	on_escape => sub {
1116	$MAPWIDGET->grab_focus;
1117
1118	0
1119	},
1120	);
1121
1122	$CONSOLE = {
1123	window => $window,
1124	input => $input,
1125	};	1346	);
1126		1347
1127	$window	1348	$table
1128	}
1129
1130	sub open_string_query {
1131	my $cb = $_[1];
1132	my $dialog = new CFPlus::UI::Toplevel
1133	x => "center",
1134	y => "center",
1135	z => 50,
1136	force_w => $WIDTH * 4/5,
1137	title => $_[0];
1138
1139	$dialog->add (
1140	my $e = new CFPlus::UI::Entry
1141	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1142	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1143	);
1144
1145	$e->grab_focus;
1146	$dialog->show;
1147	}
1148
1149	sub open_quit_dialog {
1150	unless ($QUIT_DIALOG) {
1151	$QUIT_DIALOG = new CFPlus::UI::Toplevel
1152	x => "center",
1153	y => "center",
1154	z => 50,
1155	title => "Really Quit?",
1156	on_key_down => sub {
1157	my ($dialog, $ev) = @_;
1158	$ev->{sym} == 27 and $dialog->hide;
1159	}
1160	;
1161
1162	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1163
1164	$vb->add (new CFPlus::UI::Label
1165	text => "You should find a savebed and apply it first!",
1166	max_w => $WIDTH * 0.25,
1167	ellipsize => 0,
1168	);
1169	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1170	$hb->add (new CFPlus::UI::Button
1171	text => "Ok",
1172	expand => 1,
1173	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1174	);
1175	$hb->add (new CFPlus::UI::Button
1176	text => "Quit anyway",
1177	expand => 1,
1178	on_activate => sub { exit },
1179	);
1180	}
1181
1182	$QUIT_DIALOG->show;
1183	$QUIT_DIALOG->grab_focus;
1184	}	1349	}
1185		1350
1186	sub autopickup_setup {	1351	sub autopickup_setup {
		1352	my $r = new CFPlus::UI::ScrolledWindow (
		1353	expand => 1,
		1354	scroll_y => 1
		1355	);
1187	my $table = new CFPlus::UI::Table;	1356	$r->add (my $table = new CFPlus::UI::Table
		1357	row_expand => [0],
		1358	col_expand => [0, 1, 0, 1],
		1359	);
1188		1360
1189	for (	1361	for (
1190	["General", 0, 0,	1362	["General", 0, 0,
1191	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1363	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1192	["Inhibit autopickup" => PICKUP_INHIBIT],	1364	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1206	["Boots" => PICKUP_BOOTS],	1378	["Boots" => PICKUP_BOOTS],
1207	["Gloves" => PICKUP_GLOVES],	1379	["Gloves" => PICKUP_GLOVES],
1208	["Cloaks" => PICKUP_CLOAK],	1380	["Cloaks" => PICKUP_CLOAK],
1209	],	1381	],
1210		1382
1211	["Readables", 2, 2,	1383	["Readables", 2, 0,
1212	["Spellbooks" => PICKUP_SPELLBOOK],	1384	["Spellbooks" => PICKUP_SPELLBOOK],
1213	["Skillscrolls" => PICKUP_SKILLSCROLL],	1385	["Skillscrolls" => PICKUP_SKILLSCROLL],
1214	["Normal Books/Scrolls" => PICKUP_READABLES],	1386	["Normal Books/Scrolls" => PICKUP_READABLES],
1215	],	1387	],
1216	["Misc", 2, 7,	1388	["Misc", 2, 5,
1217	["Food" => PICKUP_FOOD],	1389	["Food" => PICKUP_FOOD],
1218	["Drinks" => PICKUP_DRINK],	1390	["Drinks" => PICKUP_DRINK],
1219	["Valuables (Money, Gems)" => PICKUP_VALUABLES],	1391	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1220	["Keys" => PICKUP_KEY],	1392	["Keys" => PICKUP_KEY],
1221	["Magical Items" => PICKUP_MAGICAL],	1393	["Magical Items" => PICKUP_MAGICAL],
1222	["Potions" => PICKUP_POTION],	1394	["Potions" => PICKUP_POTION],
1223	["Magic Devices" => PICKUP_MAGIC_DEVICE],	1395	["Magic Devices" => PICKUP_MAGIC_DEVICE],
1224	["Ignore cursed" => PICKUP_NOT_CURSED],	1396	["Ignore cursed" => PICKUP_NOT_CURSED],
1225	["Jewelery" => PICKUP_JEWELS],	1397	["Jewelery" => PICKUP_JEWELS],
		1398	["Flesh" => PICKUP_FLESH],
1226	],	1399	],
1227	["Weight/Value ratio", 2, 17]	1400	["Weight/Value ratio", 2, 17]
1228	)	1401	)
1229	{	1402	{
1230	my ($title, $x, $y, @bits) = @$_;	1403	my ($title, $x, $y, @bits) = @$_;
1231	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1404	$table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1232		1405
1233	for (@bits) {	1406	for (@bits) {
1234	++$y;	1407	++$y;
1235		1408
1236	my $mask = $_->[1];	1409	my $mask = $_->[1];
1237	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);	1410	$table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1238	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox	1411	$table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1239	state => $::CFG->{pickup} & $mask,	1412	state => $::CFG->{pickup} & $mask,
1240	on_changed => sub {	1413	on_changed => sub {
1241	my ($box, $value) = @_;	1414	my ($box, $value) = @_;
1242		1415
1243	if ($value) {	1416	if ($value) {
…		…
1254		1427
1255	${$_->[2]} = $checkbox if $_->[2];	1428	${$_->[2]} = $checkbox if $_->[2];
1256	}	1429	}
1257	}	1430	}
1258		1431
1259	$table->add (2, 18, new CFPlus::UI::ValSlider	1432	$table->add_at (2, 18, new CFPlus::UI::ValSlider
1260	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1433	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1261	template => ">= 99",	1434	template => ">= 99",
1262	to_value => sub { ">= " . 5 * $_[0] },	1435	to_value => sub { ">= " . 5 * $_[0] },
1263	on_changed => sub {	1436	on_changed => sub {
1264	my ($slider, $value) = @_;	1437	my ($slider, $value) = @_;
…		…
1267	$::CFG->{pickup} \|= int $value	1440	$::CFG->{pickup} \|= int $value
1268	if $value;	1441	if $value;
1269	1;	1442	1;
1270	});	1443	});
1271		1444
1272	$table->add (3, 18, new CFPlus::UI::Button	1445	$table->add_at (3, 18, new CFPlus::UI::Button
1273	text => "set",	1446	text => "set",
1274	on_activate => sub {	1447	on_activate => sub {
1275	$::CONN->send_command ("pickup $::CFG->{pickup}")	1448	$::CONN->send_command ("pickup $::CFG->{pickup}")
1276	if defined $::CONN;	1449	if defined $::CONN;
1277	0	1450	0
1278	});	1451	});
1279		1452
1280	$table	1453	$r
1281	}	1454	}
1282		1455
1283	my %SORT_ORDER = (	1456	my %SORT_ORDER = (
1284	type => undef,	1457	type => undef,
1285	mtime => sub { sort {	1458	mtime => sub {
		1459	my $NOW = time;
		1460	sort {
		1461	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1462	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1463
1286	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)	1464	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287	or $b->{mtime} <=> $a->{mtime}	1465	or $btime <=> $atime
1288	or $a->{type} <=> $b->{type}	1466	or $a->{type} <=> $b->{type}
		1467	} @_
1289	} @_ },	1468	},
1290	weight => sub { sort {	1469	weight => sub { sort {
1291	$a->{weight} * ($a->{nrof} \|\| 1) <=> $b->{weight} * ($b->{nrof} \|\| 1)	1470	$a->{weight} * ($a->{nrof} \|\| 1) <=> $b->{weight} * ($b->{nrof} \|\| 1)
1292	or $a->{type} <=> $b->{type}	1471	or $a->{type} <=> $b->{type}
1293	} @_ },	1472	} @_ },
1294	);	1473	);
…		…
1319	#TODO# update to weigh/maxweight	1498	#TODO# update to weigh/maxweight
1320	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);	1499	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321		1500
1322	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	1501	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1323	$sw1->add ($INV = new CFPlus::UI::Inventory);	1502	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1503	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1324		1504
1325	$hb->add (my $vb2 = new CFPlus::UI::VBox);	1505	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1326		1506
1327	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);	1507	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1328		1508
…		…
1357	has_close_button => 1	1537	has_close_button => 1
1358	;	1538	;
1359		1539
1360	my $ntb =	1540	my $ntb =
1361	$PL_NOTEBOOK =	1541	$PL_NOTEBOOK =
1362	new CFPlus::UI::Notebook expand => 1, debug => 1;	1542	new CFPlus::UI::Notebook expand => 1;
1363		1543
1364	$ntb->add (	1544	$ntb->add_tab (
1365	"Statistics (F2)" => $STATS_PAGE = stats_window,	1545	"Statistics (F2)" => $STATS_PAGE = stats_window,
1366	"Shows statistics, where all your Stats and Resistances are shown."	1546	"Shows statistics, where all your Stats and Resistances are shown."
1367	);	1547	);
1368	$ntb->add (	1548	$ntb->add_tab (
1369	"Skills (F3)" => $SKILL_PAGE = skill_window,	1549	"Skills (F3)" => $SKILL_PAGE = skill_window,
1370	"Shows all your Skills."	1550	"Shows all your Skills."
1371	);	1551	);
1372		1552
1373	my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1553	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1374	$spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);	1554	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1375	$ntb->add (	1555	$ntb->add_tab (
1376	"Spellbook (F4)" => $spellsw,	1556	"Spellbook (F4)" => $spellsw,
1377	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1557	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1378	);	1558	);
1379	$ntb->add (	1559	$ntb->add_tab (
1380	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1560	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1381	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1561	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1382	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1562	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1383	);	1563	);
		1564	$ntb->add_tab (Pickup => autopickup_setup,
		1565	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1384		1566
1385	$ntb->set_current_page ($INVENTORY_PAGE);	1567	$ntb->set_current_page ($INVENTORY_PAGE);
1386		1568
1387	$plwin->add ($ntb);	1569	$plwin->add ($ntb);
1388	$plwin	1570	$plwin
1389	}	1571	}
1390		1572
1391	sub update_bindings {
1392	$BIND_UPD_CB->() if $BIND_UPD_CB;
1393	}
1394
1395	sub keyboard_setup {	1573	sub keyboard_setup {
1396	my $binding_list = new CFPlus::UI::VBox;	1574	CFPlus::Macro::keyboard_setup
1397
1398	my $refresh;
1399	$refresh = $BIND_UPD_CB = sub {
1400	$binding_list->clear ();
1401
1402	for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1403	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1404	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1405	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1406
1407	my $lbl = join "; ", @$cmds;
1408	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1409	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1410	$hb->add (new CFPlus::UI::Button
1411	text => "delete",
1412	tooltip => "Deletes the binding",
1413	on_activate => sub {
1414	$binding_list->remove ($hb);
1415	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1416	0
1417	});
1418
1419	$hb->add (new CFPlus::UI::Button
1420	text => "edit",
1421	tooltip => "Edits the binding",
1422	on_activate => sub {
1423	$::BIND_EDITOR->set_binding (
1424	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1425	sub {
1426	my ($nmod, $nsym, $ncmds) = @_;
1427	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1428	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1429	$refresh->();
1430	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1431	$SETUP_DIALOG->show;
1432	},
1433	sub {
1434	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1435	$SETUP_DIALOG->show;
1436	});
1437	$::BIND_EDITOR->show;
1438	$SETUP_DIALOG->hide;
1439	0
1440	});
1441
1442	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1443	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1444	}
1445	}
1446	};
1447
1448	my $vb = new CFPlus::UI::VBox;
1449	$vb->add (new CFPlus::UI::FancyFrame
1450	label => "Options",
1451	child => (my $hb = new CFPlus::UI::HBox),
1452	);
1453	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1454	$hb->add (new CFPlus::UI::CheckBox
1455	expand => 1,
1456	state => $CFG->{shift_fire_stop},
1457	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1458	on_changed => sub {
1459	my ($cbox, $value) = @_;
1460	$CFG->{shift_fire_stop} = $value;
1461	0
1462	});
1463
1464	$vb->add (new CFPlus::UI::FancyFrame
1465	label => "Bindings",
1466	child => $binding_list);
1467	$vb->add (my $hb = new CFPlus::UI::HBox);
1468
1469	$hb->add (new CFPlus::UI::Button
1470	text => "record new",
1471	expand => 1,
1472	tooltip => "This button opens the binding editor with an empty binding.",
1473	on_activate => sub {
1474	$::BIND_EDITOR->set_binding (undef, undef, [],
1475	sub {
1476	my ($mod, $sym, $cmds) = @_;
1477	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1478	$refresh->();
1479	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1480	$SETUP_DIALOG->show;
1481	},
1482	sub {
1483	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1484	$SETUP_DIALOG->show;
1485	},
1486	);
1487	$SETUP_DIALOG->hide;
1488	$::BIND_EDITOR->show;
1489	0
1490	},
1491	);
1492
1493	$hb->add (new CFPlus::UI::Button
1494	text => "close",
1495	tooltip => "Closes the binding window",
1496	expand => 1,
1497	on_activate => sub {
1498	$SETUP_DIALOG->hide;
1499	0
1500	}
1501	);
1502
1503	$refresh->();
1504
1505	$vb
1506	}	1575	}
1507		1576
1508	sub help_window {	1577	sub help_window {
1509	my $win = new CFPlus::UI::Toplevel	1578	my $win = new CFPlus::UI::Toplevel
1510	x => 'center',	1579	x => 'center',
1511	y => 'center',	1580	y => 'center',
1512	z => 2,	1581	z => 4,
1513	name => 'doc_browser',	1582	name => 'doc_browser',
1514	force_w => int $WIDTH * 7/8,	1583	force_w => int $WIDTH * 7/8,
1515	force_h => int $HEIGHT * 7/8,	1584	force_h => int $HEIGHT * 7/8,
1516	title => "Help Browser",	1585	title => "Help Browser",
1517	has_close_button => 1;	1586	has_close_button => 1;
…		…
1605	};	1674	};
1606		1675
1607	$win	1676	$win
1608	}	1677	}
1609		1678
		1679	sub open_string_query {
		1680	my ($title, $cb, $txt, $tooltip) = @_;
		1681	my $dialog = new CFPlus::UI::Toplevel
		1682	x => "center",
		1683	y => "center",
		1684	z => 50,
		1685	force_w => $WIDTH * 4/5,
		1686	title => $title;
		1687
		1688	$dialog->add (
		1689	my $e = new CFPlus::UI::Entry
		1690	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1691	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1692	tooltip => $tooltip
		1693	);
		1694
		1695	$e->grab_focus;
		1696	$e->set_text ($txt) if $txt;
		1697	$dialog->show;
		1698	}
		1699
		1700	sub open_quit_dialog {
		1701	unless ($QUIT_DIALOG) {
		1702	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1703	x => "center",
		1704	y => "center",
		1705	z => 50,
		1706	title => "Really Quit?",
		1707	on_key_down => sub {
		1708	my ($dialog, $ev) = @_;
		1709	$ev->{sym} == 27 and $dialog->hide;
		1710	}
		1711	;
		1712
		1713	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1714
		1715	$vb->add (new CFPlus::UI::Label
		1716	text => "You should find a savebed and apply it first!",
		1717	max_w => $WIDTH * 0.25,
		1718	ellipsize => 0,
		1719	);
		1720	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1721	$hb->add (new CFPlus::UI::Button
		1722	text => "Ok",
		1723	expand => 1,
		1724	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1725	);
		1726	$hb->add (new CFPlus::UI::Button
		1727	text => "Quit anyway",
		1728	expand => 1,
		1729	on_activate => sub { exit },
		1730	);
		1731	}
		1732
		1733	$QUIT_DIALOG->show;
		1734	$QUIT_DIALOG->grab_focus;
		1735	}
		1736
		1737	sub show_tip_of_the_day {
		1738	# find all tips
		1739	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
		1740
		1741	CFPlus::DB::get state => "tip_of_the_day", sub {
		1742	my ($todindex) = @_;
		1743	$todindex = 0 if $todindex >= @tod;
		1744	CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
		1745
		1746	# create dialog
		1747	my $dialog;
		1748
		1749	my $close = sub {
		1750	$dialog->destroy;
		1751	};
		1752
		1753	$dialog = new CFPlus::UI::Toplevel
		1754	x => "center",
		1755	y => "center",
		1756	z => 3,
		1757	name => 'tip_of_the_day',
		1758	force_w => int $WIDTH * 4/9,
		1759	force_h => int $WIDTH * 2/9,
		1760	title => "Tip of the day #" . (1 + $todindex),
		1761	child => my $vbox = new CFPlus::UI::VBox,
		1762	has_close_button => 1,
		1763	on_delete => $close,
		1764	;
		1765
		1766	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1767	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1768	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1769
		1770	$vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
		1771
		1772	$table->add_at (0, 0, new CFPlus::UI::Button
		1773	text => "Close",
		1774	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>.",
		1775	on_activate => $close,
		1776	);
		1777
		1778	$table->add_at (2, 0, new CFPlus::UI::Button
		1779	text => "Next",
		1780	tooltip => "Show the next <b>Tip of the day</b>.",
		1781	on_activate => sub {
		1782	$close->();
		1783	&show_tip_of_the_day;
		1784	},
		1785	);
		1786
		1787	$dialog->show;
		1788	};
		1789	}
		1790
1610	sub sdl_init {	1791	sub sdl_init {
1611	CFPlus::SDL_Init	1792	CFPlus::SDL_Init
1612	and die "SDL::Init failed!\n";	1793	and die "SDL::Init failed!\n";
1613	}	1794	}
1614		1795
1615	sub video_init {	1796	sub video_init {
1616	sdl_init;
1617
1618	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;	1797	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1619		1798
1620	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	1799	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1621		1800
1622	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1801	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1623	$FULLSCREEN = $CFG->{fullscreen};	1802	$FULLSCREEN = $CFG->{fullscreen};
1624	$FAST = $CFG->{fast};	1803	$FAST = $CFG->{fast};
1625		1804
1626	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1805	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1627	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";	1806	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1628		1807
1629	$SDL_ACTIVE = 1;	1808	$SDL_ACTIVE = 1;
1630	$LAST_REFRESH = time - 0.01;	1809	$LAST_REFRESH = time - 0.01;
1631		1810
…		…
1646	padding => 0,	1825	padding => 0,
1647	z => 100,	1826	z => 100,
1648	force_x => "max",	1827	force_x => "max",
1649	force_y => 0;	1828	force_y => 0;
1650	$DEBUG_STATUS->show;	1829	$DEBUG_STATUS->show;
1651
1652	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1653		1830
1654	$STATUSBOX = new CFPlus::UI::Statusbox;	1831	$STATUSBOX = new CFPlus::UI::Statusbox;
1655	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1832	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1656		1833
1657	(new CFPlus::UI::Frame	1834	(new CFPlus::UI::Frame
…		…
1675		1852
1676	$MAPWIDGET = new CFPlus::MapWidget;	1853	$MAPWIDGET = new CFPlus::MapWidget;
1677	$MAPWIDGET->connect (activate_console => sub {	1854	$MAPWIDGET->connect (activate_console => sub {
1678	my ($mapwidget, $preset) = @_;	1855	my ($mapwidget, $preset) = @_;
1679		1856
1680	if ($CONSOLE) {	1857	$MESSAGE_WINDOW->activate_console ($preset)
1681	$CONSOLE->{input}->{auto_activated} = 1;	1858	if $MESSAGE_WINDOW;
1682	$CONSOLE->{input}->grab_focus;
1683
1684	if ($preset && $CONSOLE->{input}->get_text eq '') {
1685	$CONSOLE->{input}->set_text ($preset);
1686	}
1687	}
1688	});	1859	});
1689	$MAPWIDGET->show;	1860	$MAPWIDGET->show;
1690	$MAPWIDGET->grab_focus;	1861	$MAPWIDGET->grab_focus;
1691
1692	$LOGVIEW = new CFPlus::UI::TextScroller
1693	expand => 1,
1694	font => $FONT_FIXED,
1695	fontsize => $::CFG->{log_fontsize},
1696	indent => -4,
1697	can_hover => 1,
1698	can_events => 1,
1699	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1700	;
1701		1862
1702	$SETUP_DIALOG = new CFPlus::UI::Toplevel	1863	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1703	title => "Setup",	1864	title => "Setup",
1704	name => "setup_dialog",	1865	name => "setup_dialog",
1705	x => 'center',	1866	x => 'center',
…		…
1709	force_h => $::HEIGHT * 0.6,	1870	force_h => $::HEIGHT * 0.6,
1710	has_close_button => 1,	1871	has_close_button => 1,
1711	;	1872	;
1712		1873
1713	$METASERVER = metaserver_dialog;	1874	$METASERVER = metaserver_dialog;
		1875	$MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1714		1876
1715	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,	1877	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1716	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);	1878	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1717		1879
1718	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1880	$SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1719	"Configure the server to play on, your username, password and other server-related options.");	1881	"Configure the server to play on, your username, password and other server-related options.");
1720	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1882	$SETUP_NOTEBOOK->add_tab (Client => client_setup,
1721	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1883	"Configure various client-specific settings.");
1722	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1884	$SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1723	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1885	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1724	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1886	$SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1725	"Configure the use of audio, sound effects and background music.");	1887	"Configure the use of audio, sound effects and background music.");
1726	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1888	$SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1727	"Lets you define, edit and delete key bindings."	1889	"Lets you define, edit and delete key bindings."
1728	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "	1890	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1729	. "with nothing set and the recording started. After doing the actions you "	1891	. "with nothing set and the recording started. After doing the actions you "
1730	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1892	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1731	. "After pressing the combo the binding will be saved automatically and the "	1893	. "After pressing the combo the binding will be saved automatically and the "
1732	. "binding editor closes");	1894	. "binding editor closes");
1733	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1895	$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1734	"Some debuggin' options. Do not ask.");	1896	"Some debuggin' options. Do not ask.");
1735		1897
1736	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1898	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1737		1899
1738	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1900	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1739	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1901	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1740		1902
1741	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1903	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1742	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1904	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1743		1905
1744	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	1906	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
1745		1907
1746	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,	1908	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
…		…
1757	},	1919	},
1758	);	1920	);
1759		1921
1760	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	1922	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1761	tooltip => "View Documentation");	1923	tooltip => "View Documentation");
		1924
1762		1925
1763	$BUTTONBAR->add (new CFPlus::UI::Button	1926	$BUTTONBAR->add (new CFPlus::UI::Button
1764	text => "Quit",	1927	text => "Quit",
1765	tooltip => "Terminates the program",	1928	tooltip => "Terminates the program",
1766	on_activate => sub {	1929	on_activate => sub {
…		…
1784	CFPlus::OpenGL::shutdown;	1947	CFPlus::OpenGL::shutdown;
1785		1948
1786	undef $SDL_ACTIVE;	1949	undef $SDL_ACTIVE;
1787	}	1950	}
1788		1951
1789	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1790	my $bgmusic;#TODO#hack#d#
1791
1792	sub audio_channel_finished {
1793	my ($channel) = @_;
1794
1795	#warn "channel $channel finished\n";#d#
1796	}
1797
1798	sub audio_music_finished {
1799	return unless $CFG->{bgm_enable};
1800
1801	# TODO: hack, do play loop and mood music
1802	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1803	$bgmusic->play (0);
1804
1805	push @bgmusic, shift @bgmusic;
1806	}
1807
1808	sub audio_init {	1952	sub audio_init {
1809	if ($CFG->{audio_enable}) {	1953	if ($CFG->{audio_enable}) {
1810	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {	1954	$ENV{MIX_EFFECTSMAXSPEED} = 1;
1811	$SDL_MIXER = !CFPlus::Mix_OpenAudio;	1955	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1812		1956
1813	unless ($SDL_MIXER) {	1957	unless ($SDL_MIXER) {
1814	status "Unable to open sound device: there will be no sound";	1958	status "Unable to open sound device: there will be no sound";
1815	return;	1959	return;
1816	}
1817
1818	CFPlus::Mix_AllocateChannels 8;
1819	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1820
1821	audio_music_finished;
1822
1823	while (<$fh>) {
1824	next if /^\s*#/;
1825	next if /^\s*$/;
1826
1827	my ($file, $volume, $event) = split /\s+/, $_, 3;
1828
1829	push @SOUNDS, "$volume,$file";
1830
1831	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
1832	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1833	$chunk->volume ($volume * 128 / 100);
1834	$chunk
1835	};
1836	}
1837	} else {
1838	status "unable to open sound config: $!";
1839	}	1960	}
		1961
		1962	CFPlus::Mix_AllocateChannels 16;
		1963
		1964	audio_music_finished;
		1965	} else {
		1966	undef $SDL_MIXER;
1840	}	1967	}
1841	}	1968	}
1842		1969
1843	sub audio_shutdown {	1970	sub audio_shutdown {
1844	CFPlus::Mix_CloseAudio if $SDL_MIXER;	1971	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1845	undef $SDL_MIXER;	1972	undef $SDL_MIXER;
1846	@SOUNDS = ();	1973	@SOUNDS = ();
1847	%AUDIO_CHUNKS = ();	1974	%AUDIO_CHUNK = ();
1848	}	1975	}
1849		1976
1850	my %animate_object;	1977	my %animate_object;
1851	my $animate_timer;	1978	my $animate_timer;
1852		1979
1853	my $fps = 9;	1980	my $fps = 9;
1854
1855	my %demo;#d#
1856		1981
1857	sub force_refresh {	1982	sub force_refresh {
1858	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1983	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1859	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	1984	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1860		1985
1861	$CFPlus::UI::ROOT->draw;	1986	$CFPlus::UI::ROOT->draw;
1862		1987
1863	$WANT_REFRESH = 0;	1988	$WANT_REFRESH = 0;
1864	$CAN_REFRESH = 0;	1989	$CAN_REFRESH = 0;
1865	$LAST_REFRESH = $NOW;	1990	$LAST_REFRESH = $NOW;
1866		1991
1867	CFPlus::SDL_GL_SwapBuffers;	1992	CFPlus::SDL_GL_SwapBuffers;
1868	}	1993	}
1869		1994
1870	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	1995	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1871	$NOW = time;	1996	$NOW = time;
1872		1997
1873	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)	1998	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
1874	for CFPlus::SDL_PollEvent;	1999	for CFPlus::poll_events;
1875		2000
1876	if (%animate_object) {	2001	if (%animate_object) {
1877	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2002	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1878	$WANT_REFRESH++;	2003	++$WANT_REFRESH;
1879	}	2004	}
1880		2005
1881	if ($WANT_REFRESH) {	2006	if ($WANT_REFRESH) {
1882	force_refresh;	2007	force_refresh;
1883	} else {	2008	} else {
…		…
1893	sub animation_stop {	2018	sub animation_stop {
1894	my ($widget) = @_;	2019	my ($widget) = @_;
1895	delete $animate_object{$widget};	2020	delete $animate_object{$widget};
1896	}	2021	}
1897		2022
1898	# check once/second for faces that need to be prefetched
1899	# this should, of course, only run on demand, but
1900	# SDL forces worse things on us....
1901
1902	Event->timer (after => 1, interval => 0.25, cb => sub {
1903	$CONN->face_prefetch
1904	if $CONN;
1905	});
1906
1907	%SDL_CB = (	2023	%SDL_CB = (
1908	CFPlus::SDL_QUIT => sub {	2024	CFPlus::SDL_QUIT => sub {
1909	Event::unloop -1;	2025	exit;
1910	},	2026	},
1911	CFPlus::SDL_VIDEORESIZE => sub {	2027	CFPlus::SDL_VIDEORESIZE => sub {
1912	},	2028	},
1913	CFPlus::SDL_VIDEOEXPOSE => sub {	2029	CFPlus::SDL_VIDEOEXPOSE => sub {
1914	CFPlus::UI::full_refresh;	2030	CFPlus::UI::full_refresh;
1915	},	2031	},
1916	CFPlus::SDL_ACTIVEEVENT => sub {	2032	CFPlus::SDL_ACTIVEEVENT => sub {
1917	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2033	# not useful, as APPACTIVE include sonly iconified state, not unmapped
		2034	# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
		2035	# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
		2036	# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
		2037	# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
		2038	# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1918	},	2039	},
1919	CFPlus::SDL_KEYDOWN => sub {	2040	CFPlus::SDL_KEYDOWN => sub {
1920	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {	2041	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1921	# alt-enter	2042	# alt-enter
1922	$FULLSCREEN_ENABLE->toggle;	2043	$FULLSCREEN_ENABLE->toggle;
…		…
1943		2064
1944	$SIG{INT} = $SIG{TERM} = sub { exit };	2065	$SIG{INT} = $SIG{TERM} = sub { exit };
1945		2066
1946	{	2067	{
1947	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";	2068	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
		2069	CFPlus::DB::Server::run;
		2070
1948	CFPlus::UI::set_layout ($::CFG->{layout});	2071	CFPlus::UI::set_layout ($::CFG->{layout});
1949		2072
1950	my %DEF_CFG = (	2073	my %DEF_CFG = (
1951	sdl_mode => 0,	2074	sdl_mode => 0,
1952	width => 640,
1953	height => 480,
1954	fullscreen => 0,	2075	fullscreen => 0,
1955	fast => 0,	2076	fast => 0,
1956	map_scale => 1,	2077	map_scale => 1,
1957	fow_enable => 1,	2078	fow_enable => 1,
1958	fow_intensity => 0.45,	2079	fow_intensity => 0,
1959	fow_smooth => 0,	2080	map_smoothing => 1,
1960	gui_fontsize => 1,	2081	gui_fontsize => 1,
1961	log_fontsize => 0.7,	2082	log_fontsize => 0.7,
1962	gauge_fontsize => 1,	2083	gauge_fontsize => 1,
1963	gauge_size => 0.35,	2084	gauge_size => 0.35,
1964	stat_fontsize => 0.7,	2085	stat_fontsize => 0.7,
1965	mapsize => 100,	2086	mapsize => 100,
1966	say_command => 'say',
1967	audio_enable => 1,	2087	audio_enable => 1,
1968	bgm_enable => 1,	2088	bgm_enable => 1,
1969	bgm_volume => 0.25,	2089	bgm_volume => 0.25,
1970	face_prefetch => 0,
1971	output_sync => 1,	2090	output_sync => 1,
1972	output_count => 1,	2091	output_count => 1,
		2092	output_rate => "",
1973	pickup => 0,	2093	pickup => 0,
1974	inv_sort => "mtime",	2094	inv_sort => "mtime",
1975	default => "profile", # default profile	2095	default => "profile", # default profile
		2096	show_tips => 1,
		2097	logview_max_par => 1000,
1976	);	2098	);
1977		2099
1978	while (my ($k, $v) = each %DEF_CFG) {	2100	while (my ($k, $v) = each %DEF_CFG) {
1979	$CFG->{$k} = $v unless exists $CFG->{$k};	2101	$CFG->{$k} = $v unless exists $CFG->{$k};
1980	}	2102	}
1981		2103
1982	$CFG->{profile}{default}{host} \|\|= "crossfire.schmorp.de";	2104	$CFG->{profile}{default}{host} \|\|= "crossfire.schmorp.de";
		2105	$PROFILE = $CFG->{profile}{default};
		2106
		2107	# convert old bindings (only default profile matters)
		2108	if (my $bindings = delete $PROFILE->{bindings}) {
		2109	while (my ($mod, $syms) = each %$bindings) {
		2110	while (my ($sym, $cmds) = each %$syms) {
		2111	push @{ $PROFILE->{macro} }, {
		2112	accelkey => [$mod1, $sym1],
		2113	action => $cmds,
		2114	};
		2115	}
		2116	}
		2117	}
1983		2118
1984	sdl_init;	2119	sdl_init;
1985		2120
1986	@SDL_MODES = reverse	2121	@SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1987	grep $_->[0] >= 640 && $_->[1] >= 480,	2122	@SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1988	CFPlus::SDL_ListModes;
1989
1990	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2123	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		2124
		2125	@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1991		2126
1992	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2127	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1993		2128
1994	{	2129	{
1995	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(	2130	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
…		…
2024	# }	2159	# }
2025	# my $t2 = Time::HiRes::time;	2160	# my $t2 = Time::HiRes::time;
2026	# warn $t2-$t1;	2161	# warn $t2-$t1;
2027	# }	2162	# }
2028		2163
		2164	$startup_done->();
		2165
2029	video_init;	2166	video_init;
2030	audio_init;	2167	audio_init;
2031	}	2168	}
		2169
		2170	show_tip_of_the_day if $CFG->{show_tips};
2032		2171
2033	Event::loop;	2172	Event::loop;
2034	#CFPlus::SDL_Quit;	2173	#CFPlus::SDL_Quit;
2035	#CFPlus::_exit 0;	2174	#CFPlus::_exit 0;
2036		2175
		2176	END {
2037	END { CFPlus::SDL_Quit }	2177	CFPlus::SDL_Quit;
		2178	CFPlus::DB::Server::stop;
		2179	}
2038		2180
2039	=head1 NAME	2181	=head1 NAME
2040		2182
2041	cfplus - A Crossfire+ and Crossfire game client	2183	cfplus - A Crossfire+ and Crossfire game client
2042		2184

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.116 by root, Mon Aug 14 04:15:04 2006 UTC vs. Revision 1.195 by root, Tue Jul 31 01:03:52 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.116 by root, Mon Aug 14 04:15:04 2006 UTC vs.
Revision 1.195 by root, Tue Jul 31 01:03:52 2007 UTC