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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.92 by elmex, Fri Jul 14 17:35:35 2006 UTC vs. Revision 1.209 by root, Sat Aug 11 14:41:38 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.92 by elmex, Fri Jul 14 17:35:35 2006 UTC vs.
Revision 1.209 by root, Sat Aug 11 14:41:38 2007 UTC